Merge pull request #496 from silvin-lubecki/clean-bundle-command

Rename --out to --output in bundle command

Author: silvin-lubecki

e2e/commands_test.go

@@ -260,7 +260,7 @@ func TestBundle(t *testing.T) {
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
 	// Bundle the docker application package to a CNAB bundle, using the build-context.
-	cmd.Command = dockerCli.Command("app", "bundle", filepath.Join("testdata", "simple", "simple.dockerapp"), "--out", tmpDir.Join("bundle.json"))
+	cmd.Command = dockerCli.Command("app", "bundle", filepath.Join("testdata", "simple", "simple.dockerapp"), "--output", tmpDir.Join("bundle.json"))
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
 	// Check the resulting CNAB bundle.json

e2e/testdata/plugin-usage-experimental.golden

@@ -4,7 +4,7 @@ Usage:	docker app COMMAND
 Build and deploy Docker Application Packages.
 
 Commands:
-  bundle      Create a CNAB invocation image and bundle.json for the application.
+  bundle      Create a CNAB invocation image and bundle.json for the application
   completion  Generates completion scripts for the specified shell (bash or zsh)
   init        Start building a Docker application
   inspect     Shows metadata, parameters and a summary of the compose file for a given application

e2e/testdata/plugin-usage.golden

@@ -4,7 +4,7 @@ Usage:	docker app COMMAND
 Build and deploy Docker Application Packages.
 
 Commands:
-  bundle      Create a CNAB invocation image and bundle.json for the application.
+  bundle      Create a CNAB invocation image and bundle.json for the application
   completion  Generates completion scripts for the specified shell (bash or zsh)
   init        Start building a Docker application
   inspect     Shows metadata, parameters and a summary of the compose file for a given application

internal/commands/bundle.go

@@ -28,14 +28,14 @@ func bundleCmd(dockerCli command.Cli) *cobra.Command {
 	var opts bundleOptions
 	cmd := &cobra.Command{
 		Use:   "bundle [<app-name>]",
-		Short: "Create a CNAB invocation image and bundle.json for the application.",
+		Short: "Create a CNAB invocation image and bundle.json for the application",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runBundle(dockerCli, firstOrEmpty(args), opts)
 		},
 	}
 
-	cmd.Flags().StringVarP(&opts.out, "out", "o", "bundle.json", "path to the output bundle.json (- for stdout)")
+	cmd.Flags().StringVarP(&opts.out, "output", "o", "bundle.json", "path to the output bundle.json (- for stdout)")
 	return cmd
 }