diff --git a/CHANGES.md b/CHANGES.md index 824894e..966e244 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,8 +6,12 @@ Known issues: bug](https://github.com/TooTallNate/node-gyp/issues/65). -## bunyan 1.3.7 (not yet released) +## bunyan 1.4.0 (not yet released) +(Bumping minor ver b/c I'm wary of dtrace-provider changes. :) + +- [issue #258, pull #259] Update to dtrace-provider 0.5 to fix + install and tests on recent io.js versions. - safe-json-stringify@1.0.3 changed output, breaking some tests. Fix those. diff --git a/Makefile b/Makefile index be5ce54..082f3ca 100644 --- a/Makefile +++ b/Makefile @@ -87,22 +87,37 @@ test: $(NODEUNIT) # Note: 'test10' is last so (if all is well) I end up with a binary # dtrace-provider build for node 0.10 (my current version). .PHONY: testall -testall: test11 test08 test10 +testall: test22 test20 test18 test012 test08 test010 -.PHONY: test11 -test11: - @echo "# Test node 0.11.x (with node `$(NODEOPT)/node-0.11/bin/node --version`)" - @$(NODEOPT)/node-0.11/bin/node --version - PATH="$(NODEOPT)/node-0.11/bin:$(PATH)" make distclean all test -.PHONY: test10 -test10: +.PHONY: test22 +test22: + @echo "# Test iojs 2.2.x (with node `$(NODEOPT)/iojs-v2.2/bin/node --version`)" + @$(NODEOPT)/iojs-v2.2/bin/node --version | grep '^v2\.2\.' + #PATH="$(NODEOPT)/iojs-v2.2/bin:$(PATH)" make distclean all test +.PHONY: test20 +test20: + @echo "# Test iojs 2.0.x (with node `$(NODEOPT)/iojs-v2.0/bin/node --version`)" + @$(NODEOPT)/iojs-v2.0/bin/node --version | grep '^v2\.0\.' + PATH="$(NODEOPT)/iojs-v2.0/bin:$(PATH)" make distclean all test +.PHONY: test18 +test18: + @echo "# Test iojs 1.8.x (with node `$(NODEOPT)/iojs-v1.8/bin/node --version`)" + @$(NODEOPT)/iojs-v1.8/bin/node --version | grep '^v1\.8\.' + PATH="$(NODEOPT)/iojs-v1.8/bin:$(PATH)" make distclean all test +.PHONY: test012 +test012: + @echo "# Test node 0.12.x (with node `$(NODEOPT)/node-0.12/bin/node --version`)" + @$(NODEOPT)/node-0.12/bin/node --version | grep '^v0\.12\.' + PATH="$(NODEOPT)/node-0.12/bin:$(PATH)" make distclean all test +.PHONY: test010 +test010: @echo "# Test node 0.10.x (with node `$(NODEOPT)/node-0.10/bin/node --version`)" - @$(NODEOPT)/node-0.10/bin/node --version + @$(NODEOPT)/node-0.10/bin/node --version | grep '^v0\.10\.' PATH="$(NODEOPT)/node-0.10/bin:$(PATH)" make distclean all test .PHONY: test08 test08: @echo "# Test node 0.8.x (with node `$(NODEOPT)/node-0.8/bin/node --version`)" - @$(NODEOPT)/node-0.8/bin/node --version + @$(NODEOPT)/node-0.8/bin/node --version | grep '^v0\.8\.' PATH="$(NODEOPT)/node-0.8/bin:$(PATH)" make distclean all test diff --git a/package.json b/package.json index ed99868..42b833c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bunyan", - "version": "1.3.7", + "version": "1.4.0", "description": "a JSON logging library for node.js services", "author": "Trent Mick (http://trentm.com)", "main": "./lib/bunyan.js", diff --git a/test/cli.test.js b/test/cli.test.js index c4076a4..40fd959 100644 --- a/test/cli.test.js +++ b/test/cli.test.js @@ -160,10 +160,15 @@ test('simple.log doesnotexist1.log doesnotexist2.log', function (t) { // ENOENT, no such file or directory 'asdf.log' // but node v0.6.14: // ENOENT, open 'asdf.log' - // Somewhat annoying change. - t.equal(stderr, - 'bunyan: ENOENT, open \'doesnotexist1.log\'\nbunyan: ENOENT, ' - + 'open \'doesnotexist2.log\'\n'); + // io.js 2.2 (at least): + // ENOENT: no such file or directory, open 'doesnotexist1.log' + var matches = [ + /^bunyan: ENOENT.*?, open 'doesnotexist1.log'/m, + /^bunyan: ENOENT.*?, open 'doesnotexist2.log'/m, + ]; + matches.forEach(function (match) { + t.ok(match.test(stderr), 'stderr matches ' + match.toString()); + }); t.end(); } );