Add better parameter checking

src/include/sync.sh

@@ -2,6 +2,31 @@
 
 ffoo import pretty
 
+__valid_pos_int() {
+    local val="$1"
+    local def="$2"
+    if test "$val" -gt 0;
+    then
+        echo "$val"
+    else
+        warn "not a positive int, using def: '$def' instead of '$val'"
+        echo "$default"
+    fi
+}
+
+__valid_int_rule() {
+    local rul="$1"
+    local def="$2"
+    local mocktest="test 0 $rul"
+    if bash -n <<<"$mocktest";
+    then
+        echo "$rul"
+    else
+        warn "not a valid int rule, using default: '$def' instead of '$rul'"
+        echo "$default"
+    fi
+}
+
 
 wait_until() {
     #
@@ -21,17 +46,25 @@ wait_until() {
     # more predictable behavior, limit your command with
     # timeout(1)
     #
-    local timeout=10
-    local delay=1
-    local es_test="-eq 0"
+    local delay             # delay between polls in s
+    local rule              # rule to check on exit status (`-eq 0`, `-lt 7`...)
+    local timeout           # timeout to give up in s
+    local usr_delay usr_rule usr_timeout    # user given values
+    local es_test           # to hold final exit status check
+    local def_delay=1       # defaults... vv
+    local def_rule='-eq 0'
+    local def_timeout=10
     while true; do case "$1" in
-        -x) es_test="-eq $2"; shift;    ;;
-        -X) es_test="$2"; shift;        ;;
-        -d) delay="$2"; shift 2;        ;;
-        -t) timeout="$2"; shift 2;      ;;
-        --) shift 1; break;             ;;
-        *)  break;                      ;;
+        -x) usr_rule="-eq $2";  shift; shift ;;
+        -X) usr_rule="$2";      shift; shift ;;
+        -d) usr_delay="$2";     shift; shift ;;
+        -t) usr_timeout="$2";   shift; shift ;;
+        --)                     shift; break ;;
+        *)                             break ;;
     esac done
+    delay="$(__valid_pos_int "$usr_delay" "$def_delay")"
+    rule="$(__valid_int_rule "$usr_rule" "$def_rule")"
+    timeout="$(__valid_pos_int "$usr_timeout" "$def_timeout")"
     think "waiting for: $*"
     local elapsed=0
     local start=$(date +%s)
@@ -45,7 +78,8 @@ wait_until() {
         "$@";
         es=$?
         debug -v es
-        if [ $es $es_test ];
+        es_test="test $es $rule"
+        if eval "$es_test";
         then
             return 0;
         fi

tests/ffoo_api/oracle/functions.stdout

@@ -57,4 +57,6 @@ pretty.mkhelp
 pretty.mkusage
 pretty.think
 pretty.warn
+sync.__valid_int_rule
+sync.__valid_pos_int
 sync.wait_until