Handle quoted args in reclone commands (#618)

Author: gabrie30

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Deprecated
 ### Removed
 ### Fixed
+- Quotes within reclone commands; thanks @batagy
 ### Security
 
 ## [1.11.8] - 2/1/26

cmd/reclone.go

@@ -132,9 +132,45 @@ func sanitizeCmd(cmd string) string {
 	return cmd
 }
 
+// splitCommandArgs splits a command string into arguments, handling shell-like
+// quoting (double quotes and single quotes). Quoted sections are treated as a
+// single argument with the quotes stripped. This is necessary because reclone.yaml
+// commands may contain quoted flag values (e.g., --match-regex "(foo|bar)") that
+// must be passed to cobra without the literal quote characters.
+func splitCommandArgs(cmd string) []string {
+	var args []string
+	var current strings.Builder
+	inDoubleQuote := false
+	inSingleQuote := false
+
+	for i := 0; i < len(cmd); i++ {
+		ch := cmd[i]
+
+		switch {
+		case ch == '"' && !inSingleQuote:
+			inDoubleQuote = !inDoubleQuote
+		case ch == '\'' && !inDoubleQuote:
+			inSingleQuote = !inSingleQuote
+		case ch == ' ' && !inDoubleQuote && !inSingleQuote:
+			if current.Len() > 0 {
+				args = append(args, current.String())
+				current.Reset()
+			}
+		default:
+			current.WriteByte(ch)
+		}
+	}
+
+	if current.Len() > 0 {
+		args = append(args, current.String())
+	}
+
+	return args
+}
+
 func runReClone(rc ReClone, rcIdentifier string) {
 	// make sure command starts with ghorg clone
-	splitCommand := strings.Split(rc.Cmd, " ")
+	splitCommand := splitCommandArgs(rc.Cmd)
 	ghorg, clone, remainingCommand := splitCommand[0], splitCommand[1], splitCommand[1:]
 
 	if ghorg != "ghorg" || clone != "clone" {

cmd/reclone_test.go

@@ -1,6 +1,96 @@
 package cmd
 
-import "testing"
+import (
+	"reflect"
+	"testing"
+)
+
+func Test_splitCommandArgs(t *testing.T) {
+	tests := []struct {
+		name string
+		cmd  string
+		want []string
+	}{
+		{
+			name: "simple command without quotes",
+			cmd:  "ghorg clone my-org --scm=gitlab",
+			want: []string{"ghorg", "clone", "my-org", "--scm=gitlab"},
+		},
+		{
+			name: "double-quoted flag value with spaces",
+			cmd:  `ghorg clone my-org --match-regex "(foo|bar)"`,
+			want: []string{"ghorg", "clone", "my-org", "--match-regex", "(foo|bar)"},
+		},
+		{
+			name: "double-quoted flag value with equals",
+			cmd:  `ghorg clone my-org --match-regex="(foo|bar)"`,
+			want: []string{"ghorg", "clone", "my-org", "--match-regex=(foo|bar)"},
+		},
+		{
+			name: "single-quoted flag value",
+			cmd:  `ghorg clone my-org --match-regex '(foo|bar)'`,
+			want: []string{"ghorg", "clone", "my-org", "--match-regex", "(foo|bar)"},
+		},
+		{
+			name: "gitlab-group-exclude-match-regex with double quotes (reported bug)",
+			cmd:  `ghorg clone group1/group2 --gitlab-group-exclude-match-regex "(subgroup1|subgroup2|subgroup3|helm-charts)"`,
+			want: []string{"ghorg", "clone", "group1/group2", "--gitlab-group-exclude-match-regex", "(subgroup1|subgroup2|subgroup3|helm-charts)"},
+		},
+		{
+			name: "gitlab-group-match-regex with double quotes",
+			cmd:  `ghorg clone group1/group2 --gitlab-group-match-regex "(subgroup1|subgroup2)"`,
+			want: []string{"ghorg", "clone", "group1/group2", "--gitlab-group-match-regex", "(subgroup1|subgroup2)"},
+		},
+		{
+			name: "multiple quoted arguments",
+			cmd:  `ghorg clone my-org --match-regex "(foo|bar)" --exclude-match-regex "(baz|qux)"`,
+			want: []string{"ghorg", "clone", "my-org", "--match-regex", "(foo|bar)", "--exclude-match-regex", "(baz|qux)"},
+		},
+		{
+			name: "quoted value containing spaces",
+			cmd:  `ghorg clone my-org --output-dir "my output dir"`,
+			want: []string{"ghorg", "clone", "my-org", "--output-dir", "my output dir"},
+		},
+		{
+			name: "no quotes at all",
+			cmd:  "ghorg clone my-org --token=abc123 --scm=github",
+			want: []string{"ghorg", "clone", "my-org", "--token=abc123", "--scm=github"},
+		},
+		{
+			name: "complex regex with backslashes and anchors",
+			cmd:  `ghorg clone my-group --gitlab-group-exclude-match-regex ".*\/subgroup-a($|\/.*$)"`,
+			want: []string{"ghorg", "clone", "my-group", "--gitlab-group-exclude-match-regex", `.*\/subgroup-a($|\/.*$)`},
+		},
+		{
+			name: "mixed quoted and unquoted flags",
+			cmd:  `ghorg clone my-org --scm=gitlab --base-url=https://gitlab.example.com --token=secret --gitlab-group-match-regex "(team-a|team-b)" --output-dir=my-repos`,
+			want: []string{"ghorg", "clone", "my-org", "--scm=gitlab", "--base-url=https://gitlab.example.com", "--token=secret", "--gitlab-group-match-regex", "(team-a|team-b)", "--output-dir=my-repos"},
+		},
+		{
+			name: "multiple spaces between arguments",
+			cmd:  "ghorg  clone  my-org",
+			want: []string{"ghorg", "clone", "my-org"},
+		},
+		{
+			name: "single quotes inside double quotes are preserved",
+			cmd:  `ghorg clone my-org --match-regex "it's-a-test"`,
+			want: []string{"ghorg", "clone", "my-org", "--match-regex", "it's-a-test"},
+		},
+		{
+			name: "double quotes inside single quotes are preserved",
+			cmd:  `ghorg clone my-org --match-regex 'say "hello"'`,
+			want: []string{"ghorg", "clone", "my-org", "--match-regex", `say "hello"`},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := splitCommandArgs(tt.cmd)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("splitCommandArgs() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
 
 func Test_sanitizeCmd(t *testing.T) {
 	type args struct {