Merge 3ab2c57 into 167119f

lib/getOptions.js

@@ -4,24 +4,8 @@ var yaml = require('yaml');
 var logger = require('./logger')();
 var fetchGitData = require('./fetchGitData');
 
-var getOptions = function(cb){
-  if (!cb){
-    throw new Error('getOptions requires a callback');
-  }
-	var options = {};
-
-	// try to get filepath from the command-line
-	if (process.argv[2]) {
-		if (~['-v', '--verbose'].indexOf(process.argv[2])) {
-			if (process.argv[3]) {
-				options.filepath = process.argv[3];
-			}
-		} else {
-			options.filepath = process.argv[2];
-		}
-	}
-
-
+var getBaseOptions = function(cb){
+  var options = {};
   var git_commit = process.env.COVERALLS_GIT_COMMIT;
   var git_branch = process.env.COVERALLS_GIT_BRANCH;
 
@@ -59,11 +43,11 @@ var getOptions = function(cb){
     options.service_job_id = process.env.COVERALLS_SERVICE_JOB_ID;
   }
 
-	// try to get the repo token as an environment variable
+  // try to get the repo token as an environment variable
   if (process.env.COVERALLS_REPO_TOKEN) {
     options.repo_token = process.env.COVERALLS_REPO_TOKEN;
   } else {
-		// try to get the repo token from a .coveralls.yml file
+    // try to get the repo token from a .coveralls.yml file
     var yml = path.join(process.cwd(), '.coveralls.yml');
     try {
       if (fs.statSync(yml).isFile()) {
@@ -92,7 +76,27 @@ var getOptions = function(cb){
   } else {
     return cb(null, options);
   }
+};
+
+var getOptions = function(cb){
+  if (!cb){
+    throw new Error('getOptions requires a callback');
+  }
 
+  getBaseOptions(function(err, options){
+    // try to get filepath from the command-line
+    if (process.argv[2]) {
+      if (~['-v', '--verbose'].indexOf(process.argv[2])) {
+        if (process.argv[3]) {
+          options.filepath = process.argv[3];
+        }
+      } else {
+        options.filepath = process.argv[2];
+      }
+    }
+      cb(err, options);
+  });
 };
 
+module.exports = getBaseOptions;
 module.exports = getOptions;