Merge pull request #6 from rsteube/optarg

optarg support

example/example.yaml

@@ -8,6 +8,7 @@ commands:
   flags:
     -s, --styled=: styled values
     -r, --repeatable*: repeatable flag
+    -o, --optarg=?: optarg flag
     --dynamic=: dynamic value
     --env=: env
     --novalue: no value
@@ -25,6 +26,7 @@ commands:
       - "unstyled\tunstyled with description"
       dynamic: ["$(git branch --all | cut -c 3- | sed 's/$/\t\tblue/')", "static value"]
       env: ["$(env)"]
+      optarg: ["first", "second", "third"]
     positional:
     -  ["pos1", "pos2"]
     -  ["$_files"]

spec.go

@@ -72,13 +72,14 @@ func (c *Command) ToCobra() *cobra.Command {
 }
 
 func parseFlag(flagSet *pflag.FlagSet, id, description string) error {
-	r := regexp.MustCompile(`^(?P<shorthand>-[^-])?(, *)?(?P<longhand>--[^ =*]*)?(?P<modifier>[=*]*)$`)
+	r := regexp.MustCompile(`^(?P<shorthand>-[^-])?(, *)?(?P<longhand>--[^ =*]*)?(?P<modifier>[=*?]*)$`)
 	matches := findNamedMatches(r, id)
 
 	longhand := strings.TrimPrefix(matches["longhand"], "--")
 	shorthand := strings.TrimPrefix(matches["shorthand"], "-")
 	slice := strings.Contains(matches["modifier"], "*")
 	value := strings.Contains(matches["modifier"], "=")
+	optarg := strings.Contains(matches["modifier"], "?")
 
 	if longhand != "" && shorthand != "" {
 		if value {
@@ -125,6 +126,15 @@ func parseFlag(flagSet *pflag.FlagSet, id, description string) error {
 	} else {
 		return fmt.Errorf("malformed flag: %v", id)
 	}
+
+	if optarg {
+		if longhand != "" {
+			flagSet.Lookup(longhand).NoOptDefVal = " "
+		} else {
+			flagSet.Lookup(shorthand).NoOptDefVal = " "
+		}
+	}
+
 	return nil
 }