Rename --prefix and repository_prefix to namespace

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Author: vdemeester

README.md

@@ -46,7 +46,7 @@ It should look like this:
 version: 0.1.0
 name: hello
 description: ""
-repository_prefix: ""
+namespace: ""
 maintainers:
 - name: yourusername
   email: ""
@@ -180,14 +180,14 @@ the `docker-app init` command. This will create a directory instead of a singe f
 You can push any application to the Hub using `docker-app push`:
 
 ``` bash
-$ docker-app push --prefix myHubUser --tag latest
+$ docker-app push --namespace myHubUser --tag latest
 ```
 
 This command will create an image named `myHubUser/hello.dockerapp:latest` on your local Docker
 daemon, and push it to the Hub.
 
 By default, this command uses the application version defined in `metadata.yml` as the tag,
-and the value of the metadata field `repository_prefix` as the repository prefix.
+and the value of the metadata field `namespace` as the image namespace.
 
 All `docker-app` commands accept a local image name as input, which means you can run on a different host:
 

cmd/docker-app/push.go

@@ -6,21 +6,22 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var (
-	pushPrefix string
-	pushTag    string
-)
+type pushOptions struct {
+	namespace string
+	tag       string
+}
 
 func pushCmd() *cobra.Command {
+	var opts pushOptions
 	cmd := &cobra.Command{
 		Use:   "push [<app-name>]",
 		Short: "Push the application to a registry",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return packager.Push(firstOrEmpty(args), pushPrefix, pushTag)
+			return packager.Push(firstOrEmpty(args), opts.namespace, opts.tag)
 		},
 	}
-	cmd.Flags().StringVarP(&pushPrefix, "prefix", "p", "", "repository prefix to use (default: repository_prefix in metadata)")
-	cmd.Flags().StringVarP(&pushTag, "tag", "t", "", "tag to use (default: version in metadata")
+	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "namespace to use (default: namespace in metadata)")
+	cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "tag to use (default: version in metadata")
 	return cmd
 }

cmd/docker-app/save.go

@@ -8,25 +8,26 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var (
-	savePrefix string
-	saveTag    string
-)
+type saveOptions struct {
+	namespace string
+	tag       string
+}
 
 func saveCmd() *cobra.Command {
+	var opts saveOptions
 	cmd := &cobra.Command{
 		Use:   "save [<app-name>]",
 		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), savePrefix, saveTag)
+			imageName, err := packager.Save(firstOrEmpty(args), opts.namespace, opts.tag)
 			if imageName != "" {
 				fmt.Printf("Saved application as image: %s\n", imageName)
 			}
 			return err
 		},
 	}
-	cmd.Flags().StringVarP(&savePrefix, "prefix", "p", "", "repository prefix to use (default: repository_prefix in metadata)")
-	cmd.Flags().StringVarP(&saveTag, "tag", "t", "", "tag to use (default: version in metadata)")
+	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "namespace to use (default: namespace in metadata)")
+	cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "tag to use (default: version in metadata)")
 	return cmd
 }

e2e/binary_test.go

@@ -204,8 +204,8 @@ version: 0.1.0
 name: app_test
 # A short description of the application
 description: my cool app
-# Repository prefix to use when pushing to a registry. This is typically your Hub username.
-#repository_prefix: myHubUsername
+# Namespace to use when pushing to a registry. This is typically your Hub username.
+#namespace: myHubUsername
 # List of application maitainers with name and email for each
 maintainers:
   - name: bob
@@ -368,14 +368,14 @@ func TestImageBinary(t *testing.T) {
 		runCommand("docker", args...)
 	}()
 	// save with tag/prefix override
-	assertCommand(t, dockerApp, "save", "-t", "mytag", "-p", registry+"/myuser", "render/envvariables")
+	assertCommand(t, dockerApp, "save", "-t", "mytag", "--namespace", registry+"/myuser", "render/envvariables")
 	assertCommandOutput(t, "image-inspect-labels.golden", "docker", "inspect", "-f", "{{.Config.Labels.maintainers}}", registry+"/myuser/envvariables.dockerapp:mytag")
 	// save with tag/prefix from metadata
 	assertCommand(t, dockerApp, "save", "render/envvariables")
 	assertCommandOutput(t, "image-inspect-labels.golden", "docker", "inspect", "-f", "{{.Config.Labels.maintainers}}", "alice/envvariables.dockerapp:0.1.0")
 	// push to a registry
-	assertCommand(t, dockerApp, "push", "-p", registry+"/myuser", "render/envvariables")
-	assertCommand(t, dockerApp, "push", "-p", registry+"/myuser", "-t", "latest", "render/envvariables")
+	assertCommand(t, dockerApp, "push", "--namespace", registry+"/myuser", "render/envvariables")
+	assertCommand(t, dockerApp, "push", "--namespace", registry+"/myuser", "-t", "latest", "render/envvariables")
 	assertCommand(t, "docker", "image", "rm", registry+"/myuser/envvariables.dockerapp:0.1.0")
 	assertCommand(t, dockerApp, "inspect", registry+"/myuser/envvariables.dockerapp:0.1.0")
 	assertCommand(t, dockerApp, "inspect", registry+"/myuser/envvariables.dockerapp")

e2e/render/envvariables.dockerapp/metadata.yml

@@ -1,7 +1,7 @@
 version: 0.1.0
 name: myapp
 description: ""
-repository_prefix: "alice"
+namespace: "alice"
 maintainers:
   - name: bearclaw
     email: bearclaw@bearclaw.bearclaw

e2e/testdata/init-singlefile.dockerapp

@@ -5,8 +5,8 @@ version: 0.1.0
 name: tac
 # A short description of the application
 description: my cool app
-# Repository prefix to use when pushing to a registry. This is typically your Hub username.
-#repository_prefix: myHubUsername
+# Namespace to use when pushing to a registry. This is typically your Hub username.
+#namespace: myHubUsername
 # List of application maitainers with name and email for each
 maintainers:
   - name: bob

examples/hello-world/README.md

@@ -18,7 +18,7 @@ $ cat hello-world.dockerapp
 version: 0.1.0
 name: hello-world
 description: ""
-repository_prefix: ""
+namespace: ""
 maintainers:
 - name: dimrok
   email: ""

examples/hello-world/hello-world.dockerapp

@@ -4,7 +4,7 @@
 version: 0.1.0
 name: hello-world
 description: "Hello world!"
-repository_prefix: "myhubuser"
+namespace: "myhubuser"
 maintainers:
 - name: user
   email: "user@email.com"

internal/packager/init.go

@@ -231,8 +231,8 @@ version: {{ .Version }}
 name: {{ .Name }}
 # A short description of the application
 description: {{ .Description }}
-# Repository prefix to use when pushing to a registry. This is typically your Hub username.
-{{ if len .RepositoryPrefix }}repository_prefix: {{ .RepositoryPrefix }} {{ else }}#repository_prefix: myHubUsername{{ end }}
+# Namespace to use when pushing to a registry. This is typically your Hub username.
+{{ if len .Namespace}}namespace: {{ .Namespace }} {{ else }}#namespace: myHubUsername{{ end }}
 # List of application maitainers with name and email for each
 {{ if len .Maintainers }}maintainers:
 {{ range .Maintainers }}  - name: {{ .Name  }}

internal/packager/init_test.go

@@ -80,8 +80,8 @@ version: 0.1.0
 name: writemetadata_test
 # A short description of the application
 description: 
-# Repository prefix to use when pushing to a registry. This is typically your Hub username.
-#repository_prefix: myHubUsername
+# Namespace to use when pushing to a registry. This is typically your Hub username.
+#namespace: myHubUsername
 # List of application maitainers with name and email for each
 maintainers:
   - name: bearclaw