- Change command.argfile to apply defaults instead of prepending the command line

Author: DannyBen

examples/README.md

@@ -39,7 +39,7 @@ Each of these examples demonstrates one aspect or feature of bashly.
 - [private-reveal](private-reveal#readme) - allowing users to reveal private commands, flags or environment variables
 - [stdin](stdin#readme) - reading input from stdin
 - [filters](filters#readme) - preventing commands from running unless custom conditions are met
-- [argfile](argfile#readme) - auto-load arguments from a file
+- [argfile](argfile#readme) - auto-load flag defaults from a file
 - [commands-expose](commands-expose#readme) - showing subcommands in the parent's help
 - [key-value-pairs](key-value-pairs#readme) - parsing key=value arguments and flags
 - [command-examples-on-error](command-examples-on-error#readme) - showing examples on error

examples/argfile/README.md

@@ -1,7 +1,7 @@
 # Argfile Example
 
-Demonstrates how to autoload additional arguments from a file using the
-`argfile` command option.
+Demonstrates how to autoload flag defaults from a file using the `argfile`
+command option.
 
 This example was generated with:
 
@@ -23,7 +23,7 @@ name: download
 help: Sample application with autoloaded arguments
 version: 0.1.0
 
-# Allow users to configure args and flags in a file named '.download'
+# Allow users to configure flag defaults in a file named '.download'
 argfile: .download
 
 args:
@@ -49,6 +49,9 @@ flags:
 
 ````
 
+Only flag lines are loaded from the argfile. Each flag value must appear on the
+same line as the flag. Non-flag lines are ignored.
+
 
 ## Output
 
@@ -67,6 +70,17 @@ args:
 
 ````
 
+### `$ ./download --help`
+
+````shell
+download - Sample application with autoloaded arguments
+
+Usage:
+  download SOURCE [OPTIONS]
+  download --help | -h
+  download --version | -v
+````
+
 ### `$ ./download somesource --log cli.log`
 
 ````shell
@@ -83,4 +97,3 @@ args:
 ````
 
 
-

lib/bashly/script/introspection/commands.rb

@@ -7,11 +7,6 @@ def catch_all_used_anywhere?
           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

lib/bashly/views/command/argfile_filter.gtx

@@ -1,5 +1,18 @@
 = view_marker
 
-> load_command_argfile "{{ argfile }}" "$@"
-> set -- "${argfile_input[@]}"
+> local argfile_line argfile_key argfile_value escaped
+> [[ -f "{{ argfile }}" ]] || return
+>
+> 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 4
+>   esac
+> done < "{{ argfile }}"
 >

lib/bashly/views/command/argfile_helpers.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

lib/bashly/views/command/master_script.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

lib/bashly/views/command/parse_requirements.gtx

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

lib/bashly/views/flag/argfile_case.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

lib/bashly/views/flag/argfile_case_arg.gtx

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