Merge pull request #55 from mnottale/cmd-factor-appname-extraction

cmd: Factor optional appname extraction from args

Author: mnottale

cmd/helm.go

@@ -29,11 +29,7 @@ var helmCmd = &cobra.Command{
 			}
 			d[kv[0]] = kv[1]
 		}
-		app := ""
-		if len(args) > 0 {
-			app = args[0]
-		}
-		return renderer.Helm(app, helmComposeFiles, helmSettingsFile, d)
+		return renderer.Helm(firstOrEmpty(args), helmComposeFiles, helmSettingsFile, d)
 	},
 }
 

cmd/inspect.go

@@ -12,11 +12,7 @@ var inspectCmd = &cobra.Command{
 	Short: "Retrieve metadata for a given app package",
 	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
-		app := ""
-		if len(args) > 0 {
-			app = args[0]
-		}
-		return packager.Inspect(app)
+		return packager.Inspect(firstOrEmpty(args))
 	},
 }
 

cmd/load.go

@@ -12,11 +12,7 @@ var loadCmd = &cobra.Command{
 	Short: "Load an app from docker",
 	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
-		app := ""
-		if len(args) > 0 {
-			app = args[0]
-		}
-		return packager.Load(app)
+		return packager.Load(firstOrEmpty(args))
 	},
 }
 

cmd/pack.go

@@ -12,11 +12,7 @@ var packCmd = &cobra.Command{
 	Short: "Pack this app as a single file",
 	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
-		app := ""
-		if len(args) > 0 {
-			app = args[0]
-		}
-		return packager.Pack(app, packOutputFile)
+		return packager.Pack(firstOrEmpty(args), packOutputFile)
 	},
 }
 

cmd/push.go

@@ -15,11 +15,7 @@ var pushCmd = &cobra.Command{
 		if pushTag == "" {
 			pushTag = "latest"
 		}
-		app := ""
-		if len(args) > 0 {
-			app = args[0]
-		}
-		return packager.Push(app, pushPrefix, pushTag)
+		return packager.Push(firstOrEmpty(args), pushPrefix, pushTag)
 	},
 }
 

cmd/render.go

@@ -37,11 +37,7 @@ Override is provided in different ways:
 			}
 			d[kv[0]] = kv[1]
 		}
-		app := ""
-		if len(args) > 0 {
-			app = args[0]
-		}
-		rendered, err := renderer.Render(app, renderComposeFiles, renderSettingsFile, d)
+		rendered, err := renderer.Render(firstOrEmpty(args), renderComposeFiles, renderSettingsFile, d)
 		if err != nil {
 			return err
 		}

cmd/root.go

@@ -12,6 +12,13 @@ var rootCmd = &cobra.Command{
 	SilenceUsage: true,
 }
 
+func firstOrEmpty(list []string) string {
+	if len(list) != 0 {
+		return list[0]
+	}
+	return ""
+}
+
 // 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() {

cmd/save.go

@@ -15,11 +15,7 @@ var saveCmd = &cobra.Command{
 		if saveTag == "" {
 			saveTag = "latest"
 		}
-		app := ""
-		if len(args) > 0 {
-			app = args[0]
-		}
-		return packager.Save(app, savePrefix, saveTag)
+		return packager.Save(firstOrEmpty(args), savePrefix, saveTag)
 	},
 }
 

cmd/unpack.go

@@ -12,11 +12,7 @@ var unpackCmd = &cobra.Command{
 	Short: "Unpack the app to expose the content",
 	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
-		app := ""
-		if len(args) > 0 {
-			app = args[0]
-		}
-		return packager.Unpack(app, unpackOutputDir)
+		return packager.Unpack(firstOrEmpty(args), unpackOutputDir)
 	},
 }