declare unique_lookup conditionally

Author: DannyBen

lib/bashly/script/command.rb

@@ -101,9 +101,10 @@ def commands
       end
 
       # Returns a flat array containing all the commands in this tree.
-      # This includes self + children + grandchildres + ...
-      def deep_commands
+      # This can children + grandchildres (recursive), and may include self
+      def deep_commands(include_self: false)
         result = []
+        result << self if include_self
         commands.each do |command|
           result << command
           if command.commands.any?
@@ -217,6 +218,16 @@ def grouped_commands
         result
       end
 
+      # Returns true if this command, or any subcommand (deep) as any arg or
+      # flag with arg that is defined as unique
+      def has_unique_args_or_flags?
+        deep_commands(include_self: true).each do |command|
+          return true if command.args.count(&:unique).positive? ||
+            command.flags.count(&:unique).positive?
+        end
+        false
+      end
+
       # Returns a mode identifier
       def mode
         @mode ||= if global_flags?    then :global_flags

lib/bashly/views/command/parse_requirements_case_repeatable.gtx

@@ -10,14 +10,13 @@ args.each do |arg|
     if arg.unique
       > elif [[ -z "${unique_lookup["{{ arg.name }}:$escaped"]:-}" ]]; then
       >   args['{{ arg.name }}']="${args[{{ arg.name }}]} $escaped"
-      #   TODO: This line should only be inserted if any uniques are used
       >   unique_lookup["{{ arg.name }}:$escaped"]=1
       >   shift
       > else
       >   shift
     else
       > else
-      >   args['{{ arg.name }}']="${args[{{ arg.name }}]} $escaped_value"
+      >   args['{{ arg.name }}']="${args[{{ arg.name }}]} $escaped"
       >   shift
     end
 

lib/bashly/views/command/run.gtx

@@ -6,8 +6,9 @@
 >   declare -a other_args=()
 >   declare -a env_var_names=()
 >   declare -a input=()
-# TODO: This line should only be inserted if any uniques are used
->   declare -A unique_lookup=()
+if has_unique_args_or_flags?
+  >   declare -A unique_lookup=()
+end
 >   normalize_input "$@"
 >   parse_requirements "${input[@]}"
 if user_file_exist?('before')

lib/bashly/views/flag/case_arg.gtx

@@ -13,8 +13,9 @@ if repeatable
   end
   >     args['{{ name }}']="${args['{{ name }}']} $escaped"
   >   fi
-  # TODO: This line should only be inserted if any uniques are used
-  >   unique_lookup["{{ name }}:${escaped}"]=1
+  if unique
+    >   unique_lookup["{{ name }}:${escaped}"]=1
+  end
 
 else
   >   args['{{ name }}']="$2"

spec/approvals/examples/repeatable-arg

@@ -47,7 +47,7 @@ files:
   upcase: CONTENT OF FILE1
 
 args:
-- ${args[file]} = "file1"
+- ${args[file]} = file1
 + ./upcase file1 file2
 
 files:
@@ -59,7 +59,7 @@ files:
   upcase: CONTENT OF FILE2
 
 args:
-- ${args[file]} = "file1" "file2"
+- ${args[file]} = file1 file2
 + ./upcase file1 file2 file1
 
 files:
@@ -69,6 +69,9 @@ files:
   path: file2:
   content: content of file2
   upcase: CONTENT OF FILE2
+  path: file1:
+  content: content of file1
+  upcase: CONTENT OF FILE1
 
 args:
-- ${args[file]} = "file1" "file2"
+- ${args[file]} = file1 file2 file1

spec/approvals/examples/repeatable-flag

@@ -47,7 +47,7 @@ two three
 Verbosity level: 3
 
 args:
-- ${args[--data]} = "one" "two three"
+- ${args[--data]} = one two\ three
 - ${args[--path]} = file\ one file-two
 - ${args[--verbose]} = 3
 + ./download -d one --path /bin --path /usr/lib --path /bin
@@ -57,5 +57,5 @@ one
 Verbosity level: 1
 
 args:
-- ${args[--data]} = "one"
-- ${args[--path]} = "/bin" "/usr/lib"
+- ${args[--data]} = one
+- ${args[--path]} = /bin /usr/lib

spec/approvals/fixtures/repeatable-arg-validations

@@ -11,7 +11,7 @@ args: none
 # this file is located in 'src/root_command.sh'
 # you can edit it freely and regenerate (it will not be overwritten)
 args:
-- ${args[number]} = "1"
+- ${args[number]} = 1
 + ./cli 1.1
 validation error in NUMBER:
 must be an integer
@@ -22,7 +22,7 @@ must be an integer
 # this file is located in 'src/root_command.sh'
 # you can edit it freely and regenerate (it will not be overwritten)
 args:
-- ${args[number]} = "1" "2"
+- ${args[number]} = 1 2
 + ./cli 1.1 2
 validation error in NUMBER:
 must be an integer

spec/approvals/fixtures/repeatable-flag-validations

@@ -11,7 +11,7 @@ args: none
 # this file is located in 'src/root_command.sh'
 # you can edit it freely and regenerate (it will not be overwritten)
 args:
-- ${args[--number]} = "1"
+- ${args[--number]} = 1
 + ./cli --number 1.1
 validation error in --number, -n NUMBER:
 must be an integer
@@ -22,7 +22,7 @@ must be an integer
 # this file is located in 'src/root_command.sh'
 # you can edit it freely and regenerate (it will not be overwritten)
 args:
-- ${args[--number]} = "1" "2"
+- ${args[--number]} = 1 2
 + ./cli --number 1.1 --number 2
 validation error in --number, -n NUMBER:
 must be an integer

spec/approvals/fixtures/repeatable-whitelist

@@ -12,12 +12,12 @@ args:
 # this file is located in 'src/root_command.sh'
 # you can edit it freely and regenerate (it will not be overwritten)
 args:
-- ${args[--protocol]} = "ssh"
+- ${args[--protocol]} = ssh
 + ./download -p ssh -p ftp
 # this file is located in 'src/root_command.sh'
 # you can edit it freely and regenerate (it will not be overwritten)
 args:
-- ${args[--protocol]} = "ssh" "ftp"
+- ${args[--protocol]} = ssh ftp
 + ./download -p sftp -p https
 --protocol must be one of: ssh, ftp, sftp
 + ./download -p http -p ftp