re
/
cobra
forked from mirror/cobra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that '--version' flag works properly for root command (#595) 

Make it so that, in the case that the root command is not runnable
but has subcommands, specifying a '--version' flag will still
run the "version" behavior.
This commit is contained in:
Nick Miyake 2017-12-06 23:49:35 -08:00 committed by Albert Nigmatzianov
parent c156af3984
commit ccaecb155a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command.go
View File

@ -685,7 +685,7 @@ func (c *Command) execute(a []string) (err error) {
return err return err
} }
if helpVal || !c.Runnable() { if helpVal {
return flag.ErrHelp return flag.ErrHelp
} }
@ -705,6 +705,10 @@ func (c *Command) execute(a []string) (err error) {
} }
} }
if !c.Runnable() {
return flag.ErrHelp
}
c.preRun() c.preRun()
argWoFlags := c.Flags().Args() argWoFlags := c.Flags().Args()

2
command_test.go
View File

@ -867,7 +867,7 @@ func TestVersionTemplate(t *testing.T) {
} }
func TestVersionFlagExecutedOnSubcommand(t *testing.T) { func TestVersionFlagExecutedOnSubcommand(t *testing.T) {
rootCmd := &Command{Use: "root", Version: "1.0.0", Run: emptyRun} rootCmd := &Command{Use: "root", Version: "1.0.0"}
rootCmd.AddCommand(&Command{Use: "sub", Run: emptyRun}) rootCmd.AddCommand(&Command{Use: "sub", Run: emptyRun})
output, err := executeCommand(rootCmd, "--version", "sub") output, err := executeCommand(rootCmd, "--version", "sub")