Merge pull request #70 from essentialkaos/develop

Version 4.6.0

cli/cli.go

@@ -37,7 +37,7 @@ import (
 // Application info
 const (
 	APP  = "bibop"
-	VER  = "4.5.0"
+	VER  = "4.6.0"
 	DESC = "Utility for testing command-line tools"
 )
 
@@ -344,11 +344,11 @@ func genCompletion() int {
 
 	switch options.GetS(OPT_COMPLETION) {
 	case "bash":
-		fmt.Printf(bash.Generate(info, "bibop"))
+		fmt.Printf(bash.Generate(info, "bibop", "recipe"))
 	case "fish":
 		fmt.Printf(fish.Generate(info, "bibop"))
 	case "zsh":
-		fmt.Printf(zsh.Generate(info, optMap, "bibop"))
+		fmt.Printf(zsh.Generate(info, optMap, "bibop", "*.recipe"))
 	default:
 		return 1
 	}

recipe/recipe.go

@@ -107,6 +107,10 @@ func (r *Recipe) AddCommand(cmd *Command, tag string) {
 		}
 	}
 
+	if isVariable(cmd.Description) {
+		cmd.Description = renderVars(r, cmd.Description)
+	}
+
 	r.Commands = append(r.Commands, cmd)
 }
 

recipe/recipe_test.go

@@ -65,14 +65,15 @@ func (s *RecipeSuite) TestBasicRecipe(c *C) {
 	r.AddVariable("user", "nginx")
 
 	c1 := NewCommand([]string{"{user}:echo {service}"}, 0)
-	c2 := NewCommand([]string{"echo ABCD 1.53 4000", "Echo command"}, 0)
+	c2 := NewCommand([]string{"echo ABCD 1.53 4000", "Echo command for service {service}"}, 0)
 
 	r.AddCommand(c1, "")
 	r.AddCommand(c2, "special")
 
 	c.Assert(r.RequireRoot, Equals, true)
 	c.Assert(c1.User, Equals, "nginx")
 	c.Assert(c2.Tag, Equals, "special")
+	c.Assert(c2.Description, Equals, "Echo command for service nginx")
 
 	a1 := &Action{"copy", []string{"file1", "file2"}, true, 0, nil}
 	a2 := &Action{"touch", []string{"{service}"}, false, 0, nil}