bugfixes, version bumped

Author: qzb

VERSION

@@ -1 +1 @@
-0.1.0-dev
+0.1.0

semver.sh

@@ -184,8 +184,6 @@ resolve_rule()
     # Tilde
     elif regex_match "$1" "~$RE_VER"; then
         echo "tilde $MATCHED_VER_1"
-    elif regex_match "$1" "$RE_NUM(\.[x*])+"; then
-        echo "tilde $MATCHED_NUM_1"
 
     # Caret
     elif regex_match "$1" "\^$RE_VER"; then
@@ -262,23 +260,28 @@ rule_ge_le()
 
 rule_tilde()
 {
-    ver1=$(get_version "$1")
-    maj2=$(get_major "$2")
-    min2=$(get_minor "$2")
+    num=$(get_version "$1")
+    maj=$(get_major "$1")
+    min=$(get_minor "$1")
 
-    if semver_ge "$3" "$maj2"".$min2"".0-0" && semver_le; then
+    if semver_ge "$2" "$num-0" && semver_le "$2" "$maj"".$(( $min + 1 )).0-0"; then
         return 0
     else
         return 1
     fi
 }
+if [ $# -eq 0 ]; then
+    echo "Usage:    $0 -r <rule> <version> [<version>... ]"
+fi
 
-while getopts r: o; do
+while getopts r:h o; do
     case "$o" in
-        r) rule="rule_$(resolve_rule $OPTARG)";;
+        r) rule="rule_$(resolve_rule "$OPTARG")";;
+        h|?) echo "Usage:    $0 -r <rule> <version> [<version>... ]"
     esac
 done
 
+
 shift $(( $OPTIND-1 ))
 
 for ver in $@; do

tests.sh

@@ -176,11 +176,11 @@ describe 'reslove_rule'
     RET=$(resolve_rule '~1.2.3')
     assert "$RET" "tilde 1.2.3"                             "Tilde (~1.2.3)"
 
-    RET=$(resolve_rule '1.2.x')
-    assert "$RET" "tilde 1.2"                               "Wildcard (1.2.x)"
+    #RET=$(resolve_rule '1.2.x')
+    #assert "$RET" "tilde 1.2"                               "Wildcard (1.2.x)"
 
-    RET=$(resolve_rule '1.*')
-    assert "$RET" "tilde 1"                                 "Wildcard (1.*)"
+    #RET=$(resolve_rule '1.*')
+    #assert "$RET" "tilde 1"                                 "Wildcard (1.*)"
 
     RET=$(resolve_rule '^1.2.3')
     assert "$RET" "caret 1.2.3"                             "Caret (^1.2.3)"
@@ -195,14 +195,54 @@ describe "rule_eq"
     rule_eq '1.2.3-a' '1.2.3-b'
     assert $? 1
 
+describe "rule_gt_lt"
+    rule_gt_lt '1.2.3' '2.3.4' '1.2.3'
+    assert $? 1
+
+    rule_gt_lt '1.2.3' '2.3.4' '2.1.0'
+    assert $? 0
+
+    rule_gt_lt '1.2.3' '2.3.4' '2.3.4'
+    assert $? 1
+
+describe "rule_gt_le"
+    rule_gt_le '1.2.3' '2.3.4' '1.2.3'
+    assert $? 1
+
+    rule_gt_le '1.2.3' '2.3.4' '2.1.0'
+    assert $? 0
+
+    rule_gt_le '1.2.3' '2.3.4' '2.3.4'
+    assert $? 0
+
+describe "rule_ge_lt"
+    rule_ge_lt '1.2.3' '2.3.4' '1.2.3'
+    assert $? 0
+
+    rule_ge_lt '1.2.3' '2.3.4' '2.1.0'
+    assert $? 0
+
+    rule_ge_lt '1.2.3' '2.3.4' '2.3.4'
+    assert $? 1
+
+describe "rule_ge_le"
+    rule_ge_le '1.2.3' '2.3.4' '1.2.3'
+    assert $? 0
+
+    rule_ge_le '1.2.3' '2.3.4' '2.1.0'
+    assert $? 0
+
+    rule_ge_le '1.2.3' '2.3.4' '2.3.4'
+    assert $? 0
+
 describe "rule_tilde"
     rule_tilde '1.2.3' '1.2.2'
     assert $? 1
 
-    rule_tilde '1.2.3' '1.2.3-0'
+    rule_tilde '1.2.3' '1.2.5'
     assert $? 0
 
-    rule_tilde '1.2.3' '1.3.0-0'
+    rule_tilde '1.2.3' '1.3.0'
     assert $? 1