- Refactor validations to run after assigning default values

Author: DannyBen

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'byebug'
+gem 'debug'
 gem 'lp'
 gem 'rspec'
 gem 'rspec_approvals'

lib/bashly.rb

@@ -1,5 +1,5 @@
-if ENV['BYEBUG']
-  require 'byebug'
+if ENV['DEBUGGER']
+  require 'debug'
   require 'lp'
 end
 

lib/bashly/script/command.rb

@@ -322,6 +322,11 @@ def user_lib
         @user_lib ||= Dir["#{Settings.full_lib_dir}/**/*.#{Settings.partials_extension}"]
       end
 
+      # Returns a mixed array of Argument and Flag objects that have validations
+      def validatables
+        @validatables ||= args.select(&:validate) + flags.select(&:validate)
+      end
+
       # Returns an array of all the args with a whitelist
       def whitelisted_args
         args.select(&:allowed)

lib/bashly/views/argument/validations.gtx

@@ -1,11 +1,11 @@
 if validate
 
-= view_marker
+  = view_marker
 
-> if [[ -n $(validate_{{ validate }} "$1") ]]; then
->   printf "{{ strings[:validation_error] }}\n" "{{ name.upcase }}" "$(validate_{{ validate }} "$1")" >&2
->   exit 1
-> fi
-> 
+  > if [[ -n $(validate_{{ validate }} "${args['{{ name }}']}") ]]; then
+  >   printf "{{ strings[:validation_error] }}\n" "{{ name.upcase }}" "$(validate_{{ validate }} "${args['{{ name }}']}")" >&2
+  >   exit 1
+  > fi
+  > 
 
 end

lib/bashly/views/command/parse_requirements.gtx

@@ -15,6 +15,7 @@ end
 = render(:required_flags_filter).indent 2
 = render(:catch_all_filter).indent 2
 = render(:default_assignments).indent 2
+= render(:validations).indent 2
 = render(:whitelist_filter).indent 2
 = render(:user_filter).indent 2
 

lib/bashly/views/command/parse_requirements_case_catch_all.gtx

@@ -4,7 +4,6 @@ if args.any?
   condition = "if"
   args.each do |arg|
     > {{ condition }} [[ -z ${args['{{ arg.name }}']+x} ]]; then
-    =   arg.render(:validations).indent 2
     >   args['{{ arg.name }}']=$1
     >   shift
 

lib/bashly/views/command/parse_requirements_case_repeatable.gtx

@@ -2,7 +2,6 @@
 
 condition = "if"
 args.each do |arg|
-  = arg.render(:validations)
   > {{ condition }} [[ -z ${args['{{ arg.name }}']+x} ]]; then
   if arg.repeatable
     >   args['{{ arg.name }}']="\"$1\""

lib/bashly/views/command/parse_requirements_case_simple.gtx

@@ -4,7 +4,6 @@ if args.any?
   condition = "if"
   args.each do |arg|
     > {{ condition }} [[ -z ${args['{{ arg.name }}']+x} ]]; then
-    > {{ arg.render(:validations).indent 2 }}
     >   args['{{ arg.name }}']=$1
     >   shift
 

lib/bashly/views/command/validations.gtx

@@ -0,0 +1,7 @@
+if validatables.any?
+  = view_marker
+
+  validatables.each do |arg_or_flag|
+    = arg_or_flag.render(:validations)
+  end
+end

lib/bashly/views/flag/case_arg.gtx

@@ -1,7 +1,6 @@
 = view_marker
 
 > if [[ -n ${2+x} ]]; then
-= render(:validations).indent 2
 
 if repeatable
   >   if [[ -z ${args['{{ name }}']+x} ]]; then