New tests + fixes (bashtools#12)

Author: mclarkson

JSONPath.sh

@@ -46,10 +46,10 @@ main() {
 
       [[ $MULTIPASS -eq 1 ]] && {
         # replace filter expression with index sequence
-        SET=$(sed -rn 's/.*,([0-9]+)[],].*/\1/p' $PASSFILE | tr '\n' ,)
+        SET=$(sed -rn 's/.*[[,"]+([0-9]+)[],].*/\1/p' $PASSFILE | tr '\n' ,)
         SET=${SET%,}
         QUERY=$(echo $QUERY | sed "s/?(@[^)]\+)/$SET/")
-        [[ $DEBUG -eq 1 ]] && echo "QUERY=$QUERY"
+        [[ $DEBUG -eq 1 ]] && echo "QUERY=$QUERY" >/dev/stderr
         reset
         continue
       }
@@ -120,15 +120,13 @@ usage() {
   echo "Usage: JSONPath.sh [-b] [j] [-h] [-f FILE] [pattern]"
   echo
   echo "pattern - the JSONPath query. Defaults to '$.*' if not supplied."
-  #echo "-s      - Remove escaping of the solidus symbol (straight slash)."
   echo "-b      - Brief. Only show values."
   echo "-j      - JSON output."
   echo "-u      - Strip unnecessary leading path elements."
   echo "-i      - Case insensitive."
   echo "-p      - Pass-through to the JSON parser."
   echo "-w      - Match whole words only (for filter script expression)."
   echo "-f FILE - Read a FILE instead of stdin."
-  #echo "-n      - No-head. Do not show nodes that have no path (lines that start with [])."
   echo "-h      - This help text."
   echo
 }
@@ -245,7 +243,6 @@ tokenize_path () {
     CHAR='[^[:cntrl:]"\\]'
   else
     GREP=awk_egrep
-    #CHAR='[^[:cntrl:]"\\\\]'
   fi
 
   local WILDCARD='\*'
@@ -265,10 +262,10 @@ tokenize_path () {
     $GREP "$INDEX|$STRING|$WORD|$WILDCARD|$FILTER|$DEEPSCAN|$SET|$INDEXALL|." | \
     egrep -v "^$SPACE$|^\\.$|^\[$|^\]$|^'$|^\\\$$|^\)$")
   [[ $DEBUG -eq 1 ]] && {
-    echo "egrep -o '$INDEX|$STRING|$WORD|$WILDCARD|$FILTER|$DEEPSCAN|$SET|$INDEXALL|.'"
+    echo "egrep -o '$INDEX|$STRING|$WORD|$WILDCARD|$FILTER|$DEEPSCAN|$SET|$INDEXALL|.'" >/dev/stderr
     echo -n "TOKENISED QUERY="; echo "$QUERY" | \
       $GREP "$INDEX|$STRING|$WORD|$WILDCARD|$FILTER|$DEEPSCAN|$SET|$INDEXALL|." | \
-      egrep -v "^$SPACE$|^\\.$|^\[$|^\]$|^'$|^\\\$$|^\)$"
+      egrep -v "^$SPACE$|^\\.$|^\[$|^\]$|^'$|^\\\$$|^\)$" >/dev/stderr
   }
   if [ $is_wordsplit_disabled != 0 ]; then unsetopt shwordsplit; fi
 }
@@ -396,7 +393,6 @@ create_filter() {
               else
                 [[ $i -gt 0 ]] && comma=","
               fi
-              #idx=$(echo "${PATHTOKENS[i]}" | tr -d "[]")
               query+="$comma$a"
             fi
             comma=","
@@ -410,7 +406,7 @@ create_filter() {
   done
 
   [[ -z $FILTER ]] && FILTER="$query[],]"
-  [[ $DEBUG -eq 1 ]] && echo "FILTER=$FILTER"
+  [[ $DEBUG -eq 1 ]] && echo "FILTER=$FILTER" >/dev/stderr
 }
 
 # ---------------------------------------------------------------------------
@@ -566,7 +562,7 @@ indexmatcher() {
 
   [[ $DEBUG -eq 1 ]] && {
     for i in `seq 0 $((${#INDEXMATCH_QUERY[*]}-1))`; do
-      echo "INDEXMATCH_QUERY[$i]=${INDEXMATCH_QUERY[i]}"
+      echo "INDEXMATCH_QUERY[$i]=${INDEXMATCH_QUERY[i]}" >/dev/stderr
     done
   }
 
@@ -591,11 +587,11 @@ indexmatcher() {
           [[ $i -eq $((${#INDEXMATCH_QUERY[*]}-1)) ]] && {
             if [[ $step -gt 1 ]]; then
               [[ $(((num[i]-a)%step)) -eq 0 ]] && {
-                [[ $DEBUG -eq 1 ]] && echo -n "($a,$b,${num[i]}) "
+                [[ $DEBUG -eq 1 ]] && echo -n "($a,$b,${num[i]}) " >/dev/stderr
                 echo "$line"
               }
             else
-              [[ $DEBUG -eq 1 ]] && echo -n "($a,$b,${num[i]}) "
+              [[ $DEBUG -eq 1 ]] && echo -n "($a,$b,${num[i]}) " >/dev/stderr
               echo "$line"
             fi
           }
@@ -814,7 +810,9 @@ filter() {
   [[ $NOCASE -eq 1 ]] && opts+="-i"
   [[ $WHOLEWORD -eq 1 ]] && opts+=" -w"
   if [[ -z $OPERATOR ]]; then
+    [[ $MULTIPASS -eq 1 ]] && FILTER="$FILTER[\"]?$"
     egrep $opts "$FILTER"
+    [[ $DEBUG -eq 1 ]] && echo "FILTER=$FILTER" >/dev/stderr
   else
     egrep $opts "$FILTER" | \
       while read line; do
@@ -837,7 +835,7 @@ filter() {
                [[ "${v,,}" < "${RHS,,}" ]] && echo "$line"
             ;;
         esac
-      done #< <(egrep $opts "$FILTER")
+      done
   fi
 }
 

all-docker-tests.sh

@@ -21,12 +21,25 @@ cp test/docker/Dockerfile-centos test/docker/Dockerfile
 
 c=$(grep 'test(s) failed' $log)
 
+# Debian
+export IMAGE=json-path-debian-bash
+cp test/docker/Dockerfile-debian test/docker/Dockerfile
+./test/docker/wrap_in_docker.sh ./all-tests.sh | tee $log
+
+d=$(grep 'test(s) failed' $log)
+
+# Cleanup
 rm $log
+rm test/docker/Dockerfile
 
+# Results
 echo
 echo "Fedora tests"
 echo $a
 echo "Ubuntu tests"
 echo $b
 echo "Centos tests"
 echo $c
+echo "Debian tests"
+echo $c
+

test/docker/Dockerfile-debian

@@ -0,0 +1,3 @@
+FROM ubuntu
+
+RUN apt-get update && apt-get -y install python gawk

test/valid/cburgmer.github.io.argp1

@@ -0,0 +1 @@
+$[2]

test/valid/cburgmer.github.io.argp2

@@ -0,0 +1 @@
+$[0]

test/valid/cburgmer.github.io.argp3

@@ -0,0 +1 @@
+$[1:10]

test/valid/cburgmer.github.io.argp4

@@ -0,0 +1 @@
+$[1:8]

test/valid/cburgmer.github.io.argp5

@@ -0,0 +1 @@
+$[1:2]

test/valid/cburgmer.github.io.filter_equal.argp1

@@ -0,0 +1 @@
+$[?(@.key==42)]

test/valid/cburgmer.github.io.filter_equal.json

@@ -0,0 +1,11 @@
+[
+    {"key": 0},
+    {"key": 42},
+    {"key": -1},
+    {"key": 41},
+    {"key": 43},
+    {"key": 42.0001},
+    {"key": 41.9999},
+    {"key": 100},
+    {"some": "value"}
+]

test/valid/cburgmer.github.io.filter_equal_argp1.parsed

@@ -0,0 +1 @@
+[1,"key"]	42

test/valid/cburgmer.github.io.json

@@ -0,0 +1 @@
+["first", "second", "third"]

test/valid/cburgmer.github.io_argp1.parsed

@@ -0,0 +1 @@
+[2]	"third"

test/valid/cburgmer.github.io_argp2.parsed

@@ -0,0 +1 @@
+[0]	"first"

test/valid/cburgmer.github.io_argp3.parsed

@@ -0,0 +1,2 @@
+[1]	"second"
+[2]	"third"

test/valid/cburgmer.github.io_argp4.parsed

@@ -0,0 +1,2 @@
+[1]	"second"
+[2]	"third"

test/valid/cburgmer.github.io_argp5.parsed

@@ -0,0 +1 @@
+[1]	"second"