Refactor replicated function into Alien library

Author: hishamhm

Functions/Alien

@@ -1,5 +1,17 @@
 #!/bin/sh
 
+In_Version_Range() {
+   lower="$1"
+   ver="$2"
+   upper="$3"
+   [ "$ver" ] || return 1
+   [ "$ver" != "$lower" -a "$(GuessLatest "$ver" "$lower")" = "$lower" ] && return 1
+   [ "$upper" ] || return 0
+   [ "$(GuessLatest "$ver" "$upper")" = "$upper" ] || return 1
+   [ "$ver" = "$upper" -a "$ver" != "$lower" ] && return 1
+   return 0
+}
+
 Symlink_Aliens() {
    targetdir="$1"
    shift

bin/Alien-Cabal

@@ -15,20 +15,10 @@ alien_cabal--get-manager-rule() {
     echo "Cabal-Install"
 }
 
-alien_cabal__in_version_range() {
-   # $1=inclusive lower ver, $2=ver to check, $3=exclusive upper ver ($2==$3 iff $1==$3)
-   [ "$2" ] || return 1
-   [ "$2" != "$1" -a "$(GuessLatest "$2" "$1")" = "$1" ] && return 1
-   [ "$3" ] || return 0
-   [ "$(GuessLatest "$2" "$3")" = "$3" ] || return 1
-   [ "$2" = "$3" -a "$2" != "$1" ] && return 1
-   return 0
-}
-
 alien_cabal--met() {
     # $1=package, $2=lower version inclusive, [$3=upper version exclusive]
     ver=$(alien_cabal--getversion $1)
-    alien_cabal__in_version_range "$2" "$ver" "$3"
+    In_Version_Range "$2" "$ver" "$3"
 }
 alien_cabal--greater-than() { alien_cabal--met "$@"; }
 alien_cabal--within-range() { alien_cabal--met "$@"; }

bin/Alien-PIP

@@ -19,18 +19,6 @@ getversion() {
    fi
 }
 
-in_version_range() {
-   lower="$1"
-   ver="$2"
-   upper="$3"
-   [ "$ver" ] || return 1
-   [ "$ver" != "$lower" -a "$(GuessLatest "$ver" "$lower")" = "$lower" ] && return 1
-   [ "$upper" ] || return 0
-   [ "$(GuessLatest "$ver" "$upper")" = "$upper" ] || return 1
-   [ "$ver" = "$upper" -a "$ver" != "$lower" ] && return 1
-   return 0
-}
-
 getinstallversion() {
    prog="$1"
    versions=($(python - << EOF 
@@ -50,7 +38,7 @@ EOF
    ))
    for V in ${versions[@]}
    do
-      if in_version_range "$2" "$V" "$3"
+      if In_Version_Range "$2" "$V" "$3"
       then
          echo $V
          return 0
@@ -101,7 +89,7 @@ case "$command" in
       lower="$3"
       upper="$4"
       ver=$(getversion "$2")
-	  in_version_range "$lower" "$ver" "$upper"
+	  In_Version_Range "$lower" "$ver" "$upper"
       ;;
    --have-manager)
       which pip >/dev/null 2>&1 || exit 1

bin/Alien-RubyGems

@@ -10,23 +10,11 @@ getversion() {
    gem list "$prog" | sed -n -e '/'"$prog"' / { s/.*(\([^),]\+\)[),].*/\1/ p ; q} '
 }
 
-in_version_range() {
-   lower="$1"
-   ver="$2"
-   upper="$3"
-   [ "$ver" ] || return 1
-   [ "$ver" != "$lower" -a "$(GuessLatest "$ver" "$lower")" = "$lower" ] && return 1
-   [ "$upper" ] || return 0
-   [ "$(GuessLatest "$ver" "$upper")" = "$upper" ] || return 1
-   [ "$ver" = "$upper" -a "$ver" != "$lower" ] && return 1
-   return 0
-}
-
 getinstallversion() {
    prog="$1"
    for V in $(gem list --remote "$prog"  | sed -n -e '/'"$prog"' / { s/.*(\([^)]\+\))/\1/; s/,//g; p }')
    do
-      if in_version_range "$2" "$V" "$3"
+      if In_Version_Range "$2" "$V" "$3"
       then
          echo $V
          return 0
@@ -67,7 +55,7 @@ case "$command" in
       lower="$3"
       upper="$4"
       ver=$(getversion "$prog")
-      in_version_range "$lower" "$ver" "$upper"
+      In_Version_Range "$lower" "$ver" "$upper"
       ;;
    --have-manager)
       which gem >/dev/null 2>&1 || exit 1