Merge pull request #340 from vdemeester/app-load-refacto

Heavy docker-app loading refactoring

Author: Vincent Demeester

cmd/docker-app/deploy.go

@@ -3,8 +3,8 @@ package main
 import (
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
-	"github.com/docker/app/internal/render"
-	"github.com/docker/app/internal/types"
+	"github.com/docker/app/render"
+	"github.com/docker/app/types"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/stack"
@@ -71,7 +71,7 @@ func runDeploy(dockerCli command.Cli, flags *pflag.FlagSet, appname string, opts
 	}
 	stackName := opts.deployStackName
 	if stackName == "" {
-		stackName = internal.AppNameFromDir(app.Path)
+		stackName = internal.AppNameFromDir(app.Name)
 	}
 	return stack.RunDeploy(dockerCli, flags, rendered, deployOrchestrator, options.Deploy{
 		Namespace:    stackName,

cmd/docker-app/helm.go

@@ -6,7 +6,7 @@ import (
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/helm"
 	"github.com/docker/app/internal/packager"
-	"github.com/docker/app/internal/types"
+	"github.com/docker/app/types"
 	"github.com/docker/cli/cli"
 	cliopts "github.com/docker/cli/opts"
 	"github.com/spf13/cobra"

cmd/docker-app/image-add.go

@@ -6,8 +6,8 @@ import (
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/image"
 	"github.com/docker/app/internal/packager"
-	"github.com/docker/app/internal/render"
-	"github.com/docker/app/internal/types"
+	"github.com/docker/app/render"
+	"github.com/docker/app/types"
 	cliopts "github.com/docker/cli/opts"
 	"github.com/spf13/cobra"
 )
@@ -41,7 +41,7 @@ subdirectory.`,
 			if err != nil {
 				return err
 			}
-			if err := image.Add(app.Path, args[1:], config); err != nil {
+			if err := image.Add(app.Name, args[1:], config); err != nil {
 				return err
 			}
 			// check if source was a tarball
@@ -60,7 +60,7 @@ subdirectory.`,
 					return err
 				}
 				// source was a tarball, rebuild it
-				return packager.Pack(app.Path, target)
+				return packager.Pack(app.Name, target)
 			}
 			return nil
 		},

cmd/docker-app/image-load.go

@@ -17,7 +17,7 @@ func imageLoadCmd() *cobra.Command {
 				return err
 			}
 			defer app.Cleanup()
-			return image.Load(app.Path, args[1:])
+			return image.Load(app.Name, args[1:])
 		},
 	}
 }

cmd/docker-app/inspect.go

@@ -1,8 +1,8 @@
 package main
 
 import (
+	"github.com/docker/app/internal/inspect"
 	"github.com/docker/app/internal/packager"
-	"github.com/docker/app/internal/render"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
@@ -20,7 +20,7 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {
 				return err
 			}
 			defer app.Cleanup()
-			return render.Inspect(dockerCli.Out(), app.Path)
+			return inspect.Inspect(dockerCli.Out(), app)
 		},
 	}
 }

cmd/docker-app/merge.go

@@ -57,9 +57,9 @@ func mergeCmd(dockerCli command.Cli) *cobra.Command {
 					return errors.Wrap(err, "error scanning application directory")
 				}
 				if len(extra) != 0 {
-					return fmt.Errorf("refusing to overwrite %s: extra files would be deleted: %s", extractedApp.OriginalPath, strings.Join(extra, ","))
+					return fmt.Errorf("refusing to overwrite %s: extra files would be deleted: %s", extractedApp.Path, strings.Join(extra, ","))
 				}
-				mergeOutputFile = extractedApp.OriginalPath + ".tmp"
+				mergeOutputFile = extractedApp.Path + ".tmp"
 			}
 			var target io.Writer
 			if mergeOutputFile == "-" {
@@ -70,18 +70,18 @@ func mergeCmd(dockerCli command.Cli) *cobra.Command {
 					return err
 				}
 			}
-			if err := packager.Merge(extractedApp.Path, target); err != nil {
+			if err := packager.Merge(extractedApp, target); err != nil {
 				return err
 			}
 			if mergeOutputFile != "-" {
 				// Need to close for the Rename to work on windows.
 				target.(io.WriteCloser).Close()
 			}
 			if inPlace {
-				if err := os.RemoveAll(extractedApp.OriginalPath); err != nil {
+				if err := os.RemoveAll(extractedApp.Path); err != nil {
 					return errors.Wrap(err, "failed to erase previous application")
 				}
-				if err := os.Rename(mergeOutputFile, extractedApp.OriginalPath); err != nil {
+				if err := os.Rename(mergeOutputFile, extractedApp.Path); err != nil {
 					return errors.Wrap(err, "failed to rename new application")
 				}
 			}

cmd/docker-app/push.go

@@ -18,7 +18,12 @@ func pushCmd() *cobra.Command {
 		Short: "Push the application to a registry",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return packager.Push(firstOrEmpty(args), opts.namespace, opts.tag)
+			app, err := packager.Extract(firstOrEmpty(args))
+			if err != nil {
+				return err
+			}
+			defer app.Cleanup()
+			return packager.Push(app, opts.namespace, opts.tag)
 		},
 	}
 	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "namespace to use (default: namespace in metadata)")

cmd/docker-app/render.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
-	"github.com/docker/app/internal/render"
-	"github.com/docker/app/internal/types"
+	"github.com/docker/app/render"
+	"github.com/docker/app/types"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	cliopts "github.com/docker/cli/opts"

cmd/docker-app/save.go

@@ -21,7 +21,12 @@ func saveCmd(dockerCli command.Cli) *cobra.Command {
 		Short: "Save the application as an image to the docker daemon(in preparation for push)",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			imageName, err := packager.Save(firstOrEmpty(args), opts.namespace, opts.tag)
+			app, err := packager.Extract(firstOrEmpty(args))
+			if err != nil {
+				return err
+			}
+			defer app.Cleanup()
+			imageName, err := packager.Save(app, opts.namespace, opts.tag)
 			if imageName != "" && err == nil {
 				fmt.Fprintf(dockerCli.Out(), "Saved application as image: %s\n", imageName)
 			}

cmd/docker-app/split.go

@@ -24,16 +24,16 @@ func splitCmd() *cobra.Command {
 			defer extractedApp.Cleanup()
 			inPlace := splitOutputDir == ""
 			if inPlace {
-				splitOutputDir = extractedApp.OriginalPath + ".tmp"
+				splitOutputDir = extractedApp.Path + ".tmp"
 			}
-			if err := packager.Split(extractedApp.Path, splitOutputDir); err != nil {
+			if err := packager.Split(extractedApp, splitOutputDir); err != nil {
 				return err
 			}
 			if inPlace {
-				if err := os.RemoveAll(extractedApp.OriginalPath); err != nil {
+				if err := os.RemoveAll(extractedApp.Path); err != nil {
 					return errors.Wrap(err, "failed to erase previous application directory")
 				}
-				if err := os.Rename(splitOutputDir, extractedApp.OriginalPath); err != nil {
+				if err := os.Rename(splitOutputDir, extractedApp.Path); err != nil {
 					return errors.Wrap(err, "failed to rename new application directory")
 				}
 			}