Merge branch 'main' into main

urfave · Mar 29, 2024 · ab284d7 · ab284d7
2 parents 43da2b6 + 065ea5c
commit ab284d7
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 159 deletions.
diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml
diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml
diff --git a/args.go b/args.go
@@ -118,7 +118,7 @@ func (a *ArgumentBase[T, C, VC]) Parse(s []string) ([]string, error) {
 		}
 		values = append(values, value.Get().(T))
 		count++
-		if count >= a.Max {
+		if count >= a.Max && a.Max > -1 {
 			break
 		}
 	}
@@ -128,7 +128,7 @@ func (a *ArgumentBase[T, C, VC]) Parse(s []string) ([]string, error) {
 
 	if a.Values == nil {
 		a.Values = &values
-	} else {
+	} else if count > 0 {
 		*a.Values = values
 	}
 
@@ -139,6 +139,7 @@ func (a *ArgumentBase[T, C, VC]) Parse(s []string) ([]string, error) {
 			*a.Destination = t
 		}
 	}
+
 	return s[count:], nil
 }
 

diff --git a/args_test.go b/args_test.go
@@ -174,3 +174,49 @@ func TestSingleOptionalArg(t *testing.T) {
 	require.NoError(t, cmd.Run(context.Background(), []string{"foo", "zbar"}))
 	require.Equal(t, "zbar", s1)
 }
+
+func TestUnboundedArgs(t *testing.T) {
+	arg := &StringArg{
+		Min: 0,
+		Max: -1,
+	}
+	tests := []struct {
+		name     string
+		args     []string
+		values   []string
+		expected []string
+	}{
+		{
+			name:     "cmd accepts no args",
+			args:     []string{"foo"},
+			expected: nil,
+		},
+		{
+			name:     "cmd uses given args",
+			args:     []string{"foo", "bar", "baz"},
+			expected: []string{"bar", "baz"},
+		},
+		{
+			name:     "cmd uses default values",
+			args:     []string{"foo"},
+			values:   []string{"zbar", "zbaz"},
+			expected: []string{"zbar", "zbaz"},
+		},
+		{
+			name:     "given args override default values",
+			args:     []string{"foo", "bar", "baz"},
+			values:   []string{"zbar", "zbaz"},
+			expected: []string{"bar", "baz"},
+		},
+	}
+
+	cmd := buildMinimalTestCommand()
+	cmd.Arguments = []Argument{arg}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			arg.Values = &test.values
+			require.NoError(t, cmd.Run(context.Background(), test.args))
+			require.Equal(t, test.expected, *arg.Values)
+		})
+	}
+}
diff --git a/category.go b/category.go
@@ -105,7 +105,11 @@ func newFlagCategoriesFromFlags(fs []Flag) FlagCategories {
 
 	for _, fl := range fs {
 		if cf, ok := fl.(CategorizableFlag); ok {
-			if cat := cf.GetCategory(); cat != "" {
+			visible := false
+			if vf, ok := fl.(VisibleFlag); ok {
+				visible = vf.IsVisible()
+			}
+			if cat := cf.GetCategory(); cat != "" && visible {
 				fc.AddFlag(cat, fl)
 				categorized = true
 			}
@@ -115,7 +119,11 @@ func newFlagCategoriesFromFlags(fs []Flag) FlagCategories {
 	if categorized {
 		for _, fl := range fs {
 			if cf, ok := fl.(CategorizableFlag); ok {
-				if cf.GetCategory() == "" {
+				visible := false
+				if vf, ok := fl.(VisibleFlag); ok {
+					visible = vf.IsVisible()
+				}
+				if cf.GetCategory() == "" && visible {
 					fc.AddFlag("", fl)
 				}
 			}

diff --git a/command_test.go b/command_test.go
@@ -518,11 +518,20 @@ func TestCommand_VisibleFlagCategories(t *testing.T) {
 			&StringFlag{
 				Name: "strd", // no category set
 			},
+			&StringFlag{
+				Name:   "strd1", // no category set and also hidden
+				Hidden: true,
+			},
 			&IntFlag{
 				Name:     "intd",
 				Aliases:  []string{"altd1", "altd2"},
 				Category: "cat1",
 			},
+			&StringFlag{
+				Name:     "sfd",
+				Category: "cat2", // category set and hidden
+				Hidden:   true,
+			},
 		},
 		MutuallyExclusiveFlags: []MutuallyExclusiveFlags{{
 			Category: "cat2",

diff --git a/flag.go b/flag.go
@@ -137,7 +137,7 @@ type DocGenerationFlag interface {
 	GetEnvVars() []string
 }
 
-// DocGenerationSliceFlag extends DocGenerationFlag for slice/map based flags.
+// DocGenerationMultiValueFlag extends DocGenerationFlag for slice/map based flags.
 type DocGenerationMultiValueFlag interface {
 	DocGenerationFlag
 

diff --git a/godoc-current.txt b/godoc-current.txt
@@ -567,7 +567,8 @@ type DocGenerationMultiValueFlag interface {
 	// IsMultiValueFlag returns true for flags that can be given multiple times.
 	IsMultiValueFlag() bool
 }
-    DocGenerationSliceFlag extends DocGenerationFlag for slice/map based flags.
+    DocGenerationMultiValueFlag extends DocGenerationFlag for slice/map based
+    flags.
 
 type DurationFlag = FlagBase[time.Duration, NoConfig, durationValue]
 

diff --git a/testdata/godoc-v3.x.txt b/testdata/godoc-v3.x.txt
@@ -567,7 +567,8 @@ type DocGenerationMultiValueFlag interface {
 	// IsMultiValueFlag returns true for flags that can be given multiple times.
 	IsMultiValueFlag() bool
 }
-    DocGenerationSliceFlag extends DocGenerationFlag for slice/map based flags.
+    DocGenerationMultiValueFlag extends DocGenerationFlag for slice/map based
+    flags.
 
 type DurationFlag = FlagBase[time.Duration, NoConfig, durationValue]