Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Andraž Levstik (c02f7b8aa599aad539e1a0aaec2f7e73a5b6fb6c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Andraž Levstik (c02f7b8aa599aad539e1a0aaec2f7e73a5b6fb6c)
  • Date: Sun, 12 Aug 2007 04:06:40 -0500

GIT changes to master quill by Andraž Levstik <ruskie AT mages.ath.cx>:

usr/bin/quill | 9 ++++++
var/lib/quill/ChangeLog | 6 ++++
var/lib/quill/modules/libcore | 4 ++
var/lib/quill/modules/libfsfdirectory | 47
++++++++++++++++++++++++++++++++++
var/lib/quill/version | 2 -
5 files changed, 67 insertions(+), 1 deletion(-)

New commits:
commit c02f7b8aa599aad539e1a0aaec2f7e73a5b6fb6c
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

added FSF/UNESCO Free Software directory support untested as of yet

diff --git a/usr/bin/quill b/usr/bin/quill
index e63e288..98d9f42 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -71,6 +71,10 @@ while [[ -n $1 ]]; do
check_parameter $2
QUILL_FETCH_MODE="gna"
shift ;;
+ --fsf|-F)
+ check_parameter $2
+ QUILL_FETCH_MODE="fsf"
+ shift ;;
--update|-u)
check_parameter $2
QUILL_UPDATE="on"
@@ -105,6 +109,11 @@ while [[ -n $1 ]]; do
QUILL_UPDATE="on"
QUILL_FETCH_MODE="raa"
shift ;;
+ -Fu|-uF)
+ check_parameter $2
+ QUILL_UPDATE="on"
+ QUILL_FETCH_MODE="fsf"
+ shift ;;
--purge|-p) QUILL_MODE="purge"; quill_purge $2 ;;
--apprentice|-a) QUILL_MODE="apprentice" ;;
--mage|-m) QUILL_MODE="mage" ;;
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index c69ad7c..528ce61 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-12 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * libfsfdirectory: added support for FSF/UNESCO directory
+ of Free Software
+ * quill: fsf option
+ * libcore: added some forgotten flags
+
2007-08-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* librubyraa: added to check if the project page exists yet
* libsavane: generic support for any savane compatible site
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 85769e9..c39a746 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -587,6 +587,10 @@ OPTIONS:
--fmxml, -f <SPELL> get spell data from Freshmeat if possible
--perlcpan, -c <SPELL> get spell data from Perl-CPAN if possible
--rubyraa, -y <SPELL> get spell data from Ruby Application
Archive if possible
+ --savane, -s <SPELL> get spell data from a savane run site
+ --savannah, -a <SPELL> get spell data from the savannah site
+ --gna, -g <SPELL> get spell data from the gna! site
+ --fsf, -F <SPELL> get spell data from the fsf/unesco directory
site
--update, -u <SPELL> update exsisting spell
--apprentice, -a apprentice mode (default)
--mage, -m mage mode (advanced)
diff --git a/var/lib/quill/modules/libfsfdirectory
b/var/lib/quill/modules/libfsfdirectory
new file mode 100644
index 0000000..65a6d47
--- /dev/null
+++ b/var/lib/quill/modules/libfsfdirectory
@@ -0,0 +1,47 @@
+#
+## FSF/UNESCO directory module
+#
+
+function quill_fsf_get_deps(){
+ local data
+ local file
+ file="${2}"
+ data="${1}"
+ cat $file | \
+ grep "$data" | \
+ sed -e "s:.*<tr><td valign=\"top\">$data</td><td>\(.*\)</td></tr>.*:\1:g"
|\
+ sed -e "s:</td></tr>.*::g"
+}
+##
+## @Globals SPELL_NAME SPELL_LICENSE SPELL_URL
+## @Globals QUILL_TMP_DIR
+function quill_fsf_core(){
+ local project
+ local fsf_project_file
+
+ # so it is set even if we end prematurely, useful when adding spells
+ # gets properly overwritten later on
+ SPELL_NAME="$1"
+ project="$2"
+ fsf_project_file=${QUILL_TMP_DIR}/${project}.fsf
+ if [[ ! -e ${fsf_project_file} ]]; then
+ message "Attempting to retrieve project page..."
+ wget -q -O $fsf_project_file \
+ $project_url/$project/ || \
+ (error_msg "Error: unable to fetch project page" && \
+ return 1)
+ fi
+ SPELL_SRC_URL="$(cat $fsf_project_file| grep "Source tarball" | sed -e
's:.*<tr><td valign=\"top\">Source tarball</td><td><a
href=[^\"]*\"\([^\"]*\)\"[^\"]*>.*</a></td>.*:\1:g')"
+ SPELL_SHORT_DESCRIPTION="$(cat $fsf_project_file | grep "</p><h3>" | sed
-e 's:.*</p><h3>\(.*\)</h3>.*:\1:')"
+ SPELL_DEPENDENCIES="$(quill_fsf_get_deps "Source languages"
"$fsf_project_file") $(quill_fsf_get_deps "Build prerequisites"
"$fsf_project_file") $(quill_fsf_get_deps "Use requirements"
"$fsf_project_file"))"
+ SPELL_OPTIONAL_DEPENDENCIES="$(quill_fsf_get_deps "Weak prerequisites"
"$fsf_project_file")"
+ SPELL_LICENSE="$(cat $fsf_project_file| grep "Licensed under" | sed -e
's:.*<tr><td>\(Licensed under .*\)\.</td></tr> *.*:\1:' -e
's:<tr><td>This.*::' -e 's:\.</td></tr>::')"
+ SPELL_URL="$(cat $fsf_project_file| grep "Web page" | sed -e 's:.*<tr><td
valign=\"top\">Web page</td><td><a
href=[^\"]*\"\([^\"]*\)\"[^\"]*>.*</a></td>.*:\1:g')"
+ SPELL_NAME="$project"
+ sed -e 's:<body bgcolor="white">:>INDEX<:' $fsf_project_file | \
+ sed -e "s:.*<a href=\"\(.*\)\".*:\1:g" | \
+ sed -n '/INDEX/,/All_Packages_in_Directory/ p' | \
+ sed -e ":top;/<.*>/{;s/<[^<>]*>//g;t top;};/</{;N;b top;}" > \
+ ${QUILL_TMP_DIR}/${SPELL_NAME}
+
+}
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 6e33192..50fa946 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.8-rc2
+0.2.8-rc3



  • [SM-Commit] GIT changes to master quill by Andraž Levstik (c02f7b8aa599aad539e1a0aaec2f7e73a5b6fb6c), Andraž Levstik, 08/12/2007

Archive powered by MHonArc 2.6.24.

Top of Page