bashly 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17cea196efbe1bc65a6639258fe902503b75656c6a759ea5434a12d6a53d4529
-  data.tar.gz: 5e86d08e594250889bc351d5d6113bcfc40f8ec04ba39f72a7f19eec8329c7af
+  metadata.gz: 0a7e677e8b16a4711ece6638e16e585b1bf74fca12cc6c3e9ea4810c209d4693
+  data.tar.gz: 630667bb3c3d36055a0160f05719a9561d8ec7cdbd02af80fd9c2a7a5edabd17
 SHA512:
-  metadata.gz: ade5312408fc08533dc6992673744920e941e142c09c9f05e58e66a08a6dfccfab100707cee319cb2ec388e60f9a73ae8ff735e8217c8f91820fc5e2e22af886
-  data.tar.gz: cf7f6da0438551ba2a10ed5c224d7ad6ac6b02d8675dca57c8ac01eb465e705a19bd2c3d1812b61b54ab52a433b5ce228b7f3b579e9de24f71c6f512caad1202
+  metadata.gz: 7dd08f97c66d81979c68b43d356b650ec50d30b0c2d0d8663388f0fec56f881bd5b140a55719143e00d155b2f0ae321d6207bf63c7e248d324489cf7dc3b7cee
+  data.tar.gz: 754c2b4aaa9e289b04e83e10b861933b26ef3168620315a7a9655c8dc991c095d0e42037a43d379b2d1f86d6f4eb5a6e3d6ea70009642d873e7dafb1627cfffa

data/README.md

@@ -27,15 +27,6 @@ usually handled by a framework in any other programming language.
 It is available both as a [ruby gem](https://rubygems.org/gems/bashly) and as
 a [docker image](https://hub.docker.com/r/dannyben/bashly).
 
-## Bashly is Sponsored By
-
-<table>
-   <tr>
-      <td><a href="https://rhodecode.com/"><img src='support/img/RhodeCode-logo.png' width=240></a></td>
-   </tr>
-</table>
-
-
 ## Documentation
 
 - [Bashly Homepage][docs]

data/lib/bashly/commands/generate.rb

@@ -16,8 +16,8 @@ module Bashly
       option '-e --env ENV', <<~HELP
         Force the generation environment:
 
-        - production    generate a smaller script, without file markers
-        - development   generate with file markers
+        - development   default script output
+        - production    remove file marker comments and development functions
       HELP
 
       example 'bashly generate --force'

data/lib/bashly/libraries/test/approvals.bash

@@ -1,4 +1,4 @@
-# approvals.bash v0.4.0
+# approvals.bash v0.4.2
 #
 # Interactive approval testing for Bash.
 # https://github.com/DannyBen/approvals.bash
@@ -9,8 +9,8 @@ approve() {
   cmd=$1
   last_exit_code=0
   actual=$(eval "$cmd" 2>&1) || last_exit_code=$?
-  if [[ "$allow_diff_regex" ]]; then
-    actual=$(echo "$actual" | sed "s/$allow_diff_regex/*/g")
+  if [[ -v allow_diff_regex && "$allow_diff_regex" ]]; then
+    actual=$(echo "$actual" | sed -E "s/$allow_diff_regex/*/g")
     unset allow_diff_regex
   fi
   approval=$(printf "%b" "$cmd" | tr -s -c "[:alnum:]" _)

data/lib/bashly/script/command.rb

@@ -322,6 +322,11 @@ module Bashly
         @user_lib ||= Dir["#{Settings.full_lib_dir}/**/*.#{Settings.partials_extension}"]
       end
 
+      # Returns a mixed array of Argument and Flag objects that have validations
+      def validatables
+        @validatables ||= args.select(&:validate) + flags.select(&:validate)
+      end
+
       # Returns an array of all the args with a whitelist
       def whitelisted_args
         args.select(&:allowed)

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.1.5'
+  VERSION = '1.1.7'
 end

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

@@ -1,11 +1,22 @@
 if validate
+  = view_marker
 
-= view_marker
-
-> if [[ -n $(validate_{{ validate }} "$1") ]]; then
->   printf "{{ strings[:validation_error] }}\n" "{{ name.upcase }}" "$(validate_{{ validate }} "$1")" >&2
->   exit 1
-> fi
-> 
+  if repeatable
+    > if [[ -v args['{{ name }}'] ]]; then
+    >   eval "values=(${args['{{ name }}']})"
+    >   for value in "${values[@]}"; do
+    >     if [[ -n $(validate_{{ validate }} "$value") ]]; then
+    >       printf "{{ strings[:validation_error] }}\n" "{{ name.upcase }}" "$(validate_{{ validate }} "$value")" >&2
+    >       exit 1
+    >     fi
+    >   done
+    > fi
+  else
+    > if [[ -v args['{{ name }}'] && -n $(validate_{{ validate }} "${args['{{ name }}']:-}") ]]; then
+    >   printf "{{ strings[:validation_error] }}\n" "{{ name.upcase }}" "$(validate_{{ validate }} "${args['{{ name }}']:-}")" >&2
+    >   exit 1
+    > fi
+    >
+  end
 
 end

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

@@ -4,7 +4,7 @@
 = render :version_command
 = render :usage
 = render :normalize_input
-= render :inspect_args
+= render :inspect_args unless Settings.production?
 = render :user_lib if user_lib.any?
 = render :command_functions
 = render :parse_requirements

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

@@ -15,6 +15,7 @@ end
 = render(:required_flags_filter).indent 2
 = render(:catch_all_filter).indent 2
 = render(:default_assignments).indent 2
+= render(:validations).indent 2
 = render(:whitelist_filter).indent 2
 = render(:user_filter).indent 2
 

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

@@ -4,7 +4,6 @@ if args.any?
   condition = "if"
   args.each do |arg|
     > {{ condition }} [[ -z ${args['{{ arg.name }}']+x} ]]; then
-    =   arg.render(:validations).indent 2
     >   args['{{ arg.name }}']=$1
     >   shift
     

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

@@ -2,7 +2,6 @@
 
 condition = "if"
 args.each do |arg|
-  = arg.render(:validations)
   > {{ condition }} [[ -z ${args['{{ arg.name }}']+x} ]]; then
   if arg.repeatable
     >   args['{{ arg.name }}']="\"$1\""

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

@@ -4,7 +4,6 @@ if args.any?
   condition = "if"
   args.each do |arg|
     > {{ condition }} [[ -z ${args['{{ arg.name }}']+x} ]]; then
-    > {{ arg.render(:validations).indent 2 }}
     >   args['{{ arg.name }}']=$1
     >   shift
 

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

@@ -0,0 +1,7 @@
+if validatables.any?
+  = view_marker
+
+  validatables.each do |arg_or_flag|
+    = arg_or_flag.render(:validations)
+  end
+end

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

@@ -1,7 +1,6 @@
 = view_marker
 
 > if [[ -n ${2+x} ]]; then
-= render(:validations).indent 2
 
 if repeatable
   >   if [[ -z ${args['{{ name }}']+x} ]]; then

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

@@ -1,11 +1,22 @@
 if validate
-
   = view_marker
 
-  > if [[ -n $(validate_{{ validate }} "$2") ]]; then
-  >   printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$(validate_{{ validate }} "$2")" >&2
-  >   exit 1
-  > fi
-  > 
+  if repeatable
+    > if [[ -v args['{{ long }}'] ]]; then
+    >   eval "values=(${args['{{ long }}']})"
+    >   for value in "${values[@]}"; do
+    >     if [[ -n $(validate_{{ validate }} "$value") ]]; then
+    >       printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$(validate_{{ validate }} "$value")" >&2
+    >       exit 1
+    >     fi
+    >   done
+    > fi
+  else
+    > if [[ -v args['{{ long }}'] && -n $(validate_{{ validate }} "${args['{{ long }}']:-}") ]]; then
+    >   printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$(validate_{{ validate }} "${args['{{ long }}']:-}")" >&2
+    >   exit 1
+    > fi
+    >
+  end
 
 end

data/lib/bashly.rb

@@ -1,5 +1,5 @@
-if ENV['BYEBUG']
-  require 'byebug'
+if ENV['DEBUGGER']
+  require 'debug'
   require 'lp'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2024-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -265,6 +265,7 @@ files:
 - lib/bashly/views/command/user_filter.gtx
 - lib/bashly/views/command/user_hooks.gtx
 - lib/bashly/views/command/user_lib.gtx
+- lib/bashly/views/command/validations.gtx
 - lib/bashly/views/command/version_command.gtx
 - lib/bashly/views/command/whitelist_filter.gtx
 - lib/bashly/views/environment_variable/usage.gtx
@@ -301,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Bash Command Line Tool Generator