Allow ... to denote unlimited args list

Author: cv

cli/parsing.go

@@ -79,6 +79,9 @@ func usageFrom(path string) (string, cobra.PositionalArgs, error) {
 
 			var required, optional int
 			for _, i := range parts[1:] {
+				if i == "..." {
+					continue
+				}
 				if strings.HasPrefix(i, "[") && strings.HasSuffix(i, "]") {
 					logrus.Debug("Found optional arg: ", i)
 					optional++
@@ -87,7 +90,10 @@ func usageFrom(path string) (string, cobra.PositionalArgs, error) {
 					required++
 				}
 			}
-
+			if parts[len(parts)-1] == "..." {
+				logrus.Debug("Minimum of ", required, " arguments set")
+				return match[1], cobra.MinimumNArgs(required), nil
+			}
 			logrus.Debug("Arg range of ", required, " and ", required+optional, " set")
 			return match[1], cobra.RangeArgs(required, required+optional), nil
 		}

cli/parsing_test.go

@@ -108,6 +108,48 @@ func TestUsageFrom(t *testing.T) {
 				assert.Error(t, v(&cobra.Command{}, []string{"first", "second", "third"}))
 			},
 		},
+		{
+			"unlimited arguments, mixed",
+			"#\n# usage: blah foo [bar] ...\n#\n",
+			func(t *testing.T, name string, actual string) {
+				assert.Equal(t, "blah foo [bar] ...", actual)
+			},
+			func(t *testing.T, v cobra.PositionalArgs) {
+				assert.Error(t, v(&cobra.Command{}, []string{}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second", "third"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second", "third", "fourth"}))
+			},
+		},
+		{
+			"unlimited arguments, required",
+			"#\n# usage: blah foo bar ...\n#\n",
+			func(t *testing.T, name string, actual string) {
+				assert.Equal(t, "blah foo bar ...", actual)
+			},
+			func(t *testing.T, v cobra.PositionalArgs) {
+				assert.Error(t, v(&cobra.Command{}, []string{}))
+				assert.Error(t, v(&cobra.Command{}, []string{"first"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second", "third"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second", "third", "fourth"}))
+			},
+		},
+		{
+			"unlimited arguments, optional",
+			"#\n# usage: blah [bar] ...\n#\n",
+			func(t *testing.T, name string, actual string) {
+				assert.Equal(t, "blah [bar] ...", actual)
+			},
+			func(t *testing.T, v cobra.PositionalArgs) {
+				assert.NoError(t, v(&cobra.Command{}, []string{}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second", "third"}))
+				assert.NoError(t, v(&cobra.Command{}, []string{"first", "second", "third", "fourth"}))
+			},
+		},
 		{
 			"missing",
 			"#\n#\n#\n",