mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
ed75c7727b
Use a tagged release of Cobra. All relevant PR's were merged, so the fork is no longer needed. Relevant changes: - spf13/cobra#552 Add a field to disable [flags] in UseLine() - spf13/cobra#567 Add `CalledAs` method to cobra.Command - spf13/cobra#580 Update error message for missing required flags - spf13/cobra#584 Add support for --version flag - spf13/cobra#614 If user has a project in symlink, just use its destination folder and work there - spf13/cobra#649 terminates the flags when -- is found in commandline - spf13/cobra#662 Add support for ignoring parse errors - spf13/cobra#686 doc: hide hidden parent flags Also various improvements were added for generating Bash completion scripts (currently not used by us) Fixes usage output for dockerd; Before this update: dockerd --help Usage: dockerd COMMAND A self-sufficient runtime for containers. After this update: dockerd --help Usage: dockerd [OPTIONS] [flags] A self-sufficient runtime for containers. Bump spf13/pflag to v1.0.1 Relevant changes: - spf13/pflag#106 allow lookup by shorthand - spf13/pflag#113 Add SortFlags option - spf13/pflag#138 Generate flag error output for errors returned from the parseFunc - spf13/pflag#141 Fixing Count flag usage string - spf13/pflag#143 add int16 flag - spf13/pflag#122 DurationSlice: implementation and tests - spf13/pflag#115 Implement BytesHex type of argument - spf13/pflag#150 Add uintSlice and boolSlice to name prettifier - spf13/pflag#155 Add multiline wrapping support - spf13/pflag#158 doc: clarify difference between string slice vs. array - spf13/pflag#160 add ability to ignore unknown flags - spf13/pflag#163 Allow Users To Show Deprecated Flags Hide [flags] in usage output Hides the [flags] in the usage output of commands (present in newer versions of Cobra), using the `.DisableFlagsInUseLine` option. Before this change: dockerd --help Usage: dockerd [OPTIONS] [flags] A self-sufficient runtime for containers. After this change: dockerd --help Usage: dockerd [OPTIONS] A self-sufficient runtime for containers. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Â# modified: vendor/github.com/spf13/pflag/string_array.go § Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
149 lines
4.8 KiB
Go
149 lines
4.8 KiB
Go
package pflag
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/csv"
|
|
"strings"
|
|
)
|
|
|
|
// -- stringSlice Value
|
|
type stringSliceValue struct {
|
|
value *[]string
|
|
changed bool
|
|
}
|
|
|
|
func newStringSliceValue(val []string, p *[]string) *stringSliceValue {
|
|
ssv := new(stringSliceValue)
|
|
ssv.value = p
|
|
*ssv.value = val
|
|
return ssv
|
|
}
|
|
|
|
func readAsCSV(val string) ([]string, error) {
|
|
if val == "" {
|
|
return []string{}, nil
|
|
}
|
|
stringReader := strings.NewReader(val)
|
|
csvReader := csv.NewReader(stringReader)
|
|
return csvReader.Read()
|
|
}
|
|
|
|
func writeAsCSV(vals []string) (string, error) {
|
|
b := &bytes.Buffer{}
|
|
w := csv.NewWriter(b)
|
|
err := w.Write(vals)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
w.Flush()
|
|
return strings.TrimSuffix(b.String(), "\n"), nil
|
|
}
|
|
|
|
func (s *stringSliceValue) Set(val string) error {
|
|
v, err := readAsCSV(val)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !s.changed {
|
|
*s.value = v
|
|
} else {
|
|
*s.value = append(*s.value, v...)
|
|
}
|
|
s.changed = true
|
|
return nil
|
|
}
|
|
|
|
func (s *stringSliceValue) Type() string {
|
|
return "stringSlice"
|
|
}
|
|
|
|
func (s *stringSliceValue) String() string {
|
|
str, _ := writeAsCSV(*s.value)
|
|
return "[" + str + "]"
|
|
}
|
|
|
|
func stringSliceConv(sval string) (interface{}, error) {
|
|
sval = sval[1 : len(sval)-1]
|
|
// An empty string would cause a slice with one (empty) string
|
|
if len(sval) == 0 {
|
|
return []string{}, nil
|
|
}
|
|
return readAsCSV(sval)
|
|
}
|
|
|
|
// GetStringSlice return the []string value of a flag with the given name
|
|
func (f *FlagSet) GetStringSlice(name string) ([]string, error) {
|
|
val, err := f.getFlagType(name, "stringSlice", stringSliceConv)
|
|
if err != nil {
|
|
return []string{}, err
|
|
}
|
|
return val.([]string), nil
|
|
}
|
|
|
|
// StringSliceVar defines a string flag with specified name, default value, and usage string.
|
|
// The argument p points to a []string variable in which to store the value of the flag.
|
|
// Compared to StringArray flags, StringSlice flags take comma-separated value as arguments and split them accordingly.
|
|
// For example:
|
|
// --ss="v1,v2" -ss="v3"
|
|
// will result in
|
|
// []string{"v1", "v2", "v3"}
|
|
func (f *FlagSet) StringSliceVar(p *[]string, name string, value []string, usage string) {
|
|
f.VarP(newStringSliceValue(value, p), name, "", usage)
|
|
}
|
|
|
|
// StringSliceVarP is like StringSliceVar, but accepts a shorthand letter that can be used after a single dash.
|
|
func (f *FlagSet) StringSliceVarP(p *[]string, name, shorthand string, value []string, usage string) {
|
|
f.VarP(newStringSliceValue(value, p), name, shorthand, usage)
|
|
}
|
|
|
|
// StringSliceVar defines a string flag with specified name, default value, and usage string.
|
|
// The argument p points to a []string variable in which to store the value of the flag.
|
|
// Compared to StringArray flags, StringSlice flags take comma-separated value as arguments and split them accordingly.
|
|
// For example:
|
|
// --ss="v1,v2" -ss="v3"
|
|
// will result in
|
|
// []string{"v1", "v2", "v3"}
|
|
func StringSliceVar(p *[]string, name string, value []string, usage string) {
|
|
CommandLine.VarP(newStringSliceValue(value, p), name, "", usage)
|
|
}
|
|
|
|
// StringSliceVarP is like StringSliceVar, but accepts a shorthand letter that can be used after a single dash.
|
|
func StringSliceVarP(p *[]string, name, shorthand string, value []string, usage string) {
|
|
CommandLine.VarP(newStringSliceValue(value, p), name, shorthand, usage)
|
|
}
|
|
|
|
// StringSlice defines a string flag with specified name, default value, and usage string.
|
|
// The return value is the address of a []string variable that stores the value of the flag.
|
|
// Compared to StringArray flags, StringSlice flags take comma-separated value as arguments and split them accordingly.
|
|
// For example:
|
|
// --ss="v1,v2" -ss="v3"
|
|
// will result in
|
|
// []string{"v1", "v2", "v3"}
|
|
func (f *FlagSet) StringSlice(name string, value []string, usage string) *[]string {
|
|
p := []string{}
|
|
f.StringSliceVarP(&p, name, "", value, usage)
|
|
return &p
|
|
}
|
|
|
|
// StringSliceP is like StringSlice, but accepts a shorthand letter that can be used after a single dash.
|
|
func (f *FlagSet) StringSliceP(name, shorthand string, value []string, usage string) *[]string {
|
|
p := []string{}
|
|
f.StringSliceVarP(&p, name, shorthand, value, usage)
|
|
return &p
|
|
}
|
|
|
|
// StringSlice defines a string flag with specified name, default value, and usage string.
|
|
// The return value is the address of a []string variable that stores the value of the flag.
|
|
// Compared to StringArray flags, StringSlice flags take comma-separated value as arguments and split them accordingly.
|
|
// For example:
|
|
// --ss="v1,v2" -ss="v3"
|
|
// will result in
|
|
// []string{"v1", "v2", "v3"}
|
|
func StringSlice(name string, value []string, usage string) *[]string {
|
|
return CommandLine.StringSliceP(name, "", value, usage)
|
|
}
|
|
|
|
// StringSliceP is like StringSlice, but accepts a shorthand letter that can be used after a single dash.
|
|
func StringSliceP(name, shorthand string, value []string, usage string) *[]string {
|
|
return CommandLine.StringSliceP(name, shorthand, value, usage)
|
|
}
|