bashly 0.6.7 → 0.7.1

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

@@ -6,7 +6,7 @@ export <%= env_var.name.upcase %>="${<%= env_var.name.upcase %>:-<%= env_var.def
 % end
 % if required_environment_variables.any?
 % required_environment_variables.each do |env_var|
-if [[ -z "$<%= env_var.name.upcase %>" ]]; then
+if [[ -z "${<%= env_var.name.upcase %>:-}" ]]; then
   printf "<%= strings[:missing_required_environment_variable] % { var: env_var.name.upcase } %>\n"
   exit 1
 fi

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

@@ -1,5 +1,5 @@
 # :command.fixed_flag_filter
-case "$1" in
+case "${1:-}" in
 % if short_flag_exist? "-v"
 --version )
 % else

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

@@ -2,12 +2,7 @@
 initialize() {
   version="<%= version %>"
   long_usage=''
-  set -e
-
-  if [[ "${BASH_VERSINFO:-0}" -lt 4 ]]; then
-    printf "<%= strings[:unsupported_bash_version] -%>\n"
-    exit 1
-  fi
+  <%= ENV['BASHLY_STRICT'] ? "set -euo pipefail" : "set -e" %>
 
 <%= load_user_file("initialize.sh", placeholder: false).indent 2 %>
 }

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

@@ -8,9 +8,9 @@ parse_requirements() {
 <%= render(:environment_variables_filter).indent 2 %>
 <%= render(:dependencies_filter).indent 2 %>
 <%= render(:command_filter).indent 2 %>
+<%= render(:parse_requirements_while).indent 2 %>
 <%= render(:required_args_filter).indent 2 %>
 <%= render(:required_flags_filter).indent 2 %>
-<%= render(:parse_requirements_while).indent 2 %>
 <%= render(:catch_all_filter).indent 2 %>
 <%= render(:default_assignments).indent 2 %>
 <%= render(:whitelist_filter).indent 2 %>

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

@@ -2,7 +2,8 @@
 % 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
 % condition = "elif"

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

@@ -1,11 +1,7 @@
 # :command.required_args_filter
 % required_args.each do |arg|
-if [[ $1 && $1 != -* ]]; then
-  args[<%= arg.name %>]=$1
-  shift
-else
+if [[ -z ${args[<%= arg.name %>]+x} ]]; then
   printf "<%= strings[:missing_required_argument] % { arg: arg.name.upcase, usage: usage_string } %>\n"
   exit 1
 fi
-
 % end

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

@@ -1,9 +1,6 @@
 # :command.required_flags_filter
-% if required_flags.any?
-argstring="$*"
-% end
 % required_flags.each do |flag|
-if [[ <%= flag.aliases.map { |a| %Q["$argstring" != *#{a}*] }.join " && " %> ]]; then
+if [[ -z ${args[<%= flag.long %>]+x} ]]; then
   printf "<%= strings[:missing_required_flag] % { usage: flag.usage_string } %>\n"
   exit 1
 fi

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

@@ -1,15 +1,15 @@
 # :command.run
 run() {
-  declare -A args
-  declare -a other_args
-  declare -a input
+  declare -A args=()
+  declare -a other_args=()
+  declare -a input=()
   normalize_input "$@"
   parse_requirements "${input[@]}"
 
   <%- condition = "if" -%>
   <%- deep_commands.each do |command| -%>
   <%= condition %> [[ $action == "<%= command.action_name %>" ]]; then
-    if [[ ${args[--help]} ]]; then
+    if [[ ${args[--help]:-} ]]; then
       long_usage=yes
       <%= command.function_name %>_usage
     else

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

@@ -3,7 +3,7 @@
 printf "<%= strings[:commands] %>\n"
 % end
 % maxlen = command_names.map(&:size).max
-% commands.each do |command|
+% commands.reject(&:private).each do |command|
 % summary = command.summary
 % summary = strings[:default_command_summary] % { summary: summary } if command.default
 % if command.group

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

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

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

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

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

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

data/lib/bashly/views/{script → wrapper}/header.erb

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 # This script was generated by bashly (https://github.com/DannyBen/bashly)
 # Modifying it manually is not recommended
+

data/lib/bashly.rb

@@ -9,6 +9,8 @@ requires 'bashly/concerns'
 
 requires 'bashly/settings'
 requires 'bashly/exceptions'
-requires 'bashly/models/base'
+requires 'bashly/refinements'
+requires 'bashly/script/base'
 requires 'bashly/commands/base'
+requires 'bashly/libraries/base'
 requires 'bashly'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -82,30 +82,46 @@ files:
 - lib/bashly/commands/generate.rb
 - lib/bashly/commands/init.rb
 - lib/bashly/commands/preview.rb
+- lib/bashly/commands/validate.rb
 - lib/bashly/concerns/asset_helper.rb
 - lib/bashly/concerns/completions.rb
 - lib/bashly/concerns/renderable.rb
 - lib/bashly/config.rb
+- lib/bashly/config_validator.rb
 - lib/bashly/exceptions.rb
 - lib/bashly/extensions/array.rb
+- lib/bashly/extensions/file.rb
 - lib/bashly/extensions/string.rb
+- lib/bashly/libraries.yml
+- lib/bashly/libraries/base.rb
+- lib/bashly/libraries/completions.rb
+- lib/bashly/libraries/completions_function.rb
+- lib/bashly/libraries/completions_script.rb
+- lib/bashly/libraries/completions_yaml.rb
+- lib/bashly/library.rb
 - lib/bashly/message_strings.rb
-- lib/bashly/models/argument.rb
-- lib/bashly/models/base.rb
-- lib/bashly/models/command.rb
-- lib/bashly/models/environment_variable.rb
-- lib/bashly/models/flag.rb
-- lib/bashly/models/script.rb
+- lib/bashly/refinements/compose_refinements.rb
+- lib/bashly/script/argument.rb
+- lib/bashly/script/base.rb
+- lib/bashly/script/command.rb
+- lib/bashly/script/environment_variable.rb
+- lib/bashly/script/flag.rb
+- lib/bashly/script/wrapper.rb
 - lib/bashly/settings.rb
 - lib/bashly/templates/bashly.yml
 - lib/bashly/templates/lib/colors.sh
 - lib/bashly/templates/lib/config.sh
 - lib/bashly/templates/lib/sample_function.sh
+- lib/bashly/templates/lib/validations/validate_dir_exists.sh
+- lib/bashly/templates/lib/validations/validate_file_exists.sh
+- lib/bashly/templates/lib/validations/validate_integer.sh
+- lib/bashly/templates/lib/validations/validate_not_empty.sh
 - lib/bashly/templates/lib/yaml.sh
 - lib/bashly/templates/minimal.yml
 - lib/bashly/templates/strings.yml
 - lib/bashly/version.rb
 - lib/bashly/views/argument/usage.erb
+- lib/bashly/views/argument/validations.erb
 - lib/bashly/views/command/catch_all_filter.erb
 - lib/bashly/views/command/command_fallback.erb
 - lib/bashly/views/command/command_filter.erb
@@ -143,8 +159,10 @@ files:
 - lib/bashly/views/environment_variable/usage.erb
 - lib/bashly/views/flag/case.erb
 - lib/bashly/views/flag/usage.erb
-- lib/bashly/views/script/header.erb
-- lib/bashly/views/script/wrapper.erb
+- lib/bashly/views/flag/validations.erb
+- lib/bashly/views/wrapper/bash3_bouncer.erb
+- lib/bashly/views/wrapper/header.erb
+- lib/bashly/views/wrapper/wrapper.erb
 homepage: https://github.com/dannyben/bashly
 licenses:
 - MIT