bashly 0.8.0 → 0.8.3

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

@@ -0,0 +1,41 @@
+if whitelisted_args.any? or whitelisted_flags.any?
+  = 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 }}]})"
+      > for i in "${input_array[@]}"; do
+      >   if [[ ! $i =~ ^({{ flag.allowed.join '|' }})$ ]]; then
+      >     printf "%s\n" "{{ strings[:disallowed_flag] % { name: flag.name, allowed: flag.allowed.join(', ') } }}"
+      >     exit 1
+      >   fi
+      > done
+    
+    else
+      > if [[ ! ${args[{{ flag.name }}]} =~ ^({{ flag.allowed.join '|' }})$ ]]; then
+      >   printf "%s\n" "{{ strings[:disallowed_flag] % { name: flag.name, allowed: flag.allowed.join(', ') } }}"
+      >   exit 1
+      > fi
+
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+= view_marker
+
+> echo "  {{ usage_string extended: true }}"
+> printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
+
+if default
+  > printf "    {{ strings[:default] % { value: default } }}\n"
+end
+
+> echo
+> 

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

@@ -0,0 +1,6 @@
+= view_marker
+
+> {{ aliases.join " | " }} )
+= render(:conflicts).indent 2
+= render(arg ? :case_arg : :case_no_arg).indent 2
+>

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

@@ -0,0 +1,25 @@
+= 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.gtx

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

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

@@ -0,0 +1,22 @@
+if conflicts
+
+  = view_marker
+  
+  if conflicts.count == 1
+    > if [[ -n "${args[{{ conflicts.first }}]:-}" ]]; then
+    >   printf "{{ strings[:conflicting_flags] }}\n" "$key" "{{ conflicts.first }}"
+    >   exit 1
+    > fi
+    >
+
+  else
+    > for conflict in {{ conflicts.join ' ' }}; do
+    >   if [[ -n "${args[$conflict]:-}" ]]; then
+    >     printf "{{ strings[:conflicting_flags] }}\n" "$key" "$conflict"
+    >     exit 1
+    >   fi
+    > done
+    >
+
+  end
+end

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

@@ -0,0 +1,15 @@
+= view_marker
+
+> echo "  {{ usage_string extended: true }}"
+> printf "{{ help.wrap(76).indent(4).sanitize_for_print }}\n"
+
+if allowed
+> printf "    {{ strings[:allowed] % { values: allowed.join(', ') } }}\n"
+end
+
+if default
+> printf "    {{ strings[:default] % { value: default } }}\n"
+end
+
+> echo
+> 

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

@@ -0,0 +1,11 @@
+if validate
+
+  = view_marker
+
+  > 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.gtx

@@ -0,0 +1,7 @@
+= view_marker
+
+> if [[ "${BASH_VERSINFO:-0}" -lt 4 ]]; then
+>   printf "{{ strings[:unsupported_bash_version] }}\n"
+>   exit 1
+> fi
+> 

data/lib/bashly/views/wrapper/header.gtx

@@ -0,0 +1,5 @@
+> #!/usr/bin/env bash
+> # This script was generated by bashly {{ Bashly::VERSION }} (https://bashly.dannyb.co)
+> # Modifying it manually is not recommended
+> 
+>

data/lib/bashly/views/wrapper/wrapper.gtx

@@ -0,0 +1,8 @@
+= view_marker
+
+> {{ function_name }}() {
+= body.indent 2
+> }
+>
+> (return 0 2>/dev/null) || {{ function_name }} "$@"
+>

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colsole
+  name: completely
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
-  name: completely
+  name: gtx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: mister_bin
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: filewatcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.1'
 description: Generate bash command line tools using YAML configuration
 email: db@dannyben.com
 executables:
@@ -84,7 +112,6 @@ files:
 - lib/bashly/commands/preview.rb
 - lib/bashly/commands/validate.rb
 - lib/bashly/concerns/asset_helper.rb
-- lib/bashly/concerns/command_scopes.rb
 - lib/bashly/concerns/completions.rb
 - lib/bashly/concerns/renderable.rb
 - lib/bashly/concerns/validation_helpers.rb
@@ -127,56 +154,58 @@ files:
 - lib/bashly/templates/strings.yml
 - lib/bashly/templates/test/approvals.bash
 - 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
-- lib/bashly/views/command/command_functions.erb
-- lib/bashly/views/command/default_assignments.erb
-- lib/bashly/views/command/default_initialize_script.erb
-- lib/bashly/views/command/default_root_script.erb
-- lib/bashly/views/command/default_script.erb
-- lib/bashly/views/command/dependencies_filter.erb
-- lib/bashly/views/command/environment_variables_filter.erb
-- lib/bashly/views/command/fixed_flags_filter.erb
-- lib/bashly/views/command/footer.erb
-- lib/bashly/views/command/function.erb
-- lib/bashly/views/command/initialize.erb
-- lib/bashly/views/command/inspect_args.erb
-- lib/bashly/views/command/master_script.erb
-- 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
-- lib/bashly/views/command/root_command.erb
-- lib/bashly/views/command/run.erb
-- lib/bashly/views/command/usage.erb
-- lib/bashly/views/command/usage_args.erb
-- lib/bashly/views/command/usage_commands.erb
-- lib/bashly/views/command/usage_environment_variables.erb
-- lib/bashly/views/command/usage_examples.erb
-- lib/bashly/views/command/usage_fixed_flags.erb
-- lib/bashly/views/command/usage_flags.erb
-- lib/bashly/views/command/user_filter.erb
-- lib/bashly/views/command/user_lib.erb
-- lib/bashly/views/command/version_command.erb
-- 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
-- lib/bashly/views/wrapper/bash3_bouncer.erb
-- lib/bashly/views/wrapper/header.erb
-- lib/bashly/views/wrapper/wrapper.erb
+- lib/bashly/views/README.md
+- lib/bashly/views/argument/usage.gtx
+- lib/bashly/views/argument/validations.gtx
+- lib/bashly/views/command/catch_all_filter.gtx
+- lib/bashly/views/command/command_fallback.gtx
+- lib/bashly/views/command/command_filter.gtx
+- lib/bashly/views/command/command_functions.gtx
+- lib/bashly/views/command/default_assignments.gtx
+- lib/bashly/views/command/default_initialize_script.gtx
+- lib/bashly/views/command/default_root_script.gtx
+- lib/bashly/views/command/default_script.gtx
+- lib/bashly/views/command/dependencies_filter.gtx
+- lib/bashly/views/command/environment_variables_filter.gtx
+- lib/bashly/views/command/fixed_flags_filter.gtx
+- lib/bashly/views/command/footer.gtx
+- lib/bashly/views/command/function.gtx
+- lib/bashly/views/command/initialize.gtx
+- lib/bashly/views/command/inspect_args.gtx
+- lib/bashly/views/command/long_usage.gtx
+- lib/bashly/views/command/master_script.gtx
+- lib/bashly/views/command/normalize_input.gtx
+- lib/bashly/views/command/parse_requirements.gtx
+- lib/bashly/views/command/parse_requirements_case.gtx
+- lib/bashly/views/command/parse_requirements_case_catch_all.gtx
+- lib/bashly/views/command/parse_requirements_case_repeatable.gtx
+- lib/bashly/views/command/parse_requirements_case_simple.gtx
+- lib/bashly/views/command/parse_requirements_while.gtx
+- lib/bashly/views/command/required_args_filter.gtx
+- lib/bashly/views/command/required_flags_filter.gtx
+- lib/bashly/views/command/root_command.gtx
+- lib/bashly/views/command/run.gtx
+- lib/bashly/views/command/usage.gtx
+- lib/bashly/views/command/usage_args.gtx
+- lib/bashly/views/command/usage_commands.gtx
+- lib/bashly/views/command/usage_environment_variables.gtx
+- lib/bashly/views/command/usage_examples.gtx
+- lib/bashly/views/command/usage_fixed_flags.gtx
+- lib/bashly/views/command/usage_flags.gtx
+- lib/bashly/views/command/user_filter.gtx
+- lib/bashly/views/command/user_lib.gtx
+- lib/bashly/views/command/version_command.gtx
+- lib/bashly/views/command/whitelist_filter.gtx
+- lib/bashly/views/environment_variable/usage.gtx
+- lib/bashly/views/flag/case.gtx
+- lib/bashly/views/flag/case_arg.gtx
+- lib/bashly/views/flag/case_no_arg.gtx
+- lib/bashly/views/flag/conflicts.gtx
+- lib/bashly/views/flag/usage.gtx
+- lib/bashly/views/flag/validations.gtx
+- lib/bashly/views/wrapper/bash3_bouncer.gtx
+- lib/bashly/views/wrapper/header.gtx
+- lib/bashly/views/wrapper/wrapper.gtx
 homepage: https://github.com/dannyben/bashly
 licenses:
 - MIT
@@ -200,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.14
 signing_key: 
 specification_version: 4
 summary: Bash Command Line Tool Generator

data/lib/bashly/concerns/command_scopes.rb

@@ -1,68 +0,0 @@
-module Bashly
-  # This is a `Command` concern responsible for providing additional scopes.
-  module CommandScopes
-    # Returns only the names of the Commands
-    def command_names
-      commands.map &:name
-    end
-
-    # Returns a flat array containing all the commands in this tree.
-    # This includes self + children + grandchildres + ...
-    def deep_commands
-      result = []
-      commands.each do |command|
-        result << command
-        if command.commands.any?
-          result += command.deep_commands
-        end
-      end
-      result
-    end
-
-    # If any of this command's subcommands has the default option set to
-    # true, this default command will be returned, nil otherwise.
-    def default_command
-      commands.find { |c| c.default }
-    end
-
-    # Returns an array of all the default Args
-    def default_args
-      args.select &:default
-    end
-
-    # Returns an array of all the default Environment Variables
-    def default_environment_variables
-      environment_variables.select &:default
-    end
-
-    # Returns an array of all the default Flags
-    def default_flags
-      flags.select &:default
-    end
-
-    # Returns an array of all the required Arguments
-    def required_args
-      args.select &:required
-    end
-
-    # Returns an array of all the required EnvironmentVariables
-    def required_environment_variables
-      environment_variables.select &:required
-    end
-
-    # Returns an array of all the required Flags
-    def required_flags
-      flags.select &:required
-    end
-
-    # Returns an array of all the args with a whitelist
-    def whitelisted_args
-      args.select &:allowed
-    end
-
-    # Returns an array of all the flags with a whitelist arg
-    def whitelisted_flags
-      flags.select &:allowed
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-<%= view_marker %>
-echo "  <%= label %>"
-printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
-% if allowed
-printf "    <%= strings[:allowed] % { values: allowed.join(', ') } -%>\n"
-% end
-% if default
-printf "    <%= strings[:default] % { value: default } -%>\n"
-% end
-echo

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

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

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

@@ -1,7 +0,0 @@
-<%= view_marker %>
-% if catch_all.required?
-if [[ ${#other_args[@]} -eq 0 ]]; then
-  printf "<%= strings[:missing_required_argument] % { arg: catch_all.label, usage: usage_string } %>\n"
-  exit 1
-fi
-% end

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

@@ -1,45 +0,0 @@
-<%= view_marker %>
-% if default_command
-"" )
-  <%= function_name %>_usage
-  exit 1
-  ;;
-
-* )
-  action="<%= default_command.name %>"
-  <%= default_command.function_name %>_parse_requirements "$@"
-  shift $#
-  ;;
-% elsif extensible.is_a? String
-"" )
-  <%= function_name %>_usage
-  exit 1
-  ;;
-
-* )
-  if [[ -x "$(command -v "<%= extensible %>")" ]]; then
-    exec <%= extensible %> "$@"
-  else
-    <%= function_name %>_usage
-    exit 1
-  fi
-% elsif extensible
-"" )
-  <%= function_name %>_usage
-  exit 1
-  ;;
-
-* )
-  if [[ -x "$(command -v "<%= function_name %>-$action")" ]]; then
-    shift
-    exec "<%= function_name %>-$action" "$@"
-  else
-    <%= function_name %>_usage
-    exit 1
-  fi
-% else
-* )
-  <%= function_name %>_usage
-  exit 1
-  ;;
-% end

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

@@ -1,22 +0,0 @@
-<%= view_marker %>
-% if commands.any?
-action=${1:-}
-
-case $action in
--* )
-  ;;
-
-% commands.each do |command|
-<%= command.aliases.join " | " %> )
-  action="<%= command.name %>"
-  shift
-  <%= command.function_name %>_parse_requirements "$@"
-  shift $#
-  ;;    
-
-% end
-<%= render :command_fallback %>
-esac
-% else
-action="<%= action_name %>"
-% end

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

@@ -1,4 +0,0 @@
-<%= view_marker %>
-% deep_commands.each do |command|
-<%= command.render :function unless command.commands.any? %>
-% end

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

@@ -1,7 +0,0 @@
-<%= view_marker %>
-% default_args.each do |arg|
-[[ -n ${args[<%= arg.name %>]:-} ]] || args[<%= arg.name %>]="<%= arg.default %>"
-% end
-% default_flags.each do |flag|
-[[ -n ${args[<%= flag.long %>]:-} ]] || args[<%= flag.long %>]="<%= flag.default %>"
-% end

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

@@ -1,6 +0,0 @@
-## 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.

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

@@ -1,3 +0,0 @@
-echo "# this file is located in '<%= "#{Settings.source_dir}/#{filename}" %>'"
-echo "# you can edit it freely and regenerate (it will not be overwritten)"
-inspect_args

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

@@ -1,4 +0,0 @@
-echo "# this file is located in '<%= "#{Settings.source_dir}/#{filename}" %>'"
-echo "# code for '<%= full_name %>' goes here"
-echo "# you can edit it freely and regenerate (it will not be overwritten)"
-inspect_args

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

@@ -1,9 +0,0 @@
-<%= view_marker %>
-% if dependencies
-% dependencies.each do |dependency|
-if ! [[ -x "$(command -v <%= dependency %>)" ]]; then
-  printf "<%= strings[:missing_dependency] % { dependency: dependency } -%>\n"
-  exit 1
-fi
-% end
-% end

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

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

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

@@ -1,24 +0,0 @@
-<%= view_marker %>
-case "${1:-}" in
-% if root_command?
-% if short_flag_exist? "-v"
---version )
-% else
---version | -v )
-% end
-  version_command
-  exit
-  ;;
-
-% end
-% if short_flag_exist? "-h"
---help )
-% else
---help | -h )
-% end
-  long_usage=yes
-  <%= function_name %>_usage
-  exit
-  ;;
-
-esac

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

@@ -1,3 +0,0 @@
-<%= view_marker %>
-printf "<%= footer.gsub("\n", '\n').gsub('"', '\"') %>\n"
-echo