Merge pull request #155 from kasperlewau/master

Reenabling Drone

Author: nickmerwin

lib/getOptions.js

@@ -24,14 +24,17 @@ var getBaseOptions = function(cb){
     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';

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);
   });
@@ -365,16 +361,21 @@ 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 = 'john@doe.com';
+  process.env.DRONE_COMMIT_MESSAGE = 'msgmsgmsg';
+
   sut(function(err, options){
     options.service_name.should.equal("drone");
     options.service_job_id.should.equal("1234");
     options.git.should.eql({ head:
                                { id: 'e3e3e3e3e3e3e3e3e',
                                  author_name: 'Unknown Author',
                                  author_email: '',
-                                 committer_name: 'Unknown Committer',
-                                 committer_email: '',
-                                 message: 'Unknown Commit Message' },
+                                 committer_name: 'john doe',
+                                 committer_email: 'john@doe.com',
+                                 message: 'msgmsgmsg' },
                               branch: 'master',
                               remotes: [] });
     done();