Move all the commands to their own package internal/commands so they can be re-used by another binary.

silvin-lubecki · chris-crone · commit 2475ad25af39 · 2019-03-08T11:59:30.000+01:00
Signed-off-by: Silvin Lubecki &lt;silvin.lubecki@docker.com&gt;
diff --git a/cmd/docker-app/main.go b/cmd/docker-app/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/docker/app/internal"
+	app "github.com/docker/app/internal/commands"
 	"github.com/docker/cli/cli-plugins/manager"
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"
@@ -10,7 +11,7 @@ import (
 
 func main() {
 	plugin.Run(func(dockerCli command.Cli) *cobra.Command {
-		return newRootCmd(dockerCli)
+		return app.NewRootCmd("app", dockerCli)
 	}, manager.Metadata{
 		SchemaVersion: "0.1.0",
 		Vendor:        "Docker Inc.",
diff --git a/internal/commands/bundle.go b/internal/commands/bundle.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"
diff --git a/internal/commands/bundle_test.go b/internal/commands/bundle_test.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"testing"
diff --git a/internal/commands/cnab.go b/internal/commands/cnab.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
diff --git a/internal/commands/completion.go b/internal/commands/completion.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"
diff --git a/internal/commands/init.go b/internal/commands/init.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/docker/app/internal/packager"
diff --git a/internal/commands/inspect.go b/internal/commands/inspect.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/deislabs/duffle/pkg/action"
diff --git a/internal/commands/install.go b/internal/commands/install.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
diff --git a/internal/commands/merge.go b/internal/commands/merge.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
diff --git a/internal/commands/parameters.go b/internal/commands/parameters.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
diff --git a/internal/commands/parameters_test.go b/internal/commands/parameters_test.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"testing"
diff --git a/internal/commands/pull.go b/internal/commands/pull.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
diff --git a/internal/commands/push.go b/internal/commands/push.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"
diff --git a/internal/commands/push_test.go b/internal/commands/push_test.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"testing"
diff --git a/internal/commands/render.go b/internal/commands/render.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
diff --git a/internal/commands/root.go b/internal/commands/root.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"io/ioutil"
@@ -8,19 +8,17 @@ import (
 	"github.com/spf13/pflag"
 )
 
-// rootCmd represents the base command when called without any subcommands
-// FIXME(vdemeester) use command.Cli interface
-func newRootCmd(dockerCli command.Cli) *cobra.Command {
+// NewRootCmd returns the base root command.
+func NewRootCmd(use string, dockerCli command.Cli) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "app",
 		Short: "Docker Application Packages",
 		Long:  `Build and deploy Docker Application Packages.`,
+		Use:   use,
 	}
 	addCommands(cmd, dockerCli)
 	return cmd
 }
 
-// addCommands adds all the commands from cli/command to the root command
 func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 	cmd.AddCommand(
 		installCmd(dockerCli),
diff --git a/internal/commands/split.go b/internal/commands/split.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/docker/app/internal/packager"
diff --git a/internal/commands/status.go b/internal/commands/status.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/deislabs/duffle/pkg/action"
diff --git a/internal/commands/uninstall.go b/internal/commands/uninstall.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
diff --git a/internal/commands/upgrade.go b/internal/commands/upgrade.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"
diff --git a/internal/commands/validate.go b/internal/commands/validate.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/docker/app/internal/packager"
diff --git a/internal/commands/version.go b/internal/commands/version.go
@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package main`
	`1`	`+package commands`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`