Merge pull request #32 from upsight/feature/envpropagation

Fixes parent env merging from parent to child

README.md

@@ -28,7 +28,7 @@ or download from [releases](https://github.com/upsight/ron/releases)
 
 ### Upgrade
 
-	LATEST_URL=https://github.com/upsight/ron/releases/download/v1.1.2/ron-linux-v1.1.2 ron upgrade
+	LATEST_URL=https://github.com/upsight/ron/releases/download/v1.1.3/ron-linux-v1.1.3 ron upgrade
 
 ### Testing
 

doc.go

@@ -237,7 +237,7 @@ Upgrade
 Ron can be upgraded if you already have it installed. The easiest way
 is to just provide a LATEST_URL to the upgrade command:
 
-	$ LATEST_URL=https://github.com/upsight/ron/releases/download/v1.1.2/ron-linux-v1.1.2 ron upgrade
+	$ LATEST_URL=https://github.com/upsight/ron/releases/download/v1.1.3/ron-linux-v1.1.3 ron upgrade
 
 Version
 

ron.yaml

@@ -17,7 +17,7 @@ envs:
   - CURDIR: +pwd
   - UNAME: +uname | tr '[:upper:]' '[:lower:]'
   - PACKAGE_VERSION: +git describe --always --dirty --tags | tr '-' '_'
-  - TAG: v1.1.2
+  - TAG: v1.1.3
   - LATEST_URL: "https://github.com/upsight/ron/releases/download/$TAG/ron-${UNAME}-latest"
   - REPO: github.com/upsight/ron
   - RELEASES: linux darwin windows

target/configs.go

@@ -74,19 +74,14 @@ func NewConfigs(configs []*RawConfig, remoteEnv string, stdOut io.Writer, stdErr
 			return nil, err
 		}
 		f.Env = e
+		if parentFile != nil {
+			parentFile.Env.MergeTo(f.Env)
+		}
 		confs.Files = append(confs.Files, f)
 		if strings.HasSuffix(config.Filepath, ConfigFileName) {
 			parentFile = f
 		}
 	}
-	for i := len(confs.Files) - 1; i >= 0; i-- {
-		curFile := confs.Files[i]
-		parent := confs.Files[i].Env.parent
-		for parent != nil {
-			curFile.Env.Merge(parent.Env)
-			parent = parent.Env.parent
-		}
-	}
 
 	if remoteEnv != "" {
 		// find any remote hosts if set.

target/default.yaml

@@ -4,7 +4,7 @@ envs:
   - CURDIR: +pwd
   - UNAME: +uname | tr '[:upper:]' '[:lower:]'
   - PACKAGE_VERSION: +git describe --always --dirty --tags | tr '-' '_'
-  - TAG: v1.1.2
+  - TAG: v1.1.3
   - LATEST_URL: "https://github.com/upsight/ron/releases/download/$TAG/ron-${UNAME}-$TAG"
 targets:
   _hello:

target/env.go

@@ -78,8 +78,8 @@ func (e *Env) Config() (MSS, error) {
 	return e.config, nil
 }
 
-// Merge the current env into any missing keys for the input node.
-func (e *Env) Merge(node *Env) error {
+// MergeTo the current env into any missing keys for the input node.
+func (e *Env) MergeTo(node *Env) error {
 	for k, v := range e.config {
 		if _, ok := node.config[k]; !ok {
 			node.config[k] = v

target/env_test.go

@@ -204,23 +204,24 @@ func TestEnv_PrintRawBadWriter(t *testing.T) {
 	e.PrintRaw()
 }
 
-func TestEnv_Merge(t *testing.T) {
+func TestEnv_MergeTo(t *testing.T) {
 	writer := &bytes.Buffer{}
 	e1Config := `
+- ABC: +pwd
 - APP: ron
 - HELLO: hello
-- ABC: +pwd
 `
 	e2Config := `
-- GOOD: bye
 - BLAH: +pwd
+- GOOD: bye
+- HELLO: bye
 `
 	e1, _ := NewEnv(nil, &RawConfig{Envs: e1Config}, ParseOSEnvs([]string{}), writer)
 	e2, _ := NewEnv(nil, &RawConfig{Envs: e2Config}, ParseOSEnvs([]string{}), writer)
-	e1.Merge(e2)
+	e1.MergeTo(e2)
+	equals(t, e2.config["ABC"], "+pwd")
 	equals(t, e2.config["APP"], "ron")
-	equals(t, e2.config["GOOD"], "bye")
 	equals(t, e2.config["BLAH"], "+pwd")
-	equals(t, e2.config["ABC"], "+pwd")
-	equals(t, e2.config["HELLO"], "hello")
+	equals(t, e2.config["GOOD"], "bye")
+	equals(t, e2.config["HELLO"], "bye")
 }