Merge pull request #49 from jchauncey/fix-split-newlines

fix(logger): Split on the double new lines when printing log messages

Author: Jonathan Chauncey

cmd/apps.go

@@ -168,7 +168,7 @@ func AppLogs(appID string, lines int) error {
 
 // printLogs prints each log line with a color matched to its category.
 func printLogs(logs string) error {
-	for _, log := range strings.Split(logs, "\n") {
+	for _, log := range strings.Split(logs, "\\n\\n") {
 		category := "unknown"
 		parts := strings.Split(strings.Split(log, " -- ")[0], " ")
 		category = parts[0]

controller/models/apps/apps.go

@@ -108,7 +108,7 @@ func Logs(c *client.Client, appID string, lines int) (string, error) {
 	}
 
 	// We need to trim a few characters off the front and end of the string
-	return body[3 : len(body)-2], nil
+	return body[2 : len(body)-1], nil
 }
 
 // Run one time command in an app.

controller/models/apps/apps_test.go

@@ -337,11 +337,11 @@ func TestAppsLogs(t *testing.T) {
 	tests := []testExpected{
 		{
 			Input:    -1,
-			Expected: "test foo bar",
+			Expected: "\"test foo bar\"",
 		},
 		{
 			Input:    1,
-			Expected: "test",
+			Expected: "\"test\"",
 		},
 	}