slather 2.4.8 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24ee530494c9f131751a85dba16a4bc09292c187d045be17b1212d9cf4038378
-  data.tar.gz: 4c5dabc3de752ebb88998ca29d87d6f072e4477a909926d4237078a2a9f73bc2
+  metadata.gz: 2c4a1059a1eae7156ac2c98e509e9cc267e6dd29fbd18332155e94b81c56c3de
+  data.tar.gz: b4d09bcb4d70d24e482268791c1a86f80f62a5f9206b3188931dabd1e8673b30
 SHA512:
-  metadata.gz: b7d4a1db210237adec6b9c03634774991a209c4aa64c10dea0a73208642298082b9a76f9c0e979b68a4601c6c9ff37f92d6f05bfd3c8a35429bd78cc8ac9549c
-  data.tar.gz: 9bf87cccabbd4b243e8ba9c519d491818a38924125694ca8701b3b34764a8c9ae167919b764638fa0af27b137dbbf10d9188b3e6297f93f3d1673ec07566d817
+  metadata.gz: 2a526985aec8bbf888ccdf584c3638c97349eddaff3b905df334a88ec42e865f1012c928aa520a3471ad6aadf911e60894576f018230da63aceeb27939a00921
+  data.tar.gz: fa77a74cef513c27b2e09101f20b0357c1cf163c1f94b273137a0738fd163bce9700f4e48b76bdfcd2a12e72ba4c3baaf24f0ce86738143f23f87f5a806fcda5

data/.gitignore

@@ -20,7 +20,7 @@ tmp
 *.o
 *.a
 mkmf.log
-
+.vendor 
 # Xcode
 #
 *.pbxuser

data/.travis.yml

@@ -1,10 +1,12 @@
 language: objective-c
 script: bundle exec rake
-osx_image: xcode9.2
+osx_image: xcode12.2
+
+cache: bundler
 
 before_install:
   - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
-  - gem install bundler -v "~> 1.0" --no-ri --no-rdoc
+  - gem install bundler -v "~> 2.0" --no-document
 
 install:
   - bundle install --without=documentation

data/CHANGELOG.md

@@ -1,5 +1,105 @@
 # CHANGELOG
 
+## v2.7.5
+
+* Add `--cdn-assets` flag
+  [sushant-here](https://github.com/sushant-here)
+  [#537](https://github.com/SlatherOrg/slather/pull/537)
+
+* Update nokogiri version
+
+## v2.7.4
+
+* Support Ruby 3.2.0
+  [crazymanish](https://github.com/crazymanish)
+  [#532](https://github.com/SlatherOrg/slather/pull/532)
+
+## v2.7.3
+
+* Support Coveralls parallel runs
+  [paulz](https://github.com/paulz)
+  [#523](https://github.com/SlatherOrg/slather/pull/523)
+
+* Update nokogiri version
+  [anil291987](https://github.com/anil291987)
+  [#518](https://github.com/SlatherOrg/slather/pull/518)
+  [#524](https://github.com/SlatherOrg/slather/pull/524)
+
+## v2.7.2
+
+* Update xcodeproj version
+  [adamyanalunas](https://github.com/adamyanalunas)
+  [#502](https://github.com/SlatherOrg/slather/pull/502)
+
+* Update nokogiri version
+  [jwelton](https://github.com/jwelton)
+  [#503](https://github.com/SlatherOrg/slather/pull/503)
+
+* Support alternate CI systems in coveralls output
+  [fermoyadrop](https://github.com/fermoyadrop)
+  [#504](https://github.com/SlatherOrg/slather/pull/504)
+
+* Add Bitrise support to coveralls output
+  [fermoyadrop](https://github.com/fermoyadrop)
+  [#504](https://github.com/SlatherOrg/slather/pull/505)
+
+## v2.7.1
+
+* Support generating coverage for framework targets
+  [onato](https://github.com/onato)
+  [#482](https://github.com/SlatherOrg/slather/pull/482)
+
+* Show number of lines in HTML report
+  [SiemianHS](https://github.com/SiemianHS)
+  [#494](https://github.com/SlatherOrg/slather/pull/494)
+
+* Fixed issues with HTML report generation
+  [fchiba](https://github.com/fchiba)
+  [#483](https://github.com/SlatherOrg/slather/pull/483)
+  [#484](https://github.com/SlatherOrg/slather/pull/484)
+
+* Don't fail if a source file doesn't exist
+  [chillpop](https://github.com/chillpop)
+  [#492](https://github.com/SlatherOrg/slather/pull/492)
+
+## v2.7.0
+
+* Add Branch Coverage data for ProfData coverage files
+  [hborawski](https://github.com/hborawski)
+  [#477](https://github.com/SlatherOrg/slather/pull/477)
+
+* Fixed 'Argument list too long' when running 'xcrun llvm-cov'
+  [samuelsainz](https://github.com/samuelsainz)
+  [#476](https://github.com/SlatherOrg/slather/pull/476)
+
+## v2.6.1
+
+* Update nokogiri to 1.11
+  [ashin-omg](https://github.com/ashin-omg)
+  [#473](https://github.com/SlatherOrg/slather/pull/473)
+
+## v2.6.0
+
+* Added GitHub actions support
+  [martin-key](https://github.com/martin-key), [troyfontaine](https://github.com/troyfontaine)
+  [#468](https://github.com/SlatherOrg/slather/pull/468)
+
+## v2.5.0
+
+* Fixed activesupport and cocoapods dependencies
+  [daneov](https://github.com/daneov)
+  [#456](https://github.com/SlatherOrg/slather/pull/467)
+
+* Fixed typo in documentation
+  [descorp](https://github.com/descorp)
+  [#456](https://github.com/SlatherOrg/slather/pull/463)
+
+## v2.4.9
+
+* Added support for Sonarqube output
+  [adellibovi](https://github.com/adellibovi)
+  [#456](https://github.com/SlatherOrg/slather/pull/456)
+
 ## v2.4.8
 
 * Optimize performance for many binaries

data/README.md

@@ -134,13 +134,14 @@ test:
 
 ### Usage with Coveralls
 
-Login to [Coveralls](https://coveralls.io/) and enable your repository. Right now, `slather` supports Coveralls via [Travis CI](https://travis-ci.org) and [CircleCI](https://circleci.com).
+Login to [Coveralls](https://coveralls.io/) and enable your repository. Right now, `slather` supports Coveralls via [Travis CI](https://travis-ci.org), [CircleCI](https://circleci.com), [Jenkins](https://www.jenkins.io/), [Teamcity](https://www.jetbrains.com/teamcity/), [Buildkite](https://buildkite.com/), and [Bitrise](https://bitrise.io/).
 
-Make a `.slather.yml` file:
+Make a `.slather.yml` file and specify the CI Service you're using:
 
 ```yml
 # .slather.yml
 
+ci_service: circleci | travis_ci | travis_pro | jenkins | buildkite | teamcity
 coverage_service: coveralls
 xcodeproj: path/to/project.xcodeproj
 scheme: YourXcodeSchemeName
@@ -149,7 +150,7 @@ ignore:
   - ProjectTestsGroup/*
 ```
 
-And then in your `.travis.yml` or `circle.yml`, call `slather` after a successful build:
+And then in your `.travis.yml` or `circle.yml` or `github-action.yml`, call `slather` after a successful build:
 
 ```yml
 # .travis.yml
@@ -168,6 +169,25 @@ test:
 
 ```
 
+```yml
+# github-action.yml
+  myjob:
+    steps:
+      - run: |
+          bundle config path vendor/bundle
+          bundle install --without=documentation --jobs 4 --retry 3
+      - name: Extract branch name
+        shell: bash
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        id: get_branch
+      - run: bundle exec slather
+        env:
+          GIT_BRANCH: ${{ steps.get_branch.outputs.branch }}
+          CI_PULL_REQUEST: ${{ github.event.number }}
+          COVERAGE_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+```
+
 #### Usage with Travis CI Pro
 
 To use Coveralls with Travis CI Pro (for private repos), add following lines along with other settings to `.slather.yml`:
@@ -214,6 +234,8 @@ $ slather coverage --html --scheme YourXcodeSchemeName path/to/project.xcodeproj
 
 This will make a directory named `html` in your root directory (unless `--output-directory` is specified) and will generate all the reports as static html pages inside the directory. It will print out the report's path by default, but you can also specify `--show` flag to open it in your browser automatically.
 
+By default, the generated HTML will reference locally hosted assets (js, css). You can specify the `--cdn-assets` to specify that you prefer for the generated HTML to use externally hosted assets. This can be useful if publishing the HTML file as a build artifact. 
+
 ### TeamCity Reporting
 
 To report the coverage statistics to TeamCity:
@@ -265,3 +287,4 @@ Please make sure to follow our general coding style and add test coverage for ne
 * [@jhersh](https://github.com/jhersh), CircleCI support.
 * [@tarbrain](https://github.com/tarbrain), Cobertura support and bugfixing.
 * [@ikhsan](https://github.com/ikhsan), html support.
+* [@martin-key](https://github.com/martin-key) and [@troyfontaine](https://github.com/troyfontaine), Github Actions support.

data/assets/slather.css

@@ -74,6 +74,7 @@ table.source_code {
 table.source_code td {
   padding-bottom: 0.3em;
 }
+code.missed { background-color: rgba(255, 73, 76, 0.3); }
 table.source_code tr.missed td { background-color: rgba(248, 103, 105, 0.2); }
 table.source_code tr.covered td { background-color: rgba(103, 207, 124, 0.2); }
 table.source_code td.num {
@@ -124,7 +125,7 @@ footer p, footer a {
 Syntax Highlighting using highlight.js (https://highlightjs.org)
 ------------------------------------------------------------- */
 .hljs {
-  display: block;
+  display: inline-block;
   overflow-x: auto;
   -webkit-text-size-adjust: none;
 }

data/lib/slather/command/coverage_command.rb

@@ -8,15 +8,18 @@ class CoverageCommand < Clamp::Command
   option ["--jenkins"], :flag, "Indicate that the builds are running on Jenkins"
   option ["--buildkite"], :flag, "Indicate that the builds are running on Buildkite"
   option ["--teamcity"], :flag, "Indicate that the builds are running on TeamCity"
+  option ["--github"], :flag, "Indicate that the builds are running on Github Actions"
 
   option ["--coveralls", "-c"], :flag, "Post coverage results to coveralls"
   option ["--simple-output", "-s"], :flag, "Output coverage results to the terminal"
   option ["--gutter-json", "-g"], :flag, "Output coverage results as Gutter JSON format"
   option ["--cobertura-xml", "-x"], :flag, "Output coverage results as Cobertura XML format"
+  option ["--sonarqube-xml", "-sq"], :flag, "Output coverage results as SonarQube XML format"
   option ["--llvm-cov", "-r"], :flag, "Output coverage as llvm-cov format"
   option ["--json"], :flag, "Output coverage results as simple JSON"
   option ["--html"], :flag, "Output coverage results as static html pages"
   option ["--show"], :flag, "Indicate that the static html pages will open automatically"
+  option ["--cdn-assets"], :flag, "Indicate that the static html pages will load assets from a CDN"
 
   option ["--build-directory", "-b"], "BUILD_DIRECTORY", "The directory where gcno files will be written to. Defaults to derived data."
   option ["--source-directory"], "SOURCE_DIRECTORY", "The directory where your source files are located."
@@ -28,7 +31,7 @@ class CoverageCommand < Clamp::Command
   option ["--scheme"], "SCHEME", "The scheme for which the coverage was generated"
   option ["--configuration"], "CONFIGURATION", "The configuration for test that the project was set"
   option ["--workspace"], "WORKSPACE", "The workspace that the project was built in"
-  option ["--binary-file"], "BINARY_FILE", "The binary file against the which the coverage will be run", :multivalued => true
+  option ["--binary-file"], "BINARY_FILE", "The binary file against which the coverage will be run", :multivalued => true
   option ["--binary-basename"], "BINARY_BASENAME", "Basename of the file against which the coverage will be run", :multivalued => true
   option ["--arch"], "ARCH", "Architecture to use from universal binaries"
   option ["--source-files"], "SOURCE_FILES", "A Dir.glob compatible pattern used to limit the lookup to specific source files. Ignored in gcov mode.", :multivalued => true
@@ -90,6 +93,8 @@ class CoverageCommand < Clamp::Command
       project.ci_service = :buildkite
     elsif teamcity?
       project.ci_service = :teamcity
+    elsif github?
+      project.ci_service = :github
     end
   end
 
@@ -122,8 +127,11 @@ class CoverageCommand < Clamp::Command
     elsif html?
       project.coverage_service = :html
       project.show_html = show?
+      project.cdn_assets = cdn_assets?
     elsif json?
       project.coverage_service = :json
+    elsif sonarqube_xml?
+      project.coverage_service = :sonarqube_xml
     end
   end
 

data/lib/slather/coverage_file.rb

@@ -43,18 +43,23 @@ module Slather
 
     def gcov_data
       @gcov_data ||= begin
-        gcov_output = `gcov "#{source_file_pathname}" --object-directory "#{gcno_file_pathname.parent}" --branch-probabilities --branch-counts`
-        # Sometimes gcov makes gcov files for Cocoa Touch classes, like NSRange. Ignore and delete later.
-        gcov_files_created = gcov_output.scan(/creating '(.+\..+\.gcov)'/)
+        gcov_data = ""
+
+        Dir.chdir(project.project_dir) do
+          gcov_output = `gcov "#{source_file_pathname}" --object-directory "#{gcno_file_pathname.parent}" --branch-probabilities --branch-counts`
+          # Sometimes gcov makes gcov files for Cocoa Touch classes, like NSRange. Ignore and delete later.
+          gcov_files_created = gcov_output.scan(/creating '(.+\..+\.gcov)'/)
+
+          gcov_file_name = "./#{source_file_pathname.basename}.gcov"
+          if File.exist?(gcov_file_name)
+            gcov_data = File.new(gcov_file_name).read
+          else
+            gcov_data = ""
+          end
 
-        gcov_file_name = "./#{source_file_pathname.basename}.gcov"
-        if File.exists?(gcov_file_name)
-          gcov_data = File.new(gcov_file_name).read
-        else
-          gcov_data = ""
+          gcov_files_created.each { |file| FileUtils.rm_f(file) }
         end
 
-        gcov_files_created.each { |file| FileUtils.rm_f(file) }
         gcov_data
       end
     end

data/lib/slather/coverage_service/coveralls.rb

@@ -36,6 +36,31 @@ module Slather
       end
       private :jenkins_job_id
 
+      def github_job_id
+        ENV['GITHUB_RUN_ID']
+      end
+      private :github_job_id
+
+      def bitrise_job_id
+        ENV['BITRISE_BUILD_NUMBER']
+      end
+      private :bitrise_job_id
+
+      def bitrise_pull_request
+        ENV['BITRISE_PULL_REQUEST']
+      end
+      private :bitrise_pull_request
+
+      def github_pull_request
+        ENV['CI_PULL_REQUEST'] || ""
+      end
+      private :github_pull_request
+
+      def github_repo_name
+        ENV['GITHUB_REPOSITORY'] || ""
+      end
+      private :github_repo_name
+
       def jenkins_branch_name
         branch_name = ENV['GIT_BRANCH'] || ENV['BRANCH_NAME']
         if branch_name.include? 'origin/'
@@ -51,6 +76,16 @@ module Slather
       end
       private :teamcity_branch_name
 
+      def github_branch_name
+        ENV['GIT_BRANCH'] || `git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3-`.chomp
+      end
+      private :github_branch_name
+
+      def bitrise_branch_name
+        ENV['BITRISE_GIT_BRANCH'] || `git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3-`.chomp
+      end
+      private :bitrise_branch_name
+
       def buildkite_job_id
         ENV['BUILDKITE_BUILD_NUMBER']
       end
@@ -119,11 +154,51 @@ module Slather
         "https://buildkite.com/" + ENV['BUILDKITE_PROJECT_SLUG'] + "/builds/" + ENV['BUILDKITE_BUILD_NUMBER'] + "#"
       end
 
+      def github_git_info
+        {
+          :head => {
+            :id => ENV['GITHUB_SHA'],
+            :author_name => ENV['GITHUB_ACTOR'],
+            :message => (`git log --format=%s -n 1 HEAD`.chomp || "")
+          },
+          :branch => github_branch_name
+        }
+      end
+      private :github_git_info
+
+      def bitrise_git_info
+        {
+          :head => {
+            :id => ENV['BITRISE_GIT_COMMIT'],
+            :committer_name => (ENV['GIT_CLONE_COMMIT_AUTHOR_NAME'] || `git log --format=%an -n 1 HEAD`.chomp || ""),
+            :committer_email => (ENV['GIT_CLONE_COMMIT_AUTHOR_EMAIL'] || `git log --format=%ae -n 1 HEAD`.chomp || ""),
+            :message => (ENV['BITRISE_GIT_MESSAGE'] || `git log --format=%s -n 1 HEAD`.chomp || "")
+          },
+          :branch => bitrise_branch_name
+        }
+      end
+      private :bitrise_git_info
+
+      def github_build_url
+        "https://github.com/" + ENV['GITHUB_REPOSITORY'] + "/actions/runs/" + ENV['GITHUB_RUN_ID']
+      end
+      private :github_build_url
+
+      def is_parallel
+        ENV['IS_PARALLEL'] != nil
+      end
+      private :is_parallel
+
+      def github_job_name
+        ENV['GITHUB_JOB']
+      end
+      private :github_job_name
+
       def coveralls_coverage_data
         if ci_service == :travis_ci || ci_service == :travis_pro
           if travis_job_id
             if ci_service == :travis_ci
-              
+
               if coverage_access_token.to_s.strip.length > 0
                 raise StandardError, "Access token is set. Uploading coverage data for public repositories doesn't require an access token."
               end
@@ -133,7 +208,7 @@ module Slather
                 :service_name => "travis-ci",
                 :source_files => coverage_files.map(&:as_json)
               }.to_json
-            elsif ci_service == :travis_pro              
+            elsif ci_service == :travis_pro
 
               if coverage_access_token.to_s.strip.length == 0
                 raise StandardError, "Access token is not set. Uploading coverage data for private repositories requires an access token."
@@ -206,8 +281,57 @@ module Slather
           else
             raise StandardError, "Environment variable `TC_BUILD_NUMBER` not set. Is this running on a teamcity build?"
           end
+        elsif ci_service == :github
+
+          if coverage_access_token.to_s.strip.length == 0
+            raise StandardError, "Access token is not set. Uploading coverage data for private repositories requires an access token."
+          end
+
+          if github_job_id
+            {
+              :service_job_id => github_job_id,
+              :service_name => "github",
+              :repo_token => coverage_access_token,
+              :repo_name => github_repo_name,
+              :source_files => coverage_files.map(&:as_json),
+              :service_build_url => github_build_url,
+              :service_pull_request => github_pull_request,
+              :git => github_git_info,
+              :parallel => is_parallel,
+              :flag_name => github_job_name
+            }.to_json
+          else
+            raise StandardError, "Environment variable `GITHUB_RUN_ID` not set.  Is this running on github build?"
+          end
+        elsif ci_service == :bitrise
+          {
+            :service_job_id => bitrise_job_id,
+            :service_name => 'bitrise',
+            :repo_token => coverage_access_token,
+            :source_files => coverage_files.map(&:as_json),
+            :service_pull_request => bitrise_pull_request,
+            :service_branch => bitrise_branch_name,
+            :git => bitrise_git_info
+          }.to_json
         else
-          raise StandardError, "No support for ci named #{ci_service}"
+          {
+            :service_job_id => ENV['CI_BUILD_NUMBER'],
+            :service_name => ENV['CI_NAME'] || ci_service,
+            :repo_token => coverage_access_token,
+            :source_files => coverage_files.map(&:as_json),
+            :service_build_url => ENV['CI_BUILD_URL'],
+            :service_pull_request => ENV['CI_PULL_REQUEST'],
+            :service_branch => ENV['CI_BRANCH'],
+            :git => {
+              :head => {
+                :id => ENV['CI_COMMIT'],
+                :committer_name => (`git log --format=%an -n 1 HEAD`.chomp || ""),
+                :committer_email => (`git log --format=%ae -n 1 HEAD`.chomp || ""),
+                :message => (`git log --format=%s -n 1 HEAD`.chomp || "")
+              },
+              :branch => ENV['CI_BRANCH']
+            }
+          }.to_json
         end
       end
       private :coveralls_coverage_data
@@ -220,8 +344,8 @@ module Slather
 
           curl_result = `curl -s --form json_file=@#{f.path} #{coveralls_api_jobs_path}`
 
-          if curl_result.is_a? String 
-            curl_result_json = JSON.parse(curl_result)          
+          if curl_result.is_a? String
+            curl_result_json = JSON.parse(curl_result)
 
             if curl_result_json["error"]
               error_message = curl_result_json["message"]

data/lib/slather/coverage_service/html_output.rb

@@ -70,9 +70,14 @@ module Slather
 
         total_relevant_lines = 0
         total_tested_lines = 0
+        total_relevant_branches = 0
+        total_branches_tested = 0
         coverage_files.each { |coverage_file|
           total_tested_lines += coverage_file.num_lines_tested
           total_relevant_lines += coverage_file.num_lines_testable
+
+          total_relevant_branches += coverage_file.num_branches_testable
+          total_branches_tested += coverage_file.num_branches_tested
         }
 
         builder = Nokogiri::HTML::Builder.with(template.at('#reports')) { |cov|
@@ -82,6 +87,22 @@ module Slather
             percentage = (total_tested_lines / total_relevant_lines.to_f) * 100.0
             cov.span "Total Coverage : "
             cov.span decimal_f(percentage) + '%', :class => class_for_coverage_percentage(percentage), :id => "total_coverage"
+            cov.span " ("
+            cov.span total_tested_lines, :id => "total_tested_lines"
+            cov.span " of "
+            cov.span total_relevant_lines, :id => "total_relevant_lines"
+            cov.span " lines)"
+          }
+
+          cov.h4 {
+            percentage = (total_branches_tested / total_relevant_branches.to_f) * 100.0
+            cov.span "Total Branch Coverage : "
+            cov.span decimal_f(percentage) + '%', :class => class_for_coverage_percentage(percentage), :id => "total_coverage"
+            cov.span " ("
+            cov.span total_branches_tested, :id => "total_branches_tested"
+            cov.span " of "
+            cov.span total_relevant_branches, :id => "total_relevant_branches"
+            cov.span " lines)"
           }
 
           cov.input(:class => "search", :placeholder => "Search")
@@ -133,6 +154,7 @@ module Slather
         filepath = coverage_file.source_file_pathname_relative_to_repo_root
         filename = File.basename(filepath)
         percentage = coverage_file.percentage_lines_tested
+        branch_percentage = coverage_file.rate_branches_tested * 100
 
         cleaned_gcov_lines = coverage_file.cleaned_gcov_data.split("\n")
         is_file_empty = (cleaned_gcov_lines.count <= 0)
@@ -142,7 +164,10 @@ module Slather
         builder = Nokogiri::HTML::Builder.with(template.at('#reports')) { |cov|
           cov.h2(:class => "cov_title") {
             cov.span("Coverage for \"#{filename}\"" + (!is_file_empty ? " : " : ""))
+            cov.span("Lines: ") unless is_file_empty
             cov.span("#{decimal_f(percentage)}%", :class => class_for_coverage_percentage(percentage)) unless is_file_empty
+            cov.span(" Branches: ") unless is_file_empty
+            cov.span("#{decimal_f(branch_percentage)}%", :class => class_for_coverage_percentage(branch_percentage)) unless is_file_empty
           }
 
           cov.h4("(#{coverage_file.num_lines_tested} of #{coverage_file.num_lines_testable} relevant lines covered)", :class => "cov_subtitle")
@@ -157,8 +182,9 @@ module Slather
 
           cov.table(:class => "source_code") {
             cleaned_gcov_lines.each do |line|
-
               line_number = coverage_file.line_number_in_line(line)
+              missed_regions = coverage_file.branch_region_data[line_number]
+              hits = coverage_file.coverage_for_line(line)
               next unless line_number > 0
 
               line_source = line.split(line_number_separator, 3)[2]
@@ -171,7 +197,30 @@ module Slather
                     cov.td(line, :class => classes[idx])
                   else
                     cov.td(:class => classes[idx]) {
-                      cov.pre { cov.code(line, :class => "objc") }
+                      cov.pre {
+                        # If the line has coverage and missed regions, split up
+                        # the line to show regions that weren't covered
+                        if missed_regions != nil && hits != nil && hits > 0
+                          regions = missed_regions.map do |region|
+                            region_start, region_length = region
+                            if region_length != nil
+                              line[region_start, region_length]
+                            else
+                              line[region_start, line.length - region_start]
+                            end
+                          end
+                          current_line = line
+                          regions.each do |region|
+                            covered, remainder = current_line.split(region, 2)
+                            cov.code(covered, :class => "objc")
+                            cov.code(region, :class => "objc missed")
+                            current_line = remainder
+                          end
+                          cov.code(current_line, :class => "objc")
+                        else
+                          cov.code(line, :class => "objc")
+                        end
+                      }
                     }
                   end
                 }
@@ -184,10 +233,17 @@ module Slather
       end
 
       def generate_html_template(title, is_index, is_file_empty)
-        logo_path = "logo.jpg"
-        css_path = "slather.css"
-        highlight_js_path = "highlight.pack.js"
-        list_js_path = "list.min.js"
+        if cdn_assets
+          logo_path = "https://cdn.jsdelivr.net/gh/SlatherOrg/slather/docs/logo.jpg"
+          css_path = "https://cdn.jsdelivr.net/gh/SlatherOrg/slather/assets/slather.css"
+          highlight_js_path = "https://cdn.jsdelivr.net/gh/SlatherOrg/slather/assets/highlight.pack.js"
+          list_js_path = "https://cdn.jsdelivr.net/gh/SlatherOrg/slather/assets/list.min.js"
+        else
+          logo_path = "logo.jpg"
+          css_path = "slather.css"
+          highlight_js_path = "highlight.pack.js"
+          list_js_path = "list.min.js"
+        end
 
         builder = Nokogiri::HTML::Builder.new do |doc|
           doc.html {

data/lib/slather/coverage_service/sonarqube_xml_output.rb

@@ -0,0 +1,61 @@
+require 'nokogiri'
+require 'date'
+
+module Slather
+  module CoverageService
+    module SonarqubeXmlOutput
+
+      def coverage_file_class
+        if input_format == "profdata"
+          Slather::ProfdataCoverageFile
+        else
+          Slather::CoverageFile
+        end
+      end
+      private :coverage_file_class
+
+      def post
+        cobertura_xml_report = create_xml_report(coverage_files)
+        store_report(cobertura_xml_report)
+      end
+
+      def store_report(report)
+        output_file = 'sonarqube-generic-coverage.xml'
+        if output_directory
+          FileUtils.mkdir_p(output_directory)
+          output_file = File.join(output_directory, output_file)
+        end
+        File.write(output_file, report.to_s)
+      end
+
+      def create_xml_report(coverage_files)
+        create_empty_xml_report
+        coverage_node = @doc.root
+        coverage_node['version'] = "1"
+
+        coverage_files.each do |coverage_file|
+          file_node = Nokogiri::XML::Node.new "file", @doc
+          file_node.parent = coverage_node
+          file_node['path'] = coverage_file.source_file_pathname_relative_to_repo_root.to_s
+          coverage_file.all_lines.each do |line|
+            if coverage_file.coverage_for_line(line)
+              line_node = Nokogiri::XML::Node.new "lineToCover", @doc
+              line_node['lineNumber'] = coverage_file.line_number_in_line(line)
+              line_node['covered'] = coverage_file.coverage_for_line(line) == 0 ? "false" : "true"
+              line_node.parent = file_node
+            end
+          end
+        end
+        @doc.to_xml
+      end
+
+      def create_empty_xml_report
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.coverage
+        end
+        @doc = builder.doc
+      end
+
+    end
+  end
+end