diff options
| author | Fredrik Wallgren <[email protected]> | 2016-03-06 21:07:01 +0100 |
|---|---|---|
| committer | Fredrik Wallgren <[email protected]> | 2016-03-06 21:07:01 +0100 |
| commit | e71d6514f40a7e4b99825987b408c421ced3e13f (patch) | |
| tree | 7fef19e82a3ecf75a41f90067038a681afab54dd | |
| parent | 45474a9b25793b65f90da5e25190b714c2bf1953 (diff) | |
Print defaults for multiples
Check if the default value supplied is a slice and not nil, if so
print the list of values supplied.
Test case for slice argument with and without default values.
Default values for slices was not printed because slice is not
comparable, but the zero value for slices is nil.
| -rw-r--r-- | usage.go | 2 | ||||
| -rw-r--r-- | usage_test.go | 25 |
2 files changed, 15 insertions, 12 deletions
@@ -117,7 +117,7 @@ func printOption(w io.Writer, spec *spec) { v := spec.dest if v.IsValid() { z := reflect.Zero(v.Type()) - if v.Type().Comparable() && z.Type().Comparable() && v.Interface() != z.Interface() { + if (v.Type().Comparable() && z.Type().Comparable() && v.Interface() != z.Interface()) || v.Kind() == reflect.Slice && !v.IsNil() { fmt.Fprintf(w, " [default: %v]", v) } } diff --git a/usage_test.go b/usage_test.go index fd2ba3a..b63a7d0 100644 --- a/usage_test.go +++ b/usage_test.go @@ -10,9 +10,9 @@ import ( ) func TestWriteUsage(t *testing.T) { - expectedUsage := "usage: example [--name NAME] [--value VALUE] [--verbose] [--dataset DATASET] [--optimize OPTIMIZE] [--ids IDS] [--workers WORKERS] INPUT [OUTPUT [OUTPUT ...]]\n" + expectedUsage := "usage: example [--name NAME] [--value VALUE] [--verbose] [--dataset DATASET] [--optimize OPTIMIZE] [--ids IDS] [--values VALUES] [--workers WORKERS] INPUT [OUTPUT [OUTPUT ...]]\n" - expectedHelp := `usage: example [--name NAME] [--value VALUE] [--verbose] [--dataset DATASET] [--optimize OPTIMIZE] [--ids IDS] [--workers WORKERS] INPUT [OUTPUT [OUTPUT ...]] + expectedHelp := `usage: example [--name NAME] [--value VALUE] [--verbose] [--dataset DATASET] [--optimize OPTIMIZE] [--ids IDS] [--values VALUES] [--workers WORKERS] INPUT [OUTPUT [OUTPUT ...]] positional arguments: input @@ -26,23 +26,26 @@ options: --optimize OPTIMIZE, -O OPTIMIZE optimization level --ids IDS Ids + --values VALUES Values [default: [3.14 42 256]] --workers WORKERS, -w WORKERS number of workers to start --help, -h display this help and exit ` var args struct { - Input string `arg:"positional"` - Output []string `arg:"positional,help:list of outputs"` - Name string `arg:"help:name to use"` - Value int `arg:"help:secret value"` - Verbose bool `arg:"-v,help:verbosity level"` - Dataset string `arg:"help:dataset to use"` - Optimize int `arg:"-O,help:optimization level"` - Ids []int64 `arg:"help:Ids"` - Workers int `arg:"-w,env:WORKERS,help:number of workers to start"` + Input string `arg:"positional"` + Output []string `arg:"positional,help:list of outputs"` + Name string `arg:"help:name to use"` + Value int `arg:"help:secret value"` + Verbose bool `arg:"-v,help:verbosity level"` + Dataset string `arg:"help:dataset to use"` + Optimize int `arg:"-O,help:optimization level"` + Ids []int64 `arg:"help:Ids"` + Values []float64 `arg:"help:Values"` + Workers int `arg:"-w,env:WORKERS,help:number of workers to start"` } args.Name = "Foo Bar" args.Value = 42 + args.Values = []float64{3.14, 42, 256} p, err := NewParser(Config{}, &args) require.NoError(t, err) |