bashly 1.1.10 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0857ce9cc52b919c113242568610ed9abbd447221b6d473bbf05f1cd8f29de69'
-  data.tar.gz: 3eb8279ffdbf23a69a5c7eb52d98f2f0c3ca1730f54eb6a18b4957038b69810a
+  metadata.gz: 36c0868dbf2a0e4d5d2fecdc5854aac4e1bea8f7953a07712ccc985289c89b57
+  data.tar.gz: 63df3d720e1b36ce7ab658224fde796fb9460c92c7946bd867204c0e0caea304
 SHA512:
-  metadata.gz: 2aa95822cebdc83d0e3a1af47a2d75886994a7d79976188049b8ea6732ca3d6a83003bfea48c3789e8d3a4db562e16f8f9ed169da414065567c7abf2d2d4c40b
-  data.tar.gz: 3cf237064dfe7f9cfb2523c85d838141f9869e246619b9ed2bf9862499a0345ea1da12178802ee6d7a654e1ad8fec674b751442566b8b8ca1e22b77055105fd1
+  metadata.gz: 39e367d86e8bf21ae076c35887157234e7d39d003f17a596aa4711a02a87c6b3856ac27b0f1c73c30837b2589358e479c069dba4cff657431fdca98f44116718
+  data.tar.gz: eceaabeafea2e93a9cf7c9d7c2f999a2303c0d9172ddd7799bb0d1f9eafe62166ee9512d8688ad9cc6547dd28e20b7c8925ca489cb2639fd3cd2456517461e7a

data/lib/bashly/commands/shell.rb

@@ -19,7 +19,7 @@ module Bashly
           terminal = MisterBin::Terminal.new runner, {
             autocomplete: autocomplete,
             show_usage:   true,
-            prompt:       "\n$> bashly ",
+            prompt:       "$ bashly ",
           }
 
           terminal.on('help') { runner.run %w[--help] }

data/lib/bashly/config_validator.rb

@@ -231,6 +231,10 @@ module Bashly
           assert value['args'].last['repeatable'],
             "#{key}.args cannot contain a repeatable arg unless it is the last one"
         end
+
+        required_order = value['args'].map { |x| x['required'] ? true : false }
+        refute required_order.include_sequence?(false, true),
+          "#{key}.args cannot contain required arg after optional arg"
       end
 
       if value['expose']

data/lib/bashly/extensions/array.rb

@@ -13,4 +13,10 @@ class Array
   def nonuniq
     tally.select { |_key, count| count > 1 }.keys
   end
+
+  def include_sequence?(*elements)
+    return false if elements.empty?
+
+    each_cons(elements.size).any?(elements)
+  end
 end

data/lib/bashly/libraries/settings/settings.yml

@@ -55,6 +55,10 @@ env: development
 # The extension to use when reading/writing partial script snippets
 partials_extension: sh
 
+# Show command examples (if any) whenever the user does not provide the
+# required arguments
+show_examples_on_error: false
+
 # Display various usage elements in color by providing the name of the color
 # function. The value for each property is a name of a function that is
 # available in your script, for example: `green` or `bold`.

data/lib/bashly/libraries/strings/strings.yml

@@ -4,6 +4,7 @@
 # Usage captions
 usage: "Usage:"
 options: "Options:"
+global_options: "Global Options:"
 arguments: "Arguments:"
 commands: "Commands:"
 examples: "Examples:"
@@ -32,6 +33,7 @@ missing_required_argument: "missing required argument: %{arg}\\nusage: %{usage}"
 missing_required_flag: "missing required flag: %{usage}"
 missing_required_environment_variable: "missing required environment variable: %{var}"
 missing_dependency: "missing dependency: %{dependency}"
+examples_caption_on_error: 'examples:'
 disallowed_flag: "%{name} must be one of: %{allowed}"
 disallowed_argument: "%{name} must be one of: %{allowed}"
 disallowed_environment_variable: "%{name} environment variable must be one of: %{allowed}"

data/lib/bashly/script/command.rb

@@ -307,11 +307,12 @@ module Bashly
 
       # Returns a constructed string suitable for Usage pattern
       def usage_string
-        result = [full_name]
+        result = [base_usage_pattern]
+        command_string = default_command&.default == 'force' ? '[COMMAND]' : 'COMMAND'
 
         result.push case mode
-        when :global_flags    then ['[OPTIONS]', 'COMMAND']
-        when :commands        then ['COMMAND']
+        when :global_flags    then ['[OPTIONS]', command_string]
+        when :commands        then [command_string]
         when :args_and_flags  then usage_string_args + ['[OPTIONS]']
         when :args            then usage_string_args
         when :flags           then ['[OPTIONS]']
@@ -326,6 +327,11 @@ module Bashly
         args.map(&:usage_string)
       end
 
+      def base_usage_pattern
+        usage_pattern = default ? "[#{name}]" : name
+        parents.any? ? (parents + [usage_pattern]).join(' ') : usage_pattern
+      end
+
       # Returns an array of files to include as is inside the script
       # This is meant to provide the user with the ability to add custom
       # functions

data/lib/bashly/settings.rb

@@ -10,6 +10,7 @@ module Bashly
         :config_path,
         :lib_dir,
         :partials_extension,
+        :show_examples_on_error,
         :source_dir,
         :strict,
         :tab_indent,
@@ -57,6 +58,10 @@ module Bashly
         env == :production
       end
 
+      def show_examples_on_error
+        @show_examples_on_error ||= get :show_examples_on_error
+      end
+
       def source_dir
         @source_dir ||= get :source_dir
       end

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.1.10'
+  VERSION = '1.2.1'
 end

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

@@ -3,6 +3,7 @@ if validate
 
   if repeatable
     > if [[ -v args['{{ name }}'] ]]; then
+    >   values=''
     >   eval "values=(${args['{{ name }}']})"
     >   for value in "${values[@]}"; do
     >     if [[ -n $(validate_{{ validate }} "$value") ]]; then

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

@@ -4,7 +4,9 @@ if commands.any?
   > action=${1:-}
   > 
   > case $action in
-  >   -*) ;;
+  unless default_command
+    >   -*) ;;
+  end
   > 
 
   commands.each do |command|

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

@@ -0,0 +1,8 @@
+if Settings.show_examples_on_error && examples
+  = view_marker
+
+  > printf "{{ strings[:examples_caption_on_error] }}\n" >&2
+  examples.each do |example|
+    > printf "{{ example.wrap(78).indent(2).sanitize_for_print }}\n" >&2
+  end
+end

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

@@ -1,7 +1,8 @@
 = view_marker
 
 > if [[ -n $long_usage ]]; then
->   printf "%s\n" "{{ strings[:options].color(:caption) }}"
+options_caption = public_commands.any? && public_flags.any? ? strings[:global_options] : strings[:options]
+>   printf "%s\n" "{{ options_caption.color(:caption) }}"
 >
 = render(:usage_flags).indent 2 if public_flags.any?
 = render(:usage_fixed_flags).indent 2

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

@@ -1,7 +1,11 @@
 = view_marker
 
 > normalize_input() {
->   local arg flags passthru
+if Settings.compact_short_flags
+>   local arg passthru flags
+else
+>   local arg passthru
+end
 >   passthru=false
 > 
 >   while [[ $# -gt 0 ]]; do

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

@@ -4,10 +4,10 @@ if required_args.any?
   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" >&2
+    = render(:examples_on_error).indent 2
     >   exit 1
     > fi
   end
 
   >
-
-end
+end

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

@@ -1,24 +1,17 @@
 = view_marker
 
 > {{ function_name }}_usage() {
->   if [[ -n $long_usage ]]; then
-
 if summary == help
-  >     printf "{{ caption_string.sanitize_for_print }}\n"
-  >     echo 
+  >   printf "{{ caption_string.sanitize_for_print }}\n\n"
 else
-  >     printf "{{ full_name }}\n"
-  >     echo 
-  >     printf "{{ help.wrap(78).indent(2).sanitize_for_print }}\n"
-  >     echo 
+  >   if [[ -n $long_usage ]]; then
+  >     printf "{{ full_name }}\n\n"
+  >     printf "{{ help.wrap(78).indent(2).sanitize_for_print }}\n\n"
+  >   else
+  >     printf "{{ caption_string.sanitize_for_print }}\n\n"
+  >   fi
 end
 
->   else
->     printf "{{ caption_string.sanitize_for_print }}\n"
->     echo 
->   fi
-> 
-
 if alt&.any?
   >   printf "{{ strings[:command_alias] % { alias: alt.join(', ') } }}\n"
   >   echo
@@ -48,3 +41,5 @@ end
 commands.each do |command|
   = command.render 'usage'
 end
+
+

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

@@ -3,6 +3,7 @@ if whitelisted_args.any? or whitelisted_flags.any?
 
   whitelisted_args.each do |arg|
     if arg.repeatable
+      > input_array=''
       > eval "input_array=(${args[{{ arg.name }}]})"
       > for i in "${input_array[@]}"; do
       >   if [[ ! $i =~ ^({{ arg.allowed.join '|' }})$ ]]; then
@@ -22,6 +23,7 @@ if whitelisted_args.any? or whitelisted_flags.any?
 
   whitelisted_flags.each do |flag|
     if flag.repeatable
+      > input_array=''
       > eval "input_array=(${args[{{ flag.name }}]})"
       > for i in "${input_array[@]}"; do
       >   if [[ ! $i =~ ^({{ flag.allowed.join '|' }})$ ]]; then

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

@@ -3,6 +3,7 @@ if validate
 
   if repeatable
     > if [[ -v args['{{ long }}'] ]]; then
+    >   values=''
     >   eval "values=(${args['{{ long }}']})"
     >   for value in "${values[@]}"; do
     >     if [[ -n $(validate_{{ validate }} "$value") ]]; then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.2.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-01 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -240,6 +240,7 @@ files:
 - lib/bashly/views/command/dependencies_filter.gtx
 - lib/bashly/views/command/environment_variables_default.gtx
 - lib/bashly/views/command/environment_variables_filter.gtx
+- lib/bashly/views/command/examples_on_error.gtx
 - lib/bashly/views/command/fixed_flags_filter.gtx
 - lib/bashly/views/command/footer.gtx
 - lib/bashly/views/command/function.gtx
@@ -307,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Bash Command Line Tool Generator