Merge pull request #136 from mnottale/pack-push-out-of-experimental

Move out of experimental: pack, unpack, save, load, push, pull.

Author: mnottale

cmd/load.go

@@ -2,22 +2,19 @@ package cmd
 
 import (
 	"github.com/docker/cli/cli"
-	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
 
 var loadCmd = &cobra.Command{
 	Use:   "load <repotag>",
-	Short: "Load an app from docker",
+	Short: "Load an application from a docker image",
 	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return packager.Load(firstOrEmpty(args))
 	},
 }
 
 func init() {
-	if internal.Experimental == "on" {
-		rootCmd.AddCommand(loadCmd)
-	}
+	rootCmd.AddCommand(loadCmd)
 }

cmd/pack.go

@@ -2,14 +2,13 @@ package cmd
 
 import (
 	"github.com/docker/cli/cli"
-	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
 
 var packCmd = &cobra.Command{
 	Use:   "pack [<app-name>] [-o output_file]",
-	Short: "Pack this app as a single file",
+	Short: "Pack the application as a single file",
 	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return packager.Pack(firstOrEmpty(args), packOutputFile)
@@ -19,8 +18,6 @@ var packCmd = &cobra.Command{
 var packOutputFile string
 
 func init() {
-	if internal.Experimental == "on" {
-		rootCmd.AddCommand(packCmd)
-		packCmd.Flags().StringVarP(&packOutputFile, "output", "o", "-", "Output file (- for stdout)")
-	}
+	rootCmd.AddCommand(packCmd)
+	packCmd.Flags().StringVarP(&packOutputFile, "output", "o", "-", "Output file (- for stdout)")
 }

cmd/pull.go

@@ -2,22 +2,19 @@ package cmd
 
 import (
 	"github.com/docker/cli/cli"
-	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
 
 var pullCmd = &cobra.Command{
 	Use:   "pull <repotag>",
-	Short: "Pull an app from a registry",
+	Short: "Pull an application from a registry",
 	Args:  cli.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return packager.Pull(args[0])
 	},
 }
 
 func init() {
-	if internal.Experimental == "on" {
-		rootCmd.AddCommand(pullCmd)
-	}
+	rootCmd.AddCommand(pullCmd)
 }

cmd/push.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"github.com/docker/cli/cli"
-	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
@@ -25,9 +24,7 @@ var (
 )
 
 func init() {
-	if internal.Experimental == "on" {
-		rootCmd.AddCommand(pushCmd)
-		pushCmd.Flags().StringVarP(&pushPrefix, "prefix", "p", "", "prefix to use")
-		pushCmd.Flags().StringVarP(&pushTag, "tag", "t", "latest", "tag to use")
-	}
+	rootCmd.AddCommand(pushCmd)
+	pushCmd.Flags().StringVarP(&pushPrefix, "prefix", "p", "", "prefix to use")
+	pushCmd.Flags().StringVarP(&pushTag, "tag", "t", "latest", "tag to use")
 }

cmd/save.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"github.com/docker/cli/cli"
-	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
@@ -25,9 +24,7 @@ var (
 )
 
 func init() {
-	if internal.Experimental == "on" {
-		rootCmd.AddCommand(saveCmd)
-		saveCmd.Flags().StringVarP(&savePrefix, "prefix", "p", "", "prefix to use")
-		saveCmd.Flags().StringVarP(&saveTag, "tag", "t", "latest", "tag to use")
-	}
+	rootCmd.AddCommand(saveCmd)
+	saveCmd.Flags().StringVarP(&savePrefix, "prefix", "p", "", "prefix to use")
+	saveCmd.Flags().StringVarP(&saveTag, "tag", "t", "latest", "tag to use")
 }

cmd/unpack.go

@@ -2,14 +2,13 @@ package cmd
 
 import (
 	"github.com/docker/cli/cli"
-	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
 
 var unpackCmd = &cobra.Command{
 	Use:   "unpack <app-name> [-o output_dir]",
-	Short: "Unpack the app to expose the content",
+	Short: "Unpack the application to expose the content",
 	Args:  cli.RequiresMaxArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return packager.Unpack(firstOrEmpty(args), unpackOutputDir)
@@ -19,8 +18,6 @@ var unpackCmd = &cobra.Command{
 var unpackOutputDir string
 
 func init() {
-	if internal.Experimental == "on" {
-		rootCmd.AddCommand(unpackCmd)
-		unpackCmd.Flags().StringVarP(&unpackOutputDir, "output", "o", ".", "Output directory (.)")
-	}
+	rootCmd.AddCommand(unpackCmd)
+	unpackCmd.Flags().StringVarP(&unpackOutputDir, "output", "o", ".", "Output directory (.)")
 }

e2e/binary_test.go

@@ -199,10 +199,7 @@ func TestInspectBinary(t *testing.T) {
 }
 
 func TestPackBinary(t *testing.T) {
-	dockerApp, hasExperimental := getBinary(t)
-	if !hasExperimental {
-		t.Skip("experimental mode needed for this test")
-	}
+	dockerApp, _ := getBinary(t)
 	tempDir, err := ioutil.TempDir("", "dockerapp")
 	assert.NilError(t, err)
 	defer os.RemoveAll(tempDir)