- Add ability to override raw input

Author: DannyBen

examples/hooks/src/initialize.sh

@@ -3,4 +3,10 @@
 ## Any code here will be placed inside the `initialize()` function and called
 ## before running anything else.
 ##
+## - The raw command line arguments are available to you here as "$@"
+## - If you wish to override the raw arguments before they are processed,
+##   simply define an array named `input_override`:
+##
+##     declare -g -a input_override=("modified" "args")
+##
 ## You can safely delete this file if you do not need it.

lib/bashly/libraries/hooks/initialize.sh

@@ -3,4 +3,10 @@
 ## Any code here will be placed inside the `initialize()` function and called
 ## before running anything else.
 ##
+## - The raw command line arguments are available to you here as "$@"
+## - If you wish to override the raw arguments before they are processed,
+##   simply define an array named `input_override`:
+##
+##     declare -g -a input_override=("modified" "args")
+##
 ## You can safely delete this file if you do not need it.

lib/bashly/views/command/master_script.gtx

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

lib/bashly/views/command/start.gtx

@@ -0,0 +1,8 @@
+= view_marker
+
+> {{ Settings.function_name :initialize }} "$@"
+> if declare -p input_override &>/dev/null; then
+>   {{ Settings.function_name :run }} "${input_override[@]}"
+> else
+>   {{ Settings.function_name :run }} "$@"
+> fi

spec/approvals/examples/stacktrace

@@ -47,9 +47,9 @@ Examples:
 
 + ./download something
 ./download: line 15: no_such_command: command not found
-./download:15 in `root_command`: no_such_command
+./download:<line> in `root_command`: no_such_command
 
 Stack trace:
-	from ./download:15 in `root_command`
-	from ./download:259 in `run`
-	from ./download:265 in `main`
+	from ./download:<line> in `root_command`
+	from ./download:<line> in `run`
+	from ./download:<line> in `main`

spec/bashly/integration/examples_spec.rb

@@ -24,6 +24,12 @@
   # Allow up to a certain string distance from the approval text in CI
   leeway = ENV['CI'] ? 40 : 0
 
+  # For certain examples, allow some exceptions (replacements) since they 
+  # are too volatile (e.g. line number changes)
+  exceptions = {
+    'examples/stacktrace' => [/download:\d+/, 'download:<line>']
+  }
+
   test_cases.each do |example|
     approval_name = example.gsub 'spec/fixtures/workspaces', 'fixtures'
 
@@ -41,7 +47,13 @@
         # - The "+ ..." shell messages driven by `set -x` have no space
         # - The order of our `inspect_args` sometimes differs
         # - The result of the `deps` array sometimes differs
-        expect(output).to match_approval(approval_name).diff(leeway)
+        # In addition, for some examples we allow exceptions, so the below is
+        # just a more granular version of:
+        # expect(output).to match_approval(approval_name).diff(leeway).except(*except)
+        match_output = match_approval(approval_name).diff(leeway)
+        except = exceptions[example]
+        match_output = match_output.except(*except) if except
+        expect(output).to match_output
       end
     end
   end

spec/bashly/script/wrapper_spec.rb

@@ -11,7 +11,7 @@
         lines = subject.code.split "\n"
         expect(lines[0..13].join("\n")).to match_approval('script/wrapper/code')
           .except(/\d+\.\d+\.\d+(\.rc\d)?/)
-        expect(lines[-2]).to eq '  run "$@"'
+        expect(lines[-3]).to eq '    run "$@"'
       end
     end