bashly 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 895095279e0e8793275a7f5c0e982b5ea9277881d73195d98212dab3303f682b
-  data.tar.gz: b7513cf9828698db23b417b7bff2941fc57045c28bc4968d5b33da2734834934
+  metadata.gz: 411dc6262c3232175e5a968a31ad90b56aa59be9d9b46203c3eb2db14f35d491
+  data.tar.gz: 2ce20d069c93e1e7081984ff1fb2dd9c7bca530d6fbf127e0bb1c996c0117cc1
 SHA512:
-  metadata.gz: e8eb40deb329c675f94bf1ec65d8832709c60dbdc15c76d7a3419c780852ccbb9d18110fb7fbda29d9f197a7329ffec49ae8781bd332f91ed8e49c379e5c98e7
-  data.tar.gz: 31fe31dbfb2445633b367210c415b9764ff7614b257ebcc4116b2128152cbdd2df0a528c3b8a44029f96b473e0528911e09339fca10ff6292af61ad8c0559664
+  metadata.gz: 3bff0a363b5c52c0f54b2b1e413b909256579c0b29ef8a44e88cd73b1803c584c3de26af99fa737edac8cc103a218f418a7a5f463e38b27c416ebf26bbcfe8ef
+  data.tar.gz: 2691947ed69d6f693625be4ba66a1b9803d01e46f50768d266c5f0f27c60f74242977fb91131443f6bd29161a9810970b542ecef3d3be0e9b3a84641da8dc080

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

@@ -120,6 +120,12 @@ show_examples_on_error: false
 # all the private elements in the usage texts, as if they were public.
 private_reveal_key: ~
 
+# When enabling argfile for any command, this setting controls the name of the
+# environment variable that can override or disable argfile loading at runtime.
+# Set the variable to `0`, `off`, `no` or `false` to disable argfile loading,
+# or to a different path to load another argfile instead.
+argfile_var: ARGFILE
+
 # Display various usage elements in color by providing the name of the color
 # function. The value for each property is a name of a function that is
 # available in your script, for example: `green` or `bold`.

data/lib/bashly/script/introspection/commands.rb

@@ -7,11 +7,6 @@ module Bashly
           deep_commands(include_self: true).any? { |x| x.catch_all.enabled? }
         end
 
-        # Returns true if the command or any of its descendants has `argfile`
-        def argfile_used_anywhere?
-          deep_commands(include_self: true).any?(&:argfile)
-        end
-
         # Returns a full list of the Command names and aliases combined
         def command_aliases
           commands.map(&:aliases).flatten

data/lib/bashly/settings.rb

@@ -4,6 +4,7 @@ module Bashly
       include AssetHelper
 
       attr_writer(
+        :argfile_var,
         :commands_dir,
         :compact_short_flags,
         :conjoined_flag_args,
@@ -37,6 +38,10 @@ module Bashly
         @all_lib_dirs = [full_lib_dir] + extra_lib_dirs
       end
 
+      def argfile_var
+        @argfile_var ||= get :argfile_var
+      end
+
       def commands_dir
         @commands_dir ||= get :commands_dir
       end

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.3.7'
+  VERSION = '1.3.8'
 end

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

@@ -1,5 +1,29 @@
 = view_marker
 
-> load_command_argfile "{{ argfile }}" "$@"
-> set -- "${argfile_input[@]}"
+> local argfile argfile_line argfile_key argfile_value env_argfile env_argfile_var
+> argfile="{{ argfile }}"
+> env_argfile_var="{{ Settings.argfile_var }}"
+> env_argfile="${!env_argfile_var:-}"
+>
+> case "${env_argfile,,}" in
+>   0 | off | no | false)
+>     argfile=''
+>     ;;
+> esac
+>
+> [[ -n "$env_argfile" ]] && argfile="$env_argfile"
+> if [[ -f "$argfile" ]]; then
+>   while IFS= read -r argfile_line || [[ -n "$argfile_line" ]]; do
+>     [[ "$argfile_line" =~ ^[[:space:]]*(-{1,2}[^[:space:]]+)([[:space:]]+(.+))?[[:space:]]*$ ]] || continue
+>     argfile_key="${BASH_REMATCH[1]}"
+>     argfile_value="${BASH_REMATCH[3]:-}"
+>     argfile_value="${argfile_value#"${argfile_value%%[![:space:]]*}"}"
+>     argfile_value="${argfile_value%"${argfile_value##*[![:space:]]}"}"
+>     [[ "$argfile_value" =~ ^\"(.*)\"$ || "$argfile_value" =~ ^\'(.*)\'$ ]] && argfile_value="${BASH_REMATCH[1]}"
+>
+>     case "$argfile_key" in
+= flags.map { |flag| flag.render(:argfile_case) }.join.indent 6
+>     esac
+>   done <"$argfile"
+> fi
 >

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

@@ -4,7 +4,6 @@
 = render :version_command
 = render :usage
 = render :normalize_input
-= render :argfile_helpers if argfile_used_anywhere?
 = render :inspect_args if Settings.enabled? :inspect_args
 = render :user_lib if user_lib.any?
 = render :command_functions

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

@@ -8,8 +8,8 @@ end
 >   local key
 >
 
-= render(:argfile_filter).indent 2 if argfile
 = render(:fixed_flags_filter).indent 2
+= render(:argfile_filter).indent 2 if argfile
 = render(:environment_variables_filter).indent 2
 = render(:dependencies_filter).indent 2
 = render(:command_filter).indent 2

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

@@ -0,0 +1,6 @@
+= view_marker
+
+> {{ aliases.join " | " }})
+= render(arg ? :argfile_case_arg : :argfile_case_no_arg).indent 2
+>   ;;
+>

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

@@ -0,0 +1,23 @@
+= view_marker
+
+> if [[ -n "$argfile_value" ]]; then
+
+if repeatable
+  >   escaped="$(printf '%q' "$argfile_value")"
+  >   if [[ -z ${args['{{ name }}']+x} ]]; then
+  >     args['{{ name }}']="$escaped"
+  if unique
+    >     unique_lookup["{{ name }}:$escaped"]=1
+    >   elif [[ -z "${unique_lookup["{{ name }}:$escaped"]:-}" ]]; then
+    >     args['{{ name }}']="${args['{{ name }}']} $escaped"
+    >     unique_lookup["{{ name }}:$escaped"]=1
+  else
+    >   else
+    >     args['{{ name }}']="${args['{{ name }}']} $escaped"
+  end
+  >   fi
+else
+  >   [[ -n ${args['{{ name }}']+x} ]] || args['{{ name }}']="$argfile_value"
+end
+
+> fi

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

@@ -0,0 +1,7 @@
+= view_marker
+
+if repeatable
+  > ((args['{{ name }}'] += 1))
+else
+  > [[ -n ${args['{{ name }}']+x} ]] || args['{{ name }}']=1
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -247,7 +247,6 @@ files:
 - lib/bashly/views/argument/usage.gtx
 - lib/bashly/views/argument/validations.gtx
 - lib/bashly/views/command/argfile_filter.gtx
-- lib/bashly/views/command/argfile_helpers.gtx
 - lib/bashly/views/command/catch_all_filter.gtx
 - lib/bashly/views/command/command_fallback.gtx
 - lib/bashly/views/command/command_filter.gtx
@@ -299,6 +298,9 @@ files:
 - lib/bashly/views/dependency/filter.gtx
 - lib/bashly/views/environment_variable/usage.gtx
 - lib/bashly/views/environment_variable/validations.gtx
+- lib/bashly/views/flag/argfile_case.gtx
+- lib/bashly/views/flag/argfile_case_arg.gtx
+- lib/bashly/views/flag/argfile_case_no_arg.gtx
 - lib/bashly/views/flag/case.gtx
 - lib/bashly/views/flag/case_arg.gtx
 - lib/bashly/views/flag/case_no_arg.gtx

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

@@ -1,36 +0,0 @@
-= view_marker
-
-> load_command_argfile() {
->   local argfile_path line arg
->   argfile_path="$1"
->   shift
->   argfile_input=()
->
->   if [[ ! -f "$argfile_path" ]]; then
->     argfile_input=("$@")
->     return
->   fi
->
->   while IFS= read -r line || [[ -n "$line" ]]; do
->     line="${line#"${line%%[![:space:]]*}"}"
->     line="${line%"${line##*[![:space:]]}"}"
->
->     [[ -z "$line" || "${line:0:1}" == "#" ]] && continue
->
->     if [[ "$line" =~ ^(-{1,2}[^[:space:]]+)[[:space:]]+(.+)$ ]]; then
->       for arg in "${BASH_REMATCH[1]}" "${BASH_REMATCH[2]}"; do
->         arg="${arg#"${arg%%[![:space:]]*}"}"
->         arg="${arg%"${arg##*[![:space:]]}"}"
->         [[ "$arg" =~ ^\"(.*)\"$ || "$arg" =~ ^\'(.*)\'$ ]] && arg="${BASH_REMATCH[1]}"
->         argfile_input+=("$arg")
->       done
->     else
->       arg="$line"
->       [[ "$arg" =~ ^\"(.*)\"$ || "$arg" =~ ^\'(.*)\'$ ]] && arg="${BASH_REMATCH[1]}"
->       argfile_input+=("$arg")
->     fi
->   done <"$argfile_path"
->
->   argfile_input+=("$@")
-> }
->