Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #878 #890

Merged
merged 8 commits into from
Sep 11, 2019
Merged

Fix #878 #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d6a604
Fix #878
asahasrabuddhe Sep 11, 2019
cbb9e01
Improve Code and Add Test Case
asahasrabuddhe Sep 11, 2019
1547ac2
Modify variable names
asahasrabuddhe Sep 11, 2019
82a84fc
Merge branch 'master' into issue-878
asahasrabuddhe Sep 11, 2019
c6ee3b4
Use iterative logic to determine missing flag
asahasrabuddhe Sep 11, 2019
056aef1
Merge branch 'issue-878' of https://github.com/urfave/cli into issue-878
asahasrabuddhe Sep 11, 2019
f8bb66a
Fix Typo
asahasrabuddhe Sep 11, 2019
fa858dc
Ensure flag is not blank
asahasrabuddhe Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,20 @@ func checkRequiredFlags(flags []Flag, context *Context) requiredFlagsErr {
var missingFlags []string
for _, f := range flags {
if rf, ok := f.(RequiredFlag); ok && rf.IsRequired() {
key := strings.Split(f.GetName(), ",")[0]
if !context.IsSet(key) {
missingFlags = append(missingFlags, key)
var flagPresent bool
var flagName string
for _, key := range strings.Split(f.GetName(), ",") {
if len(key) > 1 {
flagName = key
}

if context.IsSet(strings.TrimSpace(key)) {
asahasrabuddhe marked this conversation as resolved.
Show resolved Hide resolved
flagPresent = true
}
asahasrabuddhe marked this conversation as resolved.
Show resolved Hide resolved
}

if !flagPresent && flagName != "" {
missingFlags = append(missingFlags, flagName)
asahasrabuddhe marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,20 @@ func TestCheckRequiredFlags(t *testing.T) {
},
parseInput: []string{"--requiredFlag", "myinput", "--requiredFlagTwo", "myinput"},
},
{
testCase: "required_flag_with_short_name",
flags: []Flag{
StringSliceFlag{Name: "names, N", Required: true},
},
parseInput: []string{"-N", "asd", "-N", "qwe"},
},
{
testCase: "required_flag_with_multiple_short_names",
flags: []Flag{
StringSliceFlag{Name: "names, N, n", Required: true},
},
parseInput: []string{"-n", "asd", "-n", "qwe"},
},
}
for _, test := range tdata {
t.Run(test.testCase, func(t *testing.T) {
Expand Down