Bumped to latest aurora version

Fixes #8
maoueh · Feb 28, 2020 · 579649e · 579649e
1 parent 60d344d
commit 579649e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 module github.com/maoueh/zap-pretty
 
 require (
-	github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e
+	github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e
 )

diff --git a/go.sum b/go.sum
@@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e h1:9MlwzLdW7QSDrhDjFlsEYmxpFyIoXmYRon3dt0io31k=
 github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
+github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381 h1:bqDmpDG49ZRnB5PcgP0RXtQvnMSgIF14M7CBd2shtXs=
+github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

diff --git a/main.go b/main.go
@@ -231,7 +231,7 @@ func (p *processor) writeHeader(buffer *bytes.Buffer, timestamp *time.Time, seve
 	buffer.WriteString(p.colorizeSeverity(severity).String())
 
 	buffer.WriteByte(' ')
-	buffer.WriteString(Gray(fmt.Sprintf("(%s)", caller)).String())
+	buffer.WriteString(Gray(12, fmt.Sprintf("(%s)", caller)).String())
 
 	buffer.WriteByte(' ')
 	buffer.WriteString(Blue(message).String())

diff --git a/main_test.go b/main_test.go
@@ -50,7 +50,7 @@ func TestStandardNewProduction(t *testing.T) {
 				`{"level":"info","ts":1545445711.144533,"caller":"c","msg":"m"}`,
 			},
 			expectedLines: []string{
-				"[2018-12-21 21:28:31.144 EST] \x1b[32minfo\x1b[0m \x1b[37m(c)\x1b[0m \x1b[34mm\x1b[0m",
+				"[2018-12-21 21:28:31.144 EST] \x1b[32minfo\x1b[0m \x1b[38;5;244m(c)\x1b[0m \x1b[34mm\x1b[0m",
 			},
 		},
 	})
@@ -64,7 +64,7 @@ func TestStandardFieldTs_ISO8601_string(t *testing.T) {
 				`{"level":"info","ts":"2019-12-06T19:40:20.627Z","caller":"c","msg":"m"}`,
 			},
 			expectedLines: []string{
-				"[2019-12-06 14:40:20.627 EST] \x1b[32minfo\x1b[0m \x1b[37m(c)\x1b[0m \x1b[34mm\x1b[0m",
+				"[2019-12-06 14:40:20.627 EST] \x1b[32minfo\x1b[0m \x1b[38;5;244m(c)\x1b[0m \x1b[34mm\x1b[0m",
 			},
 		},
 	})
@@ -78,7 +78,7 @@ func TestZapDriverNewProduction(t *testing.T) {
 				zapdriverLine("INFO", "2018-12-21T23:06:49.435919-05:00"),
 			},
 			expectedLines: []string{
-				"[2018-12-21 23:06:49.435 EST] \x1b[32mINFO\x1b[0m \x1b[37m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
+				"[2018-12-21 23:06:49.435 EST] \x1b[32mINFO\x1b[0m \x1b[38;5;244m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
 			},
 		},
 		{
@@ -87,7 +87,7 @@ func TestZapDriverNewProduction(t *testing.T) {
 				`{"severity":"INFO","timestamp":"2018-12-21T23:06:49.435919-05:00","caller":"c:0","message":"m","folder":"f","labels":{},"logging.googleapis.com/sourceLocation":{"file":"f","line":"1","function":"fn"}}`,
 			},
 			expectedLines: []string{
-				"[2018-12-21 23:06:49.435 EST] \x1b[32mINFO\x1b[0m \x1b[37m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
+				"[2018-12-21 23:06:49.435 EST] \x1b[32mINFO\x1b[0m \x1b[38;5;244m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
 			},
 		},
 		{
@@ -106,8 +106,8 @@ func TestZapDriverNewProduction(t *testing.T) {
 				zapdriverLine("DEBUG", "2018-12-21T23:06:49.436920-05:00"),
 			},
 			expectedLines: []string{
-				"[2018-12-21 23:06:49.435 EST] \x1b[32mINFO\x1b[0m \x1b[37m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
-				"[2018-12-21 23:06:49.436 EST] \x1b[34mDEBUG\x1b[0m \x1b[37m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
+				"[2018-12-21 23:06:49.435 EST] \x1b[32mINFO\x1b[0m \x1b[38;5;244m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
+				"[2018-12-21 23:06:49.436 EST] \x1b[34mDEBUG\x1b[0m \x1b[38;5;244m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
 			},
 		},
 		{
@@ -118,9 +118,9 @@ func TestZapDriverNewProduction(t *testing.T) {
 				zapdriverLine("DEBUG", "2018-12-21T23:06:49.436920-05:00"),
 			},
 			expectedLines: []string{
-				"[2018-12-21 23:06:49.435 EST] \x1b[32mINFO\x1b[0m \x1b[37m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
+				"[2018-12-21 23:06:49.435 EST] \x1b[32mINFO\x1b[0m \x1b[38;5;244m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
 				"A non-JSON string line",
-				"[2018-12-21 23:06:49.436 EST] \x1b[34mDEBUG\x1b[0m \x1b[37m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
+				"[2018-12-21 23:06:49.436 EST] \x1b[34mDEBUG\x1b[0m \x1b[38;5;244m(c:0)\x1b[0m \x1b[34mm\x1b[0m {\"folder\":\"f\"}",
 			},
 		},
 		{
@@ -129,7 +129,7 @@ func TestZapDriverNewProduction(t *testing.T) {
 				`{"severity":"ERROR","time":"2019-04-15T15:49:55.676461-04:00","caller":"c","message":"m","errorVerbose":"initial message\nSectionA\nStack1a\n\tFile1a\nStack2a\n\tFile2a\nSectionB\nStack1b\n\tFile1b\nStack2b\n\tFile2b"}`,
 			},
 			expectedLines: []string{
-				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[37m(c)\x1b[0m \x1b[34mm\x1b[0m",
+				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[38;5;244m(c)\x1b[0m \x1b[34mm\x1b[0m",
 				`Error Verbose`,
 				`  initial message`,
 				``,
@@ -152,7 +152,7 @@ func TestZapDriverNewProduction(t *testing.T) {
 				`{"severity":"ERROR","time":"2019-04-15T15:49:55.676461-04:00","caller":"c","message":"m","errorVerbose":"single line"}`,
 			},
 			expectedLines: []string{
-				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[37m(c)\x1b[0m \x1b[34mm\x1b[0m",
+				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[38;5;244m(c)\x1b[0m \x1b[34mm\x1b[0m",
 				`Error Verbose`,
 				`  single line`,
 			},
@@ -163,7 +163,7 @@ func TestZapDriverNewProduction(t *testing.T) {
 				`{"severity":"ERROR","time":"2019-04-15T15:49:55.676461-04:00","caller":"c","message":"m","errorVerbose":"multi\nline"}`,
 			},
 			expectedLines: []string{
-				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[37m(c)\x1b[0m \x1b[34mm\x1b[0m",
+				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[38;5;244m(c)\x1b[0m \x1b[34mm\x1b[0m",
 				`Error Verbose`,
 				`  multi`,
 				`  line`,
@@ -175,7 +175,7 @@ func TestZapDriverNewProduction(t *testing.T) {
 				`{"severity":"ERROR","time":"2019-04-15T15:49:55.676461-04:00","caller":"c","message":"m","errorVerbose":"Stack1b\n\tFile1bStack2b\n\tFile2b"}`,
 			},
 			expectedLines: []string{
-				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[37m(c)\x1b[0m \x1b[34mm\x1b[0m",
+				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[38;5;244m(c)\x1b[0m \x1b[34mm\x1b[0m",
 				`Error Verbose`,
 				`      Stack1b`,
 				"    \tFile1bStack2b",
@@ -188,7 +188,7 @@ func TestZapDriverNewProduction(t *testing.T) {
 				`{"severity":"ERROR","time":"2019-04-15T15:49:55.676461-04:00","caller":"c","message":"m","stacktrace":"Stack1a\n\tFile1a\nStack2a\n\tFile2a"}`,
 			},
 			expectedLines: []string{
-				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[37m(c)\x1b[0m \x1b[34mm\x1b[0m",
+				"[2019-04-15 15:49:55.676 EDT] \x1b[31mERROR\x1b[0m \x1b[38;5;244m(c)\x1b[0m \x1b[34mm\x1b[0m",
 				`Stacktrace`,
 				`    Stack1a`,
 				"    \tFile1a",