bashly 0.7.8 → 0.8.0

data/lib/bashly/views/command/version_command.erb

@@ -1,4 +1,4 @@
-# :command.version_command
+<%= view_marker %>
 version_command() {
   echo "$version"
 }

data/lib/bashly/views/command/whitelist_filter.erb

@@ -1,10 +1,20 @@
-# :command.whitelist_filter
+<%= view_marker %>
 % 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_argument] % { 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 %>]})"

data/lib/bashly/views/environment_variable/usage.erb

@@ -1,4 +1,4 @@
-# :environment_variable.usage
+<%= view_marker %>
 echo "  <%= usage_string extended: true %>"
 printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
 % if default

data/lib/bashly/views/flag/case.erb

@@ -1,30 +1,4 @@
-# :flag.case
+<%= view_marker %>
 <%= aliases.join " | " %> )
 <%= render(:conflicts).indent 2 %>
-% if arg
-  if [[ -n ${2+x} ]]; then
-<%= render(:validations).indent 4 %>
-% if repeatable
-    if [[ -z ${args[<%= name %>]+x} ]]; then
-      args[<%= name %>]="\"$2\""
-    else
-      args[<%= name %>]="${args[<%= name %>]} \"$2\""
-    fi
-% else
-    args[<%= name %>]="$2"
-% end
-    shift
-    shift
-  else
-    printf "%s\n" "<%= strings[:flag_requires_an_argument] % { name: name, usage: usage_string } %>"
-    exit 1
-  fi
-% else
-% if repeatable
-  (( args[<%= name %>]+=1 ))
-% else
-  args[<%= name %>]=1
-% end
-  shift
-% end
-  ;;
+<%= render(arg ? :case_arg : :case_no_arg).indent 2 %>

data/lib/bashly/views/flag/case_arg.erb

@@ -0,0 +1,19 @@
+<%= view_marker %>
+if [[ -n ${2+x} ]]; then
+<%= render(:validations).indent 2 %>
+% if repeatable
+  if [[ -z ${args[<%= name %>]+x} ]]; then
+    args[<%= name %>]="\"$2\""
+  else
+    args[<%= name %>]="${args[<%= name %>]} \"$2\""
+  fi
+% else
+  args[<%= name %>]="$2"
+% end
+  shift
+  shift
+else
+  printf "%s\n" "<%= strings[:flag_requires_an_argument] % { name: name, usage: usage_string } %>"
+  exit 1
+fi
+;;

data/lib/bashly/views/flag/case_no_arg.erb

@@ -0,0 +1,8 @@
+<%= view_marker %>
+% if repeatable
+(( args[<%= name %>]+=1 ))
+% else
+args[<%= name %>]=1
+% end
+shift
+;;

data/lib/bashly/views/flag/conflicts.erb

@@ -1,4 +1,4 @@
-# :flag.conflicts
+<%= view_marker %>
 % if conflicts
 % if conflicts.count == 1
 if [[ -n "${args[<%= conflicts.first %>]:-}" ]]; then

data/lib/bashly/views/flag/usage.erb

@@ -1,4 +1,4 @@
-# :flag.usage
+<%= view_marker %>
 echo "  <%= usage_string extended: true %>"
 printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
 % if allowed

data/lib/bashly/views/flag/validations.erb

@@ -1,4 +1,4 @@
-# :flag.validations
+<%= view_marker %>
 % if validate
 if [[ -n $(validate_<%= validate %> "$2") ]]; then
   printf "<%= strings[:validation_error] %>\n" "<%= usage_string %>" "$(validate_<%= validate %> "$2")"

data/lib/bashly/views/wrapper/bash3_bouncer.erb

@@ -1,4 +1,4 @@
-# :script.bash3_bouncer
+<%= view_marker %>
 if [[ "${BASH_VERSINFO:-0}" -lt 4 ]]; then
   printf "<%= strings[:unsupported_bash_version] -%>\n"
   exit 1

data/lib/bashly/views/wrapper/wrapper.erb

@@ -1,4 +1,4 @@
-# :script.wrapper
+<%= view_marker %>
 <%= function_name %>() {
 <%= body.indent 2 %>
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -87,8 +87,10 @@ files:
 - lib/bashly/concerns/command_scopes.rb
 - lib/bashly/concerns/completions.rb
 - lib/bashly/concerns/renderable.rb
+- lib/bashly/concerns/validation_helpers.rb
 - lib/bashly/config.rb
 - lib/bashly/config_validator.rb
+- lib/bashly/deprecation.rb
 - lib/bashly/exceptions.rb
 - lib/bashly/extensions/array.rb
 - lib/bashly/extensions/file.rb
@@ -121,6 +123,7 @@ files:
 - lib/bashly/templates/lib/validations/validate_not_empty.sh
 - lib/bashly/templates/lib/yaml.sh
 - lib/bashly/templates/minimal.yml
+- lib/bashly/templates/settings.yml
 - lib/bashly/templates/strings.yml
 - lib/bashly/templates/test/approvals.bash
 - lib/bashly/version.rb
@@ -145,6 +148,9 @@ files:
 - lib/bashly/views/command/normalize_input.erb
 - lib/bashly/views/command/parse_requirements.erb
 - lib/bashly/views/command/parse_requirements_case.erb
+- lib/bashly/views/command/parse_requirements_case_catch_all.erb
+- lib/bashly/views/command/parse_requirements_case_repeatable.erb
+- lib/bashly/views/command/parse_requirements_case_simple.erb
 - lib/bashly/views/command/parse_requirements_while.erb
 - lib/bashly/views/command/required_args_filter.erb
 - lib/bashly/views/command/required_flags_filter.erb
@@ -163,6 +169,8 @@ files:
 - lib/bashly/views/command/whitelist_filter.erb
 - lib/bashly/views/environment_variable/usage.erb
 - lib/bashly/views/flag/case.erb
+- lib/bashly/views/flag/case_arg.erb
+- lib/bashly/views/flag/case_no_arg.erb
 - lib/bashly/views/flag/conflicts.erb
 - lib/bashly/views/flag/usage.erb
 - lib/bashly/views/flag/validations.erb