bashly 1.2.11 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a153068d9772fcffd185c212747324c7af5b87378329750fd742de486401384
-  data.tar.gz: f4a871e05d08f6fce8e6cceedd92a9c07549492c6d8f8133de9885afdbf4bb36
+  metadata.gz: b7352576231f786aa54762d8ae255d5599da89b8a5c1eb98d39bee4f8826cf40
+  data.tar.gz: 847a535d109089a3296b4dfce8477f1c3d40cd62183a4aeb662e396efe9a5f95
 SHA512:
-  metadata.gz: b25d31be5e4171aa088698a7665b434f9c4f13a6596b597860dee9021c3426682c9a6a873b722f04bc019ebd9c8be4d7c1b5006e72711f76ad3d8a7a0397d215
-  data.tar.gz: fc9cdd9ae807b018e1d64c15d7ed4175551624b6b5622982bf4b43c445e767aef97483359daff58e89af22a83f37edf3de6c2d1217345fa4709c70935217bf38
+  metadata.gz: 3b2c74316bd4d9d37a22e58ed20c4986a7ca86e7b74b7222e8f7adcad966f83b29d39b915ca7607f1d3655ef1653390aadcdcea173b9c9818ba475f861d8bbba
+  data.tar.gz: 89517c698abb34ec83e04590cd4919f59492fc0b999b3baade304dfde859c7aca231db77a9d469df0fcb7d98634913cb6d2321b6a791732f06c2cf608d962cc8

data/lib/bashly/libraries/libraries.yml

@@ -102,6 +102,19 @@ settings:
     - source: "settings/settings.yml"
       target: "settings.yml"
 
+stacktrace:
+  help: Add a function that shows stacktrace on error.
+  files:
+    - source: "stacktrace/stacktrace.sh"
+      target: "%{user_lib_dir}/stacktrace.%{user_ext}"
+  post_install_message: |
+    The stacktrace function is designed to be called automatically on error.
+
+    To enable this functionality, call g`enable_stacktrace` in your
+    g`src/initialize.sh`. You may run the following command to add this file:
+
+      m`$ bashly add hooks`
+
 strings:
   help: Copy an additional configuration file to your project, allowing you to customize all the tips and error strings.
   files:

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/libraries/stacktrace/stacktrace.sh

@@ -0,0 +1,29 @@
+## Stack trace functions [@bashly-upgrade stacktrace]
+## This file is a part of Bashly standard library
+##
+## Usage:
+## This function is designed to be called on error.
+## 
+## To enable this functionality, call `enable_stacktrace` in your
+## `src/initialize.sh` (Run `bashly add hooks` to add this file).
+##
+enable_stacktrace() {
+  trap 'stacktrace' ERR
+  set -o errtrace
+  set -o errexit
+}
+
+stacktrace() {
+  local exit_status="$?"
+  local i=0
+  local caller_output line func file
+
+  printf "%s:%s in \`%s\`: %s\n" "${BASH_SOURCE[0]}" "${BASH_LINENO[0]}" "${FUNCNAME[1]}" "$BASH_COMMAND"
+  printf "\nStack trace:\n"
+  while caller_output="$(caller $i)"; do
+    read -r line func file <<<"$caller_output"
+    printf "\tfrom %s:%s in \`%s\`\n" "$file" "$line" "$func"
+    i=$((i + 1))
+  done
+  exit "$exit_status"
+} >&2

data/lib/bashly/libraries/validations/validate_dir_exists.sh

@@ -1,4 +1,6 @@
 ## [@bashly-upgrade validations]
 validate_dir_exists() {
-  [[ -d "$1" ]] || echo "must be an existing directory"
+  if [[ ! -d "$1" ]]; then
+    echo "must be an existing directory"
+  fi
 }

data/lib/bashly/libraries/validations/validate_file_exists.sh

@@ -1,4 +1,6 @@
 ## [@bashly-upgrade validations]
 validate_file_exists() {
-  [[ -f "$1" ]] || echo "must be an existing file"
+  if [[ ! -f "$1" ]]; then
+    echo "must be an existing file"
+  fi
 }

data/lib/bashly/libraries/validations/validate_integer.sh

@@ -1,4 +1,6 @@
 ## [@bashly-upgrade validations]
 validate_integer() {
-  [[ "$1" =~ ^[0-9]+$ ]] || echo "must be an integer"
-}
+  if ! [[ "$1" =~ ^[0-9]+$ ]]; then
+    echo "must be an integer"
+  fi
+}

data/lib/bashly/libraries/validations/validate_not_empty.sh

@@ -1,4 +1,6 @@
 ## [@bashly-upgrade validations]
 validate_not_empty() {
-  [[ -z "$1" ]] && echo "must not be empty"
+  if [[ -z "$1" ]]; then
+    echo "must not be empty"
+  fi
 }

data/lib/bashly/script/command.rb

@@ -87,8 +87,8 @@ module Bashly
       # flag with arg that is defined as unique
       def has_unique_args_or_flags?
         deep_commands(include_self: true).each do |command|
-          return true if command.args.count(&:unique).positive? ||
-            command.flags.count(&:unique).positive?
+          return true if command.args.any?(&:unique) ||
+            command.flags.any?(&:unique)
         end
         false
       end

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.13'
 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.13
 platform: ruby
 authors:
 - Danny Ben Shitrit
 bindir: bin
 cert_chain: []
-date: 2025-04-04 00:00:00.000000000 Z
+date: 1980-01-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
@@ -238,6 +226,7 @@ files:
 - lib/bashly/libraries/render/markdown/render.rb
 - lib/bashly/libraries/render/markdown/summary.txt
 - lib/bashly/libraries/settings/settings.yml
+- lib/bashly/libraries/stacktrace/stacktrace.sh
 - lib/bashly/libraries/strings/strings.yml
 - lib/bashly/libraries/test/approvals.bash
 - lib/bashly/libraries/test/approve
@@ -355,14 +344,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Bash Command Line Tool Generator
 test_files: []