bashly 0.8.7 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09fd56d9f65d2a7859382562739364338cbe7ccf52d2c82ac446f3e9b6a5d118'
-  data.tar.gz: 10a648ebf0552b376cca8aa1ff89592670721c089acea84c10ff3aeaacd218e3
+  metadata.gz: df22bc90e5ea6fa9878280dfdafbd39614e11ca6c8d6db1cda17b838518033e8
+  data.tar.gz: 5633f2f1c7f06a9c3adf75db634cf0b045be7d743bfd6829bc3fa4ab9843ea71
 SHA512:
-  metadata.gz: 65c59416204a5c3a7da38efad9373ac555e2368fbdd27b47e4e7d3b143abe73f4c22309b0d6f8909b00f70807b9502095ec10728a8f903738e24f300d75e52f7
-  data.tar.gz: fe3a5db484a8cf4af117fc43114095acbbfb96c25ed1f63570029981ca175d6d6bd7e89a42cef8bbc2eedeff6aa5df394db6afccfba763d010aa96b75fede166
+  metadata.gz: a726b52ecddba1503a2246192f95426b49c89e1c2c890052920e61248249266a5f4c74beb4e21e204c703568a835cfcc7a35e704c8c4a7036e35ffb83f3d2657
+  data.tar.gz: 498b8fd4f7865eacd2078b150e1338110ab5f6e16b28a92ff82efa62466d0f5dd1c1cc3346e5ab3f80517e6c88b50546c1d109ceeda8331c9451148e0f27e27d

data/lib/bashly/commands/validate.rb

@@ -3,12 +3,18 @@ module Bashly
     class Validate < Base
       help "Scan the configuration file for errors"
 
-      usage "bashly validate"
+      usage "bashly validate [--verbose]"
       usage "bashly validate (-h|--help)"
 
+      option "-v --verbose", "Show the bashly configuration file prior to validating. This is useful when using split config (import) since it will show the final compiled configuration."
+
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
 
       def run
+        if args['--verbose']
+          lp config
+          puts "---"
+        end
         validate_config
         show_deprecations
         deprecations = config_validator.deprecations

data/lib/bashly/config_validator.rb

@@ -119,6 +119,7 @@ module Bashly
       assert_optional_string "#{key}.footer", value['footer']
       assert_optional_string "#{key}.group", value['group']
       assert_optional_string "#{key}.filename", value['filename']
+      assert_optional_string "#{key}.function", value['function']
 
       assert_boolean "#{key}.private", value['private']
       assert_boolean "#{key}.default", value['default']
@@ -142,6 +143,10 @@ module Bashly
       assert_uniq "#{key}.flags", value['flags'], 'short'
       assert_uniq "#{key}.args", value['args'], 'name'
 
+      if value['function']
+        assert value['function'].match(/^[a-z0-9_]+$/), "#{key}.function must contain lowercase alphanumeric characters and underscores only" 
+      end
+
       if value['default']
         assert value['args'], "#{key}.default makes no sense without args"
       end

data/lib/bashly/script/command.rb

@@ -9,7 +9,7 @@ module Bashly
             alias args catch_all commands completions
             default dependencies environment_variables examples
             extensible expose filename filters flags
-            footer group help name
+            footer function group help name
             private version
             short
           ]
@@ -168,7 +168,7 @@ module Bashly
 
       # Returns a unique name, suitable to be used in a bash function
       def function_name
-        full_name.to_underscore
+        options['function'] || full_name.to_underscore
       end
 
       # Returns the name of the command, including its parent name (in case

data/lib/bashly/settings.rb

@@ -1,18 +1,21 @@
 module Bashly
   class Settings
     class << self
-      attr_writer :source_dir, :target_dir, :lib_dir, :strict, :tab_indent
+      include AssetHelper
+
+      attr_writer :compact_short_flags, :source_dir, :target_dir,
+        :lib_dir, :strict, :tab_indent
 
       def source_dir
-        @source_dir ||= get :source_dir, 'src'
+        @source_dir ||= get :source_dir
       end
 
       def target_dir
-        @target_dir ||= get :target_dir, '.'
+        @target_dir ||= get :target_dir
       end
 
       def lib_dir
-        @lib_dir ||= get :lib_dir, 'lib'
+        @lib_dir ||= get :lib_dir
       end
 
       def strict
@@ -23,8 +26,12 @@ module Bashly
         @tab_indent ||= get :tab_indent
       end
 
+      def compact_short_flags
+        @compact_short_flags ||= get :compact_short_flags
+      end
+
       def env
-        @env ||= get(:env, :development)&.to_sym
+        @env ||= get(:env)&.to_sym
       end
 
       def env=(value)
@@ -41,14 +48,33 @@ module Bashly
 
     private
 
-      def get(key, default = nil)
-        ENV["BASHLY_#{key.upcase}"] || user_settings[key.to_s] || default
+      def get(key)
+        case env_value key
+        when nil                 then config[key.to_s]
+        when "0", "false", "no"  then false
+        when "1", "true", "yes"  then true
+        else                     env_value key
+        end
+      end
+
+      def env_value(key)
+        ENV["BASHLY_#{key.upcase}"]
+      end
+
+      def config
+        @config ||= defsult_settings.merge user_settings
       end
 
       def user_settings
-        @user_settings ||= begin
-          File.exist?('settings.yml') ? Config.new('settings.yml') : {}
-        end
+        @user_settings ||= File.exist?('settings.yml') ? Config.new('settings.yml') : {}
+      end
+
+      def defsult_settings
+        @defsult_settings ||= Config.new(default_settings_path)
+      end
+
+      def default_settings_path
+        asset "templates/settings.yml"
       end
 
     end

data/lib/bashly/templates/settings.yml

@@ -1,6 +1,10 @@
 # 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
+#
+# When setting environment variables, you can use:
+# - "0", "false" or "no" to represent false
+# - "1", "true" or "yes" to represent true
 
 # The path containing the bashly configuration and source files
 source_dir: src
@@ -18,6 +22,10 @@ strict: false
 # (every 2 leading spaces will be converted to a tab character)
 tab_indent: false
 
+# When true, the generated script will consider any argument in the form of
+# `-abc` as if it is `-a -b -c`.
+compact_short_flags: true
+
 # Set to 'production' or 'development':
 # - production    generate a smaller script, without file markers
 # - development   generate with file markers

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = "0.8.7"
+  VERSION = "0.8.9"
 end

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

@@ -11,11 +11,15 @@
 >     elif [[ $arg =~ ^(-[a-zA-Z0-9])=(.+)$ ]]; then
 >       input+=("${BASH_REMATCH[1]}")
 >       input+=("${BASH_REMATCH[2]}")
+
+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
 >         input+=("-${flags:i:1}")
 >       done
+end
+
 >     else
 >       input+=("$arg")
 >     fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.9
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: completely
@@ -53,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: mister_bin
+  name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: requires
+  name: lp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -81,19 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: filewatcher
+  name: mister_bin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: requires
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Generate bash command line tools using YAML configuration
 email: db@dannyben.com
 executables: