Move all the commands to their own package internal/commands so they …

…can be re-used by another binary.

Signed-off-by: Silvin Lubecki <[email protected]>

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.",

cmd/docker-app/bundle.go → internal/commands/bundle.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"

cmd/docker-app/bundle_test.go → internal/commands/bundle_test.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"testing"

cmd/docker-app/cnab.go → internal/commands/cnab.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/docker-app/completion.go → internal/commands/completion.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"bytes"

cmd/docker-app/init.go → internal/commands/init.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/docker/app/internal/packager"

cmd/docker-app/inspect.go → internal/commands/inspect.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/deislabs/duffle/pkg/action"

cmd/docker-app/install.go → internal/commands/install.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/docker-app/merge.go → internal/commands/merge.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/docker-app/parameters.go → internal/commands/parameters.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/docker-app/parameters_test.go → internal/commands/parameters_test.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"testing"

cmd/docker-app/pull.go → internal/commands/pull.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/docker/app/internal/packager"

cmd/docker-app/push.go → internal/commands/push.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/docker-app/render.go → internal/commands/render.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/docker-app/root.go → internal/commands/root.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"io/ioutil"
@@ -9,19 +9,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),

cmd/docker-app/split.go → internal/commands/split.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/docker/app/internal/packager"

cmd/docker-app/status.go → internal/commands/status.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/deislabs/duffle/pkg/action"

cmd/docker-app/uninstall.go → internal/commands/uninstall.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/docker-app/upgrade.go → internal/commands/upgrade.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"

cmd/docker-app/validate.go → internal/commands/validate.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"github.com/docker/app/internal/packager"

cmd/docker-app/version.go → internal/commands/version.go

@@ -1,4 +1,4 @@
-package main
+package commands
 
 import (
 	"fmt"