Merge pull request #67 from chris-crone/error-cleanup

Cleanup errors and fix e2e binary test

Author: chris-crone

cmd/helm.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/docker/cli/cli"
@@ -20,12 +19,10 @@ var helmCmd = &cobra.Command{
 		for _, v := range helmEnv {
 			kv := strings.SplitN(v, "=", 2)
 			if len(kv) != 2 {
-				fmt.Printf("Missing '=' in setting '%s', expected KEY=VALUE\n", v)
-				os.Exit(1)
+				return fmt.Errorf("Missing '=' in setting '%s', expected KEY=VALUE", v)
 			}
 			if _, ok := d[kv[0]]; ok {
-				fmt.Printf("Duplicate command line setting: '%s'\n", kv[0])
-				os.Exit(1)
+				return fmt.Errorf("Duplicate command line setting: '%s'", kv[0])
 			}
 			d[kv[0]] = kv[1]
 		}

cmd/image-add.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/docker/lunchbox/image"
@@ -19,8 +18,7 @@ var imageAddCmd = &cobra.Command{
 		for _, v := range imageAddEnv {
 			kv := strings.SplitN(v, "=", 2)
 			if len(kv) != 2 {
-				fmt.Printf("Malformed env input: '%s'\n", v)
-				os.Exit(1)
+				return fmt.Errorf("Malformed env input: '%s'", v)
 			}
 			d[kv[0]] = kv[1]
 		}

cmd/render.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/docker/cli/cli"
@@ -28,12 +27,10 @@ Override is provided in different ways:
 		for _, v := range renderEnv {
 			kv := strings.SplitN(v, "=", 2)
 			if len(kv) != 2 {
-				fmt.Printf("Missing '=' in setting '%s', expected KEY=VALUE\n", v)
-				os.Exit(1)
+				return fmt.Errorf("Missing '=' in setting '%s', expected KEY=VALUE", v)
 			}
 			if _, ok := d[kv[0]]; ok {
-				fmt.Printf("Duplicate command line setting: '%s'\n", kv[0])
-				os.Exit(1)
+				return fmt.Errorf("Duplicate command line setting: '%s'", kv[0])
 			}
 			d[kv[0]] = kv[1]
 		}
@@ -45,7 +42,7 @@ Override is provided in different ways:
 		if err != nil {
 			return err
 		}
-		fmt.Printf("%s", string(res))
+		fmt.Print(string(res))
 		return nil
 	},
 }

e2e/binary_test.go

@@ -42,7 +42,7 @@ func findBinary() string {
 		"./docker-app-" + runtime.GOOS + binExt(),
 		"./docker-app" + binExt(),
 		"../_build/docker-app-" + runtime.GOOS + binExt(),
-		"../_build/docker_app" + binExt(),
+		"../_build/docker-app" + binExt(),
 	}
 	for _, binName := range binNames {
 		if _, err := os.Stat(binName); err == nil {
@@ -122,7 +122,7 @@ func TestInitBinary(t *testing.T) {
 	cmd := exec.Command(dockerApp, args...)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		fmt.Println(string(output))
+		fmt.Println(output)
 	}
 	assert.NilError(t, err)
 	meta, err := ioutil.ReadFile(filepath.Join(dirName, "metadata.yml"))

packager/registry.go

@@ -52,9 +52,7 @@ func Load(repotag string) error {
 	cmd := exec.Command("docker", "save", "-o", file, repotag)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		fmt.Println("Error from docker save command:")
-		fmt.Println(string(output))
-		return err
+		return errors.Wrapf(err, "error from docker save command: %s", string(output))
 	}
 	defer os.Remove(file)
 	f, err := os.Open(file)
@@ -93,18 +91,17 @@ func Push(appname, prefix, tag string) error {
 	cmd := exec.Command("docker", "push", prefix+appName(appname)+constants.AppExtension+":"+tag)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		fmt.Println(string(output))
+		return errors.Wrapf(err, "error from docker push command: %s", string(output))
 	}
-	return err
+	return nil
 }
 
 // Pull pulls an app from a registry
 func Pull(repotag string) error {
 	cmd := exec.Command("docker", "pull", repotag)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		fmt.Println(string(output))
-		return err
+		return errors.Wrapf(err, "error from docker pull command: %s", string(output))
 	}
 	return Load(repotag)
 }