[config] support for env bundles

plugins/config/src/configenv/configenv.go

@@ -3,19 +3,23 @@ package configenv
 import (
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
 
+	"archive/tar"
+
 	common "github.com/dokku/dokku/plugins/common"
 )
 
 //Env is a representation for global or app environment
 type Env struct {
-	name     string
-	env      map[string]string
-	filename string
+	name           string
+	env            map[string]string
+	filename       string
+	EscapeNewlines bool
 }
 
 func (e *Env) String() string {
@@ -38,7 +42,11 @@ func (e *Env) StringWithPrefixAndSeparator(prefix string, separator string) stri
 	keys := e.Keys()
 	entries := make([]string, len(keys))
 	for i, k := range keys {
-		entries[i] = fmt.Sprintf("%s%s='%s'", prefix, k, SingleQuoteEscape(e.env[k]))
+		v := SingleQuoteEscape(e.env[k])
+		if e.EscapeNewlines {
+			v = strings.Replace(v, "\n", "'$'\\n''", -1)
+		}
+		entries[i] = fmt.Sprintf("%s%s='%s'", prefix, k, v)
 	}
 	return strings.Join(entries, separator)
 }
@@ -48,7 +56,29 @@ func SingleQuoteEscape(value string) string { // so that 'esc'apped' -> 'esc'\''
 	return strings.Replace(value, "'", "'\\''", -1)
 }
 
-//NewFromTarget creates an env from the given target. Tareget is either "--global" or an app name
+//ExportBundle writes a tarfile of the environmnet to the given io.Writer.
+// for every environment variable there is a file with the variable's key
+// with its content set to the variable's value
+func (e *Env) ExportBundle(dest io.Writer) error {
+	tarfile := tar.NewWriter(dest)
+	defer tarfile.Close()
+
+	for _, k := range e.Keys() {
+		val, _ := e.Get(k)
+		valbin := []byte(val)
+
+		header := &tar.Header{
+			Name: k,
+			Mode: 0600,
+			Size: int64(len(valbin)),
+		}
+		tarfile.WriteHeader(header)
+		tarfile.Write(valbin)
+	}
+	return nil
+}
+
+//NewFromTarget creates an env from the given target. Target is either "--global" or an app name
 func NewFromTarget(target string) (*Env, error) {
 	if target == "--global" {
 		return LoadGlobal()

plugins/config/src/configenv/parsing.go

@@ -36,7 +36,7 @@ func parseEnvFromReader(name string, filename string, reader io.Reader) (*Env, e
 		StateKey   = iota
 		StateValue = iota
 	)
-	env := &Env{name, map[string]string{}, filename}
+	env := &Env{name, map[string]string{}, filename, false}
 	var buffer bytes.Buffer
 	var state = StateKey
 	var quoted = false

plugins/config/src/subcommands/export/export.go

@@ -12,13 +12,16 @@ import (
 // print the environment to stdout
 func main() {
 	const defaultPrefix = "export "
+	const defaultSeparator = "\n"
 	args := flag.NewFlagSet("config:export", flag.ExitOnError)
 	global := args.Bool("global", false, "--global: use the global environment")
 	merged := args.Bool("merged", false, "--merged: merge app environment and global environment")
 	keys := args.Bool("keys", false, "--keys: export keys only")
+	bundle := args.Bool("bundle", false, "--bundle: export as tar bundle")
 	envfile := args.Bool("envfile", false, "--envfile: export as envfile rather than bash exports (--prefix='')")
-	prefix := args.String("prefix", "export ", "--prefix: prefix")
-	separator := args.String("separator", "\n", "--separator: separator")
+	prefix := args.String("prefix", defaultPrefix, "--prefix: prefix")
+	separator := args.String("separator", defaultSeparator, "--separator: separator")
+	escapeNewlines := args.Bool("escape-newlines", false, "--escape-newlines: replace literal newlines with $'\n'")
 	args.Parse(os.Args[2:])
 
 	appName := args.Arg(0)
@@ -57,6 +60,16 @@ func main() {
 		return
 	}
 
+	if *escapeNewlines {
+		env.EscapeNewlines = true
+	}
+
+	if *bundle {
+		if *prefix != defaultPrefix || *separator != defaultSeparator || *envfile {
+			common.LogFail("--bundle cannot be given with --envfile, --prefix, or --separator")
+		}
+		env.ExportBundle(os.Stdout)
+	}
 	if *envfile {
 		if *prefix != defaultPrefix {
 			common.LogFail("--prefix and --envfile cannot both be given")