bashly 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e204b6791653f135c34bdf18a2b882d180087bbec57044db09540e342d81f0
-  data.tar.gz: ef1bc1015e325d227b3bc32d537a51fc369ea7833972f6f9a15e592d79ddc131
+  metadata.gz: '0857ce9cc52b919c113242568610ed9abbd447221b6d473bbf05f1cd8f29de69'
+  data.tar.gz: 3eb8279ffdbf23a69a5c7eb52d98f2f0c3ca1730f54eb6a18b4957038b69810a
 SHA512:
-  metadata.gz: 4947a104aa165d0e216a53a07908b72c290ff8e905e96acde044025bccefbab783ed5c87f3c217b674bdfb57db21c5d149827a9d8383065fef78eaac701826c0
-  data.tar.gz: 99eb5313b587980c540f22596cc8e99794cf7ed24cb0f62e06c4179a64399e80099c6cbc7d2803fe96827cdbf5734bbb9fc7364533979da45cd44973d0511748
+  metadata.gz: 2aa95822cebdc83d0e3a1af47a2d75886994a7d79976188049b8ea6732ca3d6a83003bfea48c3789e8d3a4db562e16f8f9ed169da414065567c7abf2d2d4c40b
+  data.tar.gz: 3cf237064dfe7f9cfb2523c85d838141f9869e246619b9ed2bf9862499a0345ea1da12178802ee6d7a654e1ad8fec674b751442566b8b8ca1e22b77055105fd1

data/lib/bashly/extensions/string.rb

@@ -1,6 +1,6 @@
 class String
   def sanitize_for_print
-    gsub("\n", '\\n').gsub('"', '\"').gsub('`', '\\\\`')
+    gsub("\n", '\\n').gsub('"', '\"').gsub('`', '\\\\`').gsub('%', '%%')
   end
 
   def for_markdown

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

@@ -42,6 +42,11 @@ tab_indent: false
 # `-abc` as if it is `-a -b -c`.
 compact_short_flags: true
 
+# When true, the generated script will consider any argument in the form of
+# `--flag=value` and `-f=value` as if it is `--flag value` and `-f value`
+# respectively.
+conjoined_flag_args: true
+
 # Set to 'production' or 'development':
 # env: production    Generate a smaller script, without file markers
 # env: development   Generate with file markers

data/lib/bashly/script/base.rb

@@ -29,7 +29,7 @@ module Bashly
         options['help'] ||= ''
       end
 
-      def method_missing(method_name, *arguments, &block)
+      def method_missing(method_name, *arguments, &)
         key = method_name.to_s
         respond_to?(method_name) ? options[key] : super
       end

data/lib/bashly/script/catch_all.rb

@@ -48,7 +48,7 @@ module Bashly
       def usage_string
         return nil unless enabled?
 
-        required? ? label : "[#{label}]"
+        required? ? "[--] #{label}" : "[--] [#{label}]"
       end
     end
   end

data/lib/bashly/settings.rb

@@ -6,6 +6,7 @@ module Bashly
       attr_writer(
         :commands_dir,
         :compact_short_flags,
+        :conjoined_flag_args,
         :config_path,
         :lib_dir,
         :partials_extension,
@@ -24,6 +25,10 @@ module Bashly
         @compact_short_flags ||= get :compact_short_flags
       end
 
+      def conjoined_flag_args
+        @conjoined_flag_args ||= get :conjoined_flag_args
+      end
+
       def config_path
         @config_path ||= get(:config_path) % { source_dir: source_dir }
       end

data/lib/bashly/version.rb

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

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

@@ -1,30 +1,7 @@
 = view_marker
 
-> 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]}")
-
-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
+if Settings.compact_short_flags || Settings.conjoined_flag_args
+  = render :normalize_input_function
+else
+  = render :normalize_input_simple
 end
-
->     else
->       input+=("$arg")
->     fi
-> 
->     shift
->   done
-> }
->

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

@@ -0,0 +1,39 @@
+= view_marker
+
+> normalize_input() {
+>   local arg flags passthru
+>   passthru=false
+> 
+>   while [[ $# -gt 0 ]]; do
+>     arg="$1"
+>     if [[ $passthru == true ]]; then
+>       input+=("$arg")
+
+if Settings.conjoined_flag_args
+>     elif [[ $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]}")
+end
+
+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
+
+>     elif [[ "$arg" == "--" ]]; then
+>       passthru=true
+>       input+=("$arg")
+>     else
+>       input+=("$arg")
+>     fi
+> 
+>     shift
+>   done
+> }
+>

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

@@ -0,0 +1,6 @@
+= view_marker
+
+> normalize_input() {
+>   input=("$@")
+> }
+>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -248,6 +248,8 @@ files:
 - lib/bashly/views/command/long_usage.gtx
 - lib/bashly/views/command/master_script.gtx
 - lib/bashly/views/command/normalize_input.gtx
+- lib/bashly/views/command/normalize_input_function.gtx
+- lib/bashly/views/command/normalize_input_simple.gtx
 - lib/bashly/views/command/parse_requirements.gtx
 - lib/bashly/views/command/parse_requirements_case.gtx
 - lib/bashly/views/command/parse_requirements_case_catch_all.gtx
@@ -298,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="