bashly 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a153068d9772fcffd185c212747324c7af5b87378329750fd742de486401384
-  data.tar.gz: f4a871e05d08f6fce8e6cceedd92a9c07549492c6d8f8133de9885afdbf4bb36
+  metadata.gz: 409606d6cd016389acf10a1d9a44211659b2d567bfd72d62aec4151d4d08846b
+  data.tar.gz: 3bbefdeee9dff2b530366cbb453fa45390d87f0f45d57fdfd643361fb7a498d2
 SHA512:
-  metadata.gz: b25d31be5e4171aa088698a7665b434f9c4f13a6596b597860dee9021c3426682c9a6a873b722f04bc019ebd9c8be4d7c1b5006e72711f76ad3d8a7a0397d215
-  data.tar.gz: fc9cdd9ae807b018e1d64c15d7ed4175551624b6b5622982bf4b43c445e767aef97483359daff58e89af22a83f37edf3de6c2d1217345fa4709c70935217bf38
+  metadata.gz: 0aa662d5e9e82b795f0885337fb033762317fb6a6b4967892ebe777b5adf9e8ec771ae6969f020d26b3a36f33be686ba3a61482cdbd225a8777412a393895c66
+  data.tar.gz: 6673f3a65b9bf0e4f9aadfc766b3bc2dfff36a21ce1fbabfdd495a0548663237d369561dd2dfccea507e705cdcb70c9654b4f79819e461df467ca8ead950ae43

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

@@ -126,3 +126,8 @@ var_aliases:
   other_args: ~
   deps: ~
   env_var_names: ~
+
+# Choose different names for some of the internal functions.
+function_names:
+  run: ~
+  initialize: ~

data/lib/bashly/settings.rb

@@ -15,6 +15,7 @@ module Bashly
         :enable_inspect_args,
         :enable_sourcing,
         :enable_view_markers,
+        :function_names,
         :lib_dir,
         :partials_extension,
         :private_reveal_key,
@@ -89,6 +90,14 @@ module Bashly
         "#{source_dir}/#{lib_dir}"
       end
 
+      def function_name(key)
+        function_names[key.to_s] || key.to_s
+      end
+
+      def function_names
+        @function_names ||= get :function_names
+      end
+
       def lib_dir
         @lib_dir ||= get :lib_dir
       end

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.2.11'
+  VERSION = '1.2.12'
 end

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

@@ -1,6 +1,6 @@
 = view_marker
 
-> initialize() {
+> {{ Settings.function_name :initialize }}() {
 >   declare -g version="<%= version %>"
 >   {{ Settings.strict_string }}
 

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

@@ -15,11 +15,11 @@
 > 
 if Settings.enabled? :sourcing
   > if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-  >   initialize
-  >   run "$@"
+  >   {{ Settings.function_name :initialize }}
+  >   {{ Settings.function_name :run }} "$@"
   > fi
 else
-  > initialize
-  > run "$@"
+  > {{ Settings.function_name :initialize }}
+  > {{ Settings.function_name :run }} "$@"
 end
 > 

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

@@ -1,6 +1,6 @@
 = view_marker
 
-> run() {
+> {{ Settings.function_name :run }}() {
 = render(:globals).indent(2)
 >
 >   normalize_input "$@"

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

@@ -6,16 +6,20 @@ if validate
     >   values=''
     >   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
+    >     validation_output="$(validate_{{ validate }} "$value")"
+    >     if [[ -n "$validation_output" ]]; then
+    >       printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$validation_output" >&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
+    > if [[ -v args['{{ long }}'] ]]; then
+    >   validation_output="$(validate_{{ validate }} "${args['{{ long }}']:-}")"
+    >   if [[ -n "${validation_output}" ]]; then
+    >     printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$validation_output" >&2
+    >     exit 1
+    >   fi
     > fi
     >
   end

metadata

@@ -1,54 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - Danny Ben Shitrit
 bindir: bin
 cert_chain: []
-date: 2025-04-04 00:00:00.000000000 Z
+date: 2025-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: completely
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement
@@ -355,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="