bashly 0.6.3 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01c46120b6cecba45cf9b55dd726ce4b66888ba3fc11d3383557a554ac51b154
-  data.tar.gz: 9682934a468d1624d05924f4ca5bd76d6438c26853fed1ad8098865dae669bc2
+  metadata.gz: c47271e43a775ff08c071428540301ed1fa0656c7d58020c9825dfbc492804ef
+  data.tar.gz: fdc8ac40f1d18c2bc90ae4700fd0757e55132852bbdf8700a2829a02dd3be61c
 SHA512:
-  metadata.gz: bb068fa1b263a1f820910b548cd48fde9cc1ae8607c50eea381361f9cbfe952581a4e1c9e54ac31e20a96c6ccba876d2a58b2f0ec6e8a59c3f8a467fbe0bde43
-  data.tar.gz: 653410059e779fffdf9aa28d8c23a0a2cc8d3ba0a7911651deaf2669fc1b4d744dc3a3824124ba79140813d331510ec14a1b47f852049c305ab47fe55fe9c89d
+  metadata.gz: aff1e0723cdfdc10c409697cb2c715a37382dc7dbef3da3afe3b0e45fc8c91255ffeda153d24a25aa3bdcdf67ff863cfa7bec4558f79fced3d3ff33dc720b4d1
+  data.tar.gz: 54aa504a25003ddf1331e39de9b68612d2fff39bedc93dfc09bc961254c6b4ba7beacadf90412af6d76f9159bffb48456b6d6e85e5c805864372221f2edfbe2e

data/README.md

@@ -3,22 +3,66 @@
 
 # Bashly - Bash CLI Framework and Generator
 
-Create beautiful bash scripts from simple YAML configuration
+Create feature-rich bash scripts using simple YAML configuration
 
 [![Gem Version](https://badge.fury.io/rb/bashly.svg)](https://badge.fury.io/rb/bashly)
 [![Build Status](https://github.com/DannyBen/bashly/workflows/Test/badge.svg)](https://github.com/DannyBen/bashly/actions?query=workflow%3ATest)
 [![Maintainability](https://api.codeclimate.com/v1/badges/8cf89047e50ca601e431/maintainability)](https://codeclimate.com/github/DannyBen/bashly/maintainability)
 
+## [bashly.dannyb.co](https://bashly.dannyb.co)
+
 ---
 
 ![demo](demo/cast.svg)
 
 </div>
 
+Bashly is a command line application (written in Ruby) that lets you
+generate feature-rich bash command line tools.
+
+Bashly lets you focus on your specific code, without worrying about command line
+argument parsing, usage texts, error messages and other functions that are
+usually handled by a framework in any other programming language.
+
+It is available both as a [ruby gem](https://rubygems.org/gems/bashly) and as
+a [docker image](https://hub.docker.com/r/dannyben/bashly).
+
+
 ## Documentation
 
-Visit the [Bashly Documentation][docs] site.
+- [Bashly Homepage][docs]
+- [Examples][examples]
+
+## How it works
+
+1. You provide a YAML configuration file, describing commands, sub-commands,
+   arguments, and flags. Running `bashly init` creates an initial sample YAML
+   file for you ([example](https://github.com/DannyBen/bashly/tree/master/examples/minimal#bashlyyml)).
+2. Bashly then automatically generates a bash script (when you run
+   `bashly generate`) that can parse and validate user input, provide help
+   messages, and run your code for each command ([example](https://github.com/DannyBen/bashly/blob/master/examples/minimal/download)).
+3. Your code for each command is kept in a separate file, and can be merged
+   again if you change it ([example](https://github.com/DannyBen/bashly/blob/master/examples/minimal/src/root_command.sh)).
+
+## Features
+
+Bashly is responsible for:
 
+- Generating a **single, standalone bash script**.
+- Generating **usage texts** and help screens, showing your tool's arguments, flags and commands (works for sub-commands also).
+- Parsing the user's command line and extracting:
+  - Optional or required **positional arguments**.
+  - Optional or required **option flags** (with or without flag arguments).
+  - **Commands** (and sub-commands).
+  - Standard flags (like **--help** and **--version**).
+- Preventing your script from running unless the command line is valid.
+- Providing you with a place to input your code for each of the functions your tool performs, and merging it back to the final script.
+- Providing you with additional (optional) framework-style, standard library functions:
+  - **Color output**.
+  - **Config file management** (INI format).
+  - **YAML parsing**.
+  - **Bash completions**.
+  - and more.
 
 ## Contributing / Support
 
@@ -29,4 +73,5 @@ to contribute, feel free to [open an issue][issues].
 
 [issues]: https://github.com/DannyBen/bashly/issues
 [docs]: https://bashly.dannyb.co/
+[examples]: https://github.com/DannyBen/bashly/tree/master/examples#bashly-examples
 

data/lib/bashly/models/command.rb

@@ -5,7 +5,7 @@ module Bashly
 
       # 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 tone (root) joined
+      # - Else, it is all the parents, except the first one (root) joined
       #   by space. For example, for a command like "docker container run"
       #   the action name is "container run".
       def action_name
@@ -54,6 +54,17 @@ module Bashly
         end
       end
 
+      # Returns true if catch_all is required
+      def catch_all_required?
+        catch_all.is_a?(Hash) and catch_all['required']
+      end
+
+      # Returns a string suitable for catch_all Usage pattern
+      def catch_all_usage
+        return nil unless catch_all
+        catch_all_required? ? catch_all_label : "[#{catch_all_label}]"
+      end
+
       # Returns only the names of the Commands
       def command_names
         commands.map &:name
@@ -190,7 +201,7 @@ module Bashly
           result << arg.usage_string
         end
         result << "[options]" unless flags.empty?
-        result << "[#{catch_all_label}]" if catch_all
+        result << catch_all_usage if catch_all
         result.join " "
       end
 
@@ -198,7 +209,7 @@ module Bashly
       # This is meant to provide the user with the ability to add custom
       # functions
       def user_lib
-        @user_lib ||= Dir["#{Settings.source_dir}/lib/**/*.sh"]
+        @user_lib ||= Dir["#{Settings.source_dir}/lib/**/*.sh"].sort
       end
 
       # Raise an exception if there are some serious issues with the command
@@ -227,4 +238,4 @@ module Bashly
 
     end
   end
-end
+end

data/lib/bashly/templates/lib/config.sh

@@ -10,7 +10,7 @@
 # ---
 
 # Create a new config file.
-# There is normally no need to use this fucntion, it is used by other
+# There is normally no need to use this function, it is used by other
 # functions as needed.
 config_init() {
   CONFIG_FILE=${CONFIG_FILE:=config.ini}
@@ -20,8 +20,9 @@ config_init() {
 # Get a value from the config.
 # Usage: result=$(config_get hello)
 config_get() {
-  key=$1
-  regex="^$key *= *(.+)$"
+  local key=$1
+  local regex="^$key *= *(.+)$"
+  local value=""
 
   config_init
   
@@ -38,15 +39,16 @@ config_get() {
 # Add or update a key=value pair in the config.
 # Usage: config_set key value
 config_set() {
-  key=$1
+  local key=$1
   shift
-  value="$*"
+  local value="$*"
 
   config_init
 
-  regex="^($key) *= *.+$"
-  output=""
-  found_key=""
+  local regex="^($key) *= *.+$"
+  local output=""
+  local found_key=""
+  local newline
   
   while IFS= read -r line || [ -n "$line" ]; do
     newline=$line
@@ -69,15 +71,14 @@ config_set() {
 # Delete a key from the config.
 # Usage: config_del key
 config_del() {
-  key=$1
+  local key=$1
 
-  regex="^($key) *="
-  output=""
+  local regex="^($key) *="
+  local output=""
 
   config_init
 
   while IFS= read -r line || [ -n "$line" ]; do
-    newline=$line
     if [[ $line ]] && [[ ! $line =~ $regex ]]; then
       output="$output$line\n"
     fi
@@ -100,11 +101,13 @@ config_show() {
 #   done
 #
 config_keys() {
-  regex="^([a-zA-Z0-9_\-\/\.]+) *="
+  local regex="^([a-zA-Z0-9_\-\/\.]+) *="
 
   config_init
 
-  keys=()
+  local keys=()
+  local key
+  
   while IFS= read -r line || [ -n "$line" ]; do
     if [[ $line =~ $regex ]]; then
       key="${BASH_REMATCH[1]}"

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = "0.6.3"
+  VERSION = "0.6.7"
 end

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

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

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

@@ -0,0 +1,7 @@
+# :command.catch_all_filter
+% 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,5 +1,5 @@
 # :command.command_fallback
-<%- if default_command -%>
+% if default_command
 "" )
   <%= function_name %>_usage
   exit 1
@@ -10,7 +10,7 @@
   <%= default_command.function_name %>_parse_requirements "$@"
   shift $#
   ;;
-<%- elsif extensible.is_a? String -%>
+% elsif extensible.is_a? String
 "" )
   <%= function_name %>_usage
   exit 1
@@ -23,7 +23,7 @@
     <%= function_name %>_usage
     exit 1
   fi
-<%- elsif extensible -%>
+% elsif extensible
 "" )
   <%= function_name %>_usage
   exit 1
@@ -37,9 +37,9 @@
     <%= function_name %>_usage
     exit 1
   fi
-<%- else -%>
+% else
 * )
   <%= function_name %>_usage
   exit 1
   ;;
-<%- end -%>
+% end

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

@@ -1,12 +1,12 @@
 # :command.command_filter
-<%- if commands.any? -%>
+% if commands.any?
 action=$1
 
 case $action in
 -* )
   ;;
 
-<%- commands.each do |command| -%>
+% commands.each do |command|
 <%= command.aliases.join " | " %> )
   action="<%= command.name %>"
   shift
@@ -14,9 +14,9 @@ case $action in
   shift $#
   ;;    
 
-<%- end -%>
+% end
 <%= render :command_fallback %>
 esac
-<%- else -%>
+% else
 action="<%= action_name %>"
-<%- end -%>
+% end

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

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

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

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

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

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

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

@@ -1,14 +1,14 @@
 # :command.environment_variables_filter
-<%- if default_environment_variables.any? -%>
-<%- default_environment_variables.each do |env_var| -%>
+% 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| -%>
+% 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"
+  printf "<%= strings[:missing_required_environment_variable] % { var: env_var.name.upcase } %>\n"
   exit 1
 fi
-<%- end -%>
-<%- end -%>
+% end
+% end

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

@@ -1,22 +1,22 @@
 # :command.fixed_flag_filter
 case "$1" in
-<%- if short_flag_exist? "-v" -%>
+% if short_flag_exist? "-v"
 --version )
-<%- else -%>
+% else
 --version | -v )
-<%- end -%>
+% end
   version_command
   exit
   ;;
 
-<%- if short_flag_exist? "-h" -%>
+% if short_flag_exist? "-h"
 --help )
-<%- else -%>
+% else
 --help | -h )
-<%- end -%>
+% end
   long_usage=yes
   <%= function_name %>_usage
-  exit 1
+  exit
   ;;
 
 esac

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

@@ -1,6 +1,7 @@
 <%= render :root_command if commands.empty? %>
 <%= render :version_command %>
 <%= render :usage %>
+<%= render :normalize_input %>
 <%= render :inspect_args %>
 <%= render :user_lib if user_lib.any? %>
 <%= render :command_functions %>

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

@@ -0,0 +1,24 @@
+# :command.normalize_input
+normalize_input() {
+  local arg flags
+
+  while [[ $# -gt 0 ]]; do
+    arg="$1"
+    if [[ $arg =~ ^(--[a-zA-Z0-9_\-]+)=(.+)$ ]]; then
+      input+=("${BASH_REMATCH[1]}")
+      input+=("${BASH_REMATCH[2]}")
+    elif [[ $arg =~ ^(-[a-zA-Z0-9])=(.+)$ ]]; then
+      input+=("${BASH_REMATCH[1]}")
+      input+=("${BASH_REMATCH[2]}")
+    elif [[ $arg =~ ^-([a-zA-Z0-9][a-zA-Z0-9]+)$ ]]; then
+      flags="${BASH_REMATCH[1]}"
+      for (( i=0 ; i < ${#flags} ; i++ )); do
+        input+=("-${flags:i:1}")
+      done
+    else
+      input+=("$arg")
+    fi
+
+    shift
+  done
+}

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

@@ -1,9 +1,9 @@
 # :command.parse_requirements
-<%- if root_command? -%>
+% if root_command?
 parse_requirements() {
-<%- else -%>
+% else
 <%= function_name %>_parse_requirements() {
-<%- end -%>
+% end
 <%= render(:fixed_flags_filter).indent 2 %>
 <%= render(:environment_variables_filter).indent 2 %>
 <%= render(:dependencies_filter).indent 2 %>
@@ -11,10 +11,11 @@ parse_requirements() {
 <%= 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 %>
 }
 
-<%- commands.each do |command| %>
+% commands.each do |command|
 <%= command.render :parse_requirements %>
-<%- end -%>
+% end

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

@@ -1,25 +1,25 @@
 # :command.parse_requirements_case
-<%- if args.any? -%>
-<%- condition = "if" -%>
-<%- args.each do |arg| -%>
+% if args.any?
+% condition = "if"
+% args.each do |arg|
 <%= condition %> [[ ! ${args[<%= arg.name %>]} ]]; then
   args[<%= arg.name %>]=$1
   shift
-<%- condition = "elif" -%>
-<%- end -%>
+% condition = "elif"
+% end
 else
-<%- if catch_all -%>
+% if catch_all
   other_args+=("$1")
   shift
-<%- else -%>
+% else
   printf "<%= strings[:invalid_argument] %>\n" "$key"
   exit 1
-<%- end -%>
+% end
 fi
-<%- elsif catch_all -%>
+% elsif catch_all
   other_args+=("$1")
   shift
-<%- else -%>
+% else
 printf "<%= strings[:invalid_argument] %>\n" "$key"
 exit 1
-<%- end -%>
+% end

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

@@ -2,21 +2,21 @@
 while [[ $# -gt 0 ]]; do
   key="$1"
   case "$key" in
-  <%- flags.each do |flag| -%>
+% flags.each do |flag|
 <%= flag.render(:case).indent 2 %>
 
-  <%- end -%>
+% end
 
   -* )
-<%- if catch_all -%>
+% if catch_all
     other_args+=("$1")
     shift
     ;;
-<%- else -%>
+% else
     printf "<%= strings[:invalid_flag] %>\n" "$key"
     exit 1
     ;;
-<%- end -%>
+% end
 
   * )
 <%= render(:parse_requirements_case).indent 4 %>

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

@@ -1,5 +1,5 @@
 # :command.required_args_filter
-<%- required_args.each do |arg| -%>
+% required_args.each do |arg|
 if [[ $1 && $1 != -* ]]; then
   args[<%= arg.name %>]=$1
   shift
@@ -8,4 +8,4 @@ else
   exit 1
 fi
 
-<%- end %>
+% end

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

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

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

@@ -2,7 +2,9 @@
 run() {
   declare -A args
   declare -a other_args
-  parse_requirements "$@"
+  declare -a input
+  normalize_input "$@"
+  parse_requirements "${input[@]}"
 
   <%- condition = "if" -%>
   <%- deep_commands.each do |command| -%>

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

@@ -1,14 +1,14 @@
 # :command.usage_args
 printf "<%= strings[:arguments] %>\n"
-<%- if args.any? -%>
+% if args.any?
 
-<%- args.each do |arg| -%>
+% args.each do |arg|
 <%= arg.render(:usage) %>
-<%- end -%>
-<%- end -%>
-<%- if catch_all_help -%>
+% end
+% end
+% if catch_all_help
 
 echo "  <%= catch_all_label %>"
 printf "<%= catch_all_help.wrap(76).indent(4).sanitize_for_print %>\n"
 echo
-<%- end -%>
+% end

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

@@ -1,18 +1,18 @@
 # :command.usage_commands
-<%- unless commands.first.group -%>
+% unless commands.first.group
 printf "<%= strings[:commands] %>\n"
-<%- end -%>
-<%- maxlen = command_names.map(&:size).max -%>
-<%- commands.each do |command| -%>
-<%- summary = command.summary -%>
-<%- summary = strings[:default_command_summary] % { summary: summary } if command.default -%>
-<%- if command.group -%>
-<%- if command.name == commands.first.name -%>
+% end
+% maxlen = command_names.map(&:size).max
+% commands.each do |command|
+% summary = command.summary
+% summary = strings[:default_command_summary] % { summary: summary } if command.default
+% if command.group
+% if command.name == commands.first.name
 printf "<%= strings[:group] % { group: command.group } %>\n"
-<%- else -%>
+% else
 printf "\n<%= strings[:group] % { group: command.group } %>\n"
-<%- end -%>
-<%- end -%>
+% end
+% end
 echo "  <%= command.name.ljust maxlen %>   <%= summary %>"
-<%- end -%>
+% end
 echo

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

@@ -1,6 +1,6 @@
 # :command.usage_environment_variables
 printf "<%= strings[:environment_variables] %>\n"
 
-<%- environment_variables.each do |env_var| -%>
+% environment_variables.each do |env_var|
 <%= env_var.render(:usage) %>
-<%- end -%>
+% end

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

@@ -1,7 +1,7 @@
 # :command.usage_examples
 printf "<%= strings[:examples] %>\n"
 
-<%- examples.each do |example| -%>
+% examples.each do |example|
 printf "<%= example.wrap(78).indent(2).sanitize_for_print %>\n"
-<%- end -%>
+% end
 echo

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

@@ -1,17 +1,17 @@
 # :command.usage_fixed_flags
-<%- if short_flag_exist? "-h" -%>
+% if short_flag_exist? "-h"
 echo "  --help"
-<%- else -%>
+% else
 echo "  --help, -h"
-<%- end -%>
+% end
 printf "    <%= strings[:help_flag_text] %>\n"
 echo
-<%- if root_command? -%>
-<%- if short_flag_exist? "-v" -%>
+% if root_command?
+% if short_flag_exist? "-v"
 echo "  --version"
-<%- else -%>
+% else
 echo "  --version, -v"
-<%- end -%>
+% end
 printf "    <%= strings[:version_flag_text] %>\n"
 echo
-<%- end -%>
+% end

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

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

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

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

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

@@ -1,13 +1,13 @@
 # :command.whitelist_filter
-<%- whitelisted_args.each do |arg| -%>
+% whitelisted_args.each do |arg|
 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 -%>
-<%- whitelisted_flags.each do |flag| -%>
+% end
+% whitelisted_flags.each do |flag|
 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

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

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

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

@@ -1,6 +1,6 @@
 # :flag.case
 <%= aliases.join " | " %> )
-  <%- if arg -%>
+% if arg
   if [[ $2 ]]; then
     args[<%= name %>]="$2"
     shift
@@ -9,8 +9,8 @@
     printf "%s\n" "<%= strings[:flag_requires_an_argument] % { name: name, usage: usage_string } %>"
     exit 1
   fi
-  <%- else -%>
+% else
   args[<%= name %>]=1
   shift
-  <%- end -%>
+% end
   ;;

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

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

data/lib/bashly.rb

@@ -5,7 +5,6 @@ if ENV['BYEBUG']
   require 'lp'
 end
 
-requires 'bashly/polyfills'
 requires 'bashly/concerns'
 
 requires 'bashly/settings'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.7
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: mister_bin
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +96,6 @@ files:
 - lib/bashly/models/environment_variable.rb
 - lib/bashly/models/flag.rb
 - lib/bashly/models/script.rb
-- lib/bashly/polyfills/hash.rb
 - lib/bashly/settings.rb
 - lib/bashly/templates/bashly.yml
 - lib/bashly/templates/lib/colors.sh
@@ -113,6 +106,7 @@ files:
 - lib/bashly/templates/strings.yml
 - lib/bashly/version.rb
 - lib/bashly/views/argument/usage.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
@@ -128,6 +122,7 @@ files:
 - 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_while.erb
@@ -153,7 +148,11 @@ files:
 homepage: https://github.com/dannyben/bashly
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/DannyBen/bashly/issues
+  changelog_uri: https://github.com/DannyBen/bashly/blob/master/CHANGELOG.md
+  homepage_uri: https://bashly.dannyb.co/
+  source_code_uri: https://github.com/DannyBen/bashly
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/bashly/polyfills/hash.rb

@@ -1,12 +0,0 @@
-# :nocov:
-
-# Required for Ruby < 2.4
-if !Dir.respond_to? :empty?
-  class Dir
-    def self.empty?(path_name)
-      exist?(path_name) && (entries(path_name) - ['.', '..']).empty?
-    end
-  end
-end
-
-# :nocov: