sort output of Write/Marshal

alexquick · alexquick · commit 3dd2dbe832c5 · 2017-09-16T18:02:27.000-04:00
diff --git a/godotenv.go b/godotenv.go
@@ -21,6 +21,7 @@ import (
 	"os"
 	"os/exec"
 	"regexp"
+	"sort"
 	"strings"
 )
 
@@ -165,6 +166,7 @@ func Marshal(envMap map[string]string) (string, error) {
 	for k, v := range envMap {
 		lines = append(lines, fmt.Sprintf(`%s="%s"`, k, doubleQuoteEscape(v)))
 	}
+	sort.Strings(lines)
 	return strings.Join(lines, "\n"), nil
 }
 
diff --git a/godotenv_test.go b/godotenv_test.go
@@ -348,6 +348,9 @@ func TestWrite(t *testing.T) {
 	writeAndCompare(`key=va'lu'e`, `key="va'lu'e"`)
 	// newlines, backslashes, and some other special chars are escaped
 	writeAndCompare(`foo="$ba\n\r\\r!"`, `foo="\$ba\n\r\\r\!"`)
+	// lines should be sorted
+	writeAndCompare("foo=bar\nbaz=buzz", "baz=\"buzz\"\nfoo=\"bar\"")
+
 }
 
 func TestRoundtrip(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`	`"os"`
`22`	`22`	`"os/exec"`
`23`	`23`	`"regexp"`
	`24`	`+ "sort"`
`24`	`25`	`"strings"`
`25`	`26`	`)`
`26`	`27`
`@@ -165,6 +166,7 @@ func Marshal(envMap map[string]string) (string, error) {`
`165`	`166`	`for k, v := range envMap {`
`166`	`167`	lines = append(lines, fmt.Sprintf(`%s="%s"`, k, doubleQuoteEscape(v)))
`167`	`168`	`}`
	`169`	`+ sort.Strings(lines)`
`168`	`170`	`return strings.Join(lines, "\n"), nil`
`169`	`171`	`}`
`170`	`172`
Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,9 @@ func TestWrite(t *testing.T) {`
`348`	`348`	writeAndCompare(`key=va'lu'e`, `key="va'lu'e"`)
`349`	`349`	`// newlines, backslashes, and some other special chars are escaped`
`350`	`350`	writeAndCompare(`foo="$ba\n\r\\r!"`, `foo="\$ba\n\r\\r\!"`)
	`351`	`+ // lines should be sorted`
	`352`	`+ writeAndCompare("foo=bar\nbaz=buzz", "baz=\"buzz\"\nfoo=\"bar\"")`
	`353`	`+`
`351`	`354`	`}`
`352`	`355`
`353`	`356`	`func TestRoundtrip(t *testing.T) {`