bashly 0.8.10 → 0.9.1

data/lib/bashly/templates/test/approvals.bash

@@ -1,14 +1,14 @@
-# approvals.bash v0.2.7
+# approvals.bash v0.3.3
 #
 # Interactive approval testing for Bash.
 # https://github.com/DannyBen/approvals.bash
 approve() {
   local expected approval approval_file actual cmd
   approvals_dir=${APPROVALS_DIR:=approvals}
-  
+
   cmd=$1
-  actual=$(eval "$cmd" 2>&1)  
-  last_exit_code=$?
+  last_exit_code=0
+  actual=$(eval "$cmd" 2>&1) || last_exit_code=$?
   approval=$(printf "%b" "$cmd" | tr -s -c "[:alnum:]" _)
   approval_file="$approvals_dir/${2:-"$approval"}"
 
@@ -26,26 +26,32 @@ approve() {
   fi
 
   if [[ "$(printf "%b" "$actual")" = "$(printf "%b" "$expected")" ]]; then
-    green "PASS $cmd"
+    pass "$cmd"
   else
     echo "--- [$(blue "diff: $cmd")] ---"
-    $diff_cmd <(printf "%b" "$expected\n") <(printf "%b" "$actual\n" )  | tail -n +4
+    $diff_cmd <(printf "%b" "$expected\n") <(printf "%b" "$actual\n") | tail -n +4
     echo "--- [$(blue "diff: $cmd")] ---"
     user_approval "$cmd" "$actual" "$approval_file"
   fi
 }
 
 describe() {
-  cyan "TEST $*"
+  echo
+  blue "= $*"
+}
+
+context() {
+  echo
+  magenta "= $*"
 }
 
 fail() {
-  red "FAIL $*"
+  red "  FAILED: $*"
   exit 1
 }
 
 pass() {
-  green "PASS $*"
+  green "  approved: $*"
   return 0
 }
 
@@ -74,19 +80,37 @@ user_approval() {
     fail "$cmd"
   fi
 
-  echo 
+  echo
   printf "[A]pprove? \n"
   response=$(bash -c "read -n 1 key; echo \$key")
   printf "\r"
   if [[ $response =~ [Aa] ]]; then
-    printf "%b\n" "$actual" > "$approval_file"
+    printf "%b\n" "$actual" >"$approval_file"
     pass "$cmd"
   else
     fail "$cmd"
   fi
 }
 
-if diff --help | grep -- --color > /dev/null 2>&1; then
+onexit() {
+  exitcode=$?
+  if [[ "$exitcode" == 0 ]]; then
+    green "\nFinished successfully"
+  else
+    red "\nFinished with failures"
+  fi
+  exit $exitcode
+}
+
+onerror() {
+  fail "Caller: $(caller)"
+}
+
+set -e
+trap 'onexit' EXIT
+trap 'onerror' ERR
+
+if diff --help | grep -- --color >/dev/null 2>&1; then
   diff_cmd="diff --unified --color=always"
 else
   diff_cmd="diff --unified"

data/lib/bashly/templates/test/approve

@@ -3,18 +3,23 @@
 
 cd ./test || exit
 source approvals.bash
-PATH="$PATH:../"
 
 # Update me
-cli=download
+cli=./download
 
-# Tests
-describe "root command"
-  approve "$cli"
-  approve "$cli --help"
+# Tests (context, describe and indentation are optional)
+context "when DEBUG is on"
+  export DEBUG=1
 
-describe "some other command"
-  approve "$cli other"
-  approve "$cli other --help"
+  describe "root command"
+    approve "$cli"
+    approve "$cli --help"
+
+context "when DEBUG is off"
+  unset DEBUG
+
+  describe "some other command"
+    approve "$cli other"
+    approve "$cli other --help"
 
 # ...more tests...

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = "0.8.10"
-end
+  VERSION = '0.9.1'
+end

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

@@ -1,11 +1,14 @@
 = view_marker
 
-> "" )
->   {{ function_name }}_usage >&2
->   exit 1
->   ;;
->
-> * )
+if !default_command || default_command.default != 'force'
+  > "")
+  >   {{ function_name }}_usage >&2
+  >   exit 1
+  >   ;;
+  >
+end
+
+> *)
 
 if default_command
   >   action="{{ default_command.name }}"

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

@@ -4,22 +4,21 @@ 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 $#
-    >   ;;    
+    >   {{ command.aliases.join " | " }})
+    >     action="{{ command.name }}"
+    >     shift
+    >     {{ command.function_name }}_parse_requirements "$@"
+    >     shift $#
+    >     ;;
     > 
 
   end
 
-  = render :command_fallback
+  = render(:command_fallback).indent(2)
   > esac
   >
 

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

@@ -1,10 +1,14 @@
 if dependencies
   = view_marker
 
-  dependencies.each do |dependency|
-    > if ! [[ -x "$(command -v {{ dependency }})" ]]; then
+  dependencies.each do |dependency, message|
+    > if ! command -v {{ dependency }} >/dev/null 2>&1; then
     >   printf "{{ strings[:missing_dependency] % { dependency: dependency } }}\n" >&2
+    if message and !message.empty?
+      >   printf "%s\n" "{{ message }}" >&2
+    end
     >   exit 1
     > fi
+    >
   end
 end

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

@@ -1,27 +1,33 @@
 = view_marker
 
-> case "${1:-}" in
+> while [[ $# -gt 0 ]]; do
+>   case "${1:-}" in
 
 if root_command?
-  = short_flag_exist?("-v") ? "--version )" : "--version | -v )"
-  >   version_command
-  >   exit
-  >   ;;
+  = short_flag_exist?("-v") ? "--version)" : "--version | -v)".indent(4)
+  >       version_command
+  >       exit
+  >       ;;
   > 
 end
 
-= short_flag_exist?("-h") ? "--help )" : "--help | -h )"
->   long_usage=yes
->   <%= function_name %>_usage
->   exit
->   ;;
+= short_flag_exist?("-h") ? "--help)" : "--help | -h)".indent(4)
+>       long_usage=yes
+>       <%= function_name %>_usage
+>       exit
+>       ;;
 > 
 
 if global_flags?
   flags.each do |flag|
-    = flag.render(:case)
+    = flag.render(:case).indent(4)
   end
 end
 
-> esac
+>     *)
+>       break
+>       ;;
+>
+>   esac
+> done
 >

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

@@ -2,14 +2,14 @@
 
 > inspect_args() {
 >   readarray -t sorted_keys < <(printf '%s\n' "${!args[@]}" | sort)
->   if (( ${#args[@]} )); then
+>   if ((${#args[@]})); then
 >     echo args:
 >     for k in "${sorted_keys[@]}"; do echo "- \${args[$k]} = ${args[$k]}"; done
 >   else
 >     echo args: none
 >   fi
 > 
->   if (( ${#other_args[@]} )); then
+>   if ((${#other_args[@]})); then
 >     echo
 >     echo other_args:
 >     echo "- \${other_args[*]} = ${other_args[*]}"

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

@@ -15,7 +15,7 @@
 if Settings.compact_short_flags
 >     elif [[ $arg =~ ^-([a-zA-Z0-9][a-zA-Z0-9]+)$ ]]; then
 >       flags="${BASH_REMATCH[1]}"
->       for (( i=0 ; i < ${#flags} ; i++ )); do
+>       for ((i = 0; i < ${#flags}; i++)); do
 >         input+=("-${flags:i:1}")
 >       done
 end

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

@@ -6,29 +6,29 @@
 
 unless global_flags?
   flags.each do |flag|
-    = flag.render(:case).indent 2
+    = flag.render(:case).indent(4)
   end
 end
 
 >
->   -?* )
+>     -?*)
 
 if catch_all.enabled?
-  >     other_args+=("$1")
-  >     shift
-  >     ;;
+  >       other_args+=("$1")
+  >       shift
+  >       ;;
 
 else
-  >     printf "<%= strings[:invalid_flag] %>\n" "$key" >&2
-  >     exit 1
-  >     ;;
+  >       printf "<%= strings[:invalid_flag] %>\n" "$key" >&2
+  >       exit 1
+  >       ;;
 
 end
 
 > 
->   * )
-= render(:parse_requirements_case).indent 4
->     ;;
+>     *)
+= render(:parse_requirements_case).indent(6)
+>       ;;
 > 
 >   esac
 > done

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

@@ -7,22 +7,25 @@
 >   normalize_input "$@"
 >   parse_requirements "${input[@]}"
 > 
+>   case "$action" in
 
-condition = "if"
 deep_commands.each do |command|
-  >   {{ condition }} [[ $action == "{{ command.action_name }}" ]]; then
-  >     if [[ ${args[--help]:-} ]]; then
-  >       long_usage=yes
-  >       {{ command.function_name }}_usage
-  >     else
-  >       {{ command.function_name }}_command
-  >     fi
+  >     "{{ command.action_name }}")
+  >       if [[ ${args[--help]:-} ]]; then
+  >         long_usage=yes
+  >         {{ command.function_name }}_usage
+  >       else
+  >         {{ command.function_name }}_command
+  >       fi
+  >       ;;
   >
-    
-  condition = "elif"
 end
 
->   {{ condition }} [[ $action == "root" ]]; then
->     root_command
->   fi
+if commands.empty?
+  >     "root")
+  >       root_command
+  >       ;;
+end
+>
+>   esac
 > }

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

@@ -3,7 +3,7 @@
 > printf "{{ strings[:environment_variables] }}\n"
 > 
 
-environment_variables.each do |env_var|
+environment_variables.reject(&:private).each do |env_var|
   = env_var.render :usage
 end
 

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

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.9.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: completely
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: gtx
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: requires
   requirement: !ruby/object:Gem::Requirement
@@ -139,10 +139,10 @@ files:
 - lib/bashly/extensions/yaml.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/libraries/help.rb
 - lib/bashly/library.rb
 - lib/bashly/message_strings.rb
 - lib/bashly/refinements/compose_refinements.rb
@@ -155,6 +155,7 @@ files:
 - lib/bashly/script/wrapper.rb
 - lib/bashly/settings.rb
 - lib/bashly/templates/bashly.yml
+- lib/bashly/templates/help/help_command.sh
 - lib/bashly/templates/lib/colors.sh
 - lib/bashly/templates/lib/config.sh
 - lib/bashly/templates/lib/sample_function.sh
@@ -230,6 +231,7 @@ metadata:
   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
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -245,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Bash Command Line Tool Generator

data/lib/bashly/libraries/completions.rb

@@ -1,14 +0,0 @@
-module Bashly
-  module Libraries
-    class Completions < Base
-    protected
-      def command
-        @command ||= Script::Command.new config
-      end
-
-      def config
-        @config ||= Config.new "#{Settings.source_dir}/bashly.yml"
-      end
-    end
-  end
-end