v0.1.2 - More of yaml spec supported and some code cleanup.

azohra · Dec 11, 2018 · 399ff33 · 399ff33
1 parent dd00546
commit 399ff33
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ YSH_LIB=1;source /usr/local/bin/ysh
 
 If you want the internet as your only dependency:
 ```bash
-$ YSH_LIB=1;source /dev/stdin <<< "$(curl -s https://raw.githubusercontent.com/azohra/yaml.sh/master/y.sh)"
+$ YSH_LIB=1;source /dev/stdin <<< "$(curl -s https://raw.githubusercontent.com/azohra/yaml.sh/v0.1.2/ysh)"
 ```
 
 ## Flags

diff --git a/_static/_get/index.html b/_static/_get/index.html
@@ -1,2 +1,2 @@
-curl -s -L https://raw.githubusercontent.com/azohra/yaml.sh/master/ysh --output /usr/local/bin/ysh
+curl -s -L https://raw.githubusercontent.com/azohra/yaml.sh/v0.1.2/ysh --output /usr/local/bin/ysh
 chmod u+x /usr/local/bin/ysh
diff --git a/src/ysh.awk b/src/ysh.awk
@@ -66,7 +66,6 @@ function check_started() {
     next
 }
 
-
 /^[[:space:]]*[^[:space:]]+:/ {
     started=1
     depth=level()
@@ -95,7 +94,6 @@ function check_started() {
 
 /^[[:space:]]*-[[:space:]]+\{.*\}[[:space:]]*$/ {
     check_started()
-    depth=level()
     line=$0
     sub(/^[[:space:]]*-[[:space:]]+\{/, "", line)
     sub(/\}[[:space:]]*$/, "", line)
@@ -120,7 +118,7 @@ function check_started() {
 
 /^[[:space:]]*-[[:space:]][^[:space:]]+:/ {
     check_started()
-    depth=level() + 1
+    depth++
     key=$0
     sub(/^[[:space:]]*-[[:space:]]/, "", key)
     sub(/:.*$/, "", key)
@@ -129,7 +127,6 @@ function check_started() {
 
 /^[[:space:]]*-[[:space:]][^[:space:]]+:[[:space:]]+[^[:space:]]+/ {
     check_started()
-    depth=level() + 1
     val=$0
     sub(/^[[:space:]]*-[[:space:]][^[:space:]]+:[[:space:]]+/, "", val)
     val = remove_sur_quotes(val)
@@ -139,7 +136,6 @@ function check_started() {
 
 /^[[:space:]]*-[[:space:]]+[^[:space:]]+/ {
     check_started()
-    depth=level()
     val=$0
     sub(/^[[:space:]]*-[[:space:]]+/, "", val)
     sub(/[[:space:]]*$/, "", val)

diff --git a/src/ysh.sh b/src/ysh.sh
@@ -63,7 +63,6 @@ YSH_usage() {
     echo "  -l, --list        <query>        query for a list"
     echo "  -c, --count       <query>        count length of list element"
     echo "  -i, --index       <i>            array access by index"
-    echo "  -I, --index       <i>            array access by index. Guarentees a value."
     echo "  -I, --index-val   <i>            safe array access by index. Guarentees a value."
     echo "  -t, --tops                       top level children keys of structure"
     echo "  -n, --next                       move to next block"

diff --git a/test/test.sh b/test/test.sh
@@ -129,6 +129,10 @@ testNextBlock() {
     file=$(ysh -T "$file" -n)
     result=$(ysh -T "$file" -Q key)
     assertEquals "block_2_value" "${result}"
+
+    file=$(ysh -T "$file" -n)
+    result=$(ysh -T "$file" -Q key)
+    assertEquals "block_3_value" "${result}"
 }
 
 . ./test/shunit2
diff --git a/test/test.yml b/test/test.yml
@@ -51,4 +51,4 @@ key: value
 ---
 key: block_2_value
 ---
-key: block_3_value
+key: block_3_value
diff --git a/ysh b/ysh
@@ -1,5 +1,5 @@
 #! /bin/bash
-YSH_version='0.1.1'
+YSH_version='0.1.2'
 YAML_AWK_PARSER='
 function raise(msg) { print msg > "/dev/stderr"; if (force_complete) { exit_status = 1; } else { exit 1; };};
 function level() { match($0, /^[[:space:]]*/); if (RLENGTH % 2 != 0) { raise("Bad indentation on line "NR". Number of spaces uneven."); }; return RLENGTH / 2;};
@@ -11,10 +11,10 @@ function check_started() { if (started == 0) { raise("Keys must be added before
 /^[[:space:]]*[^[:space:]]+:/ { started=1; depth=level(); key=$1; sub(/:.*$/, "", key); stack[depth] = key;};
 /^[[:space:]]*[^[:space:]]+:[[:space:]]+[^[:space:]]+/ { started=1; depth=level(); val=$0; sub(/^[[:space:]]*[^[:space:]]+:[[:space:]]+/, "", val); val = remove_sur_quotes(val); print join_stack(depth) "=\"" val "\""; next;};
 /^[[:space:]]*\-/ { check_started(); depth=level(); stack_key=join_stack(depth-1); indx=list_counter[stack_key]++; stack[depth]="[" indx "]";};
-/^[[:space:]]*-[[:space:]]+\{.*\}[[:space:]]*$/ { check_started(); depth=level(); line=$0; sub(/^[[:space:]]*-[[:space:]]+\{/, "", line); sub(/\}[[:space:]]*$/, "", line); safe_split(line, entries); for (i in entries) { key=entries[i]; val=entries[i]; sub(/^[[:space:]]*/, "", key); sub(/:.*$/, "", key); sub(/^[[:space:]]*[^[:space:]]+:[[:space:]]+\"?/, "", val) ; sub(/\"?[[:space:]]*$/, "", val) ; val = remove_sur_quotes(val); print join_stack(depth) "." key "=\"" val "\""; }; delete entries; next;};
-/^[[:space:]]*-[[:space:]][^[:space:]]+:/ { check_started(); depth=level() + 1; key=$0; sub(/^[[:space:]]*-[[:space:]]/, "", key); sub(/:.*$/, "", key); stack[depth]=key;};
-/^[[:space:]]*-[[:space:]][^[:space:]]+:[[:space:]]+[^[:space:]]+/ { check_started(); depth=level() + 1; val=$0; sub(/^[[:space:]]*-[[:space:]][^[:space:]]+:[[:space:]]+/, "", val); val = remove_sur_quotes(val); print join_stack(depth) "=\"" val "\""; next;};
-/^[[:space:]]*-[[:space:]]+[^[:space:]]+/ { check_started(); depth=level(); val=$0; sub(/^[[:space:]]*-[[:space:]]+/, "", val); sub(/[[:space:]]*$/, "", val); val = remove_sur_quotes(val); print join_stack(depth) "=\"" val "\""; next;};
+/^[[:space:]]*-[[:space:]]+\{.*\}[[:space:]]*$/ { check_started(); line=$0; sub(/^[[:space:]]*-[[:space:]]+\{/, "", line); sub(/\}[[:space:]]*$/, "", line); safe_split(line, entries); for (i in entries) { key=entries[i]; val=entries[i]; sub(/^[[:space:]]*/, "", key); sub(/:.*$/, "", key); sub(/^[[:space:]]*[^[:space:]]+:[[:space:]]+\"?/, "", val) ; sub(/\"?[[:space:]]*$/, "", val) ; val = remove_sur_quotes(val); print join_stack(depth) "." key "=\"" val "\""; }; delete entries; next;};
+/^[[:space:]]*-[[:space:]][^[:space:]]+:/ { check_started(); depth++; key=$0; sub(/^[[:space:]]*-[[:space:]]/, "", key); sub(/:.*$/, "", key); stack[depth]=key;};
+/^[[:space:]]*-[[:space:]][^[:space:]]+:[[:space:]]+[^[:space:]]+/ { check_started(); val=$0; sub(/^[[:space:]]*-[[:space:]][^[:space:]]+:[[:space:]]+/, "", val); val = remove_sur_quotes(val); print join_stack(depth) "=\"" val "\""; next;};
+/^[[:space:]]*-[[:space:]]+[^[:space:]]+/ { check_started(); val=$0; sub(/^[[:space:]]*-[[:space:]]+/, "", val); sub(/[[:space:]]*$/, "", val); val = remove_sur_quotes(val); print join_stack(depth) "=\"" val "\""; next;};
 /^[[:space:]]*[^[:space:]]+:[[:space:]]*$/ {next};
 /^[[:space:]]*-[[:space:]]+[^[:space:]]+:[[:space:]]*$/ {next};
 /^[[:space:]]*$/ { next };
@@ -66,7 +66,6 @@ YSH_usage() {
     echo "  -l, --list        <query>        query for a list"
     echo "  -c, --count       <query>        count length of list element"
     echo "  -i, --index       <i>            array access by index"
-    echo "  -I, --index       <i>            array access by index. Guarentees a value."
     echo "  -I, --index-val   <i>            safe array access by index. Guarentees a value."
     echo "  -t, --tops                       top level children keys of structure"
     echo "  -n, --next                       move to next block"