fix: arg parsing (#108)

Author: notnmeyer

cmd/tsk/tsk.go

@@ -74,7 +74,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	opts.tasks, opts.cliArgs = parseArgs(flag.Args())
+	opts.tasks, opts.cliArgs = parseArgs(flag.Args(), flag.CommandLine.ArgsLenAtDash())
 
 	// cfg is the parsed task file
 	cfg, err := task.NewTaskConfig(opts.taskFile, opts.cliArgs, opts.listTasks)
@@ -114,31 +114,11 @@ func main() {
 	exec.RunTasks(exec.Config, &opts.tasks)
 }
 
-// splits args like [task1, task2 --, arg1, arg2] into
-// - tasks = []string{"task1", "task2"}
-// - cliArgs = "arg1 arg2"
-func parseArgs(args []string) (tasks []string, cliArgs string) {
-	cliArgsIndex := func() int {
-		for index, arg := range args {
-			if arg == "--" {
-				return index
-			}
-		}
-		return -1
-	}()
-
-	hasCliArgs := func() bool {
-		if cliArgsIndex >= 0 {
-			return true
-		}
-		return false
-	}()
-
-	if hasCliArgs {
-		tasks = args[:cliArgsIndex]
-		cliArgs = strings.Join(args[cliArgsIndex+1:], " ")
-		return
+func parseArgs(args []string, dashIndex int) (tasks []string, cliArgs string) {
+	if dashIndex >= 0 {
+		tasks = args[:dashIndex]
+		cliArgs = strings.Join(args[dashIndex:], " ")
+		return tasks, cliArgs
 	}
-
 	return args, ""
 }

cmd/tsk/tsk_test.go

@@ -10,24 +10,27 @@ func TestParseArgs(t *testing.T) {
 		input           []string
 		expectedTasks   []string
 		expectedCliArgs string
+		dashIndex       int
 	}{
 		{
 			name:            "tasks and args",
-			input:           []string{"task1", "task2", "--", "arg1", "arg2"},
+			input:           []string{"task1", "task2", "arg1", "arg2"},
 			expectedTasks:   []string{"task1", "task2"},
 			expectedCliArgs: "arg1 arg2",
+			dashIndex:       2,
 		},
 		{
 			name:            "just tasks",
 			input:           []string{"task1", "task2"},
 			expectedTasks:   []string{"task1", "task2"},
 			expectedCliArgs: "",
+			dashIndex:       -1,
 		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			tasks, cliArgs := parseArgs(test.input)
+			tasks, cliArgs := parseArgs(test.input, test.dashIndex)
 			if !equalSlices(tasks, test.expectedTasks) {
 				t.Errorf("Expected tasks: %v, got: %v", test.expectedTasks, tasks)
 			}