diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | bin/coveralls.js | 7 | ||||
| -rw-r--r-- | lib/convertLcovToCoveralls.js | 2 | ||||
| -rw-r--r-- | lib/handleInput.js | 2 | ||||
| -rw-r--r-- | lib/logger.js | 9 | ||||
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | test/convertLcovToCoveralls.js | 2 |
7 files changed, 19 insertions, 10 deletions
@@ -14,7 +14,7 @@ test-cov: lib-cov test-coveralls:lib-cov $(MAKE) test REPORTER=spec echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID) - @COVERALLS_COVERAGE=1 $(MAKE) test REPORTER=mocha-lcov-reporter | ./bin/coveralls.js + @COVERALLS_COVERAGE=1 $(MAKE) test REPORTER=mocha-lcov-reporter | ./bin/coveralls.js --verbose rm -rf lib-cov .PHONY: test diff --git a/bin/coveralls.js b/bin/coveralls.js index 578c692..ba05eec 100755 --- a/bin/coveralls.js +++ b/bin/coveralls.js @@ -1,14 +1,11 @@ #!/usr/bin/env node var handleInput = require('../lib/handleInput'); -var logger = require('log-driver')({level : 'warn'}); +var logger = require('../lib/logger'); var options = {}; + if (process.argv[2]) { if (~['-v', '--verbose'].indexOf(process.argv[2])) { - options.verbose = true; - if (options.verbose){ - logger = require('log-driver')({level : 'debug'}); - } if (process.argv[3]) { options.filepath = process.argv[3]; } diff --git a/lib/convertLcovToCoveralls.js b/lib/convertLcovToCoveralls.js index ed5ec8b..a93c142 100644 --- a/lib/convertLcovToCoveralls.js +++ b/lib/convertLcovToCoveralls.js @@ -2,7 +2,7 @@ var TRAVIS_JOB_ID = process.env.TRAVIS_JOB_ID || 'unknown'; var fs = require('fs'); var lcovParse = require('lcov-parse'); var path = require('path'); -var logger = require('log-driver').logger; +var logger = require('./logger'); var detailsToCoverage = function(length, details){ var coverage = new Array(length); diff --git a/lib/handleInput.js b/lib/handleInput.js index 703c87d..af850c6 100644 --- a/lib/handleInput.js +++ b/lib/handleInput.js @@ -3,7 +3,7 @@ var path = require('path'); var YAML = require('libyaml'); var sendToCoveralls = require('../index').sendToCoveralls; var convertLcovToCoveralls = require('../index').convertLcovToCoveralls; -var logger = require('log-driver').logger; +var logger = require('./logger'); var handleInput = function(input, options){ logger.debug(input); diff --git a/lib/logger.js b/lib/logger.js new file mode 100644 index 0000000..f44fe28 --- /dev/null +++ b/lib/logger.js @@ -0,0 +1,9 @@ +var logger = require('log-driver')({level : 'warn'}); + +if (process.argv[2]) { + if (~['-v', '--verbose'].indexOf(process.argv[2])) { + logger = require('log-driver')({level : 'debug'}); + } +} + +module.exports = logger; diff --git a/package.json b/package.json index 314d234..8986508 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "coverage", "coveralls" ], - "version": "2.0.10", + "version": "2.0.11", "bugs": { "url": "https://github.com/cainus/node-coveralls/issues" }, @@ -21,7 +21,8 @@ "contributors": [ "Alan Gutierrez <[email protected]> (http://www.prettyrobots.com/)", "Kir Belevich (https://github.com/svg)", - "elliotcable <[email protected]> (http://elliottcable.name/)" + "elliotcable <[email protected]> (http://elliottcable.name/)", + "Arpad Borsos <[email protected]> (http://swatinem.de/)" ], "dependencies": { "libyaml": "0.2.2", diff --git a/test/convertLcovToCoveralls.js b/test/convertLcovToCoveralls.js index 6883f64..c83dc6c 100644 --- a/test/convertLcovToCoveralls.js +++ b/test/convertLcovToCoveralls.js @@ -1,6 +1,8 @@ var convertLcovToCoveralls = require('../index').convertLcovToCoveralls; var should = require('should'); var fs = require('fs'); +var logger = require('../lib/logger'); +logger = require('log-driver')({level : false}); describe("convertLcovToCoveralls", function(){ it ("should convert a simple lcov file", function(){ |