added option for debug output

Author: Ben Keil

cmd/cmd-build.go

@@ -41,6 +41,11 @@ func newBuildCmd(out io.Writer, workdir string) *cobra.Command {
 			c.version = args[0]
 			return c.run()
 		},
+		PersistentPostRun: func(cmd *cobra.Command, args []string) {
+			if c.push {
+				fmt.Fprintf(c.out, "pushing images for version: %s\n", c.version)
+			}
+		},
 	}
 	cmd.Flags().BoolVarP(&c.push, "push", "", false, "also push the images (experimental)")
 

cmd/hydra.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
 	"os"
 
@@ -15,7 +14,7 @@ var logger = loggo.GetLogger("hydra")
 var version string
 
 func init() {
-	loggo.ConfigureLoggers("<root>=INFO; hydra=ERROR")
+	loggo.ConfigureLoggers(fmt.Sprintf("<root>=INFO; hydra=%s", "ERROR"))
 }
 
 func main() {
@@ -25,33 +24,25 @@ func main() {
 	}
 }
 
-func emptyRun(*cobra.Command, []string) {}
-
-func executeCommand(root *cobra.Command, args ...string) (output string, err error) {
-	_, output, err = executeCommandC(root, args...)
-	return output, err
-}
-
-func executeCommandC(root *cobra.Command, args ...string) (c *cobra.Command, output string, err error) {
-	buf := new(bytes.Buffer)
-	root.SetOutput(buf)
-	root.SetArgs(args)
-
-	c, err = root.ExecuteC()
-
-	return c, buf.String(), err
-}
-
 func newRootCmd(args []string) *cobra.Command {
 	var workdir string
+	var debug bool
 	cmd := &cobra.Command{
 		Use:          "hydra",
 		Short:        "Hydra builds docker images and add multiple convenient tags",
 		Version:      version,
 		SilenceUsage: true,
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			var logLevel = "ERROR"
+			if debug {
+				logLevel = "DEBUG"
+			}
+			loggo.ConfigureLoggers(fmt.Sprintf("<root>=INFO; hydra=%s", logLevel))
+		},
 	}
 
 	cmd.PersistentFlags().StringVarP(&workdir, "workdir", "w", ".", "the root directory of the project you want to build")
+	cmd.PersistentFlags().BoolVar(&debug, "debug", false, "enable debug output")
 	cmd.PersistentFlags().Parse(args)
 
 	out := cmd.OutOrStdout()

cmd/tag-parser.go

@@ -77,6 +77,9 @@ func (parser *DefaultTagParser) parseTag(version Version, tag string) []string {
 		logger.Debugf("Using ReplaceStrategy for tag: %v", tag)
 		strategy := ReplaceStrategy{tag, parser.version}
 		parsedTags = append(parsedTags, strategy.GetTags()...)
+	} else {
+		// convenient should not be build if we dont have a semver tag
+		logger.Debugf("Using SkipStrategy for tag: %v", tag)
 	}
 	logger.Debugf("Parsed tags: %v\n", parsedTags)
 	return parsedTags

cmd/validator.go

@@ -10,7 +10,7 @@ import (
 func SemverValidator() cobra.PositionalArgs {
 	return func(cmd *cobra.Command, args []string) error {
 		if len(args) == 0 {
-			return errors.New("the version you want to push is required")
+			return errors.New("the version you want to build/push is required")
 		}
 		/*_, err := semver.Parse(args[0])
 		if err != nil {