JMS #4: Delegating to Command.Run

cli.go

@@ -30,9 +30,7 @@ func Run(arguments []string) {
 		name := args[0]
 		for _, c := range append(Commands, HelpCommand) {
 			if c.Name == name || c.ShortName == name {
-				locals := flagSet(c.Flags)
+				c.Run(context)
-				locals.Parse(args[1:])
-				c.Action(NewContext(locals, set))
 				return
 			}
 		}

command.go

@@ -8,3 +8,9 @@ type Command struct {
 	Action      Handler
 	Flags       []Flag
 }
+
+func (command Command) Run(c *Context) {
+	set := flagSet(command.Flags)
+	set.Parse(c.Args()[1:])
+	command.Action(NewContext(set, c.globalSet))
+}