Merge pull request #3 from cdr/move-def-value

deansheather · web-flow · commit 9949b8215b63 · 2019-07-13T05:48:42.000Z
Move default value next to the flag name in help
diff --git a/help.go b/help.go
@@ -4,7 +4,9 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"strings"
 	"text/tabwriter"
+	"unicode"
 	"unicode/utf8"
 )
 
@@ -15,6 +17,22 @@ func flagDashes(name string) string {
 	return "-"
 }
 
+// fmtDefValue adds quotes around default value strings that contain spaces so
+// the help representation matches what you would need to do when running a
+// command.
+func fmtDefValue(value interface{}) string {
+	switch v := value.(type) {
+	case string:
+		if strings.IndexFunc(v, unicode.IsSpace) != -1 {
+			return fmt.Sprintf(`"%v"`, v)
+		}
+		return v
+
+	default:
+		return fmt.Sprintf("%v", v)
+	}
+}
+
 func renderFlagHelp(fl *flag.FlagSet, w io.Writer) {
 	var count int
 	fl.VisitAll(func(f *flag.Flag) {
@@ -26,7 +44,7 @@ func renderFlagHelp(fl *flag.FlagSet, w io.Writer) {
 		if f.DefValue == "" {
 			fmt.Fprintf(w, "\t%v%v\t%v\n", flagDashes(f.Name), f.Name, f.Usage)
 		} else {
-			fmt.Fprintf(w, "\t%v%v\t%v\t(%v)\n", flagDashes(f.Name), f.Name, f.Usage, f.DefValue)
+			fmt.Fprintf(w, "\t%v%v=%v\t%v\n", flagDashes(f.Name), f.Name, fmtDefValue(f.DefValue), f.Usage)
 		}
 	})
 }
