JMS #39: App.Run returns an error

codegangsta · codegangsta · commit e6e641143cf1 · 2013-11-01T07:33:15.000-07:00
diff --git a/app.go b/app.go
@@ -34,7 +34,7 @@ func NewApp() *App {
 }
 
 // Entry point to the cli app. Parses the arguments slice and routes to the proper flag/args combination
-func (a *App) Run(arguments []string) {
+func (a *App) Run(arguments []string) error {
 	// append help to commands
 	if a.Command(helpCommand.Name) == nil {
 		a.Commands = append(a.Commands, helpCommand)
@@ -54,7 +54,7 @@ func (a *App) Run(arguments []string) {
 		fmt.Println("Incorrect Usage.\n")
 		ShowAppHelp(context)
 		fmt.Println("")
-		os.Exit(1)
+		return err
 	}
 
 	checkHelp(context)
@@ -66,12 +66,13 @@ func (a *App) Run(arguments []string) {
 		c := a.Command(name)
 		if c != nil {
 			c.Run(context)
-			return
+			return nil
 		}
 	}
 
 	// Run default Action
 	a.Action(context)
+	return nil
 }
 
 // Returns the named command on App. Returns nil if the command does not exist
diff --git a/app_test.go b/app_test.go
@@ -32,8 +32,10 @@ func TestApp_Run(t *testing.T) {
 		s = s + c.Args()[0]
 	}
 
-	app.Run([]string{"command", "foo"})
-	app.Run([]string{"command", "bar"})
+	err := app.Run([]string{"command", "foo"})
+	expect(t, err, nil)
+	err = app.Run([]string{"command", "bar"})
+	expect(t, err, nil)
 	expect(t, s, "foobar")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func NewApp() *App {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// Entry point to the cli app. Parses the arguments slice and routes to the proper flag/args combination`
`37`		`-func (a *App) Run(arguments []string) {`
	`37`	`+func (a *App) Run(arguments []string) error {`
`38`	`38`	`// append help to commands`
`39`	`39`	`if a.Command(helpCommand.Name) == nil {`
`40`	`40`	`a.Commands = append(a.Commands, helpCommand)`
`@@ -54,7 +54,7 @@ func (a *App) Run(arguments []string) {`
`54`	`54`	`fmt.Println("Incorrect Usage.\n")`
`55`	`55`	`ShowAppHelp(context)`
`56`	`56`	`fmt.Println("")`
`57`		`- os.Exit(1)`
	`57`	`+ return err`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`checkHelp(context)`
`@@ -66,12 +66,13 @@ func (a *App) Run(arguments []string) {`
`66`	`66`	`c := a.Command(name)`
`67`	`67`	`if c != nil {`
`68`	`68`	`c.Run(context)`
`69`		`- return`
	`69`	`+ return nil`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Run default Action`
`74`	`74`	`a.Action(context)`
	`75`	`+ return nil`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`// Returns the named command on App. Returns nil if the command does not exist`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,10 @@ func TestApp_Run(t *testing.T) {`
`32`	`32`	`s = s + c.Args()[0]`
`33`	`33`	`}`
`34`	`34`
`35`		`- app.Run([]string{"command", "foo"})`
`36`		`- app.Run([]string{"command", "bar"})`
	`35`	`+ err := app.Run([]string{"command", "foo"})`
	`36`	`+ expect(t, err, nil)`
	`37`	`+ err = app.Run([]string{"command", "bar"})`
	`38`	`+ expect(t, err, nil)`
`37`	`39`	`expect(t, s, "foobar")`
`38`	`40`	`}`
`39`	`41`