Merge pull request #135 from DannyBen/fix/pr-122

Allow empty string as argument (replacing #122)

Author: DannyBen

lib/bashly/views/argument/validations.erb

@@ -3,4 +3,4 @@ if [[ -n $(validate_<%= validation_function %> "$1") ]]; then
   printf "<%= strings[:validation_error] %>\n" "<%= name.upcase %> $(validate_<%= validation_function %> "$1")"
   exit 1
 fi
-% end
+% end

lib/bashly/views/command/parse_requirements_case.erb

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

lib/bashly/views/command/required_args_filter.erb

@@ -1,6 +1,6 @@
 # :command.required_args_filter
 % required_args.each do |arg|
-if [[ $1 && $1 != -* ]]; then
+if [[ -n ${1+x} && $1 != -* ]]; then
 <%= arg.render(:validations).indent 2 %>
   args[<%= arg.name %>]=$1
   shift

lib/bashly/views/flag/case.erb

@@ -1,7 +1,7 @@
 # :flag.case
 <%= aliases.join " | " %> )
 % if arg
-  if [[ $2 ]]; then
+  if [[ -n ${2+x} ]]; then
 <%= render(:validations).indent 4 %>
     args[<%= name %>]="$2"
     shift

lib/bashly/views/flag/validations.erb

@@ -3,4 +3,4 @@ if [[ -n $(validate_<%= validation_function %> "$2") ]]; then
   printf "<%= strings[:validation_error] %>\n" "<%= usage_string %> $(validate_<%= validation_function %> "$2")"
   exit 1
 fi
-% end
+% end

spec/approvals/examples/empty-args

@@ -0,0 +1,22 @@
+creating user files in src
+skipped src/initialize.sh (exists)
+skipped src/test_command.sh (exists)
+created ./cli
+run ./cli --help to test your bash script
++ ./cli test a b --flag c
+args:
+- ${args[--flag]} = c
+- ${args[optional_arg]} = b
+- ${args[required_arg]} = a
++ ./cli test ''
+args:
+- ${args[required_arg]} = 
++ ./cli test '' --flag ''
+args:
+- ${args[--flag]} = 
+- ${args[required_arg]} = 
++ ./cli test '' '' --flag ''
+args:
+- ${args[--flag]} = 
+- ${args[optional_arg]} = 
+- ${args[required_arg]} = 

spec/fixtures/workspaces/empty-args/.gitignore

@@ -0,0 +1 @@
+cli

spec/fixtures/workspaces/empty-args/src/bashly.yml

@@ -0,0 +1,14 @@
+name: cli
+help: Sample application
+version: 0.1.0
+
+commands:
+- name: test
+  help: Run test
+  flags:
+  - long: --flag
+    arg: value
+  args:
+  - name: required_arg
+    required: true
+  - name: optional_arg

spec/fixtures/workspaces/empty-args/src/initialize.sh

@@ -0,0 +1,6 @@
+# Code here runs inside the initialize() function
+# Use it for anything that you need to run before any other function, like
+# setting environment vairables:
+# CONFIG_FILE=settings.ini
+#
+# Feel free to empty (but not delete) this file.

spec/fixtures/workspaces/empty-args/src/test_command.sh

@@ -0,0 +1 @@
+inspect_args