bashly 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d80ba9b8ae35371153a3610de0d3d76e64a7a18e3fcc3500c112634b38ec13e
-  data.tar.gz: 908bd0775b5568471da0fe0b113fcddfefa1d1063ecafdd12019eacae8392e3d
+  metadata.gz: fc29835d6181be972a508c311ad9554e9f57a8ad705804690ed4cb6aa98c6ab7
+  data.tar.gz: 7f052f8027e16e8b3fcc684349aa784342c734e7e6381d0ff0032ec0b2a3da2c
 SHA512:
-  metadata.gz: f11a315e7d68230adedb9b73916619b30893871711cb5716f119b53621813eae23ac9c72a76248d13349924343cc3e77834f0b12c3699130309ecd0c0b9b699d
-  data.tar.gz: 3a19eada91503c3535b47643e18bb43b4c04d5548f5f18aac0195b8b14f3e18fb548f60a81cccf59d76ed714f8684dcdc9eec3a413b73b1e63d71d8c2d4cf875
+  metadata.gz: c019868212b40635d602a9e9c2f5bee24bb6cc5b6b78e748a37cb912cff799f932bbb365178f6b74354e8012d54e4e61bb86e47b01793fd340a5fe8a35f17eb2
+  data.tar.gz: 7b4fd782e6e1e3a180a10c947581d9252db38da47a652afc3687d651ebf0eb0aa4a35d6ec0827ff6083d0f6cb935cd9aab9deb90bd2c1bbe411bc11493fd2cf0

data/README.md

@@ -27,6 +27,7 @@ a [docker image](https://hub.docker.com/r/dannyben/bashly).
 
 - [Bashly Homepage][docs]
 - [Examples][examples]
+- [Bashly AI Assistant][gpt]
 
 ## How it works
 
@@ -73,5 +74,6 @@ Visit the *[How to contribute][contributing]* page for more information.
 [issues]: https://github.com/bashly-framework/bashly/issues
 [discussions]: https://github.com/bashly-framework/bashly/discussions
 [docs]: https://bashly.dev/
+[gpt]: https://bashly.dev/chat
 [examples]: https://github.com/bashly-framework/bashly/tree/master/examples#bashly-examples
 [contributing]: https://github.com/bashly-framework/bashly/blob/master/CONTRIBUTING.md#how-to-contribute

data/lib/bashly/config_validator.rb

@@ -35,6 +35,7 @@ module Bashly
       assert_string "#{key}.label", value['label']
       assert_optional_string "#{key}.help", value['help']
       assert_boolean "#{key}.required", value['required']
+      assert_boolean "#{key}.catch_help", value['catch_help']
     end
 
     def assert_default_command(key, value)

data/lib/bashly/libraries/lib/sample_function.sh

@@ -5,7 +5,7 @@
 ## Note that code here should be wrapped inside bash functions, and it is
 ## recommended to have a separate file for each function.
 ##
-## Subdirectories will also be scanned for *.sh, so you have no reason not
+## Sub-directories will also be scanned for *.sh, so you have no reason not
 ## to organize your code neatly.
 ##
 sample_function() {

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

@@ -53,10 +53,16 @@ target_dir: .
 # The path to use for common library files, relative to source_dir
 lib_dir: lib
 
+# An array or comma delimited string of additional directories to search for
+# bash functions. Any bash script found in any of these directories
+# (or sub-directories) will be merged into the final script.
+# Note that this is relative to the working directory.
+extra_lib_dirs: ~
+
 # The path to use for command files, relative to source_dir
 # When set to nil (~), command files will be placed directly under source_dir
 # When set to any other string, command files will be placed under this
-# directory, and each command will get its own subdirectory
+# directory, and each command will get its own sub-directory
 commands_dir: ~
 
 # The extension to use when reading/writing partial script snippets

data/lib/bashly/library_source_config.rb

@@ -34,6 +34,7 @@ module Bashly
       assert_optional_string "#{key}.usage", value['usage']
       assert_optional_string "#{key}.handler", value['handler']
       assert_optional_string "#{key}.post_install_message", value['post_install_message']
+      assert_boolean "#{key}.skip_src_check", value['skip_src_check']
 
       return if value['handler']
 

data/lib/bashly/script/catch_all.rb

@@ -3,7 +3,7 @@ module Bashly
     class CatchAll
       class << self
         def option_keys
-          @option_keys ||= %i[label help required]
+          @option_keys ||= %i[label help required catch_help]
         end
 
         def from_config(config)
@@ -13,7 +13,7 @@ module Bashly
           when String
             { label: config }
           when Hash
-            { label: config['label'], help: config['help'], required: config['required'] }
+            config.transform_keys(&:to_sym).slice(*option_keys)
           else
             {}
           end
@@ -22,11 +22,12 @@ module Bashly
         end
       end
 
-      def initialize(label: nil, help: nil, required: false, enabled: true)
+      def initialize(label: nil, help: nil, required: false, catch_help: false, enabled: true)
         @label = label
         @help = help
         @required = required
         @enabled = enabled
+        @catch_help = catch_help
       end
 
       def enabled?
@@ -45,6 +46,10 @@ module Bashly
         @required
       end
 
+      def catch_help?
+        @catch_help
+      end
+
       def usage_string
         return nil unless enabled?
 

data/lib/bashly/script/command.rb

@@ -153,7 +153,13 @@ module Bashly
       # This is meant to provide the user with the ability to add custom
       # functions
       def user_lib
-        @user_lib ||= Dir["#{Settings.full_lib_dir}/**/*.#{Settings.partials_extension}"]
+        @user_lib ||= begin
+          result = Settings.all_lib_dirs.map do |dir|
+            Dir["#{dir}/**/*.#{Settings.partials_extension}"]
+          end
+
+          result.flatten
+        end
       end
 
       # Returns a mixed array of Argument and Flag objects that have validations

data/lib/bashly/script/introspection/flags.rb

@@ -16,6 +16,13 @@ module Bashly
           end
         end
 
+        # Returns true if there is at least one fixed flag (--version / --help)
+        # Root command always has --version and subcommands always have --help
+        # except when it is consumed by catch_all
+        def fixed_flags?
+          root_command? || !catch_all.catch_help?
+        end
+
         # Returns true if this command's flags should be considered as gloal
         # flags, and cascade to subcommands
         def global_flags?

data/lib/bashly/settings.rb

@@ -15,6 +15,7 @@ module Bashly
         :enable_inspect_args,
         :enable_sourcing,
         :enable_view_markers,
+        :extra_lib_dirs,
         :formatter,
         :function_names,
         :lib_dir,
@@ -107,6 +108,21 @@ module Bashly
         @lib_dir ||= get :lib_dir
       end
 
+      def extra_lib_dirs
+        @extra_lib_dirs ||= begin
+          dirs = get :extra_lib_dirs
+          case dirs
+          when Array then dirs
+          when String then dirs.split(',').map(&:strip)
+          else []
+          end
+        end
+      end
+
+      def all_lib_dirs
+        @all_lib_dirs = [full_lib_dir] + extra_lib_dirs
+      end
+
       def partials_extension
         @partials_extension ||= get :partials_extension
       end

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 end

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

@@ -12,12 +12,14 @@ if root_command?
   > 
 end
 
-= (short_flag_exist?("-h") ? "--help)" : "--help | -h)").indent(4)
->       long_usage=yes
->       <%= function_name %>_usage
->       exit
->       ;;
-> 
+unless catch_all.catch_help?
+  = (short_flag_exist?("-h") ? "--help)" : "--help | -h)").indent(4)
+  >       long_usage=yes
+  >       <%= function_name %>_usage
+  >       exit
+  >       ;;
+  > 
+end
 
 if global_flags?
   flags.each do |flag|

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

@@ -1,6 +1,8 @@
 = view_marker
 
 > inspect_args() {
+>   local k
+>
 >   if ((${#args[@]})); then
 >     readarray -t sorted_keys < <(printf '%s\n' "${!args[@]}" | sort)
 >     echo args:
@@ -17,8 +19,8 @@ if catch_all_used_anywhere?
 >     echo
 >     echo other_args:
 >     echo "- \${other_args[*]} = ${other_args[*]}"
->     for i in "${!other_args[@]}"; do
->       echo "- \${other_args[$i]} = ${other_args[$i]}"
+>     for k in "${!other_args[@]}"; do
+>       echo "- \${other_args[$k]} = ${other_args[$k]}"
 >     done
 >   fi
 >

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

@@ -1,15 +1,7 @@
 = view_marker
 
 > if [[ -n "$long_usage" ]]; then
-options_caption = strings[:options]
-if commands.any? && (public_flags.any? || (flags.any? && Settings.private_reveal_key))
-  options_caption = strings[:global_options]
-end
-
->   printf "%s\n" "{{ options_caption.color(:caption) }}"
->
-= render(:usage_flags).indent 2 if flags.any?
-= render(:usage_fixed_flags).indent 2
+= render(:usage_options).indent 2 if flags.any? || fixed_flags?
 = render(:usage_args).indent 2 if args.any? or catch_all.help
 = render(:usage_environment_variables).indent 2 if environment_variables.any?
 = render(:usage_examples).indent 2 if examples

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

@@ -5,6 +5,8 @@ if root_command?
 else
   > {{ function_name }}_parse_requirements() {
 end
+>   local key
+>
 
 = render(:fixed_flags_filter).indent 2
 = render(:environment_variables_filter).indent 2

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

@@ -1,13 +1,15 @@
 = view_marker
 
-if short_flag_exist?("-h")
-  > printf "  %s\n" "{{ '--help'.color(:flag) }}"
-else
-  > printf "  %s\n" "{{ '--help, -h'.color(:flag) }}"
-end
+unless catch_all.catch_help?
+  if short_flag_exist?("-h")
+    > printf "  %s\n" "{{ '--help'.color(:flag) }}"
+  else
+    > printf "  %s\n" "{{ '--help, -h'.color(:flag) }}"
+  end
 
-> printf "    {{ strings[:help_flag_text] }}\n"
-> echo
+  > printf "    {{ strings[:help_flag_text] }}\n"
+  > echo
+end
 
 if root_command?
   if short_flag_exist?("-v")

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

@@ -0,0 +1,11 @@
+= view_marker
+
+options_caption = strings[:options]
+if commands.any? && (public_flags.any? || (flags.any? && Settings.private_reveal_key))
+  options_caption = strings[:global_options]
+end
+
+> printf "%s\n" "{{ options_caption.color(:caption) }}"
+>
+= render(:usage_flags) if flags.any?
+= render(:usage_fixed_flags)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -314,6 +314,7 @@ files:
 - 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/usage_options.gtx
 - lib/bashly/views/command/user_filter.gtx
 - lib/bashly/views/command/user_hooks.gtx
 - lib/bashly/views/command/user_lib.gtx