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>
105 lines
2.7 KiB
Go
105 lines
2.7 KiB
Go
// Copyright 2009 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package pflag
|
|
|
|
import (
|
|
goflag "flag"
|
|
"reflect"
|
|
"strings"
|
|
)
|
|
|
|
// flagValueWrapper implements pflag.Value around a flag.Value. The main
|
|
// difference here is the addition of the Type method that returns a string
|
|
// name of the type. As this is generally unknown, we approximate that with
|
|
// reflection.
|
|
type flagValueWrapper struct {
|
|
inner goflag.Value
|
|
flagType string
|
|
}
|
|
|
|
// We are just copying the boolFlag interface out of goflag as that is what
|
|
// they use to decide if a flag should get "true" when no arg is given.
|
|
type goBoolFlag interface {
|
|
goflag.Value
|
|
IsBoolFlag() bool
|
|
}
|
|
|
|
func wrapFlagValue(v goflag.Value) Value {
|
|
// If the flag.Value happens to also be a pflag.Value, just use it directly.
|
|
if pv, ok := v.(Value); ok {
|
|
return pv
|
|
}
|
|
|
|
pv := &flagValueWrapper{
|
|
inner: v,
|
|
}
|
|
|
|
t := reflect.TypeOf(v)
|
|
if t.Kind() == reflect.Interface || t.Kind() == reflect.Ptr {
|
|
t = t.Elem()
|
|
}
|
|
|
|
pv.flagType = strings.TrimSuffix(t.Name(), "Value")
|
|
return pv
|
|
}
|
|
|
|
func (v *flagValueWrapper) String() string {
|
|
return v.inner.String()
|
|
}
|
|
|
|
func (v *flagValueWrapper) Set(s string) error {
|
|
return v.inner.Set(s)
|
|
}
|
|
|
|
func (v *flagValueWrapper) Type() string {
|
|
return v.flagType
|
|
}
|
|
|
|
// PFlagFromGoFlag will return a *pflag.Flag given a *flag.Flag
|
|
// If the *flag.Flag.Name was a single character (ex: `v`) it will be accessiblei
|
|
// with both `-v` and `--v` in flags. If the golang flag was more than a single
|
|
// character (ex: `verbose`) it will only be accessible via `--verbose`
|
|
func PFlagFromGoFlag(goflag *goflag.Flag) *Flag {
|
|
// Remember the default value as a string; it won't change.
|
|
flag := &Flag{
|
|
Name: goflag.Name,
|
|
Usage: goflag.Usage,
|
|
Value: wrapFlagValue(goflag.Value),
|
|
// Looks like golang flags don't set DefValue correctly :-(
|
|
//DefValue: goflag.DefValue,
|
|
DefValue: goflag.Value.String(),
|
|
}
|
|
// Ex: if the golang flag was -v, allow both -v and --v to work
|
|
if len(flag.Name) == 1 {
|
|
flag.Shorthand = flag.Name
|
|
}
|
|
if fv, ok := goflag.Value.(goBoolFlag); ok && fv.IsBoolFlag() {
|
|
flag.NoOptDefVal = "true"
|
|
}
|
|
return flag
|
|
}
|
|
|
|
// AddGoFlag will add the given *flag.Flag to the pflag.FlagSet
|
|
func (f *FlagSet) AddGoFlag(goflag *goflag.Flag) {
|
|
if f.Lookup(goflag.Name) != nil {
|
|
return
|
|
}
|
|
newflag := PFlagFromGoFlag(goflag)
|
|
f.AddFlag(newflag)
|
|
}
|
|
|
|
// AddGoFlagSet will add the given *flag.FlagSet to the pflag.FlagSet
|
|
func (f *FlagSet) AddGoFlagSet(newSet *goflag.FlagSet) {
|
|
if newSet == nil {
|
|
return
|
|
}
|
|
newSet.VisitAll(func(goflag *goflag.Flag) {
|
|
f.AddGoFlag(goflag)
|
|
})
|
|
if f.addedGoFlagSets == nil {
|
|
f.addedGoFlagSets = make([]*goflag.FlagSet, 0)
|
|
}
|
|
f.addedGoFlagSets = append(f.addedGoFlagSets, newSet)
|
|
}
|