Merge branch 'master' of github.com:nickmerwin/node-coveralls

5 files changed, 28 insertions, 21 deletions

diff --git a/.travis.yml b/.travis.yml
index 04aaca5..950be54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ language: node_js
 node_js:
   - "node"
   - "iojs"
-  - "6.0"
-  - "5.0"
-  - "4.2"
+  - "6"
+  - "5"
+  - "4"
   - "0.12"
   - "0.10"
 script: make test-coveralls
diff --git a/lib/getOptions.js b/lib/getOptions.js
index bb4248d..ce3bcaf 100644
--- a/lib/getOptions.js
+++ b/lib/getOptions.js
@@ -20,18 +20,22 @@ var getBaseOptions = function(cb){
   if (process.env.TRAVIS){
     options.service_name = 'travis-ci';
     options.service_job_id = process.env.TRAVIS_JOB_ID;
+    options.service_pull_request = process.env.TRAVIS_PULL_REQUEST;
     git_commit = 'HEAD';
     git_branch = process.env.TRAVIS_BRANCH;
   }
 
-  /*
+
   if (process.env.DRONE){
     options.service_name = 'drone';
     options.service_job_id = process.env.DRONE_BUILD_NUMBER;
+    options.service_pull_request = process.env.DRONE_PULL_REQUEST;
+    git_committer_name = process.env.DRONE_COMMIT_AUTHOR;
+    git_committer_email = process.env.DRONE_COMMIT_AUTHOR_EMAIL;
     git_commit = process.env.DRONE_COMMIT;
     git_branch = process.env.DRONE_BRANCH;
+    git_message = process.env.DRONE_COMMIT_MESSAGE;
   }
-  */
 
   if (process.env.JENKINS_URL){
     options.service_name = 'jenkins';
diff --git a/package.json b/package.json
index 9777196..eb9f647 100644
--- a/package.json
+++ b/package.json
@@ -34,16 +34,16 @@
     "lcov-parse": "0.0.10",
     "log-driver": "1.2.5",
     "minimist": "1.2.0",
-    "request": "2.75.0"
+    "request": "2.79.0"
   },
   "devDependencies": {
-    "istanbul": "0.4.4",
+    "istanbul": "0.4.5",
     "jshint": "2.9.3",
-    "mocha": "2.5.3",
+    "mocha": "3.2.0",
     "mocha-lcov-reporter": "1.2.0",
     "should": "9.0.2",
     "sinon-restore": "1.0.1",
-    "snyk": "1.17.0"
+    "snyk": "1.23.3"
   },
   "engines": {
     "node": ">=0.8.6"
diff --git a/test/convertLcovToCoveralls.js b/test/convertLcovToCoveralls.js
index 25a0e97..31f40d9 100644
--- a/test/convertLcovToCoveralls.js
+++ b/test/convertLcovToCoveralls.js
@@ -8,7 +8,7 @@ logger = require('log-driver')({level : false});
 
 describe("convertLcovToCoveralls", function(){
   it ("should convert a simple lcov file", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     var lcovpath = __dirname + "/../fixtures/onefile.lcov";
     var input = fs.readFileSync(lcovpath, "utf8");
     var libpath = __dirname + "/../fixtures/lib";
@@ -23,7 +23,7 @@ describe("convertLcovToCoveralls", function(){
   });
 
   it ("should pass on all appropriate parameters from the environment", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     process.env.COVERALLS_GIT_COMMIT = "GIT_HASH";
     process.env.COVERALLS_GIT_BRANCH = "master";
     process.env.COVERALLS_SERVICE_NAME = "SERVICE_NAME";
@@ -47,7 +47,7 @@ describe("convertLcovToCoveralls", function(){
     });
   });
   it ("should work with a relative path as well", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     var lcovpath = __dirname + "/../fixtures/onefile.lcov";
     var input = fs.readFileSync(lcovpath, "utf8");
     var libpath = "fixtures/lib";
@@ -60,7 +60,7 @@ describe("convertLcovToCoveralls", function(){
   });
 
   it ("should convert absolute input paths to relative", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     var lcovpath = __dirname + "/../fixtures/istanbul.lcov";
     var input = fs.readFileSync(lcovpath, "utf8");
     var libpath = "/Users/deepsweet/Dropbox/projects/svgo/lib";
@@ -89,7 +89,7 @@ describe("convertLcovToCoveralls", function(){
   });
 
   it ("should ignore files that do not exists", function(done){
-    process.env.TRAVIS_JOB_ID = -1;
+    delete process.env.TRAVIS;
     var lcovpath = __dirname + "/../fixtures/istanbul.lcov";
     var input = fs.readFileSync(lcovpath, "utf8");
     var libpath = "/Users/deepsweet/Dropbox/projects/svgo/lib";
diff --git a/test/getOptions.js b/test/getOptions.js
index bd38b7c..51e4fa0 100644
--- a/test/getOptions.js
+++ b/test/getOptions.js
@@ -49,11 +49,9 @@ describe("getBaseOptions", function(){
   it ("should set service_name and service_job_id if it's running on codeship", function(done){
     testCodeship(getBaseOptions, done);
   });
-  /*
   it ("should set service_name and service_job_id if it's running on drone", function(done){
     testDrone(getBaseOptions, done);
   });
-  */
   it ("should set service_name and service_job_id if it's running on wercker", function(done){
     testWercker(getBaseOptions, done);
   });
@@ -133,11 +131,9 @@ describe("getOptions", function(){
   it ("should set service_name and service_job_id if it's running on codeship", function(done){
     testCodeship(getOptions, done);
   });
-  /*
   it ("should set service_name and service_job_id if it's running on drone", function(done){
     testDrone(getBaseOptions, done);
   });
-  */
   it ("should set service_name and service_job_id if it's running on wercker", function(done){
     testWercker(getOptions, done);
   });
@@ -285,9 +281,11 @@ var testServicePullRequest = function(sut, done){
 var testTravisCi = function(sut, done){
   process.env.TRAVIS = "TRUE";
   process.env.TRAVIS_JOB_ID = "1234";
+  process.env.TRAVIS_PULL_REQUEST = "123";
   sut(function(err, options){
     options.service_name.should.equal("travis-ci");
     options.service_job_id.should.equal("1234");
+    options.service_pull_request.should.equal("123");
     done();
   });
 };
@@ -365,6 +363,11 @@ var testDrone = function(sut, done) {
   process.env.DRONE_BUILD_NUMBER = '1234';
   process.env.DRONE_COMMIT = "e3e3e3e3e3e3e3e3e";
   process.env.DRONE_BRANCH = "master";
+  process.env.DRONE_PULL_REQUEST = '3';
+  process.env.DRONE_COMMIT_AUTHOR = 'john doe';
+  process.env.DRONE_COMMIT_AUTHOR_EMAIL = '[email protected]';
+  process.env.DRONE_COMMIT_MESSAGE = 'msgmsgmsg';
+
   sut(function(err, options){
     options.service_name.should.equal("drone");
     options.service_job_id.should.equal("1234");
@@ -372,9 +375,9 @@ var testDrone = function(sut, done) {
                                { id: 'e3e3e3e3e3e3e3e3e',
                                  author_name: 'Unknown Author',
                                  author_email: '',
-                                 committer_name: 'Unknown Committer',
-                                 committer_email: '',
-                                 message: 'Unknown Commit Message' },
+                                 committer_name: 'john doe',
+                                 committer_email: '[email protected]',
+                                 message: 'msgmsgmsg' },
                               branch: 'master',
                               remotes: [] });
     done();