Merge pull request #51 from mnottale/detect-app-cwd

Extract: Detect app in cwd and subdirs.

Author: mnottale

cmd/helm.go

@@ -13,7 +13,7 @@ import (
 var helmCmd = &cobra.Command{
 	Use:   "helm <app-name> [-c <compose-files>...] [-e key=value...] [-f settings-file...]",
 	Short: "Render the Compose file for this app as an Helm package",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		d := make(map[string]string)
 		for _, v := range helmEnv {
@@ -28,7 +28,11 @@ var helmCmd = &cobra.Command{
 			}
 			d[kv[0]] = kv[1]
 		}
-		err := renderer.Helm(args[0], helmComposeFiles, helmSettingsFile, d)
+		app := ""
+		if len(args) > 0 {
+			app = args[0]
+		}
+		err := renderer.Helm(app, helmComposeFiles, helmSettingsFile, d)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

cmd/inspect.go

@@ -12,9 +12,13 @@ import (
 var inspectCmd = &cobra.Command{
 	Use:   "inspect <app-name>",
 	Short: "Retrieve metadata for a given app package",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		err := packager.Inspect(args[0])
+		app := ""
+		if len(args) > 0 {
+			app = args[0]
+		}
+		err := packager.Inspect(app)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

cmd/load.go

@@ -12,9 +12,13 @@ import (
 var loadCmd = &cobra.Command{
 	Use:   "load <repotag>",
 	Short: "Load an app from docker",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		err := packager.Load(args[0])
+		app := ""
+		if len(args) > 0 {
+			app = args[0]
+		}
+		err := packager.Load(app)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

cmd/pack.go

@@ -12,9 +12,13 @@ import (
 var packCmd = &cobra.Command{
 	Use:   "pack <app-name> [-o output_file]",
 	Short: "Pack this app as a single file",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		err := packager.Pack(args[0], packOutputFile)
+		app := ""
+		if len(args) > 0 {
+			app = args[0]
+		}
+		err := packager.Pack(app, packOutputFile)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

cmd/push.go

@@ -12,12 +12,16 @@ import (
 var pushCmd = &cobra.Command{
 	Use:   "push <app-name>",
 	Short: "Push the application to a registry",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		if pushTag == "" {
 			pushTag = "latest"
 		}
-		err := packager.Push(args[0], pushPrefix, pushTag)
+		app := ""
+		if len(args) > 0 {
+			app = args[0]
+		}
+		err := packager.Push(app, pushPrefix, pushTag)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

cmd/render.go

@@ -21,7 +21,7 @@ Override is provided in different ways:
 - Individual settings values can be passed directly on the command line with the
   -s flag. These value takes precedence over all settings files.
 `,
-	Args: cobra.ExactArgs(1),
+	Args: cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		d := make(map[string]string)
 		for _, v := range renderEnv {
@@ -36,7 +36,11 @@ Override is provided in different ways:
 			}
 			d[kv[0]] = kv[1]
 		}
-		rendered, err := renderer.Render(args[0], renderComposeFiles, renderSettingsFile, d)
+		app := ""
+		if len(args) > 0 {
+			app = args[0]
+		}
+		rendered, err := renderer.Render(app, renderComposeFiles, renderSettingsFile, d)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

cmd/save.go

@@ -12,12 +12,16 @@ import (
 var saveCmd = &cobra.Command{
 	Use:   "save <app-name>",
 	Short: "Save the application to docker (in preparation for push)",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		if saveTag == "" {
 			saveTag = "latest"
 		}
-		err := packager.Save(args[0], savePrefix, saveTag)
+		app := ""
+		if len(args) > 0 {
+			app = args[0]
+		}
+		err := packager.Save(app, savePrefix, saveTag)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

cmd/unpack.go

@@ -12,9 +12,13 @@ import (
 var unpackCmd = &cobra.Command{
 	Use:   "unpack <app-name> [-o output_dir]",
 	Short: "Unpack the app to expose the content",
-	Args:  cobra.ExactArgs(1),
+	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		err := packager.Unpack(args[0], unpackOutputDir)
+		app := ""
+		if len(args) > 0 {
+			app = args[0]
+		}
+		err := packager.Unpack(app, unpackOutputDir)
 		if err != nil {
 			fmt.Printf("%v\n", err)
 			os.Exit(1)

packager/extract.go

@@ -2,10 +2,14 @@ package packager
 
 import (
 	"archive/tar"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
+	"path"
+	"strings"
 
+	"github.com/docker/lunchbox/constants"
 	"github.com/docker/lunchbox/utils"
 	"github.com/pkg/errors"
 )
@@ -14,9 +18,45 @@ var (
 	noop = func() {}
 )
 
+// findApp looks for an app in CWD or subdirs
+func findApp() (string, error) {
+	cwd, err := os.Getwd()
+	if err != nil {
+		return "", errors.Wrap(err, "cannot resolve current working directory")
+	}
+	if strings.HasSuffix(cwd, constants.AppExtension) {
+		return cwd, nil
+	}
+	content, err := ioutil.ReadDir(cwd)
+	if err != nil {
+		return "", errors.Wrap(err, "failed to read current working directory")
+	}
+	hit := ""
+	for _, c := range content {
+		if strings.HasSuffix(c.Name(), constants.AppExtension) {
+			if hit != "" {
+				return "", fmt.Errorf("multiple apps found in current directory, specify the app on the command line")
+			}
+			hit = c.Name()
+		}
+	}
+	if hit == "" {
+		return "", fmt.Errorf("no app found in current directory")
+	}
+	return path.Join(cwd, hit), nil
+}
+
 // Extract extracts the app content if argument is an archive, or does nothing if a dir.
 // It returns effective app name, and cleanup function
+// If appname is empty, it looks into cwd, and all subdirs for a single matching .dockerapp
 func Extract(appname string) (string, func(), error) {
+	if appname == "" {
+		var err error
+		appname, err = findApp()
+		if err != nil {
+			return "", nil, err
+		}
+	}
 	// try verbatim first
 	s, err := os.Stat(appname)
 	if err != nil {