bashly 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5000e81ecf047c31547832097355e0d1b5de630041ef2533a80ce70f146e8282
-  data.tar.gz: 9c03b8ef9215a317ebfd75333304065c271e77296a55753de65e612f9d1a8432
+  metadata.gz: 36c0868dbf2a0e4d5d2fecdc5854aac4e1bea8f7953a07712ccc985289c89b57
+  data.tar.gz: 63df3d720e1b36ce7ab658224fde796fb9460c92c7946bd867204c0e0caea304
 SHA512:
-  metadata.gz: c6dc6b49075f6e250aec3204f6b9ff2bd6e4236da1bcc5229691565dcc8a4ff4c1d1c06a139c092eae33c61123753cdb542583a69596caf299f87c6ccf3d4f07
-  data.tar.gz: ab9d9fc13a779bfd4d71adbae49e66961c697a46e5cb386875dac1d9e1b021828a2821332f2687d16b87b3fb820cdc006b61d86e7425dd6fdb37ac7aceb12b33
+  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/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.2.0'
+  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/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/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.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole