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

Make Command accessible from Context

Browse Source
This commit is contained in:
Chris Winslett 2014-03-29 12:02:05 -07:00
parent 3fa24ca4f3
commit c69522c960
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
command.go
View File

@ -70,6 +70,7 @@ func (c Command) Run(ctx *Context) error {
if checkCommandHelp(context, c.Name) { if checkCommandHelp(context, c.Name) {
return nil return nil
} }
context.Command = c
c.Action(context) c.Action(context)
return nil return nil
} }

3
context.go
View File

@ -13,6 +13,7 @@ import (
// parsed command-line options. // parsed command-line options.
type Context struct { type Context struct {
App *App App *App
Command Command
flagSet *flag.FlagSet flagSet *flag.FlagSet
globalSet *flag.FlagSet globalSet *flag.FlagSet
setFlags map[string]bool setFlags map[string]bool
@ -20,7 +21,7 @@ type Context struct {
// Creates a new context. For use in when invoking an App or Command action. // Creates a new context. For use in when invoking an App or Command action.
func NewContext(app *App, set *flag.FlagSet, globalSet *flag.FlagSet) *Context { func NewContext(app *App, set *flag.FlagSet, globalSet *flag.FlagSet) *Context {
return &Context{app, set, globalSet, nil} return &Context{App: app, flagSet: set, globalSet: globalSet}
} }
// Looks up the value of a local int flag, returns 0 if no int flag exists // Looks up the value of a local int flag, returns 0 if no int flag exists

3
context_test.go
View File

@ -11,9 +11,12 @@ func TestNewContext(t *testing.T) {
set.Int("myflag", 12, "doc") set.Int("myflag", 12, "doc")
globalSet := flag.NewFlagSet("test", 0) globalSet := flag.NewFlagSet("test", 0)
globalSet.Int("myflag", 42, "doc") globalSet.Int("myflag", 42, "doc")
command := cli.Command{Name: "mycommand"}
c := cli.NewContext(nil, set, globalSet) c := cli.NewContext(nil, set, globalSet)
c.Command = command
expect(t, c.Int("myflag"), 12) expect(t, c.Int("myflag"), 12)
expect(t, c.GlobalInt("myflag"), 42) expect(t, c.GlobalInt("myflag"), 42)
expect(t, c.Command.Name, "mycommand")
} }
func TestContext_Int(t *testing.T) { func TestContext_Int(t *testing.T) {