merge conflict

Author: nickmerwin

lib/convertLcovToCoveralls.js

@@ -31,7 +31,7 @@ var convertLcovToCoveralls = function(input, options, cb){
     if (err){
       logger.error("error from lcovParse: ", err);
       logger.error("input: ", input);
-      return cb(err); 
+      return cb(err);
     }
     var postJson = {
       source_files : []
@@ -48,7 +48,7 @@ var convertLcovToCoveralls = function(input, options, cb){
     if (options.service_job_id){
       postJson.service_job_id = options.service_job_id;
     }
-    if (options.service_pull_request){
+    if (options.service_pull_request) {
       postJson.service_pull_request = options.service_pull_request;
     }
     if (options.repo_token) {
@@ -114,4 +114,3 @@ example output from lcov parser:
         },
 
 */
-

lib/getOptions.js

@@ -42,6 +42,11 @@ var getBaseOptions = function(cb){
   if (process.env.CIRCLECI){
     options.service_name = 'circleci';
     options.service_job_id = process.env.CIRCLE_BUILD_NUM;
+
+    if (process.env.CI_PULL_REQUEST) {
+      var pr = process.env.CI_PULL_REQUEST.split('/pull/');
+      options.service_pull_request = pr[1];
+    }
     git_commit = process.env.CIRCLE_SHA1;
     git_branch = process.env.CIRCLE_BRANCH;
   }

test/getOptions.js

@@ -301,9 +301,11 @@ var testCircleCi = function(sut, done){
   process.env.CIRCLE_BRANCH = "master";
   process.env.CIRCLE_BUILD_NUM = "1234";
   process.env.CIRCLE_SHA1 = "e3e3e3e3e3e3e3e3e";
+  process.env.CI_PULL_REQUEST = 'http://github.com/node-coveralls/pull/3';
   sut(function(err, options){
     options.service_name.should.equal("circleci");
     options.service_job_id.should.equal("1234");
+    options.service_pull_request.should.equal('3');
     options.git.should.eql({ head:
                                { id: 'e3e3e3e3e3e3e3e3e',
                                  author_name: 'Unknown Author',