x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor, more robust flag propagation

Browse Source
This commit is contained in:
Jared Forsyth 2013-11-20 01:05:18 -07:00
parent 73e88630a5
commit dc8a62e0e9
5 changed files with 76 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app.go
View File

@ -48,11 +48,19 @@ func (a *App) Run(arguments []string) error {
set := flagSet(a.Name, a.Flags)
set.SetOutput(ioutil.Discard)
err := set.Parse(arguments[1:])
normalizeFlags(a.Flags, set)
nerr := normalizeFlags(a.Flags, set)
if nerr != nil {
fmt.Println(nerr)
context := NewContext(a, set, set)
ShowAppHelp(context)
fmt.Println("")
return nerr
}
context := NewContext(a, set, set)
if err != nil {
fmt.Println("Incorrect Usage.\n")
fmt.Println("")
ShowAppHelp(context)
fmt.Println("")
return err

8
command.go
View File

@ -57,6 +57,14 @@ func (c Command) Run(ctx *Context) error {
return err
}
nerr := normalizeFlags(c.Flags, set)
if nerr != nil {
fmt.Println(nerr)
fmt.Println("")
ShowCommandHelp(ctx, c.Name)
fmt.Println("")
return nerr
}
context := NewContext(ctx.App, set, ctx.globalSet)
if checkCommandHelp(context, c.Name) {
return nil

20
context.go
View File

@ -2,6 +2,7 @@ package cli
import (
"flag"
"errors"
"strconv"
"strings"
)
@ -131,24 +132,33 @@ func lookupBool(name string, set *flag.FlagSet) bool {
return false
}
func normalizeFlags(flags []Flag, set *flag.FlagSet) {
func normalizeFlags(flags []Flag, set *flag.FlagSet) error {
visited := make(map[string]bool)
set.Visit(func(f *flag.Flag) {
visited[f.Name] = true
})
for _, f := range flags {
parts := strings.Split(f.GetName(), ", ")
parts := strings.Split(f.GetName(), ",")
if len(parts) == 1 {
continue
}
var ff *flag.Flag
for _, name := range parts {
ff = set.Lookup(name)
if ff != nil && ff.Value.String() != "" {
break
name = strings.Trim(name, " ")
if visited[name] {
if ff != nil {
return errors.New("Cannot use two forms of the same flag: " + name + " " + ff.Name)
}
ff = set.Lookup(name)
}
}
if ff == nil {
continue
}
for _, name := range parts {
name = strings.Trim(name, " ")
set.Set(name, ff.Value.String())
}
}
return nil
}

64
flag.go
View File

@ -24,6 +24,14 @@ func flagSet(name string, flags []Flag) *flag.FlagSet {
return set
}
func eachName(longName string, fn func(string)) {
parts := strings.Split(longName, ",")
for _, name := range parts {
name = strings.Trim(name, " ")
fn(name)
}
}
type StringSlice []string
func (f *StringSlice) Set(value string) error {
@ -46,14 +54,13 @@ type StringSliceFlag struct {
}
func (f StringSliceFlag) String() string {
return fmt.Sprintf("%s%v '%v'\t%v", prefixFor(f.Name), f.Name, "-"+f.Name+" option -"+f.Name+" option", f.Usage)
return fmt.Sprintf("%s '%v'\t%v", prefixFor(f.Name), f.Name, "-"+f.Name+" option -"+f.Name+" option", f.Usage)
}
func (f StringSliceFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.Var(f.Value, name, f.Usage)
}
})
}
func (f StringSliceFlag) GetName() string {
@ -88,14 +95,15 @@ type IntSliceFlag struct {
}
func (f IntSliceFlag) String() string {
return fmt.Sprintf("%s%v '%v'\t%v", prefixFor(f.Name), f.Name, "-"+f.Name+" option -"+f.Name+" option", f.Usage)
firstName := strings.Trim(strings.Split(f.Name, ",")[0], " ")
pref := prefixFor(firstName)
return fmt.Sprintf("%s '%v'\t%v", prefixedNames(f.Name), pref+firstName+" option "+pref+firstName+" option", f.Usage)
}
func (f IntSliceFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.Var(f.Value, name, f.Usage)
}
})
}
func (f IntSliceFlag) GetName() string {
@ -108,14 +116,13 @@ type BoolFlag struct {
}
func (f BoolFlag) String() string {
return fmt.Sprintf("%s%v\t%v", prefixFor(f.Name), f.Name, f.Usage)
return fmt.Sprintf("%s\t%v", prefixedNames(f.Name), f.Usage)
}
func (f BoolFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.Bool(name, false, f.Usage)
}
})
}
func (f BoolFlag) GetName() string {
@ -129,14 +136,13 @@ type StringFlag struct {
}
func (f StringFlag) String() string {
return fmt.Sprintf("%s%v '%v'\t%v", prefixFor(f.Name), f.Name, f.Value, f.Usage)
return fmt.Sprintf("%s '%v'\t%v", prefixedNames(f.Name), f.Value, f.Usage)
}
func (f StringFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.String(name, f.Value, f.Usage)
}
})
}
func (f StringFlag) GetName() string {
@ -150,14 +156,13 @@ type IntFlag struct {
}
func (f IntFlag) String() string {
return fmt.Sprintf("%s%v '%v'\t%v", prefixFor(f.Name), f.Name, f.Value, f.Usage)
return fmt.Sprintf("%s '%v'\t%v", prefixedNames(f.Name), f.Value, f.Usage)
}
func (f IntFlag) Apply(set *flag.FlagSet) {
parts := strings.Split(f.Name, ", ")
for _, name := range parts {
eachName(f.Name, func(name string) {
set.Int(name, f.Value, f.Usage)
}
})
}
func (f IntFlag) GetName() string {
@ -169,12 +174,13 @@ type helpFlag struct {
}
func (f helpFlag) String() string {
return fmt.Sprintf("--help, -h\t%v", f.Usage)
return fmt.Sprintf("%s\t%v", prefixedNames("help, h"), f.Usage)
}
func (f helpFlag) Apply(set *flag.FlagSet) {
set.Bool("h", false, f.Usage)
set.Bool("help", false, f.Usage)
eachName("help, h", func(name string) {
set.Bool(name, false, f.Usage)
})
}
func (f helpFlag) GetName() string {
@ -190,3 +196,15 @@ func prefixFor(name string) (prefix string) {
return
}
func prefixedNames(fullName string) (prefixed string) {
parts := strings.Split(fullName, ",")
for i, name := range parts {
name = strings.Trim(name, " ")
prefixed += prefixFor(name) + name
if i < len(parts) - 1 {
prefixed += ", "
}
}
return
}

5
flag_test.go
View File

@ -80,7 +80,7 @@ func TestParseMultiString(t *testing.T) {
},
}).Run([]string{"run", "-s", "10"})
(&cli.App{
/*(&cli.App{
Flags: []cli.Flag{
cli.StringFlag{Name: "serve, s"},
},
@ -93,6 +93,7 @@ func TestParseMultiString(t *testing.T) {
}
},
}).Run([]string{"run", "--serve", "10"})
*/
}
func TestParseMultiInt(t *testing.T) {
@ -109,7 +110,7 @@ func TestParseMultiInt(t *testing.T) {
}
},
}
a.Run([]string{"run", "--serve", "10"})
a.Run([]string{"run", "-s", "10"})
}
func TestParseMultiBool(t *testing.T) {