bashly 0.7.7 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187dd845a74d432185c8c53460836cf856251384c750cc4c0e4f2d2d894946c9
-  data.tar.gz: 1b4f519c55758ca113be95a0149ca8050481e0a57c64ba5a01ce1596d0aa1035
+  metadata.gz: 471a0ae8e462a056c196ebf128f02f3f30ff3a100c10aff2d2c010757d6d942e
+  data.tar.gz: d78cf8473f40b241ee412a00d819be124a244acda1f487f20e105dee1cba9842
 SHA512:
-  metadata.gz: 92a1416625eeb9d8f8e3d3b5c7b1cfaadf0b43b5d7e329af5f89173f82eb1f5d9bda10fa33d486d5e86262a8858b36ff5a8e794271d10ec57b8191f0ed96dd06
-  data.tar.gz: f52974cfdabc844b12ba046b155fe77dd598f5dcbfd3d7dbbf6e7b7dd0103cefb006e08cfebc0ecb93a811748e523afe18a57883ce6e71bdb080a7ec0cf138ed
+  metadata.gz: 77617bc6668796730c67d33621d497a8a454a6208d7f42d7c28ecb26e940da2e4edee6b3aefd8fc98b301d8480a13f14c1f6b292ff7f4d29b6030e601cdc1b08
+  data.tar.gz: d7b851826c9dde19201f2fb48b5f4b5ff0cd9a2421f4770ed3fdbc1c340943b9d0c3b3703b26646e46dfb012dca0c2a10728c568786ac4c381ab1431dc191695

data/lib/bashly/cli.rb

@@ -6,7 +6,8 @@ module Bashly
   class CLI
     def self.runner
       runner = MisterBin::Runner.new version: Bashly::VERSION,
-        header: "Bashly - Bash CLI Generator"
+        header: "Bashly - Bash CLI Generator",
+        footer: "Help: !txtpur!bashly COMMAND --help!txtrst!\nDocs: !undblu!https://bashly.dannyb.co"
 
       runner.route 'init',      to: Commands::Init
       runner.route 'preview',   to: Commands::Preview

data/lib/bashly/commands/add.rb

@@ -3,14 +3,15 @@ module Bashly
     class Add < Base
       help "Add extra features and customization to your script"
 
-      usage "bashly add strings [--force]"
-      usage "bashly add lib [--force]"
-      usage "bashly add config [--force]"
       usage "bashly add colors [--force]"
-      usage "bashly add yaml [--force]"
-      usage "bashly add validations [--force]"
-      usage "bashly add test [--force]"
       usage "bashly add comp FORMAT [OUTPUT --force]"
+      usage "bashly add config [--force]"
+      usage "bashly add lib [--force]"
+      usage "bashly add settings [--force]"
+      usage "bashly add strings [--force]"
+      usage "bashly add test [--force]"
+      usage "bashly add validations [--force]"
+      usage "bashly add yaml [--force]"
       usage "bashly add (-h|--help)"
 
       option "-f --force", "Overwrite existing files"
@@ -18,14 +19,15 @@ module Bashly
       param "FORMAT", "Output format, can be one of:\n  function : generate a function file to be included in your script.\n  script   : generate a standalone bash completions script.\n  yaml     : generate a yaml compatible with completely."
       param "OUTPUT", "For the 'comp function' command: Name of the generated function.\nFor the 'comp script' or 'comp yaml' commands: path to output file.\nIn all cases, this is optional and will have sensible defaults."
 
-      command "strings", "Copy an additional configuration file to your project, allowing you to customize all the tips and error strings."
-      command "lib", "Create the additional lib directory for additional user scripts. All *.sh scripts in this folder will be included in the final bash script."
-      command "config", "Add standard functions for handling INI files to the lib directory."
       command "colors", "Add standard functions for printing colorful and formatted text to the lib directory."
-      command "yaml", "Add standard functions for reading YAML files to the lib directory."
-      command "validations", "Add argument validation functions to the lib directory."
-      command "test", "Add approval testing."
       command "comp", "Generate a bash completions script or function."
+      command "config", "Add standard functions for handling INI files to the lib directory."
+      command "lib", "Create the additional lib directory for additional user scripts. All *.sh scripts in this folder will be included in the final bash script."
+      command "settings", "Copy a sample settings.yml file to your project, allowing you to customize some bashly options."
+      command "strings", "Copy an additional configuration file to your project, allowing you to customize all the tips and error strings."
+      command "test", "Add approval testing."
+      command "validations", "Add argument validation functions to the lib directory."
+      command "yaml", "Add standard functions for reading YAML files to the lib directory."
 
       example "bashly add strings --force"
       example "bashly add comp function"
@@ -34,45 +36,51 @@ module Bashly
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
       environment "BASHLY_LIB_DIR", "The path to use for creating the library files, relative to the source dir [default: lib]"
 
-      def strings_command
-        add_lib 'strings'
+      attr_reader :skip_src_check
+
+      def colors_command
+        add_lib 'colors'
       end
 
-      def lib_command
-        add_lib 'lib'
+      def comp_command
+        format = args['FORMAT']
+        output = args['OUTPUT']
+
+        case format
+        when "script"   then add_lib 'completions_script', output
+        when "function" then add_lib 'completions', output
+        when "yaml"     then add_lib 'completions_yaml', output
+        else            raise Error, "Unrecognized format: #{format}"
+        end
       end
 
       def config_command
         add_lib 'config'
       end
 
-      def colors_command
-        add_lib 'colors'
+      def settings_command
+        @skip_src_check = true
+        add_lib 'settings'
       end
 
-      def yaml_command
-        add_lib 'yaml'
+      def strings_command
+        add_lib 'strings'
       end
 
-      def validations_command
-        add_lib 'validations'
+      def lib_command
+        add_lib 'lib'
       end
 
       def test_command
         add_lib 'test'
       end
 
-      def comp_command
-        format = args['FORMAT']
-        output = args['OUTPUT']
-
-        case format
-        when "script"   then add_lib 'completions_script', output
-        when "function" then add_lib 'completions', output
-        when "yaml"     then add_lib 'completions_yaml', output
-        else            raise Error, "Unrecognized format: #{format}"
-        end
+      def yaml_command
+        add_lib 'yaml'
+      end
 
+      def validations_command
+        add_lib 'validations'
       end
 
     private
@@ -89,7 +97,7 @@ module Bashly
       end
 
       def safe_write(path, content)
-        if !Dir.exist? Settings.source_dir
+        if !skip_src_check and !Dir.exist? Settings.source_dir
           raise InitError, "Directory !txtgrn!#{Settings.source_dir}!txtrst! does not exist\nRun !txtpur!bashly init!txtrst! first"
         end
 

data/lib/bashly/commands/generate.rb

@@ -3,24 +3,35 @@ module Bashly
     class Generate < Base
       help "Generate the bash script and required files"
 
-      usage "bashly generate [--force --quiet --upgrade --wrap FUNCTION]"
+      usage "bashly generate [options]"
       usage "bashly generate (-h|--help)"
 
       option "-f --force", "Overwrite existing files"
       option "-q --quiet", "Disable on-screen progress report"
       option "-u --upgrade", "Upgrade all added library functions"
       option "-w --wrap FUNCTION", "Wrap the entire script in a function so it can also be sourced"
+      option "-e --env ENV", "Force the generation environment (see BASHLY_ENV)"
 
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
       environment "BASHLY_TARGET_DIR", "The path to use for creating the bash script [default: .]"
       environment "BASHLY_LIB_DIR", "The path to use for upgrading library files, relative to the source dir [default: lib]"
       environment "BASHLY_STRICT", "When not empty, enable bash strict mode (set -euo pipefail)"
+      environment "BASHLY_TAB_INDENT", "When not empty, the generated script will use tab indentation instead of spaces (every 2 leading spaces will be converted to a tab character)"
+      environment "BASHLY_ENV", <<~EOF
+        Set to 'production' or 'development':
+        - production    generate a smaller script, without file markers
+        - development   generate with file markers
+
+        Can be overridden with --env [default: development]
+      EOF
 
       example "bashly generate --force"
       example "bashly generate --wrap my_function"
 
       def run
         validate_config
+        Settings.env = args['--env'] if args['--env']
+        quiet_say "creating !txtgrn!production!txtrst! version" if Settings.production?
         create_user_files
         upgrade_libs if args['--upgrade']
         create_master_script
@@ -104,7 +115,7 @@ module Bashly
       end
 
       def create_master_script
-        File.write master_script_path, script.code
+        File.write master_script_path, script.code(tab_indent: Settings.tab_indent)
         FileUtils.chmod "+x", master_script_path
         quiet_say "!txtgrn!created!txtrst! #{master_script_path}"
       end

data/lib/bashly/concerns/renderable.rb

@@ -4,13 +4,20 @@ module Bashly
   module Renderable
     def render(view)
       template = File.read view_path(view)
-      ERB.new(template, trim_mode: '%-').result(binding)
+      erb = ERB.new(template, trim_mode: '%-')
+      erb.filename = "#{views_subfolder}.#{view}"
+      erb.result binding
     end
 
     def strings
       @strings ||= MessageStrings.new
     end
 
+    def view_marker(id = nil)
+      id ||= ":#{caller_locations.first.path}"
+      "# #{id}" unless Settings.production?
+    end
+
   private
 
     def view_path(view)

data/lib/bashly/config_validator.rb

@@ -42,8 +42,13 @@ module Bashly
       end
     end
 
-    def assert_hash(key, value)
+    def assert_hash(key, value, whitelist = nil)
       assert value.is_a?(Hash), "#{key} must be a hash"
+      
+      if whitelist
+        invalid_keys = value.keys.map(&:to_sym) - whitelist
+        assert invalid_keys.empty?, "#{key} contains invalid options: #{invalid_keys.join(', ')}"
+      end
     end
 
     def assert_version(key, value)
@@ -61,6 +66,7 @@ module Bashly
     end
 
     def assert_catch_all_hash(key, value)
+      assert_hash key, value, Script::CatchAll.option_keys
       assert_string "#{key}.label", value['label']
       assert_optional_string "#{key}.help", value['help']
       assert_boolean "#{key}.required", value['required']
@@ -73,7 +79,7 @@ module Bashly
     end
 
     def assert_arg(key, value)
-      assert_hash key, value
+      assert_hash key, value, Script::Argument.option_keys
       assert_string "#{key}.name", value['name']
       assert_optional_string "#{key}.help", value['help']
       assert_optional_string "#{key}.default", value['default']
@@ -89,7 +95,7 @@ module Bashly
     end
 
     def assert_flag(key, value)
-      assert_hash key, value
+      assert_hash key, value, Script::Flag.option_keys
       assert value['short'] || value['long'], "#{key} must have at least one of long or short name"
 
       assert_optional_string "#{key}.long", value['long']
@@ -99,6 +105,7 @@ module Bashly
       assert_optional_string "#{key}.default", value['default']
       assert_optional_string "#{key}.validate", value['validate']
       
+      assert_boolean "#{key}.repeatable", value['repeatable']
       assert_boolean "#{key}.required", value['required']
       assert_array "#{key}.allowed", value['allowed'], of: :string
       assert_array "#{key}.conflicts", value['conflicts'], of: :string
@@ -119,7 +126,7 @@ module Bashly
     end
 
     def assert_env_var(key, value)
-      assert_hash key, value
+      assert_hash key, value, Script::EnvironmentVariable.option_keys
       assert_string "#{key}.name", value['name']
       assert_optional_string "#{key}.help", value['help']
       assert_optional_string "#{key}.default", value['default']
@@ -127,11 +134,11 @@ module Bashly
     end
 
     def assert_command(key, value)
-      assert_hash key, value
+      assert_hash key, value, Script::Command.option_keys
 
       refute value['commands'] && value['args'], "#{key} cannot have both commands and args"
       refute value['commands'] && value['flags'], "#{key} cannot have both commands and flags"
-      
+
       assert_string "#{key}.name", value['name']
       assert_optional_string "#{key}.short", value['short']
       assert_optional_string "#{key}.help", value['help']
@@ -139,6 +146,7 @@ module Bashly
       assert_optional_string "#{key}.group", value['group']
       assert_optional_string "#{key}.filename", value['filename']
 
+      assert_boolean "#{key}.private", value['private']
       assert_boolean "#{key}.default", value['default']
       assert_version "#{key}.version", value['version']
       assert_catch_all "#{key}.catch_all", value['catch_all']
@@ -153,6 +161,11 @@ module Bashly
       assert_array "#{key}.environment_variables", value['environment_variables'], of: :env_var
       assert_array "#{key}.examples", value['examples'], of: :string
 
+      if value['catch_all'] and value['args']
+        repeatable_arg = value['args'].select { |a| a['repeatable'] }.first&.dig 'name'
+        refute repeatable_arg, "#{key}.catch_all makes no sense with repeatable arg (#{repeatable_arg})"
+      end
+
       if key == "root"
         refute value['short'], "#{key}.short makes no sense"
         refute value['group'], "#{key}.group makes no sense"

data/lib/bashly/extensions/string.rb

@@ -31,4 +31,10 @@ class String
     split(/^---\s*/).last
   end
 
+  def expand_tabs(tabstop = 2)
+    gsub(/^( {#{tabstop}}+)/) do
+      "\t" * ($1.size / tabstop)
+    end
+  end
+
 end

data/lib/bashly/extensions/yaml.rb

@@ -3,6 +3,8 @@ module YAML
   def self.properly_load_file(path)
     YAML.load_file path, aliases: true
   rescue ArgumentError
+    # :nocov:
     YAML.load_file path
+    # :nocov:
   end
 end

data/lib/bashly/libraries.yml

@@ -3,21 +3,25 @@ colors:
     - source: "templates/lib/colors.sh"
       target: "%{user_lib_dir}/colors.sh"
 
+completions: :CompletionsFunction
+completions_script: :CompletionsScript
+completions_yaml: :CompletionsYAML
+
 config:
   files:
     - source: "templates/lib/config.sh"
       target: "%{user_lib_dir}/config.sh"
 
-yaml:
-  files:
-    - source: "templates/lib/yaml.sh"
-      target: "%{user_lib_dir}/yaml.sh"
-
 lib:
   files:
     - source: "templates/lib/sample_function.sh"
       target: "%{user_lib_dir}/sample_function.sh"
 
+settings:
+  files:
+    - source: "templates/settings.yml"
+      target: "settings.yml"
+
 strings:
   files:
     - source: "templates/strings.yml"
@@ -37,7 +41,6 @@ test:
 
     Docs: !undblu!https://github.com/DannyBen/approvals.bash
 
-
 validations:
   files:
     - source: "templates/lib/validations/validate_dir_exists.sh"
@@ -49,6 +52,7 @@ validations:
     - source: "templates/lib/validations/validate_not_empty.sh"
       target: "%{user_lib_dir}/validations/validate_not_empty.sh"
 
-completions: :CompletionsFunction
-completions_script: :CompletionsScript
-completions_yaml: :CompletionsYAML
+yaml:
+  files:
+    - source: "templates/lib/yaml.sh"
+      target: "%{user_lib_dir}/yaml.sh"

data/lib/bashly/script/argument.rb

@@ -1,8 +1,20 @@
 module Bashly
   module Script
     class Argument < Base
+      class << self
+        def option_keys
+          @option_keys ||= %i[
+            allowed default help name repeatable required validate
+          ]
+        end
+      end
+
       def usage_string
-        required ? name.upcase : "[#{name.upcase}]"
+        required ? label : "[#{label}]"
+      end
+
+      def label
+        repeatable ? "#{name.upcase}..." : name.upcase
       end
     end
   end

data/lib/bashly/script/base.rb

@@ -5,33 +5,11 @@ module Bashly
 
       attr_reader :options
 
-      OPTION_KEYS = %i[
-        allowed
-        arg
-        catch_all
-        completions
-        conflicts
-        default
-        dependencies
-        description
-        environment_variables
-        examples
-        extensible
-        filters
-        flags
-        footer
-        group
-        help
-        long
-        name
-        parent_name
-        private
-        repeatable
-        required
-        short
-        validate
-        version
-      ]
+      class << self
+        def option_keys
+          @option_keys ||= []
+        end
+      end
 
       def initialize(options)
         raise Error, "Invalid options provided" unless options.respond_to? :keys
@@ -39,7 +17,7 @@ module Bashly
       end
 
       def optional
-        !required
+        !options['required']
       end
 
       def summary
@@ -56,7 +34,7 @@ module Bashly
       end
 
       def respond_to_missing?(method_name, include_private = false)
-        OPTION_KEYS.include?(method_name) || super
+        self.class.option_keys.include?(method_name) || super
       end
     end
   end

data/lib/bashly/script/catch_all.rb

@@ -2,6 +2,10 @@ module Bashly
   module Script
     class CatchAll
       class << self
+        def option_keys
+          @option_keys ||= %i[label help required]
+        end
+
         def from_config(config)
           options = case config
           when nil

data/lib/bashly/script/command.rb

@@ -4,6 +4,18 @@ module Bashly
       include Completions
       include CommandScopes
 
+      class << self
+        def option_keys
+          @option_keys ||= %i[
+            args catch_all commands completions
+            default dependencies environment_variables examples
+            extensible filename filters flags
+            footer group help name
+            private short version
+          ]
+        end
+      end
+
       # Returns the name to be used as an action.
       # - If it is the root command, the action is "root"
       # - Else, it is all the parents, except the first one (root) joined
@@ -28,7 +40,7 @@ module Bashly
 
       # Returns a string suitable to be a headline
       def caption_string
-        help ? "#{full_name} - #{summary}" : full_name
+        help.empty? ? full_name : "#{full_name} - #{summary}"
       end
 
       def catch_all
@@ -82,15 +94,16 @@ module Bashly
       # If the file is not found, returns a string with a hint.
       def load_user_file(file, placeholder: true)
         path = "#{Settings.source_dir}/#{file}"
-        default_content = placeholder ? "echo \"error: cannot load file\"" : ''
 
         content = if File.exist? path
           File.read(path).remove_front_matter
-        else 
-          default_content
+        elsif placeholder
+          %q[echo "error: cannot load file"]
+        else
+          ''
         end
 
-        "# :#{path}\n#{content}"
+        Settings.production? ? content : "#{view_marker path}\n#{content}"
       end
 
       # Returns an array of all parents. For example, the command 
@@ -99,7 +112,12 @@ module Bashly
         options['parents'] || []
       end
 
-      # Returns trus if this is the root command (no parents)
+      # Returns true if one of the args is repeatable
+      def repeatable_arg_exist?
+        args.select(&:repeatable).any?
+      end
+
+      # Returns true if this is the root command (no parents)
       def root_command?
         parents.empty?
       end

data/lib/bashly/script/environment_variable.rb

@@ -1,6 +1,12 @@
 module Bashly
   module Script
     class EnvironmentVariable < Base
+      class << self
+        def option_keys
+          @option_keys ||= %i[default help name required]
+        end
+      end
+      
       def usage_string(extended: false)
         result = [name.upcase]
         result << strings[:required] if required and extended

data/lib/bashly/script/flag.rb

@@ -1,6 +1,15 @@
 module Bashly
   module Script
     class Flag < Base
+      class << self
+        def option_keys
+          @option_keys ||= %i[
+            allowed arg conflicts default help long repeatable required
+            short validate
+          ]
+        end
+      end
+      
       def aliases
         if long and short
           [long, short]

data/lib/bashly/script/wrapper.rb

@@ -9,18 +9,22 @@ module Bashly
         @command, @function_name = command, function_name
       end
 
-      def code
-        if function_name
-          result = [header, render('wrapper')].join "\n"
+      def code(tab_indent: false)
+        tab_indent ? base_code.expand_tabs : base_code
+      end
+
+    private
+
+      def base_code
+        result = if function_name
+          [header, render('wrapper')]
         else
-          result = [header, body].join "\n"
+          [header, body]
         end
 
-        result.lint
+        result.join("\n").lint
       end
 
-    private
-
       def header
         @header ||= header!
       end

data/lib/bashly/settings.rb

@@ -1,27 +1,56 @@
 module Bashly
   class Settings
     class << self
-      attr_writer :source_dir, :target_dir, :lib_dir, :strict
+      attr_writer :source_dir, :target_dir, :lib_dir, :strict, :tab_indent
 
       def source_dir
-        @source_dir ||= ENV['BASHLY_SOURCE_DIR'] || 'src'
+        @source_dir ||= get :source_dir, 'src'
       end
 
       def target_dir
-        @target_dir ||= ENV['BASHLY_TARGET_DIR'] || '.'
+        @target_dir ||= get :target_dir, '.'
       end
 
       def lib_dir
-        @lib_dir ||= ENV['BASHLY_LIB_DIR'] || 'lib'
+        @lib_dir ||= get :lib_dir, 'lib'
       end
 
       def strict
-        @strict ||= ENV['BASHLY_STRICT']
+        @strict ||= get :strict
+      end
+
+      def tab_indent
+        @tab_indent ||= get :tab_indent
+      end
+
+      def env
+        @env ||= get(:env, :development)&.to_sym
+      end
+
+      def env=(value)
+        @env = value&.to_sym
+      end
+
+      def production?
+        env == :production
       end
 
       def full_lib_dir
         "#{source_dir}/#{lib_dir}"
       end
+
+    private
+
+      def get(key, default = nil)
+        ENV["BASHLY_#{key.upcase}"] || user_settings[key.to_s] || default
+      end
+
+      def user_settings
+        @user_settings ||= begin
+          File.exist?('settings.yml') ? Config.new('settings.yml') : {}
+        end
+      end
+
     end
   end
 end

data/lib/bashly/templates/settings.yml

@@ -0,0 +1,24 @@
+# All settings are optional (with their default values provided below), and
+# can also be set with an environment variable with the same name, capitalized
+# and prefixed by `BASHLY_` - for example: BASHLY_SOURCE_DIR
+
+# The path containing the bashly configuration and source files
+source_dir: src
+
+# The path to use for creating the bash script
+target_dir: .
+
+# The path to use for upgrading library files, relative to the source dir
+lib_dir: lib
+
+# When true, enable bash strict mode (set -euo pipefail)
+strict: false
+
+# When true, the generated script will use tab indentation instead of spaces
+# (every 2 leading spaces will be converted to a tab character)
+tab_indent: false
+
+# Set to 'production' or 'development':
+# - production    generate a smaller script, without file markers
+# - development   generate with file markers
+env: development

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = "0.7.7"
+  VERSION = "0.7.10"
 end

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

@@ -1,5 +1,5 @@
-# :argument.usage
-echo "  <%= name.upcase %>"
+<%= view_marker %>
+echo "  <%= label %>"
 printf "<%= help.wrap(76).indent(4).sanitize_for_print %>\n"
 % if allowed
 printf "    <%= strings[:allowed] % { values: allowed.join(', ') } -%>\n"

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

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

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

@@ -1,4 +1,4 @@
-# :command.catch_all_filter
+<%= 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"

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

@@ -1,4 +1,4 @@
-# :command.command_fallback
+<%= view_marker %>
 % if default_command
 "" )
   <%= function_name %>_usage

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

@@ -1,4 +1,4 @@
-# :command.command_filter
+<%= view_marker %>
 % if commands.any?
 action=${1:-}
 

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

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

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

@@ -1,4 +1,4 @@
-# :command.default_assignments
+<%= view_marker %>
 % default_args.each do |arg|
 [[ -n ${args[<%= arg.name %>]:-} ]] || args[<%= arg.name %>]="<%= arg.default %>"
 % end

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

@@ -1,4 +1,4 @@
-# :command.dependencies_filter
+<%= view_marker %>
 % if dependencies
 % dependencies.each do |dependency|
 if ! [[ -x "$(command -v <%= dependency %>)" ]]; then

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

@@ -1,4 +1,4 @@
-# :command.environment_variables_filter
+<%= 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 %>}"

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

@@ -1,5 +1,6 @@
-# :command.fixed_flag_filter
+<%= view_marker %>
 case "${1:-}" in
+% if root_command?
 % if short_flag_exist? "-v"
 --version )
 % else
@@ -9,6 +10,7 @@ case "${1:-}" in
   exit
   ;;
 
+% end
 % if short_flag_exist? "-h"
 --help )
 % else

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

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

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

@@ -1,4 +1,4 @@
-# :command.function
+<%= view_marker %>
 <%= function_name %>_command() {
 <%= load_user_file(filename).indent 2 %>
 }

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

@@ -1,4 +1,4 @@
-# :command.initialize
+<%= view_marker %>
 initialize() {
   version="<%= version %>"
   long_usage=''

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

@@ -1,4 +1,4 @@
-# :command.inspect_args
+<%= view_marker %>
 inspect_args() {
   readarray -t sorted_keys < <(printf '%s\n' "${!args[@]}" | sort)
   if (( ${#args[@]} )); then

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

@@ -1,3 +1,4 @@
+<%= view_marker %>
 <%= render :root_command if commands.empty? %>
 <%= render :version_command %>
 <%= render :usage %>

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

@@ -1,4 +1,4 @@
-# :command.normalize_input
+<%= view_marker %>
 normalize_input() {
   local arg flags
 

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

@@ -1,4 +1,4 @@
-# :command.parse_requirements
+<%= view_marker %>
 % if root_command?
 parse_requirements() {
 % else

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

@@ -1,26 +1,8 @@
-# :command.parse_requirements_case
-% 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
-% condition = "elif"
-% end
-else
+<%= view_marker %>
 % if catch_all.enabled?
-  other_args+=("$1")
-  shift
-% else
-  printf "<%= strings[:invalid_argument] %>\n" "$key"
-  exit 1
-% end
-fi
-% elsif catch_all.enabled?
-  other_args+=("$1")
-  shift
+<%= render(:parse_requirements_case_catch_all) %>
+% elsif repeatable_arg_exist?
+<%= render(:parse_requirements_case_repeatable) %>
 % else
-printf "<%= strings[:invalid_argument] %>\n" "$key"
-exit 1
+<%= render(:parse_requirements_case_simple) %>
 % end

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

@@ -0,0 +1,18 @@
+<%= view_marker %>
+% 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
+% condition = "elif"
+% end
+else
+  other_args+=("$1")
+  shift
+fi
+% else
+other_args+=("$1")
+shift
+% end

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

@@ -0,0 +1,18 @@
+<%= view_marker %>
+% condition = "if"
+% args.each do |arg|
+<%= condition %> [[ -z ${args[<%= arg.name %>]+x} ]]; then
+<%= arg.render(:validations).indent 2 %>
+% if arg.repeatable
+  args[<%= arg.name %>]="\"$1\""
+  shift
+else
+  args[<%= arg.name %>]="${args[<%= arg.name %>]} \"$1\""
+  shift
+% else
+  args[<%= arg.name %>]=$1
+  shift
+% end
+% condition = "elif"
+% end
+fi

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

@@ -0,0 +1,18 @@
+<%= view_marker %>
+% 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
+% condition = "elif"
+% end
+else
+  printf "<%= strings[:invalid_argument] %>\n" "$key"
+  exit 1
+fi
+% else
+printf "<%= strings[:invalid_argument] %>\n" "$key"
+exit 1
+% end

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

@@ -1,4 +1,4 @@
-# :command.parse_requirements_while
+<%= view_marker %>
 while [[ $# -gt 0 ]]; do
   key="$1"
   case "$key" in

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

@@ -1,4 +1,4 @@
-# :command.required_args_filter
+<%= view_marker %>
 % required_args.each do |arg|
 if [[ -z ${args[<%= arg.name %>]+x} ]]; then
   printf "<%= strings[:missing_required_argument] % { arg: arg.name.upcase, usage: usage_string } %>\n"

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

@@ -1,4 +1,4 @@
-# :command.required_flags_filter
+<%= view_marker %>
 % required_flags.each do |flag|
 if [[ -z ${args[<%= flag.long %>]+x} ]]; then
   printf "<%= strings[:missing_required_flag] % { usage: flag.usage_string } %>\n"

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

@@ -1,4 +1,4 @@
-# :command.root_command
+<%= view_marker %>
 root_command() {
 <%= load_user_file(filename).indent 2 %>
 }

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

@@ -1,4 +1,4 @@
-# :command.run
+<%= view_marker %>
 run() {
   declare -A args=()
   declare -a other_args=()

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

@@ -1,4 +1,4 @@
-# :command.usage
+<%= view_marker %>
 <%= function_name %>_usage() {
   if [[ -n $long_usage ]]; then
     <%- if summary == help -%>

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

@@ -1,4 +1,4 @@
-# :command.usage_args
+<%= view_marker %>
 printf "<%= strings[:arguments] %>\n"
 % if args.any?
 

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

@@ -1,4 +1,4 @@
-# :command.usage_commands
+<%= view_marker %>
 % unless commands.first.group
 printf "<%= strings[:commands] %>\n"
 % end

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

@@ -1,4 +1,4 @@
-# :command.usage_environment_variables
+<%= view_marker %>
 printf "<%= strings[:environment_variables] %>\n"
 
 % environment_variables.each do |env_var|

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

@@ -1,4 +1,4 @@
-# :command.usage_examples
+<%= view_marker %>
 printf "<%= strings[:examples] %>\n"
 
 % examples.each do |example|

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

@@ -1,4 +1,4 @@
-# :command.usage_fixed_flags
+<%= view_marker %>
 % if short_flag_exist? "-h"
 echo "  --help"
 % else

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

@@ -1,4 +1,4 @@
-# :command.usage_flags
+<%= view_marker %>
 % flags.each do |flag|
 <%= flag.render(:usage) %>
 % end

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

@@ -1,4 +1,4 @@
-# :command.user_filter
+<%= view_marker %>
 % if filters
 % filters.each do |filter|
 filter_error=$(filter_<%= filter %>)

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

@@ -1,6 +1,6 @@
-# :command.user_lib
+<%= view_marker %>
 % user_lib.each do |file|
-# <%= ":#{file}" %>
+<%= view_marker file %>
 <%= File.read file %>
 
 % end

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.7
+  version: 0.7.10
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-20 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -121,6 +121,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 +146,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 +167,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
@@ -192,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Bash Command Line Tool Generator