Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Jaka Kranjc (981591a794cf710c1529b56713e78f14c965c11d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Jaka Kranjc (981591a794cf710c1529b56713e78f14c965c11d)
  • Date: Wed, 25 Apr 2007 04:16:09 -0500

GIT changes to master quill by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

usr/bin/quill | 6 +++---
var/lib/quill/ChangeLog | 8 ++++++++
var/lib/quill/modules/libcore | 9 ++++-----
var/lib/quill/modules/libperlcpan | 29 ++++++++++++++++-------------
var/lib/quill/modules/librubyraa | 2 +-
var/lib/quill/version | 2 +-
6 files changed, 33 insertions(+), 23 deletions(-)

New commits:
commit 981591a794cf710c1529b56713e78f14c965c11d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

* libcore: fix name normalisation, original is stored in
QUILL_ORIG_TARGET
* quill: use the non-normalised target for cpan
* libperlcpan, librubyraa: removed redundant lowcasing
* libperlcpan: removed other parameter references in favour of a
stored one
silenced quill_get_manifests find errors, improved output; react on
error

* version: 0.2.5
ruskie ^ please make it happen

diff --git a/usr/bin/quill b/usr/bin/quill
index 9614128..7bf79bc 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -12,7 +12,7 @@
## @Globals SPELL_UPDATED SPELL_NAME actions ANSWER WEB_SITE GRIMOIRE SECTION
## @Globals SPELL_DEPENDENCIES SPELL_OPTIONAL_DEPENDENCIES SPELL_CONFLICTS
## @Globals SPELL_PROVIDES PREPAREISON PREBUILDISON BUILDISON SPELL_SRC_FILE
-## @Globals INSTALLISON BS BUILD_DTFILE SPELL_SRC_URL
+## @Globals INSTALLISON BS BUILD_DTFILE SPELL_SRC_URL QUILL_ORIG_TARGET
##
## @Thanks BearPerson, dufflebunk, afrayedknot
## @Thanks To all testers
@@ -140,8 +140,8 @@ fi
quill_welcome
if [[ ! -z $QUILL_FETCH_MODE ]]
then
- # fetch various spell variables
- quill_${QUILL_FETCH_MODE}_core $QUILL_TARGET
+ # fetch various spell variables; some fetchers need the capsy names
+ quill_${QUILL_FETCH_MODE}_core $QUILL_TARGET $QUILL_ORIG_TARGET

# creates SPELL_VERSION and SPELL_SRC_FILE (to be SOURCE)
parse_spell_source_file_info
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 052e35f..2fba39f 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcore: fix name normalisation, original is stored in
QUILL_ORIG_TARGET
+ * quill: use the non-normalised target for cpan
+ * libperlcpan, librubyraa: removed redundant lowcasing
+ * libperlcpan: removed other parameter references in favour of a
stored one
+ silenced quill_get_manifests find errors, improved output; react on
error
+ * version: 0.2.5
+
2007-04-23 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* libcore: created the spell dir if it's not there in quill_rc

diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index db570e6..3523a5d 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -372,17 +372,16 @@ Arjan 'abouter' Bouter

#---
## @Synopsis checks if the parameter is missing
-## @Synopsis if not, saves it in QUILL_TARGET
-## Don't touch capitalisation... each module should
-## handle that on it's own
+## @Synopsis if not, saves it in QUILL_TARGET and QUILL_ORIG_TARGET
##
-## @Globals QUILL_TARGET
+## @Globals QUILL_TARGET QUILL_ORIG_TARGET
#---
function check_parameter() {
[[ -z $1 ]] &&
error_msg "Missing parameter" &&
quill_help 101 ||
- QUILL_TARGET="$1"
+ QUILL_ORIG_TARGET="$1" &&
+ QUILL_TARGET=$(tr '[[:upper:]]' '[[:lower:]]' <<< "$1")
}

#---
diff --git a/var/lib/quill/modules/libperlcpan
b/var/lib/quill/modules/libperlcpan
index 0ce9c46..d473c03 100644
--- a/var/lib/quill/modules/libperlcpan
+++ b/var/lib/quill/modules/libperlcpan
@@ -9,22 +9,25 @@ function quill_get_manifests()
# unless someone knows a better way to check files creation time
# this shoud work quite well
# basicaly update if the files are over a day old
- if [[ ! "$(find ${QUILL_TMP_DIR}/02packages.details.txt.gz -ctime 0)" ==
"${QUILL_TMP_DIR}/02packages.details.txt.gz" ]] ||
- [[ ! "$(find ${QUILL_TMP_DIR}/03modlist.data.gz -ctime 0)" ==
"${QUILL_TMP_DIR}/03modlist.data.gz" ]] ||
- [[ ! -f $QUILL_TMP_DIR/02packages.details.txt.gz ]] ||
- [[ ! -f $QUILL_TMP_DIR/03modlist.data.gz ]]
+ if [[ ! -f $QUILL_TMP_DIR/02packages.details.txt.gz ]] ||
+ [[ ! -f $QUILL_TMP_DIR/03modlist.data.gz ]] ||
+ [[ ! "$(find ${QUILL_TMP_DIR}/02packages.details.txt.gz -ctime 0)" ==
"${QUILL_TMP_DIR}/02packages.details.txt.gz" ]] ||
+ [[ ! "$(find ${QUILL_TMP_DIR}/03modlist.data.gz -ctime 0)" ==
"${QUILL_TMP_DIR}/03modlist.data.gz" ]]
then
cd $QUILL_TMP_DIR
- message "Attempting to retrieve 02packages.details.txt.gz..."
+ message -n "Retrieving 02packages.details.txt.gz ... "
wget -q \
-O 02packages.details.txt.gz \
ftp://ftp.perl.org/pub/CPAN/modules/02packages.details.txt.gz ||
(error_msg "Error: unable to fetch 02packages.details.txt.gz" &&
return 1)
- message "Attempting to retrieve 03modlist.data.gz..."
+ message "done."
+
+ message -n "Retrieving 03modlist.data.gz ... "
wget -q \
-O 03modlist.data.gz \
ftp://ftp.perl.org/pub/CPAN/modules/03modlist.data.gz ||
(error_msg "Error: unable to fetch 03modlist.data.gz" && return 1)
+ message "done."
fi
}

@@ -45,14 +48,14 @@ function quill_cpan_core()
{
# so it is set even if we end prematurely, useful when adding spells
# gets properly overwritten later on
- SPELL_NAME="$1"
+ SPELL_NAME="$2"

- quill_get_manifests
- if zgrep -q -w -E "^${1}" $QUILL_TMP_DIR/02packages.details.txt.gz ||
- zgrep -q -w -E "^'${1}'" $QUILL_TMP_DIR/03modlist.data.gz
+ quill_get_manifests || return 1
+ if zgrep -q -w -E "^$SPELL_NAME" $QUILL_TMP_DIR/02packages.details.txt.gz
||
+ zgrep -q -w -E "^'$SPELL_NAME'" $QUILL_TMP_DIR/03modlist.data.gz
then
- quill_get_cpan_meta $1
- SPELL_NAME="$(echo ${1} | sed -e 's/::/-/g')"
+ quill_get_cpan_meta $SPELL_NAME
+ SPELL_NAME="$(sed -e 's/::/-/g' <<< "$SPELL_NAME")"
SPELL_SRC_URL="http://www.cpan.org/authors/id/${QUILL_CPAN_INFO[2]}";
SPELL_VERSION="${QUILL_CPAN_INFO[1]}"
SPELL_SHORT_DESCRIPTION="${QUILL_CPAN_METADATA[6]}"
@@ -60,7 +63,7 @@ function quill_cpan_core()

SPELL_URL="http://search.cpan.org/~${QUILL_CPAN_METADATA[7]}/${SPELL_NAME}/";
local description
description="${QUILL_CPAN_METADATA[6]}"
- SPELL_NAME="$(echo $SPELL_NAME | tr "A-Z" "a-z")"
+ SPELL_NAME="${1//::/-}" # the lower case target wasn't manipulated yet
echo $description > ${QUILL_TMP_DIR}/${SPELL_NAME}
BUILDISON="BUILD, "
touch ${QUILL_TMP_DIR}/${SPELL_NAME}-BUILD
diff --git a/var/lib/quill/modules/librubyraa
b/var/lib/quill/modules/librubyraa
index 7f08f23..e0a9bff 100644
--- a/var/lib/quill/modules/librubyraa
+++ b/var/lib/quill/modules/librubyraa
@@ -24,7 +24,7 @@ function quill_raa_core(){
# so it is set even if we end prematurely, useful when adding spells
# gets properly overwritten later on
SPELL_NAME="$1"
- project="$(tr 'A-Z' 'a-z' <<< $1 )"
+ project="$SPELL_NAME"
raa_project_file=${QUILL_TMP_DIR}/${project}.raa
message "Attempting to retrieve project page..."
wget -q -O $raa_project_file.tmp \
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 9e53921..3a4036f 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.4-rc18
+0.2.5



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (981591a794cf710c1529b56713e78f14c965c11d), Jaka Kranjc, 04/25/2007

Archive powered by MHonArc 2.6.24.

Top of Page