Merge pull request #66 from chris-crone/iss-28

Use logrus for logging

Author: mat007

Gopkg.lock

@@ -38,6 +38,10 @@
   name = "github.com/gotestyourself/gotestyourself"
   branch = "master"
 
+[[constraint]]
+  name = "github.com/sirupsen/logrus"
+  version = "v1.0.5"
+
 [[override]]
   name = "k8s.io/kubernetes"
   revision = "v1.8.2"

Gopkg.toml

@@ -1,9 +1,8 @@
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/docker/lunchbox/internal"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -12,7 +11,7 @@ var buildCmd = &cobra.Command{
 	Use:   "build <app-name>",
 	Short: "Compile an app package from locally available data",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("build called")
+		log.Info("build called")
 	},
 }
 

cmd/build.go

@@ -1,9 +1,8 @@
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/docker/lunchbox/internal"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -12,7 +11,7 @@ var deployCmd = &cobra.Command{
 	Use:   "deploy <app-name>",
 	Short: "Deploy the specified app on the connected cluster",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("deploy called")
+		log.Info("deploy called")
 	},
 }
 

cmd/deploy.go

@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
@@ -14,7 +12,6 @@ var initCmd = &cobra.Command{
 	Short: "Initialize an app package in the current working directory",
 	Args:  cli.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
-		fmt.Println("init called")
 		return packager.Init(args[0], composeFile)
 	},
 }

cmd/init.go

@@ -3,6 +3,8 @@ package cmd
 import (
 	"os"
 
+	"github.com/docker/lunchbox/internal"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -12,6 +14,12 @@ var rootCmd = &cobra.Command{
 	Short:        "Docker App Packages",
 	Long:         "",
 	SilenceUsage: true,
+	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+		if internal.Debug {
+			log.SetLevel(log.DebugLevel)
+		}
+		return nil
+	},
 }
 
 func firstOrEmpty(list []string) string {
@@ -32,6 +40,8 @@ func Execute() {
 func init() {
 	cobra.OnInitialize(initConfig)
 
+	rootCmd.PersistentFlags().BoolVar(&internal.Debug, "debug", false, "Enable debug mode")
+
 	// Here you will define your flags and configuration settings.
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.

cmd/root.go

@@ -1,6 +1,8 @@
 package internal
 
 var (
+	// Debug enables debug logging and features
+	Debug = false
 	// Experimental enables experimental features if set to "on"
 	Experimental = "on"
 )

internal/config.go

@@ -3,7 +3,6 @@ package packager
 import (
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -12,6 +11,7 @@ import (
 	"github.com/docker/lunchbox/types"
 	"github.com/docker/lunchbox/utils"
 	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 )
 
@@ -49,7 +49,7 @@ func Init(name string, composeFile string) error {
 }
 
 func initFromScratch(name string) error {
-	log.Println("init from scratch")
+	log.Debug("init from scratch")
 	composeData, err := composeFileFromScratch()
 	if err != nil {
 		return err
@@ -152,7 +152,7 @@ func extractVariables(composeRaw string) ([]string, error) {
 }
 
 func initFromComposeFile(name string, composeFile string) error {
-	log.Println("init from compose")
+	log.Debug("init from compose")
 
 	dirName := utils.DirNameFromAppName(name)
 	composeRaw, err := ioutil.ReadFile(composeFile)