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

Use iterative logic to determine missing flag

Browse Source
This commit is contained in:
Ajitem Sahasrabuddhe 2019-09-11 14:34:41 +05:30
parent 1547ac2f6a
commit c6ee3b4904
No known key found for this signature in database
GPG Key ID: 5B0EE10DAA76876C
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
context.go
View File

@ -313,18 +313,21 @@ func checkRequiredFlags(flags []Flag, context *Context) requiredFlagsErr {
var missingFlags []string var missingFlags []string
for _, f := range flags { for _, f := range flags {
if rf, ok := f.(RequiredFlag); ok && rf.IsRequired() { if rf, ok := f.(RequiredFlag); ok && rf.IsRequired() {
key := strings.Split(f.GetName(), ",") var flagPresent bool
if len(key) > 1 { var flagName string
// has short name for _, key := range strings.Split(f.GetName(), ",") {
if !context.IsSet(strings.TrimSpace(key[0])) && !context.IsSet(strings.TrimSpace(key[1])) { if len(key) > 1 {
missingFlags = append(missingFlags, key[0]) flagName = key
} }
} else {
// does not have short name if context.IsSet(strings.TrimSpace(key)) {
if !context.IsSet(strings.TrimSpace(key[0])) { flagPresent = true
missingFlags = append(missingFlags, key[0])
} }
} }
if !flagPresent {
missingFlags = append(missingFlags, flagName)
}
} }
} }

7
context_test.go
View File

@ -524,6 +524,13 @@ func TestCheckRequiredFlags(t *testing.T) {
}, },
parseInput: []string{"-N", "asd", "-N", "qwe"}, parseInput: []string{"-N", "asd", "-N", "qwe"},
}, },
{
testCase: "required_flag_with_short_name",
flags: []Flag{
StringSliceFlag{Name: "names, N, n", Required: true},
},
parseInput: []string{"-n", "asd", "-n", "qwe"},
},
} }
for _, test := range tdata { for _, test := range tdata {
t.Run(test.testCase, func(t *testing.T) { t.Run(test.testCase, func(t *testing.T) {