diff options
| -rw-r--r-- | index.js | 9 | ||||
| -rw-r--r-- | lib/logger.js | 9 | ||||
| -rw-r--r-- | lib/sendToCoveralls.js | 9 | ||||
| -rw-r--r-- | package.json | 3 |
4 files changed, 16 insertions, 14 deletions
@@ -1,3 +1,12 @@ +var minimist = require('minimist'); + +// this needs to go before the other require()s so that +// the other files can already use index.options +exports.options = minimist(process.argv.slice(2), { + boolean: ['verbose', 'stdout'], + alias: { 'v': 'verbose', 's': 'stdout' } +}); + var dir = './lib/'; exports.convertLcovToCoveralls = require(dir + 'convertLcovToCoveralls'); exports.sendToCoveralls = require(dir + 'sendToCoveralls'); diff --git a/lib/logger.js b/lib/logger.js index a847a41..f834586 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -1,19 +1,16 @@ +var index = require('../index'); + module.exports = function(){ return require('log-driver')({level : getLogLevel()}); }; function getLogLevel(){ - if (hasVerboseCommandLineOption() || hasDebugEnvVariable()) { + if (index.options.verbose || hasDebugEnvVariable()) { return 'warn'; } return 'error'; } -function hasVerboseCommandLineOption(){ - // look into command line arguments starting from index 2 - return process.argv.slice(2).filter(RegExp.prototype.test.bind(/^(-v|--verbose)$/)).length > 0; -} - function hasDebugEnvVariable(){ return process.env.NODE_COVERALLS_DEBUG == 1; } diff --git a/lib/sendToCoveralls.js b/lib/sendToCoveralls.js index 9606a08..fcf63a8 100644 --- a/lib/sendToCoveralls.js +++ b/lib/sendToCoveralls.js @@ -1,4 +1,5 @@ var request = require('request'); +var index = require('../index'); var sendToCoveralls = function(obj, cb){ var urlBase = 'https://coveralls.io'; @@ -9,7 +10,7 @@ var sendToCoveralls = function(obj, cb){ var str = JSON.stringify(obj); var url = urlBase + '/api/v1/jobs'; - if (hasWriteToStdoutOption()) { + if (index.options.stdout) { process.stdout.write(str); cb(null, { statusCode: 200 }, ''); } else { @@ -19,10 +20,4 @@ var sendToCoveralls = function(obj, cb){ } }; -function hasWriteToStdoutOption(){ - // look into command line arguments starting from index 2 - return process.argv.slice(2).filter(RegExp.prototype.test.bind(/^(-s|--stdout)$/)).length > 0; -} - - module.exports = sendToCoveralls; diff --git a/package.json b/package.json index d8f4dfb..24b7237 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,8 @@ "js-yaml": "3.0.1", "lcov-parse": "0.0.6", "log-driver": "1.2.4", - "request": "2.67.0" + "request": "2.67.0", + "minimist": "1.2.0" }, "devDependencies": { "sinon-restore": "1.0.0", |
