Merge pull request #7 from ulyssessouza/inherited-vars2

Fix inherited for multi variables in file

Author: ndeloof

fixtures/inherited-multi-var.env

@@ -0,0 +1,3 @@
+foo=bar
+VAR_TO_BE_LOADED_FROM_OS_ENV
+bar=baz

fixtures/inherited.env renamed to fixtures/inherited-single-var.env

@@ -506,14 +506,16 @@ func TestRoundtrip(t *testing.T) {
 	}
 }
 
-func TestInheritedEnvVariable(t *testing.T) {
+func TestInheritedEnvVariablSameSize(t *testing.T) {
 	const envKey = "VAR_TO_BE_LOADED_FROM_OS_ENV"
 	const envVal = "SOME_RANDOM_VALUE"
 	os.Setenv(envKey, envVal)
 
-	envFileName := "fixtures/inherited.env"
+	envFileName := "fixtures/inherited-multi-var.env"
 	expectedValues := map[string]string{
 		envKey: envVal,
+		"foo": "bar",
+		"bar": "baz",
 	}
 
 	envMap, err := ReadWithLookup(os.LookupEnv, envFileName)
@@ -525,7 +527,31 @@ func TestInheritedEnvVariable(t *testing.T) {
 	}
 	for key, value := range expectedValues {
 		if envMap[key] != value {
-			t.Error("Read got one of the keys wrong")
+			t.Errorf("Read got one of the keys wrong, [%q]->%q", key, envMap[key])
+		}
+	}
+}
+
+func TestInheritedEnvVariablSingleVar(t *testing.T) {
+	const envKey = "VAR_TO_BE_LOADED_FROM_OS_ENV"
+	const envVal = "SOME_RANDOM_VALUE"
+	os.Setenv(envKey, envVal)
+
+	envFileName := "fixtures/inherited-single-var.env"
+	expectedValues := map[string]string{
+		envKey: envVal,
+	}
+
+	envMap, err := ReadWithLookup(os.LookupEnv, envFileName)
+	if err != nil {
+		t.Error("Error reading file")
+	}
+	if len(envMap) != len(expectedValues) {
+		t.Error("Didn't get the right size map back")
+	}
+	for key, value := range expectedValues {
+		if envMap[key] != value {
+			t.Errorf("Read got one of the keys wrong, [%q]->%q", key, envMap[key])
 		}
 	}
 }

godotenv_test.go

@@ -25,15 +25,15 @@ func parseBytes(src []byte, out map[string]string, lookupFn LookupFn) error {
 			break
 		}
 
-		key, left, err := locateKeyName(cutset)
+		key, left, inherited, err := locateKeyName(cutset)
 		if err != nil {
 			return err
 		}
 		if strings.Contains(key, " ") {
 			return errors.New("key cannot contain a space")
 		}
 
-		if left == nil  {
+		if inherited {
 			if lookupFn == nil {
 				lookupFn = noLookupFn
 			}
@@ -82,7 +82,7 @@ func getStatementStart(src []byte) []byte {
 }
 
 // locateKeyName locates and parses key name and returns rest of slice
-func locateKeyName(src []byte) (key string, cutset []byte, err error) {
+func locateKeyName(src []byte) (key string, cutset []byte, inherited bool, err error) {
 	// trim "export" and space at beginning
 	src = bytes.TrimLeftFunc(bytes.TrimPrefix(src, []byte(exportPrefix)), isSpace)
 
@@ -100,6 +100,7 @@ loop:
 			// library also supports yaml-style value declaration
 			key = string(src[0:i])
 			offset = i + 1
+			inherited = char == '\n'
 			break loop
 		case '_':
 		default:
@@ -108,20 +109,20 @@ loop:
 				continue
 			}
 
-			return "", nil, fmt.Errorf(
+			return "", nil, inherited, fmt.Errorf(
 				`unexpected character %q in variable name near %q`,
 				string(char), string(src))
 		}
 	}
 
 	if len(src) == 0 {
-		return "", nil, errors.New("zero length string")
+		return "", nil, inherited, errors.New("zero length string")
 	}
 
 	// trim whitespace
 	key = strings.TrimRightFunc(key, unicode.IsSpace)
 	cutset = bytes.TrimLeftFunc(src[offset:], isSpace)
-	return key, cutset, nil
+	return key, cutset, inherited, nil
 }
 
 // extractVarValue extracts variable value and returns rest of slice