Merge pull request #285 from ibuildthecloud/main

bug: expand interpreter args to multiple arguments

Author: ibuildthecloud

pkg/engine/cmd.go

@@ -211,6 +211,12 @@ func (e *Engine) newCommand(ctx context.Context, extraEnv []string, tool types.T
 		cmdArgs = append(cmdArgs, f.Name())
 	}
 
+	// This is a bit hacky, but we want ARGS="x y" to expand to "x" and "y" not "x y" if used as arguments
+	cmdArgs, err = shlex.Split(strings.Join(cmdArgs, " "))
+	if err != nil {
+		return nil, nil, err
+	}
+
 	// This is a workaround for Windows, where the command interpreter is constructed with unix style paths
 	// It converts unix style paths to windows style paths
 	if runtime.GOOS == "windows" {

pkg/tests/runner_test.go

@@ -559,3 +559,19 @@ func TestExport(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, "TEST RESULT CALL: 3", x)
 }
+
+func TestShlex(t *testing.T) {
+	runner := tester.NewRunner(t)
+
+	runner.RespondWith(tester.Result{
+		Func: types.CompletionFunctionCall{
+			Name: "transient",
+		},
+	})
+	x, err := runner.Run("", `{
+"args":" x y  z  "
+}`)
+	require.NoError(t, err)
+	// The fact the white space is all perfect means that the string didn't get passed as one arg but multiple
+	assert.Equal(t, "x y z\n", x)
+}

pkg/tests/testdata/TestShlex/test.gpt

@@ -0,0 +1,2 @@
+
+#!/usr/bin/env echo ${ARGS}