aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNick Merwin <[email protected]>2015-12-10 12:11:25 -0800
committerNick Merwin <[email protected]>2015-12-10 12:11:25 -0800
commit62455e648f4e5020ac8ea2efe3bf09696f8d65c5 (patch)
tree2a5a5b1a73fd00be056f538ad494111c97331d89 /lib
parentee82dd92ac9b65f069d5ed722c0e241ddc30dcee (diff)
parent6d2e7203351b34dd53eed0dee796d93e0e10d4e7 (diff)
downloadnode-coveralls-62455e648f4e5020ac8ea2efe3bf09696f8d65c5.tar.xz
node-coveralls-62455e648f4e5020ac8ea2efe3bf09696f8d65c5.zip
Merge pull request #76 from jacob-meacham/feature/user-options
allow users to pass options through.
Diffstat (limited to 'lib')
-rw-r--r--lib/getOptions.js11
-rw-r--r--lib/handleInput.js7
2 files changed, 13 insertions, 5 deletions
diff --git a/lib/getOptions.js b/lib/getOptions.js
index 42a3de1..79fde60 100644
--- a/lib/getOptions.js
+++ b/lib/getOptions.js
@@ -114,11 +114,13 @@ var getBaseOptions = function(cb){
}
};
-var getOptions = function(cb){
+var getOptions = function(cb, _userOptions){
if (!cb){
throw new Error('getOptions requires a callback');
}
+ var userOptions = _userOptions || {};
+
getBaseOptions(function(err, options){
// try to get filepath from the command-line
if (process.argv[2]) {
@@ -130,7 +132,12 @@ var getOptions = function(cb){
options.filepath = process.argv[2];
}
}
- cb(err, options);
+
+ // lodash or else would be better, but no need for the extra dependency
+ for (var option in userOptions) {
+ options[option] = userOptions[option];
+ }
+ cb(err, options);
});
};
diff --git a/lib/handleInput.js b/lib/handleInput.js
index 5f88394..845bfad 100644
--- a/lib/handleInput.js
+++ b/lib/handleInput.js
@@ -1,9 +1,10 @@
var index = require('../index');
var logger = require('./logger')();
-function handleInput(input, cb) {
+function handleInput(input, cb, userOptions) {
logger.debug(input);
- var options = index.getOptions(function(err, options){
+ logger.debug('user options ' + userOptions);
+ index.getOptions(function(err, options){
if (err){
logger.error("error from getOptions");
@@ -33,7 +34,7 @@ function handleInput(input, cb) {
cb(null);
});
});
- });
+ }, userOptions);
}
module.exports = handleInput;