slather 2.4.7 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96a2924692977293e43094ff06f13424436d3e52c4703d7827753164043d65b
-  data.tar.gz: 813bb754172204b270f51b2e8548506163a7d38eddd8c8f69899bf0b5b6c789e
+  metadata.gz: 65797ce8dfbfe5637c983ce35e07296cf3948e054b84db165536643e6fa7bd2f
+  data.tar.gz: 77ee9800d1f2845739563b06932037409499b07c9d7524a1e15e8c709453aeda
 SHA512:
-  metadata.gz: 11206bb710d0fbcdc70970113c18c250e94c009ee99b85d8b8fbc655dcd10f1d88d42c7fa29a67cad3e9b07a09ebb4b1866af70f21b54944aeeb898ddc52ffca
-  data.tar.gz: 7f0b18beaacafa3e38eaded6df28747619570f6d0a67a4546465485bfcddfcb152543185782703cd32814cd38b86dfb3f68c49876a13a9642eb02f7ae96cb224
+  metadata.gz: 9e14157b010048c0d03876f2aed5107821e2c533ddc0b48e1eaa8cc5e177c7346b23d92c0fa6c4b0393c63c921036f8e65f2574374aa6c655bf4c1ff79dffe2b
+  data.tar.gz: 51d9746ef872aa49cf26ad6b03e78d61d6a4e99a87551f54f99bee6714ce4401002fe83ccf609a86233f50560b4e181ee8412fb122bf59f026a184a3289a75d3

data/.gitignore

@@ -46,4 +46,8 @@ html
 *.gcno
 
 # JetBrains IDE
-.idea/
+.idea/
+
+# Test output
+report.llcov
+report.json

data/.travis.yml

@@ -1,10 +1,10 @@
 language: objective-c
 script: bundle exec rake
-osx_image: xcode9.2
+osx_image: xcode12.2
 
 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,47 @@
 # CHANGELOG
 
+## 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
+  [cltnschlosser](https://github.com/cltnschlosser)
+  [#455](https://github.com/SlatherOrg/slather/pull/455)
+
+* Don't generate line 0 in profdata_coverage_file.rb from line with error
+  [tthbalazs](https://github.com/tthbalazs)
+  [#449](https://github.com/SlatherOrg/slather/pull/449)
+
+* coveralls dependency update
+  [GRiMe2D](https://github.com/GRiMe2D)
+  [#448](https://github.com/SlatherOrg/slather/pull/448)
+
 ## v2.4.7
 
 * Update dependencies

data/README.md

@@ -67,6 +67,20 @@ If your configuration produces a universal binary you need to specify a specific
 $ slather coverage -s --arch x86_64 --scheme YourXcodeSchemeName --configuration YourBuildConfigurationName path/to/project.xcodeproj
 ```
 
+### For multiple modules
+
+If you want to run some modules, but not all (like modules created by CocoaPods) you can do it like this:
+
+```sh
+$ slather coverage --binary-basename module1 --binary-basename module2 path/to/project.xcodeproj
+```
+You can also add it to the `.slather.yml` file as an array:
+```yml
+binary_basename:
+  - module1
+  - module2
+```
+
 ### Setup for Xcode 5 and 6
 
 Run this command to enable the `Generate Test Coverage` and `Instrument Program Flow` flags for your project:
@@ -135,7 +149,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
@@ -154,6 +168,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`:
@@ -251,3 +284,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/lib/slather.rb

@@ -12,6 +12,7 @@ require 'slather/coverage_service/simple_output'
 require 'slather/coverage_service/html_output'
 require 'slather/coverage_service/json_output'
 require 'slather/coverage_service/llvm_cov_output'
+require 'slather/coverage_service/sonarqube_xml_output'
 require 'cfpropertylist'
 
 module Slather

data/lib/slather/command/coverage_command.rb

@@ -8,11 +8,13 @@ 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"
@@ -90,6 +92,8 @@ class CoverageCommand < Clamp::Command
       project.ci_service = :buildkite
     elsif teamcity?
       project.ci_service = :teamcity
+    elsif github?
+      project.ci_service = :github
     end
   end
 
@@ -124,6 +128,8 @@ class CoverageCommand < Clamp::Command
       project.show_html = show?
     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.exists?(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,21 @@ module Slather
       end
       private :jenkins_job_id
 
+      def github_job_id
+        ENV['GITHUB_RUN_ID']
+      end
+      private :github_job_id
+
+      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 +66,11 @@ 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 buildkite_job_id
         ENV['BUILDKITE_BUILD_NUMBER']
       end
@@ -119,6 +139,23 @@ 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 github_build_url
+        "https://github.com/" + ENV['GITHUB_REPOSITORY'] + "/actions/runs/" + ENV['GITHUB_RUN_ID']
+      end
+      private :github_build_url
+
       def coveralls_coverage_data
         if ci_service == :travis_ci || ci_service == :travis_pro
           if travis_job_id
@@ -206,6 +243,26 @@ 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
+            }.to_json
+          else
+            raise StandardError, "Environment variable `GITHUB_RUN_ID` not set.  Is this running on github build?"
+          end
         else
           raise StandardError, "No support for ci named #{ci_service}"
         end

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

data/lib/slather/profdata_coverage_file.rb

@@ -18,7 +18,6 @@ module Slather
     end
 
     def create_line_data
-      all_lines = source_code_lines
       line_data = Hash.new
       all_lines.each { |line| line_data[line_number_in_line(line, self.line_numbers_first)] = line }
       self.line_data = line_data
@@ -26,14 +25,20 @@ module Slather
     private :create_line_data
 
     def path_on_first_line?
-      path = self.source.split("\n")[0].sub ":", ""
-      !path.lstrip.start_with?("1|")
+      !source.lstrip.start_with?("1|")
     end
 
     def source_file_pathname
       @source_file_pathname ||= begin
         if path_on_first_line?
-          path = self.source.split("\n")[0].sub ":", ""
+          end_index = self.source.index(/:?\n/)
+          if end_index != nil
+            end_index -= 1
+            path = self.source[0..end_index]
+          else
+            # Empty file, output just contains path
+            path = self.source.sub ":", ""
+          end
           path &&= Pathname(path)
         else
           # llvm-cov was run with just one matching source file
@@ -64,7 +69,16 @@ module Slather
     end
 
     def source_code_lines
-      self.source.split("\n")[(path_on_first_line? ? 1 : 0)..-1]
+      lines = self.source.split("\n")[(path_on_first_line? ? 1 : 0)..-1]
+      ignore_error_lines(lines)
+    end
+
+    def ignore_error_lines(lines, line_numbers_first = self.line_numbers_first)
+      if line_numbers_first
+        lines.reject { |line| line.lstrip.start_with?('|', '--') }
+      else
+        lines
+      end
     end
 
     def source_data
@@ -72,10 +86,7 @@ module Slather
     end
 
     def all_lines
-      if @all_lines == nil
-        @all_lines = source_code_lines
-      end
-      @all_lines
+      @all_lines ||= source_code_lines
     end
 
     def raw_source
@@ -94,6 +105,9 @@ module Slather
 
     def line_number_in_line(line, line_numbers_first = self.line_numbers_first)
       if line_numbers_first
+        # Skip regex if the number is the first thing in the line
+        fastpath_number = line.to_i
+        return fastpath_number if fastpath_number != 0
         line =~ /^(\s*)(\d*)/
         group = $2
       else
@@ -123,7 +137,7 @@ module Slather
     end
 
     def line_coverage_data
-      source_code_lines.map do |line|
+      all_lines.map do |line|
         coverage_for_line(line, self.line_numbers_first)
       end
     end

data/lib/slather/project.rb

@@ -191,36 +191,38 @@ module Slather
     end
 
     def profdata_coverage_dir
-      raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.exists?(self.build_directory)
-      dir = nil
-      if self.scheme
-        dir = Dir[File.join(build_directory,"/**/CodeCoverage/#{self.scheme}")].first
-      else
-        dir = Dir[File.join(build_directory,"/**/#{first_product_name}")].first
-      end
+      @profdata_coverage_dir ||= begin
+        raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.exists?(self.build_directory)
+        dir = nil
+        if self.scheme
+          dir = Dir[File.join(build_directory,"/**/CodeCoverage/#{self.scheme}")].first
+        else
+          dir = Dir[File.join(build_directory,"/**/#{first_product_name}")].first
+        end
 
-      if dir == nil
-        # Xcode 7.3 moved the location of Coverage.profdata
-        dir = Dir[File.join(build_directory,"/**/CodeCoverage")].first
-      end
+        if dir == nil
+          # Xcode 7.3 moved the location of Coverage.profdata
+          dir = Dir[File.join(build_directory,"/**/CodeCoverage")].first
+        end
 
-      if dir == nil && Slather.xcode_version[0] >= 9
-        # Xcode 9 moved the location of Coverage.profdata
-        coverage_files = Dir[File.join(build_directory, "/**/ProfileData/*/Coverage.profdata")]
+        if dir == nil && Slather.xcode_version[0] >= 9
+          # Xcode 9 moved the location of Coverage.profdata
+          coverage_files = Dir[File.join(build_directory, "/**/ProfileData/*/Coverage.profdata")]
 
-        if coverage_files.count == 0
-          # Look up one directory
-          # The ProfileData directory is next to Intermediates.noindex (in previous versions of Xcode the coverage was inside Intermediates)
-          coverage_files = Dir[File.join(build_directory, "../**/ProfileData/*/Coverage.profdata")]
-        end
+          if coverage_files.count == 0
+            # Look up one directory
+            # The ProfileData directory is next to Intermediates.noindex (in previous versions of Xcode the coverage was inside Intermediates)
+            coverage_files = Dir[File.join(build_directory, "../**/ProfileData/*/Coverage.profdata")]
+          end
 
-        if coverage_files != nil && coverage_files.count != 0
-          dir = Pathname.new(coverage_files.first).parent()
+          if coverage_files != nil && coverage_files.count != 0
+            dir = Pathname.new(coverage_files.first).parent()
+          end
         end
-      end
 
-      raise StandardError, "No coverage directory found." unless dir != nil
-      dir
+        raise StandardError, "No coverage directory found." unless dir != nil
+        dir
+      end
     end
 
     def profdata_file
@@ -422,6 +424,8 @@ module Slather
         extend(Slather::CoverageService::HtmlOutput)
       when :json
         extend(Slather::CoverageService::JsonOutput)
+      when :sonarqube_xml
+        extend(Slather::CoverageService::SonarqubeXmlOutput)
       else
         raise ArgumentError, "`#{coverage_service}` is not a valid coverage service. Try `terminal`, `coveralls`, `gutter_json`, `cobertura_xml` or `html`"
       end

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = '2.4.7' unless defined?(Slather::VERSION)
+  VERSION = '2.6.1' unless defined?(Slather::VERSION)
 end

data/slather.gemspec

@@ -17,20 +17,20 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'coveralls', '~> 0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'simplecov', '~> 0'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'pry', '~> 0.12'
-  spec.add_development_dependency 'cocoapods', '~> 1.5'
+  spec.add_development_dependency 'cocoapods', '~> 1.10.beta.1'
   spec.add_development_dependency 'json_spec', '~> 1.1'
   spec.add_development_dependency 'equivalent-xml', '~> 0.6'
 
   spec.add_dependency 'clamp', '~> 1.3'
   spec.add_dependency 'xcodeproj', '~> 1.7'
-  spec.add_dependency 'nokogiri', '~> 1.8'
+  spec.add_dependency 'nokogiri', '~> 1.11'
   spec.add_dependency 'CFPropertyList', '>= 2.2', '< 4'
 
-  spec.add_runtime_dependency 'activesupport', '< 5', '>= 4.0.2'
+  spec.add_runtime_dependency 'activesupport'
 end

data/spec/fixtures/sonarqube-generic-coverage.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<coverage version="1">
+  <file path="spec/fixtures/fixtures/fixtures.m">
+    <lineToCover lineNumber="14" covered="true"/>
+    <lineToCover lineNumber="15" covered="true"/>
+    <lineToCover lineNumber="16" covered="true"/>
+    <lineToCover lineNumber="19" covered="false"/>
+    <lineToCover lineNumber="20" covered="false"/>
+    <lineToCover lineNumber="21" covered="false"/>
+  </file>
+  <file path="spec/fixtures/fixtures/more_files/Branches.m">
+    <lineToCover lineNumber="14" covered="true"/>
+    <lineToCover lineNumber="15" covered="true"/>
+    <lineToCover lineNumber="16" covered="true"/>
+    <lineToCover lineNumber="17" covered="true"/>
+    <lineToCover lineNumber="18" covered="true"/>
+    <lineToCover lineNumber="19" covered="false"/>
+    <lineToCover lineNumber="20" covered="false"/>
+    <lineToCover lineNumber="21" covered="true"/>
+    <lineToCover lineNumber="22" covered="true"/>
+    <lineToCover lineNumber="23" covered="true"/>
+    <lineToCover lineNumber="24" covered="true"/>
+    <lineToCover lineNumber="25" covered="true"/>
+    <lineToCover lineNumber="26" covered="true"/>
+    <lineToCover lineNumber="27" covered="true"/>
+    <lineToCover lineNumber="28" covered="true"/>
+    <lineToCover lineNumber="29" covered="false"/>
+    <lineToCover lineNumber="30" covered="false"/>
+    <lineToCover lineNumber="31" covered="false"/>
+    <lineToCover lineNumber="32" covered="false"/>
+    <lineToCover lineNumber="33" covered="false"/>
+    <lineToCover lineNumber="34" covered="false"/>
+    <lineToCover lineNumber="35" covered="false"/>
+    <lineToCover lineNumber="36" covered="false"/>
+    <lineToCover lineNumber="37" covered="false"/>
+    <lineToCover lineNumber="38" covered="false"/>
+    <lineToCover lineNumber="39" covered="false"/>
+    <lineToCover lineNumber="40" covered="false"/>
+    <lineToCover lineNumber="41" covered="false"/>
+    <lineToCover lineNumber="42" covered="false"/>
+    <lineToCover lineNumber="43" covered="false"/>
+  </file>
+  <file path="spec/fixtures/fixturesTests/BranchesTests.m">
+    <lineToCover lineNumber="18" covered="true"/>
+    <lineToCover lineNumber="19" covered="true"/>
+    <lineToCover lineNumber="20" covered="true"/>
+    <lineToCover lineNumber="21" covered="true"/>
+    <lineToCover lineNumber="23" covered="true"/>
+    <lineToCover lineNumber="24" covered="true"/>
+    <lineToCover lineNumber="25" covered="true"/>
+    <lineToCover lineNumber="26" covered="true"/>
+    <lineToCover lineNumber="28" covered="true"/>
+    <lineToCover lineNumber="29" covered="true"/>
+    <lineToCover lineNumber="30" covered="true"/>
+    <lineToCover lineNumber="31" covered="true"/>
+    <lineToCover lineNumber="33" covered="true"/>
+    <lineToCover lineNumber="34" covered="true"/>
+    <lineToCover lineNumber="35" covered="true"/>
+    <lineToCover lineNumber="36" covered="true"/>
+  </file>
+  <file path="spec/fixtures/fixturesTests/fixturesTests.m">
+    <lineToCover lineNumber="20" covered="true"/>
+    <lineToCover lineNumber="21" covered="true"/>
+    <lineToCover lineNumber="22" covered="true"/>
+    <lineToCover lineNumber="23" covered="true"/>
+    <lineToCover lineNumber="26" covered="true"/>
+    <lineToCover lineNumber="27" covered="true"/>
+    <lineToCover lineNumber="28" covered="true"/>
+    <lineToCover lineNumber="29" covered="true"/>
+    <lineToCover lineNumber="32" covered="true"/>
+    <lineToCover lineNumber="33" covered="true"/>
+    <lineToCover lineNumber="34" covered="true"/>
+    <lineToCover lineNumber="35" covered="true"/>
+    <lineToCover lineNumber="38" covered="true"/>
+    <lineToCover lineNumber="39" covered="true"/>
+    <lineToCover lineNumber="40" covered="true"/>
+    <lineToCover lineNumber="41" covered="true"/>
+    <lineToCover lineNumber="42" covered="true"/>
+  </file>
+  <file path="spec/fixtures/fixturesTests/peekaviewTests&#x1F4A3;.m">
+    <lineToCover lineNumber="18" covered="true"/>
+    <lineToCover lineNumber="19" covered="true"/>
+    <lineToCover lineNumber="20" covered="true"/>
+    <lineToCover lineNumber="21" covered="true"/>
+    <lineToCover lineNumber="24" covered="true"/>
+    <lineToCover lineNumber="25" covered="true"/>
+    <lineToCover lineNumber="26" covered="true"/>
+    <lineToCover lineNumber="27" covered="true"/>
+    <lineToCover lineNumber="30" covered="true"/>
+    <lineToCover lineNumber="31" covered="true"/>
+    <lineToCover lineNumber="32" covered="true"/>
+  </file>
+</coverage>

data/spec/slather/cocoapods_plugin_spec.rb

@@ -13,7 +13,7 @@ describe Slather do
       # Execute the post_install hook via CocoaPods
       sandbox_root = 'Pods'
       sandbox = Pod::Sandbox.new(sandbox_root)
-      context = Pod::Installer::PostInstallHooksContext.generate(sandbox, [])
+      context = Pod::Installer::PostInstallHooksContext.generate(sandbox, mock_project, [])
       Pod::HooksManager.run(:post_install, context, {'slather' => nil})
     end
   end

data/spec/slather/coverage_service/coveralls_spec.rb

@@ -151,6 +151,26 @@ describe Slather::CoverageService::Coveralls do
         ENV['GIT_BRANCH'] = git_branch
       end
     end
+
+    context "coverage_service is :github" do
+      before(:each) { fixtures_project.ci_service = :github }
+
+      it "should return valid json for coveralls coverage data" do
+        allow(fixtures_project).to receive(:github_job_id).and_return("9182")
+        allow(fixtures_project).to receive(:coverage_access_token).and_return("abc123")
+        allow(fixtures_project).to receive(:github_pull_request).and_return("1")
+        allow(fixtures_project).to receive(:github_build_url).and_return("https://github.com/Bruce/Wayne/actions/runs/1")
+        allow(fixtures_project).to receive(:github_git_info).and_return({ :head => { :id => "ababa123", :author_name => "bwayne", :message => "hello" }, :branch => "master" })
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql("{\"service_job_id\":\"9182\",\"service_name\":\"github\",\"repo_name\":\"\",\"repo_token\":\"abc123\",\"service_pull_request\":\"1\",\"service_build_url\":\"https://github.com/Bruce/Wayne/actions/runs/1\",\"git\":{\"head\":{\"id\":\"ababa123\",\"author_name\":\"bwayne\",\"message\":\"hello\"},\"branch\":\"master\"}}").excluding("source_files")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql(fixtures_project.coverage_files.map(&:as_json).to_json).at_path("source_files")
+      end
+
+      it "should raise an error if there is no GITHUB_RUN_ID" do
+        allow(fixtures_project).to receive(:github_job_id).and_return(nil)
+        expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
+      end
+    end
+
   end
 
   describe '#coveralls_coverage_data' do

data/spec/slather/coverage_service/sonarqube_xml_spec.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require 'json'
+
+describe Slather::CoverageService::SonarqubeXmlOutput do
+
+  let(:fixtures_project) do
+    proj = Slather::Project.open(FIXTURES_PROJECT_PATH)
+    proj.build_directory = TEMP_DERIVED_DATA_PATH
+    proj.input_format = "profdata"
+    proj.coverage_service = "sonarqube_xml"
+    proj.configure
+    proj
+  end
+
+  describe '#coverage_file_class' do
+    it "should return CoverageFile" do
+      expect(fixtures_project.send(:coverage_file_class)).to eq(Slather::ProfdataCoverageFile)
+    end
+  end
+
+  describe '#post' do
+    it "should create an XML report spanning all coverage files" do
+      fixtures_project.post
+
+      file = File.open(FIXTURES_SONARQUBE_XML_PATH)
+      fixture_xml_doc = Nokogiri::XML(file)
+      file.close
+
+      file = File.open('sonarqube-generic-coverage.xml')
+      current_xml_doc = Nokogiri::XML(file)
+      file.close
+
+      expect(EquivalentXml.equivalent?(current_xml_doc, fixture_xml_doc)).to be_truthy
+    end
+
+    it "should create an XML report in the given output directory" do
+      fixtures_project.output_directory = "./output"
+      fixtures_project.post
+
+      filepath = "#{fixtures_project.output_directory}/sonarqube-generic-coverage.xml"
+      expect(File.exists?(filepath)).to be_truthy
+
+      FileUtils.rm_rf(fixtures_project.output_directory)
+    end
+  end
+end

data/spec/slather/profdata_coverage_spec.rb

@@ -90,6 +90,23 @@ describe Slather::ProfdataCoverageFile do
     end
   end
 
+  describe '#ignore_error_lines' do
+    it 'should ignore lines starting with - when line_numbers_first is true' do
+      expect(profdata_coverage_file.ignore_error_lines(['--------'], true)).to eq([])
+      expect(profdata_coverage_file.ignore_error_lines(['--------', 'not ignored'], true)).to eq(['not ignored'])
+    end
+
+    it 'should ignore lines starting with | when line_numbers_first is true' do
+      expect(profdata_coverage_file.ignore_error_lines(['| Unexecuted instantiation'], true)).to eq([])
+      expect(profdata_coverage_file.ignore_error_lines(['| Unexecuted instantiation', 'not ignored'], true)).to eq(['not ignored'])
+    end
+
+    it 'should not ignore any lines when line_numbers_first is false' do
+      lines = ['| Unexecuted instantiation', '------']
+      expect(profdata_coverage_file.ignore_error_lines(lines, false)).to eq(lines)
+    end
+  end
+
   describe "#coverage_for_line" do
     it "should return the number of hits for the line" do
       expect(profdata_coverage_file.coverage_for_line("      10|   40|    func applicationWillTerminate(application: UIApplication) {", false)).to eq(10)
@@ -116,6 +133,10 @@ describe Slather::ProfdataCoverageFile do
       expect(profdata_coverage_file.coverage_for_line("   18|  11.8k|    return a + b;", true)).to eq(11800)
       expect(profdata_coverage_file.coverage_for_line("   18|  2.58M|    return a + b;", true)).to eq(2580000)
     end
+
+    it 'should ignore errors in profdata' do
+      expect(profdata_coverage_file.coverage_for_line('------------------', true)).to eq(nil)
+    end
   end
 
   describe "#num_lines_tested" do

data/spec/slather/project_spec.rb

@@ -653,8 +653,8 @@ describe Slather::Project do
     it "should find relevant source files" do
       source_files = fixtures_project.find_source_files
       expect(source_files.count).to eq(2)
-      expect(source_files.first.to_s).to include("fixtures.m")
-      expect(source_files.last.to_s).to include("fixturesTwo.m")
+      expect(source_files.first.to_s).to include("fixturesTwo.m")
+      expect(source_files.last.to_s).to include("fixtures.m")
     end
 
     it "should print out the coverage for each file, and then total coverage" do

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'equivalent-xml'
 
 
 FIXTURES_XML_PATH = File.join(File.dirname(__FILE__), 'fixtures/cobertura.xml')
+FIXTURES_SONARQUBE_XML_PATH = File.join(File.dirname(__FILE__), 'fixtures/sonarqube-generic-coverage.xml')
 FIXTURES_JSON_PATH = File.join(File.dirname(__FILE__), 'fixtures/report.json')
 FIXTURES_LLCOV_PATH = File.join(File.dirname(__FILE__), 'fixtures/report.llcov')
 FIXTURES_GUTTER_JSON_PATH = File.join(File.dirname(__FILE__), 'fixtures/gutter.json')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.6.1
 platform: ruby
 authors:
 - Mark Larsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.10.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.10.beta.1
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -202,23 +202,17 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
-description: 
+        version: '0'
+description:
 email:
 - mark@venmo.com
 executables:
@@ -255,6 +249,7 @@ files:
 - lib/slather/coverage_service/json_output.rb
 - lib/slather/coverage_service/llvm_cov_output.rb
 - lib/slather/coverage_service/simple_output.rb
+- lib/slather/coverage_service/sonarqube_xml_output.rb
 - lib/slather/coveralls_coverage.rb
 - lib/slather/profdata_coverage_file.rb
 - lib/slather/project.rb
@@ -304,6 +299,7 @@ files:
 - spec/fixtures/gutter.json
 - spec/fixtures/report.json
 - spec/fixtures/report.llcov
+- spec/fixtures/sonarqube-generic-coverage.xml
 - spec/slather/cocoapods_plugin_spec.rb
 - spec/slather/coverage_file_spec.rb
 - spec/slather/coverage_service/cobertura_xml_spec.rb
@@ -314,6 +310,7 @@ files:
 - spec/slather/coverage_service/json_spec.rb
 - spec/slather/coverage_service/llvm_cov_spec.rb
 - spec/slather/coverage_service/simple_output_spec.rb
+- spec/slather/coverage_service/sonarqube_xml_spec.rb
 - spec/slather/fixtures.gcno
 - spec/slather/profdata_coverage_spec.rb
 - spec/slather/project_spec.rb
@@ -322,7 +319,7 @@ homepage: https://github.com/SlatherOrg/slather
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -337,9 +334,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Test coverage reports for Xcode projects
 test_files:
@@ -387,6 +383,7 @@ test_files:
 - spec/fixtures/gutter.json
 - spec/fixtures/report.json
 - spec/fixtures/report.llcov
+- spec/fixtures/sonarqube-generic-coverage.xml
 - spec/slather/cocoapods_plugin_spec.rb
 - spec/slather/coverage_file_spec.rb
 - spec/slather/coverage_service/cobertura_xml_spec.rb
@@ -397,6 +394,7 @@ test_files:
 - spec/slather/coverage_service/json_spec.rb
 - spec/slather/coverage_service/llvm_cov_spec.rb
 - spec/slather/coverage_service/simple_output_spec.rb
+- spec/slather/coverage_service/sonarqube_xml_spec.rb
 - spec/slather/fixtures.gcno
 - spec/slather/profdata_coverage_spec.rb
 - spec/slather/project_spec.rb