Skip to Content.
Sympa Menu

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

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 (4c5556667b4590397da2e7f2fd1bc5b2a51ed27d)
  • Date: Thu, 21 Aug 2008 07:22:14 -0500

GIT changes to master quill by Andraž Levstik <ruskie AT codemages.net>:

var/lib/quill/ChangeLog | 4 +
var/lib/quill/modules/site_handlers/libfsfdirectory | 43
+++++++++++---------
var/lib/quill/version | 2
3 files changed, 30 insertions(+), 19 deletions(-)

New commits:
commit 4c5556667b4590397da2e7f2fd1bc5b2a51ed27d
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

quill: updated libfsfdirectory to work with new layout, 0.2.9 release

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 6ea0555..4b1e2b2 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * libfsfdirectory: updated for new layout
+ * version: 0.2.9, time for the dance
+
2008-08-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* quill: made it possible to ^C out of the source_url sanity checks
* version: 0.2.9-rc14
diff --git a/var/lib/quill/modules/site_handlers/libfsfdirectory
b/var/lib/quill/modules/site_handlers/libfsfdirectory
index e3b89eb..f51bc91 100644
--- a/var/lib/quill/modules/site_handlers/libfsfdirectory
+++ b/var/lib/quill/modules/site_handlers/libfsfdirectory
@@ -8,9 +8,11 @@ function quill_fsf_get_deps(){
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"
+ sed -n '/h5>Requirements</,/<\/ul>/ p' ${file} | \
+ grep "li" | \
+ grep "$data" | \
+ sed -e "s:<li>\(.*\)\ ($data).*</li>:\1:g" | \
+ tr "\n" " " | tr "A-Z" "a-z"
}
##
## @Globals SPELL_NAME SPELL_LICENSE SPELL_URL
@@ -27,23 +29,28 @@ function quill_fsf_core(){
if [[ ! -e ${fsf_project_file} ]]; then
message "Attempting to retrieve project page..."
wget -q -O $fsf_project_file \
- http://directory.fsf.org/$project.html || \
+ http://directory.fsf.org/project/$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')"
- cat $fsf_project_file | \
- sed -e 's:<body bgcolor="white">:>INDEX<:' | \
- sed -n '/INDEX/,/All_Packages_in_Directory/ p' | \
- sed -e ":top;/<.*>/{;s/<[^<>]*>//g;t top;};/</{;N;b top;}" | \
- sed '/Obtaining/d' | \
- sed '/INDEX/d' | \
- sed 's:Top &gt;.* &gt;::g' > \
- ${QUILL_TMP_DIR}/${SPELL_NAME}
+ SPELL_SRC_URL="$(sed -n '/<h4>Versions/,/<li>Licenses:/ p'
$fsf_project_file | grep "Source Archive:" | sed -e "s:.*<a
href=\"\(.*\)\".*:\1:g" -e "s:\".*::g")"
+
+ SPELL_SHORT_DESCRIPTION="$(sed -n '/<div id="description">/,/<p><em>Last
updated/ p' $fsf_project_file | sed -n '/<\/h3>/,/<p><em>/ p' | sed -e
"s:</h3>::g" -e "s:<p>::g" -e "s:</p>::g" -e "s:<em>.*::g" | head -n2 | tail
-n1 | sed -e "s:^ *::" -e "s: *$::")"
+
+ SPELL_DEPENDENCIES="$(echo $(quill_fsf_get_deps "Source Language"
"$fsf_project_file") $(quill_fsf_get_deps "Build Prerequisite"
"$fsf_project_file") $(quill_fsf_get_deps "Use Requirement"
"$fsf_project_file") | sed -e "s:^ *::" -e "s: *$::" )"
+
+ SPELL_OPTIONAL_DEPENDENCIES="$(echo $(quill_fsf_get_deps "Weak
prerequisites" "$fsf_project_file") | sed -e "s:^ *::" -e "s: *$::" )"
+
+ SPELL_LICENSE="$(sed -n '/<li>Licenses:/,/<\/li>/ p' $fsf_project_file |
tr "\n" " " | sed -e "s:.*<a href.*>\(.*\)</a>.*:\1:g")"
+
+ SPELL_URL="$(grep -E "<p>.*Homepage" $fsf_project_file | sed -e "s:.*<a
href=\"\(.*\)\">Homepage.*:\1:g")"
+
+ # Description
+
+ sed -n '/<div id="description">/,/<p><em>Last updated/ p'
$fsf_project_file | \
+ sed -n '/<\/h3>/,/<p><em>/ p' | \
+ sed -e "s:</h3>::g" -e "s:<p>::g" -e "s:</p>::g" -e "s:<em>.*::g" |
+ sed -e "s:^ *::" -e "s: *$::" > \
+ ${QUILL_TMP_DIR}/${SPELL_NAME}

}
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 1387aa1..1866a36 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.9-rc14
+0.2.9



  • [SM-Commit] GIT changes to master quill by Andraž Levstik (4c5556667b4590397da2e7f2fd1bc5b2a51ed27d), Andraž Levstik, 08/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page