- Add array syntax to validate

Author: DannyBen

examples/validations/src/bashly.yml

@@ -15,9 +15,12 @@ commands:
     # Bashly will look for a function named `validate_integer` in your
     # script, you can use any name as long as it has a matching function.
     validate: integer
+  
   - name: second
     help: Second number
-    validate: integer
+
+    # Multiple validations can be provided as an array.
+    validate: [not_empty, integer]
 
   flags:
   - long: --save

examples/validations/test.sh

@@ -12,6 +12,7 @@ bashly generate
 
 ./validate calc 1 2 --save README.md
 ./validate calc A
+./validate calc 1 ''
 ./validate calc 1 B
 ./validate calc 1 2 --save no-such-file.txt
 

lib/bashly/config_validator.rb

@@ -92,7 +92,7 @@ def assert_arg(key, value)
       assert_string "#{key}.name", value['name']
       assert_optional_string "#{key}.help", value['help']
       assert_string_or_array "#{key}.default", value['default']
-      assert_optional_string "#{key}.validate", value['validate']
+      assert_string_or_array "#{key}.validate", value['validate']
       assert_boolean "#{key}.required", value['required']
       assert_boolean "#{key}.repeatable", value['repeatable']
       assert_boolean "#{key}.unique", value['unique']
@@ -123,7 +123,7 @@ def assert_flag(key, value)
       assert_optional_string "#{key}.help", value['help']
       assert_optional_string "#{key}.arg", value['arg']
       assert_string_or_array "#{key}.default", value['default']
-      assert_optional_string "#{key}.validate", value['validate']
+      assert_string_or_array "#{key}.validate", value['validate']
 
       assert_boolean "#{key}.private", value['private']
       assert_boolean "#{key}.repeatable", value['repeatable']
@@ -169,7 +169,7 @@ def assert_env_var(key, value)
       assert_boolean "#{key}.required", value['required']
       assert_boolean "#{key}.private", value['private']
       assert_array "#{key}.allowed", value['allowed'], of: :string
-      assert_optional_string "#{key}.validate", value['validate']
+      assert_string_or_array "#{key}.validate", value['validate']
 
       refute value['required'] && value['default'], "#{key} cannot have both nub`required` and nub`default`"
     end

lib/bashly/script/argument.rb

@@ -28,6 +28,15 @@ def label
       def usage_string
         required ? label : "[#{label}]"
       end
+
+      def validate
+        return [] unless options['validate']
+
+        result = options['validate']
+        result.is_a?(Array) ? result : [result]
+      end
+
+      def validate? = validate.any?
     end
   end
 end

lib/bashly/script/command.rb

@@ -158,7 +158,7 @@ def user_lib
 
       # Returns a mixed array of Argument and Flag objects that have validations
       def validatables
-        @validatables ||= args.select(&:validate) + flags.select(&:validate)
+        @validatables ||= args.select(&:validate?) + flags.select(&:validate?)
       end
 
     private

lib/bashly/script/environment_variable.rb

@@ -16,6 +16,15 @@ def usage_string(extended: false)
         result << strings[:required] if required && extended
         result.join ' '
       end
+
+      def validate
+        return [] unless options['validate']
+
+        result = options['validate']
+        result.is_a?(Array) ? result : [result]
+      end
+
+      def validate? = validate.any?
     end
   end
 end

lib/bashly/script/flag.rb

@@ -46,6 +46,15 @@ def usage_string(extended: false)
         result << strings[:repeatable] if repeatable && extended
         result.join ' '
       end
+
+      def validate
+        return [] unless options['validate']
+
+        result = options['validate']
+        result.is_a?(Array) ? result : [result]
+      end
+
+      def validate? = validate.any?
     end
   end
 end

lib/bashly/script/introspection/environment_variables.rb

@@ -28,7 +28,7 @@ def required_environment_variables
 
         # Returns an array of all the environment_variables with a validation
         def validated_environment_variables
-          environment_variables.select(&:validate)
+          environment_variables.select(&:validate?)
         end
 
         # Returns only public environment variables, or both public and private

lib/bashly/views/argument/validations.gtx

@@ -1,25 +1,29 @@
-if validate
+if validate?
   = view_marker
 
   if repeatable
     > if [[ -v args['{{ name }}'] ]]; then
     >   values=''
     >   eval "values=(${args['{{ name }}']})"
     >   for value in "${values[@]}"; do
-    >     validation_output="$(validate_{{ validate }} "$value")"
+    validate.each do |funcname|
+    >     validation_output="$(validate_{{ funcname }} "$value")"
     >     if [[ -n "$validation_output" ]]; then
     >       printf "{{ strings[:validation_error] }}\n" "{{ name.upcase }}" "$validation_output" >&2
     >       exit 1
     >     fi
+    end
     >   done
     > fi
   else
     > if [[ -v args['{{ name }}'] ]]; then
-    >   validation_output="$(validate_{{ validate }} "${args['{{ name }}']:-}")"
+    validate.each do |funcname|
+    >   validation_output="$(validate_{{ funcname }} "${args['{{ name }}']:-}")"
     >   if [[ -n "$validation_output" ]]; then
     >     printf "{{ strings[:validation_error] }}\n" "{{ name.upcase }}" "$validation_output" >&2
     >     exit 1
     >   fi
+    end
     > fi
     >
   end

lib/bashly/views/environment_variable/validations.gtx

@@ -1,12 +1,14 @@
-if validate
+if validate?
   = view_marker
 
   > if [[ -v {{ name.upcase }} ]]; then
-  >   validation_output="$(validate_{{ validate }} "${{ name.upcase }}")"
+  validate.each do |funcname|
+  >   validation_output="$(validate_{{ funcname }} "${{ name.upcase }}")"
   >   if [[ -n "${validation_output}" ]]; then
   >     printf "{{ strings[:environment_variable_validation_error] }}\n" "{{ usage_string }}" "$validation_output" >&2
   >     exit 1
   >   fi
+  end
   > fi
   >
 end