Multiline following spec from ruby

Author: esttorhe

fixtures/invalid2.env

@@ -1,4 +1,3 @@
-INVALID_MULTILINE='bar
+INVALID_MULTILINE="bar
 ASDFASDF
-VALID_MULTILINE='ASDFASDFADF
-ASDFASDFASDFADF'
+VALID_MULTILINE=ASDFASDFADF

fixtures/invalid3.env

@@ -1,2 +1,2 @@
-INVALID_MULTILINE='bar
+INVALID_MULTILINE="bar
 ASDFASDF

fixtures/multiline.env

@@ -1,5 +1,5 @@
 SINGLE_LINE=Single Line Value
-MULTI_LINE='This is a
-multiline value
-should be properly parsed'
+MULTI_LINE="This is a
+multiline value = not breaking the line
+should be properly parsed"
 SINGLE_LINE_2="Another single line"

godotenv.go

@@ -121,12 +121,6 @@ func Parse(r io.Reader) (envMap map[string]string, err error) {
 				return
 			}
 
-			// Previous multi-line value was not closed. We shouldn't find new keys until closing the multi-line value
-			if isMultilineValue && len(multilineKey) > 0 && len(key) > 0 {
-				err = fmt.Errorf("Multiline value for key %s reached key %s without closing the single quotes", multilineKey, key)
-				return
-			}
-
 			if multilineValue == true && isMultilineValue == false && len(key) <= 0 {
 				// We are on a multi-line; but last line closed the multi-line single quote
 				value = fmt.Sprintf("%s\n%s", buffer, value)
@@ -282,44 +276,44 @@ func parseLine(line string, envMap map[string]string, isMultiline bool) (key str
 		multilineValue = quotesAreOpen
 	}
 
-	firstEquals := strings.Index(line, "=")
-	firstColon := strings.Index(line, ":")
-	splitString := strings.SplitN(line, "=", 2)
-	if firstColon != -1 && (firstColon < firstEquals || firstEquals == -1) {
-		//this is a yaml-style line
-		splitString = strings.SplitN(line, ":", 2)
-	}
+	if !isMultiline {
+		firstEquals := strings.Index(line, "=")
+		firstColon := strings.Index(line, ":")
+		splitString := strings.SplitN(line, "=", 2)
+		if firstColon != -1 && (firstColon < firstEquals || firstEquals == -1) {
+			//this is a yaml-style line
+			splitString = strings.SplitN(line, ":", 2)
+		}
 
-	// Only check key, value pair if is not a multi-line value
-	if isMultiline == false && len(splitString) != 2 {
-		err = errors.New("Can't separate key from value")
-		return
-	}
+		// Only check key, value pair if is not a multi-line value
+		if isMultiline == false && len(splitString) != 2 {
+			err = errors.New("Can't separate key from value")
+			return
+		}
 
-	if len(splitString) == 2 {
-		// Parse the key
-		key = splitString[0]
-		if strings.HasPrefix(key, "export") {
-			key = strings.TrimPrefix(key, "export")
+		if len(splitString) == 2 {
+			// Parse the key
+			key = splitString[0]
+			if strings.HasPrefix(key, "export") {
+				key = strings.TrimPrefix(key, "export")
+			}
+			key = strings.Trim(key, " ")
 		}
-		key = strings.Trim(key, " ")
-	}
 
-	if !isMultiline {
 		// Parse the value
 		value = parseValue(splitString[1], envMap)
 		if len(value) <= 0 {
 			return
 		}
 
-		// Multi-line delimiting character is a single quote '
-		if multilineValue = (value[0:1] == "'" && value[len(value)-1:] != "'"); multilineValue == true {
+		// Multi-line delimiting character is a double quote "
+		if multilineValue = (value[0:1] == "\"" && value[len(value)-1:] != "\""); multilineValue == true {
 			value = value[1:len(value)]
 		}
 	} else {
-		value = parseValue(splitString[0], envMap)
+		value = parseValue(line, envMap)
 		// Check if we reached the end of the multi-line value
-		multilineValue = value[len(value)-1:] != "'"
+		multilineValue = value[len(value)-1:] != "\""
 	}
 
 	return

godotenv_test.go

@@ -28,7 +28,7 @@ func loadEnvAndCompareValues(t *testing.T, loader func(files ...string) error, e
 
 	err := loader(envFileName)
 	if err != nil {
-		t.Fatalf("Error loading %v", envFileName)
+		t.Fatalf("Error loading %v. +%v", envFileName, err)
 	}
 
 	for k := range expectedValues {
@@ -199,7 +199,7 @@ func TestMultilineEnv(t *testing.T) {
 	expectedValues := map[string]string{
 		"SINGLE_LINE": "Single Line Value",
 		"MULTI_LINE": `This is a
-multiline value
+multiline value = not breaking the line
 should be properly parsed`,
 		"SINGLE_LINE_2": "Another single line",
 	}
@@ -366,7 +366,7 @@ func TestParsing(t *testing.T) {
 
 	parseAndCompare(t, `="value"`, "", "value")
 	parseAndCompare(t, `KEY="`, "KEY", "\"")
-	parseAndCompare(t, `KEY="value`, "KEY", "\"value")
+	parseAndCompare(t, `KEY="value`, "KEY", "value")
 
 	// it 'throws an error if line format is incorrect' do
 	// expect{env('lol$wut')}.to raise_error(Dotenv::FormatError)