improved testing.

4 files changed, 15 insertions, 16 deletions

diff --git a/lib/convertLcovToCoveralls.js b/lib/convertLcovToCoveralls.js
index a88b3ae..15bf962 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('./logger');
+var logger = require('./logger')();
 
 var detailsToCoverage = function(length, details){
   var coverage = new Array(length);
diff --git a/lib/getOptions.js b/lib/getOptions.js
index fa294b1..46957e5 100644
--- a/lib/getOptions.js
+++ b/lib/getOptions.js
@@ -1,7 +1,7 @@
 var fs = require('fs');
 var path = require('path');
 var yaml = require('yaml');
-var logger = require('./logger');
+var logger = require('./logger')();
 
 var getOptions = function(){
 	var options = {};
@@ -17,16 +17,16 @@ var getOptions = function(){
 		}
 	}
 
-  if (process.env.git){
+  if (process.env.COVERALLS_GIT){
     options.git = process.env.COVERALLS_GIT;
   }
-  if (process.env.service_job_id){
-    options.git = process.env.COVERALLS_SERVICE_JOB_ID;
+  if (process.env.COVERALLS_SERVICE_JOB_ID){
+    options.service_job_id = process.env.COVERALLS_SERVICE_JOB_ID;
   }
 
   options.run_at = process.env.COVERALLS_RUN_AT || JSON.stringify(new Date()).slice(1, -1);
-  if (process.env.service_name){
-    options.service_name = service_name;
+  if (process.env.COVERALLS_SERVICE_NAME){
+    options.service_name = process.env.COVERALLS_SERVICE_NAME;
   }
   if (process.env.TRAVIS){
     options.service_name = 'travis-ci';
diff --git a/lib/handleInput.js b/lib/handleInput.js
index 0ea17a9..8dee588 100644
--- a/lib/handleInput.js
+++ b/lib/handleInput.js
@@ -1,5 +1,5 @@
 var index = require('../index');
-var logger = require('./logger');
+var logger = require('./logger')();
 
 var handleInput = function(input){
   logger.debug(input);
diff --git a/lib/logger.js b/lib/logger.js
index f44fe28..985b67b 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -1,9 +1,8 @@
-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 = function(){
+  if (process.argv[2]) {
+    if (~['-v', '--verbose'].indexOf(process.argv[2])) {
+      return require('log-driver')({level : 'debug'});
+    }
   }
-}
-
-module.exports = logger;
+  return require('log-driver')({level : 'warn'});
+};