- Allow flag.default and arg.default to be an array if repeatable is true

Author: DannyBen

lib/bashly/concerns/validation_helpers.rb

@@ -61,7 +61,7 @@ def assert_string_or_array(key, value)
       return unless value
 
       assert [Array, String].include?(value.class),
-        "#{key} must be a string or an array"
+        "#{key} must be a string or an array of strings"
 
       assert_array key, value, of: :string if value.is_a? Array
     end

lib/bashly/config_validator.rb

@@ -91,7 +91,7 @@ def assert_arg(key, value)
       assert_hash key, value, keys: Script::Argument.option_keys
       assert_string "#{key}.name", value['name']
       assert_optional_string "#{key}.help", value['help']
-      assert_optional_string "#{key}.default", value['default']
+      assert_string_or_array "#{key}.default", value['default']
       assert_optional_string "#{key}.validate", value['validate']
       assert_boolean "#{key}.required", value['required']
       assert_boolean "#{key}.repeatable", value['repeatable']
@@ -106,6 +106,10 @@ def assert_arg(key, value)
       if value['unique']
         assert value['repeatable'], "#{key}.unique does not make sense without nub`repeatable`"
       end
+
+      if value['default'].is_a? Array
+        assert value['repeatable'], "#{key}.default array does not make sense without nub`repeatable`"
+      end
     end
 
     def assert_flag(key, value)
@@ -118,7 +122,7 @@ def assert_flag(key, value)
       assert_optional_string "#{key}.short", value['short']
       assert_optional_string "#{key}.help", value['help']
       assert_optional_string "#{key}.arg", value['arg']
-      assert_optional_string "#{key}.default", value['default']
+      assert_string_or_array "#{key}.default", value['default']
       assert_optional_string "#{key}.validate", value['validate']
 
       assert_boolean "#{key}.private", value['private']
@@ -150,6 +154,10 @@ def assert_flag(key, value)
       if value['unique']
         assert value['arg'] && value['repeatable'], "#{key}.unique does not make sense without nub`arg` and nub`repeatable`"
       end
+
+      if value['default'].is_a? Array
+        assert value['repeatable'], "#{key}.default array does not make sense without nub`repeatable`"
+      end
     end
 
     def assert_env_var(key, value)

lib/bashly/script/argument.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Bashly
   module Script
     class Argument < Base
@@ -9,6 +11,10 @@ def option_keys
         end
       end
 
+      def default_string
+        default.is_a?(Array) ? Shellwords.shelljoin(default) : default
+      end
+
       def usage_string
         required ? label : "[#{label}]"
       end

lib/bashly/script/flag.rb

@@ -22,6 +22,10 @@ def aliases
         end
       end
 
+      def default_string
+        default.is_a?(Array) ? Shellwords.shelljoin(default) : default
+      end
+
       def name
         long || short
       end

lib/bashly/views/argument/usage.gtx

@@ -8,7 +8,11 @@ if allowed
 end
 
 if default
-  > printf "    {{ strings[:default] % { value: default } }}\n"
+  if default.is_a? Array
+    > printf "    {{ strings[:default] % { value: default.join(', ') } }}\n"
+  else
+    > printf "    {{ strings[:default] % { value: default } }}\n"
+  end
 end
 
 > echo

lib/bashly/views/command/default_assignments.gtx

@@ -2,11 +2,11 @@ if default_args.any? or default_flags.any?
   = view_marker
 
   default_args.each do |arg|
-    > [[ -n ${args['{{ arg.name }}']:-} ]] || args['{{ arg.name }}']="{{ arg.default }}"
+    > [[ -n ${args['{{ arg.name }}']:-} ]] || args['{{ arg.name }}']="{{ arg.default_string }}"
   end
 
   default_flags.each do |flag|
-    > [[ -n ${args['{{ flag.name }}']:-} ]] || args['{{ flag.name }}']="{{ flag.default }}"
+    > [[ -n ${args['{{ flag.name }}']:-} ]] || args['{{ flag.name }}']="{{ flag.default_string }}"
   end
 
   >

lib/bashly/views/flag/usage.gtx

@@ -4,11 +4,15 @@
 > printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
 
 if allowed
-> printf "    {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
+  > printf "    {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
 end
 
 if default
-> printf "    {{ strings[:default] % { value: default } }}\n"
+  if default.is_a? Array
+    > printf "    {{ strings[:default] % { value: default.join(', ') } }}\n"
+  else
+    > printf "    {{ strings[:default] % { value: default } }}\n"
+  end
 end
 
 > echo