- Add support for repeatable args

Author: DannyBen

lib/bashly/config_validator.rb

@@ -99,6 +99,7 @@ def assert_flag(key, value)
       assert_optional_string "#{key}.default", value['default']
       assert_optional_string "#{key}.validate", value['validate']
 
+      assert_boolean "#{key}.repeatable", value['repeatable']
       assert_boolean "#{key}.required", value['required']
       assert_array "#{key}.allowed", value['allowed'], of: :string
       assert_array "#{key}.conflicts", value['conflicts'], of: :string

lib/bashly/script/argument.rb

@@ -2,7 +2,11 @@ module Bashly
   module Script
     class Argument < Base
       def usage_string
-        required ? name.upcase : "[#{name.upcase}]"
+        required ? label : "[#{label}]"
+      end
+
+      def label
+        repeatable ? "#{name.upcase}..." : name.upcase
       end
     end
   end

lib/bashly/views/argument/usage.erb

@@ -1,5 +1,5 @@
 # :argument.usage
-echo "  <%= name.upcase %>"
+echo "  <%= label %>"
 printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
 % if allowed
 printf "    <%= strings[:allowed] % { values: allowed.join(', ') } -%>\n"

lib/bashly/views/command/parse_requirements_case.erb

@@ -1,26 +1,38 @@
 # :command.parse_requirements_case
+% repeatable_arg = false
 % if args.any?
 % condition = "if"
 % args.each do |arg|
 <%= condition %> [[ -z ${args[<%= arg.name %>]+x} ]]; then
 <%= arg.render(:validations).indent 2 %>
+% if arg.repeatable
+% repeatable_arg = true
+  args[<%= arg.name %>]="\"$1\""
+  shift
+else
+  args[<%= arg.name %>]="${args[<%= arg.name %>]} \"$1\""
+  shift
+% else
   args[<%= arg.name %>]=$1
   shift
+% end
 % condition = "elif"
 % end
+% if !repeatable_arg
 else
+% end
 % if catch_all.enabled?
   other_args+=("$1")
   shift
-% else
+% elsif !repeatable_arg
   printf "<%= strings[:invalid_argument] %>\n" "$key"
   exit 1
 % end
 fi
 % elsif catch_all.enabled?
   other_args+=("$1")
   shift
-% else
+% elsif !repeatable_arg
 printf "<%= strings[:invalid_argument] %>\n" "$key"
 exit 1
 % end

lib/bashly/views/command/whitelist_filter.erb

@@ -1,10 +1,20 @@
 # :command.whitelist_filter
 % whitelisted_args.each do |arg|
+% if arg.repeatable
+eval "input_array=(${args[<%= arg.name %>]})"
+for i in "${input_array[@]}"; do
+  if [[ ! $i =~ ^(<%= arg.allowed.join '|' %>)$ ]]; then
+    printf "%s\n" "<%= strings[:disallowed_arg] % { name: arg.name, allowed: arg.allowed.join(', ') } %>"
+    exit 1
+  fi
+done
+% else
 if [[ ! ${args[<%= arg.name %>]} =~ ^(<%= arg.allowed.join '|' %>)$ ]]; then
   printf "%s\n" "<%= strings[:disallowed_argument] % { name: arg.name, allowed: arg.allowed.join(', ') } %>"
   exit 1
 fi
 % end
+% end
 % whitelisted_flags.each do |flag|
 % if flag.repeatable
 eval "input_array=(${args[<%= flag.name %>]})"