coveralls.rb in slather-1.8

- old
+ new

@@ -9,26 +9,58 @@
 
       def travis_job_id
         ENV['TRAVIS_JOB_ID']
       end
       private :travis_job_id
-      
+
       def circleci_job_id
         ENV['CIRCLE_BUILD_NUM']
       end
       private :circleci_job_id
-      
+
       def circleci_pull_request
-        ENV['CI_PULL_REQUEST']
+        ENV['CIRCLE_PR_NUMBER'] || ENV['CI_PULL_REQUEST'] || ""
       end
       private :circleci_pull_request
-      
+
+      def jenkins_job_id
+        ENV['BUILD_ID']
+      end
+      private :jenkins_job_id
+
+      def jenkins_branch_name
+        branch_name = ENV['GIT_BRANCH']
+        if branch_name.include? 'origin/'
+          branch_name[7...branch_name.length]
+        else
+          branch_name
+        end
+      end
+      private :jenkins_branch_name
+
+      def jenkins_git_info
+        {
+          head: {
+            id: ENV['sha1'],
+            author_name: ENV['ghprbActualCommitAuthor'],
+            message: ENV['ghprbPullTitle']
+          },
+          branch: jenkins_branch_name
+        }
+      end
+      private :jenkins_git_info
+
+      def circleci_build_url
+        "https://circleci.com/gh/" + ENV['CIRCLE_PROJECT_USERNAME'] || "" + "/" + ENV['CIRCLE_PROJECT_REPONAME'] || "" + "/" + ENV['CIRCLE_BUILD_NUM'] || ""
+      end
+      private :circleci_build_url
+
       def circleci_git_info
         {
           :head => {
             :id => (ENV['CIRCLE_SHA1'] || ""),
-            :author_name => (ENV['CIRCLE_USERNAME'] || ""),
+            :author_name => (ENV['CIRCLE_PR_USERNAME'] || ENV['CIRCLE_USERNAME'] || ""),
             :message => (`git log --format=%s -n 1 HEAD`.chomp || "")
           },
           :branch => (ENV['CIRCLE_BRANCH'] || "")
         }
       end
@@ -45,11 +77,11 @@
               }.to_json
             elsif ci_service == :travis_pro
               {
                 :service_job_id => travis_job_id,
                 :service_name => "travis-pro",
-                :repo_token => ci_access_token,
+                :repo_token => coverage_access_token,
                 :source_files => coverage_files.map(&:as_json)
               }.to_json
             end
           else
             raise StandardError, "Environment variable `TRAVIS_JOB_ID` not set. Is this running on a travis build?"
@@ -57,21 +89,34 @@
         elsif ci_service == :circleci
           if circleci_job_id
             coveralls_hash = {
               :service_job_id => circleci_job_id,
               :service_name => "circleci",
-              :repo_token => ci_access_token,
+              :repo_token => coverage_access_token,
               :source_files => coverage_files.map(&:as_json),
-              :git => circleci_git_info
+              :git => circleci_git_info,
+              :service_build_url => circleci_build_url
             }
-            
+
             if circleci_pull_request != nil && circleci_pull_request.length > 0
               coveralls_hash[:service_pull_request] = circleci_pull_request.split("/").last
             end
-            
+
             coveralls_hash.to_json
           else
             raise StandardError, "Environment variable `CIRCLE_BUILD_NUM` not set. Is this running on a circleci build?"
+          end
+        elsif ci_service == :jenkins
+          if jenkins_job_id
+            {
+              service_job_id: jenkins_job_id,
+              service_name: "jenkins",
+              repo_token: coverage_access_token,
+              source_files: coverage_files.map(&:as_json),
+              git: jenkins_git_info
+            }.to_json
+          else
+            raise StandardError, "Environment variable `BUILD_ID` not set. Is this running on a jenkins build?"
           end
         else
           raise StandardError, "No support for ci named #{ci_service}"
         end
       end
\ No newline at end of file