Merge pull request #6 from jwaldrip/subcmd-err

Subcmd err

cli/output.go

@@ -12,6 +12,16 @@ func (cmd *CLI) ErrOutput() io.Writer {
 	return cmd.errOutput
 }
 
+// SetErrOutput sets the error output for the command
+func (cmd *CLI) SetErrOutput(writer io.Writer) {
+	cmd.errOutput = writer
+}
+
+// SetStdOutput sets the standard output for the command
+func (cmd *CLI) SetStdOutput(writer io.Writer) {
+	cmd.stdOutput = writer
+}
+
 // Mute mutes the output
 func (cmd *CLI) Mute() {
 	var err error

cli/subCommand_parsing.go

@@ -7,7 +7,8 @@ func (cmd *CLI) parseSubCommands(args []string) ([]string, bool) {
 	name := args[0]
 	subcmd, ok := cmd.subCommands[name]
 	if !ok {
-		subcmd.errf("invalid command: %s", name)
+		cmd.errf("invalid command: %s", name)
+		return args, false
 	}
 	subcmd.Start(args...)
 

cli/subcommand_parsing_test.go

@@ -1,6 +1,8 @@
 package cli_test
 
 import (
+	"bytes"
+
 	. "github.com/jwaldrip/odin/cli"
 
 	. "github.com/onsi/ginkgo"
@@ -13,8 +15,10 @@ var _ = Describe("CLI Start", func() {
 	var cmd Command
 	var didRun bool
 	var didRunSub bool
+	var errout *bytes.Buffer
 
 	BeforeEach(func() {
+		errout = bytes.NewBufferString("")
 		didRun = false
 		runFn := func(c Command) {
 			cmd = c
@@ -23,6 +27,7 @@ var _ = Describe("CLI Start", func() {
 		cli = New("v1.0.0", "sample description", runFn)
 		cli.ErrorHandling = PanicOnError
 		cli.Mute()
+		cli.SetErrOutput(errout)
 		didRunSub = false
 		cli.DefineSubCommand("razzle", "razzle dazzle me", func(c Command) {
 			didRunSub = true
@@ -39,6 +44,7 @@ var _ = Describe("CLI Start", func() {
 	Context("when the subcommand is not valid", func() {
 		It("should raise an error", func() {
 			Expect(func() { cli.Start("cmd", "bad") }).Should(Panic())
+			Expect(errout.String()).To(ContainSubstring("invalid command: bad"))
 		})
 	})
 

main.go

@@ -3,7 +3,7 @@ package main
 import odin "github.com/jwaldrip/odin/cli"
 
 // VERSION is the odin version
-var VERSION = "1.3.0"
+var VERSION = "1.3.1"
 
 var cli = odin.New(VERSION, "a command line DSL for go-lang", func(cmd odin.Command) { cmd.Usage() })