Take usagePrefix into account in log message.

sinanawad · May 20, 2014 · d2aeef6 · d2aeef6
1 parent 50ab979
commit d2aeef6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/cmd/supercommand.go b/cmd/supercommand.go
@@ -298,7 +298,11 @@ func (c *SuperCommand) Run(ctx *Context) error {
 			return err
 		}
 	}
-	logger.Infof("running %s-%s [%s]", c.Name, version.Current, runtime.Compiler)
+	if c.usagePrefix == "" || c.usagePrefix == c.Name {
+		logger.Infof("running %s-%s [%s]", c.Name, version.Current, runtime.Compiler)
+	} else {
+		logger.Infof("running %s %s-%s [%s]", c.usagePrefix, c.Name, version.Current, runtime.Compiler)
+	}
 	err := c.subcmd.Run(ctx)
 	if err != nil && err != ErrSilent {
 		logger.Errorf("%v", err)

diff --git a/cmd/supercommand_test.go b/cmd/supercommand_test.go
@@ -172,16 +172,33 @@ func (s *SuperCommandSuite) TestVersionFlag(c *gc.C) {
 	c.Assert(testVersionFlagCommand.version, gc.Equals, "abc.123")
 }
 
+var loggingTests = []struct {
+	usagePrefix, name string
+	pattern           string
+}{
+	{"juju", "juju", `^.* running juju-.*
+.* ERROR .* BAM!
+`},
+	{"something", "else", `^.* running something else-.*
+.* ERROR .* BAM!
+`},
+	{"", "juju", `^.* running juju-.*
+.* ERROR .* BAM!
+`},
+}
+
 func (s *SuperCommandSuite) TestLogging(c *gc.C) {
-	for _, name := range []string{"juju", "jujutest", "zaphod"} {
-		jc := cmd.NewSuperCommand(cmd.SuperCommandParams{Name: name, Log: &cmd.Log{}})
+	for _, test := range loggingTests {
+		jc := cmd.NewSuperCommand(cmd.SuperCommandParams{
+			UsagePrefix: test.usagePrefix,
+			Name:        test.name,
+			Log:         &cmd.Log{},
+		})
 		jc.Register(&TestCommand{Name: "blah"})
 		ctx := testing.Context(c)
 		code := cmd.Main(jc, ctx, []string{"blah", "--option", "error", "--debug"})
 		c.Assert(code, gc.Equals, 1)
-		c.Assert(bufferString(ctx.Stderr), gc.Matches, fmt.Sprintf(`^.* running %s-.*
-.* ERROR .* BAM!
-`, name))
+		c.Assert(bufferString(ctx.Stderr), gc.Matches, test.pattern)
 	}
 }