- Fix repeatable flag args when the input has quotes

Author: DannyBen

lib/bashly/views/flag/case_arg.gtx

@@ -3,14 +3,15 @@
 > if [[ -n ${2+x} ]]; then
 
 if repeatable
+  >   escaped_value="${2//\"/\\\"}"
   >   if [[ -z ${args['{{ name }}']+x} ]]; then
-  >     args['{{ name }}']="\"$2\""
+  >     args['{{ name }}']="\"$escaped_value\""
   if unique
-    >   elif [[ ! "${args['{{ name }}']}" =~ \"$2\" ]]; then
+    >   elif [[ ! "${args['{{ name }}']}" =~ \"$escaped_value\" ]]; then
   else
     >   else
   end
-  >     args['{{ name }}']="${args['{{ name }}']} \"$2\""
+  >     args['{{ name }}']="${args['{{ name }}']} \"$escaped_value\""
   >   fi
 
 else

spec/approvals/fixtures/repeatable-arg-validations

@@ -32,3 +32,6 @@ must be an integer
 + ./cli 1 a
 validation error in NUMBER:
 must be an integer
++ ./cli 1 'not"a"number'
+validation error in NUMBER:
+must be an integer

spec/approvals/fixtures/repeatable-escaping

@@ -0,0 +1,50 @@
++ bundle exec bashly generate
+creating user files in src
+skipped src/root_command.sh (exists)
+created ./cli
+run ./cli --help to test your bash script
++ ./cli
+args: none
+
++ ./cli one 'two and a half' three
+args:
+- ${args[term]} = "one" "two and a half" "three"
+[TERM] --> one
+[TERM] --> two and a half
+[TERM] --> three
+
++ ./cli one 'the phrase "hello world"' three
+args:
+- ${args[term]} = "one" "the phrase \"hello world\"" "three"
+[TERM] --> one
+[TERM] --> the phrase "hello world"
+[TERM] --> three
+
++ ./cli one 'bad"quote' three
+args:
+- ${args[term]} = "one" "bad\"quote" "three"
+[TERM] --> one
+[TERM] --> bad"quote
+[TERM] --> three
+
++ ./cli -s one -s 'two and a half' -s three
+args:
+- ${args[--search]} = "one" "two and a half" "three"
+[--serach] --> one
+[--serach] --> two and a half
+[--serach] --> three
+
++ ./cli -s one -s 'the phrase "hello world"' -s three
+args:
+- ${args[--search]} = "one" "the phrase \"hello world\"" "three"
+[--serach] --> one
+[--serach] --> the phrase "hello world"
+[--serach] --> three
+
++ ./cli -s one -s 'bad"quote' -s three
+args:
+- ${args[--search]} = "one" "bad\"quote" "three"
+[--serach] --> one
+[--serach] --> bad"quote
+[--serach] --> three
+

spec/approvals/fixtures/repeatable-flag-validations

@@ -32,3 +32,6 @@ must be an integer
 + ./cli --number 1 --number a
 validation error in --number, -n NUMBER:
 must be an integer
++ ./cli --number 1 --number 'not"a"number'
+validation error in --number, -n NUMBER:
+must be an integer

spec/approvals/fixtures/repeatable-whitelist

@@ -24,3 +24,5 @@ args:
 --protocol must be one of: ssh, ftp, sftp
 + ./download --protocol telnet
 --protocol must be one of: ssh, ftp, sftp
++ ./download --protocol telnet --protocol 'not"a"protocol'
+--protocol must be one of: ssh, ftp, sftp

spec/fixtures/workspaces/repeatable-arg-validations/test.sh

@@ -16,3 +16,4 @@ bundle exec bashly generate
 ./cli 1.1 2
 ./cli 1 2.2
 ./cli 1 a
+./cli 1 'not"a"number'

spec/fixtures/workspaces/repeatable-escaping/.gitignore

@@ -0,0 +1 @@
+cli

spec/fixtures/workspaces/repeatable-escaping/README.md

@@ -0,0 +1,2 @@
+This fixture tests that repeatable args and flag args with quotes do not break.
+Reference issue: https://github.com/DannyBen/bashly/issues/503

spec/fixtures/workspaces/repeatable-escaping/src/bashly.yml

@@ -0,0 +1,13 @@
+name: cli
+help: Test repeatable args with input that contains quotes
+version: 0.1.0
+
+flags:
+- long: --search
+  short: -s
+  arg: query
+  repeatable: true
+
+args:
+- name: term
+  repeatable: true

spec/fixtures/workspaces/repeatable-escaping/src/root_command.sh

@@ -0,0 +1,17 @@
+inspect_args
+
+if [[ -v args[term] ]]; then
+  eval "terms=(${args[term]})"
+  for t in "${terms[@]}"; do
+    echo "[TERM] --> ${t}"
+  done
+fi
+
+if [[ -v args[--search] ]]; then
+  eval "terms=(${args[--search]})"
+  for t in "${terms[@]}"; do
+    echo "[--serach] --> ${t}"
+  done
+fi
+
+echo