Merge pull request #56 from mnottale/cli-no-usage-on-error

cmd: Silence usage on error, except on command line error.

Author: mnottale

cmd/helm.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/renderer"
 	"github.com/spf13/cobra"
@@ -13,7 +14,7 @@ import (
 var helmCmd = &cobra.Command{
 	Use:   "helm <app-name> [-c <compose-files>...] [-e key=value...] [-f settings-file...]",
 	Short: "Render the Compose file for this app as an Helm package",
-	Args:  cobra.MaximumNArgs(1),
+	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		d := make(map[string]string)
 		for _, v := range helmEnv {

cmd/init.go

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

cmd/inspect.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
@@ -9,7 +10,7 @@ import (
 var inspectCmd = &cobra.Command{
 	Use:   "inspect <app-name>",
 	Short: "Retrieve metadata for a given app package",
-	Args:  cobra.MaximumNArgs(1),
+	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		app := ""
 		if len(args) > 0 {

cmd/load.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
@@ -9,7 +10,7 @@ import (
 var loadCmd = &cobra.Command{
 	Use:   "load <repotag>",
 	Short: "Load an app from docker",
-	Args:  cobra.MaximumNArgs(1),
+	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		app := ""
 		if len(args) > 0 {

cmd/pack.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
@@ -9,7 +10,7 @@ import (
 var packCmd = &cobra.Command{
 	Use:   "pack <app-name> [-o output_file]",
 	Short: "Pack this app as a single file",
-	Args:  cobra.MaximumNArgs(1),
+	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		app := ""
 		if len(args) > 0 {

cmd/pull.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
@@ -9,7 +10,7 @@ import (
 var pullCmd = &cobra.Command{
 	Use:   "pull <repotag>",
 	Short: "Pull an app from a registry",
-	Args:  cobra.ExactArgs(1),
+	Args:  cli.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return packager.Pull(args[0])
 	},

cmd/push.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
@@ -9,7 +10,7 @@ import (
 var pushCmd = &cobra.Command{
 	Use:   "push <app-name>",
 	Short: "Push the application to a registry",
-	Args:  cobra.MaximumNArgs(1),
+	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if pushTag == "" {
 			pushTag = "latest"

cmd/render.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/renderer"
 	"github.com/spf13/cobra"
@@ -21,7 +22,7 @@ Override is provided in different ways:
 - Individual settings values can be passed directly on the command line with the
   -s flag. These value takes precedence over all settings files.
 `,
-	Args: cobra.MaximumNArgs(1),
+	Args: cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		d := make(map[string]string)
 		for _, v := range renderEnv {

cmd/root.go

@@ -1,26 +1,21 @@
 package cmd
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/spf13/cobra"
 )
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "docker-app",
-	Short: "Docker App Packages",
-	Long:  "",
+	Use:          "docker-app",
+	Short:        "Docker App Packages",
+	Long:         "",
+	SilenceUsage: true,
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
+	rootCmd.Execute()
 }
 
 func init() {

cmd/save.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/docker/cli/cli"
 	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
@@ -9,7 +10,7 @@ import (
 var saveCmd = &cobra.Command{
 	Use:   "save <app-name>",
 	Short: "Save the application to docker (in preparation for push)",
-	Args:  cobra.MaximumNArgs(1),
+	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if saveTag == "" {
 			saveTag = "latest"