slather 2.4.4 → 2.4.9

data/lib/slather/version.rb

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

data/slather.gemspec

@@ -17,21 +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.6'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'rake', '~> 10.4'
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'pry', '~> 0.9'
-  spec.add_development_dependency 'cocoapods', '~> 1.2'
-  spec.add_development_dependency 'json_spec', '~> 1.1.4'
-  spec.add_development_dependency 'equivalent-xml', '~> 0.5.1'
+  spec.add_development_dependency 'bundler', '~> 1.17'
+  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 'json_spec', '~> 1.1'
+  spec.add_development_dependency 'equivalent-xml', '~> 0.6'
 
-  spec.add_dependency 'clamp', '~> 0.6'
-  spec.add_dependency 'xcodeproj', '~> 1.4'
-  spec.add_dependency 'nokogiri', '>= 1.6', '< 1.7'
-  spec.add_dependency 'CFPropertyList', '~> 2.2'
+  spec.add_dependency 'clamp', '~> 1.3'
+  spec.add_dependency 'xcodeproj', '~> 1.7'
+  spec.add_dependency 'nokogiri', '~> 1.8'
+  spec.add_dependency 'CFPropertyList', '>= 2.2', '< 4'
 
-  ## Version 5 needs Ruby 2.2, so we specify an upper bound to stay compatible with system ruby
-  spec.add_runtime_dependency 'activesupport', '>= 4.0.2', '< 5'
+  spec.add_runtime_dependency 'activesupport', '< 5', '>= 4.0.2'
 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

@@ -158,6 +158,15 @@ describe Slather::CoverageService::Coveralls do
       before(:each) {
         fixtures_project.ci_service = :travis_ci
         project_root = Pathname("./").realpath
+        allow(fixtures_project).to receive(:llvm_cov_export_output).and_return(%q(
+          {
+             "data":[
+                {
+                   "files":[]
+                }
+             ]
+          }
+        ))
         allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return("#{project_root}/spec/fixtures/fixtures/fixtures.m:
        |    1|//
        |    2|//  fixtures.m

data/spec/slather/coverage_service/hardcover_spec.rb

@@ -66,6 +66,15 @@ describe Slather::CoverageService::Hardcover do
       allow(Slather::Project).to receive(:yml).and_return(fixture_yaml)
       fixtures_project.ci_service = :jenkins_ci
       project_root = Pathname("./").realpath
+      allow(fixtures_project).to receive(:llvm_cov_export_output).and_return(%q(
+        {
+           "data":[
+              {
+                 "files":[]
+              }
+           ]
+        }
+      ))
       allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return("#{project_root}/spec/fixtures/fixtures/fixtures.m:
        |    1|//
        |    2|//  fixtures.m
@@ -104,7 +113,6 @@ describe Slather::CoverageService::Hardcover do
 
     it "should always remove the hardcover_json_file after it's done" do
       allow(fixtures_project).to receive(:`)
-
       allow(fixtures_project).to receive(:jenkins_job_id).and_return("slather-master/9182")
       allow(fixtures_project).to receive(:coverage_service_url).and_return("http://api.hardcover.io")
       fixtures_project.post

data/spec/slather/coverage_service/simple_output_spec.rb

@@ -25,6 +25,7 @@ describe Slather::CoverageService::SimpleOutput do
       "spec/fixtures/fixturesTests/fixturesTests.m: 17 of 17 lines (100.00%)",
       "spec/fixtures/fixturesTests/peekaviewTests💣.m: 11 of 11 lines (100.00%)",
       "spec/fixtures/fixturesTwo/fixturesTwo.m: 6 of 6 lines (100.00%)",
+      "Tested 66/86 statements",
       "Test Coverage: 76.74%"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
@@ -47,6 +48,7 @@ describe Slather::CoverageService::SimpleOutput do
            "spec/fixtures/fixturesTwo/fixturesTwo.m: 6 of 6 lines (100.00%)",
            "##teamcity[buildStatisticValue key='CodeCoverageAbsLCovered' value='66']",
            "##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='86']",
+           "Tested 66/86 statements",
            "Test Coverage: 76.74%"
           ].each do |line|
             expect(fixtures_project).to receive(:puts).with(line)

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

@@ -64,15 +64,91 @@ describe Slather::Project do
     end
   end
 
-  describe "#profdata_coverage_files" do
+  describe "#profdata_coverage_files with large file lists" do
     class SpecXcode7CoverageFile < Slather::ProfdataCoverageFile
     end
 
+    llvm_cov_export_output = %q(
+        {
+           "data":[
+              {
+                 "files":[
+                    {
+                       "filename":"spec/fixtures/fixtures/Fixtures.swift"
+                    }
+                 ]
+              },
+              {
+                 "files":[
+                    {
+                       "filename":"spec/fixtures/fixtures/Fixtures.swift"
+                    }
+                 ]
+              }
+           ]
+        })
+
+    profdata_llvm_cov_output = "#{FIXTURES_SWIFT_FILE_PATH}:
+       |    0|
+       |    1|import UIKit
+       |    2|
+       |    3|@UIApplicationMain
+       |    4|class AppDelegate: UIResponder, UIApplicationDelegate {
+       |    5|
+       |    6|    var window: UIWindow?
+       |    7|
+      1|    8|    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+      1|    9|        return true
+      1|   10|    }
+       |   11|
+      0|   12|    func applicationWillResignActive(application: UIApplication) {
+      0|   13|    }
+      0|   14|}"
+
     before(:each) do
       allow(Dir).to receive(:[]).and_call_original
       allow(Dir).to receive(:[]).with("#{fixtures_project.build_directory}/**/Coverage.profdata").and_return(["/some/path/Coverage.profdata"])
       allow(fixtures_project).to receive(:binary_file).and_return(["Fixtures"])
-      allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return("#{FIXTURES_SWIFT_FILE_PATH}:
+      allow(fixtures_project).to receive(:llvm_cov_export_output).and_return(llvm_cov_export_output)
+      allow(fixtures_project).to receive(:coverage_file_class).and_return(SpecXcode7CoverageFile)
+      allow(fixtures_project).to receive(:ignore_list).and_return([])
+    end
+
+    it "Should catch Errno::E2BIG and re-raise if the input is too large to split into multiple chunks" do
+      allow(fixtures_project).to receive(:unsafe_profdata_llvm_cov_output).and_raise(Errno::E2BIG)
+      expect { fixtures_project.send(:profdata_coverage_files) }.to raise_error(Errno::E2BIG, "Argument list too long. A path in your project is close to the E2BIG limit. https://github.com/SlatherOrg/slather/pull/414")
+    end
+
+    it "Should catch Errno::E2BIG and return Coverage.profdata file objects when the work can be split into two" do
+      allow(fixtures_project).to receive(:unsafe_profdata_llvm_cov_output).once { 
+        # raise once and then insert the stub
+        allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return(profdata_llvm_cov_output)
+        raise Errno::E2BIG 
+      }
+      profdata_coverage_files = fixtures_project.send(:profdata_coverage_files)
+      profdata_coverage_files.each { |cf| expect(cf.kind_of?(SpecXcode7CoverageFile)).to be_truthy }
+      expect(profdata_coverage_files.map { |cf| cf.source_file_pathname.basename.to_s }).to eq(["Fixtures.swift", "Fixtures.swift"])
+    end
+  end
+
+  describe "#profdata_coverage_files" do
+    class SpecXcode7CoverageFile < Slather::ProfdataCoverageFile
+    end
+
+    llvm_cov_export_output = %q(
+        {
+           "data":[
+              {
+                 "files":[
+                    {
+                       "filename":"spec/fixtures/fixtures/Fixtures.swift"
+                    }
+                 ]
+              }
+           ]
+        })
+
+    profdata_llvm_cov_output = "#{FIXTURES_SWIFT_FILE_PATH}:
        |    0|
        |    1|import UIKit
        |    2|
@@ -87,7 +163,14 @@ describe Slather::Project do
        |   11|
       0|   12|    func applicationWillResignActive(application: UIApplication) {
       0|   13|    }
-      0|   14|}")
+      0|   14|}"
+
+    before(:each) do
+      allow(Dir).to receive(:[]).and_call_original
+      allow(Dir).to receive(:[]).with("#{fixtures_project.build_directory}/**/Coverage.profdata").and_return(["/some/path/Coverage.profdata"])
+      allow(fixtures_project).to receive(:binary_file).and_return(["Fixtures"])
+      allow(fixtures_project).to receive(:llvm_cov_export_output).and_return(llvm_cov_export_output)
+      allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return(profdata_llvm_cov_output)
       allow(fixtures_project).to receive(:coverage_file_class).and_return(SpecXcode7CoverageFile)
       allow(fixtures_project).to receive(:ignore_list).and_return([])
     end
@@ -111,6 +194,18 @@ describe Slather::Project do
       allow(fixtures_project).to receive(:ignore_list).and_return([])
       allow(Dir).to receive(:[]).with("#{fixtures_project.build_directory}/**/Coverage.profdata").and_return(["/some/path/Coverage.profdata"])
       allow(fixtures_project).to receive(:binary_file).and_return(["Fixtures"])
+      allow(fixtures_project).to receive(:unsafe_llvm_cov_export_output).and_return("
+      {
+         \"data\":[
+            {
+               \"files\":[
+                  {
+                     \"filename\":\"sp\145c/fixtures/fixtures/fixtures.m\"
+                  }
+               ]
+            }
+         ]
+      }")
       allow(fixtures_project).to receive(:unsafe_profdata_llvm_cov_output).and_return("#{FIXTURES_SWIFT_FILE_PATH}:
       1|    8|    func application(application: \255, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
       1|    9|        return true
@@ -163,12 +258,19 @@ describe Slather::Project do
 
     it "should find the product path for a scheme with no buildable products" do
       allow(fixtures_project).to receive(:scheme).and_return("fixturesTests")
+      allow(fixtures_project).to receive(:arch).and_return("x86_64")
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
       expect(binary_file_location.count).to eq(1)
       expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
+    it "should not find a product path for an invalid architecture" do
+      allow(fixtures_project).to receive(:scheme).and_return("fixturesTests")
+      allow(fixtures_project).to receive(:arch).and_return("arm64")
+      expect { fixtures_project.send(:configure_binary_file) }.to raise_error.with_message(/No product binary found in (.+)./)
+    end
+
     it "should find multiple unique paths for a scheme with serveral buildable/testable products" do
       allow(fixtures_project).to receive(:scheme).and_return("aggregateFixturesTests")
       fixtures_project.send(:configure_binary_file)
@@ -509,9 +611,9 @@ describe Slather::Project do
     it "should print out environment info when in verbose_mode" do
       project_root = Pathname("./").realpath
 
-      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Coverage.profdata",
+      [/\nProcessing coverage file: #{project_root}\/spec\/DerivedData\/libfixtures\/Build\/ProfileData\/[A-Z0-9-]+\/Coverage.profdata/,
        "Against binary files:",
-       "\t#{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests",
+       "\t#{project_root}/spec/DerivedData/libfixtures/Build/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests",
        "\n"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
@@ -525,7 +627,7 @@ describe Slather::Project do
 
       project_root = Pathname("./").realpath
 
-      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Coverage.profdata",
+      [/\nProcessing coverage file: #{project_root}\/spec\/DerivedData\/libfixtures\/Build\/ProfileData\/[A-Z0-9-]+\/Coverage.profdata/,
        "No binary files found.",
        "\n",
       ].each do |line|
@@ -556,8 +658,25 @@ describe Slather::Project do
     end
 
     it "should print out the coverage for each file, and then total coverage" do
+      allow(fixtures_project).to receive(:llvm_cov_export_output).and_return(%q(
+        {
+           "data":[
+              {
+                 "files":[
+                    {
+                       "filename":"spec/fixtures/fixtures/fixtures.m"
+                    },
+                    {
+                       "filename":"spec/fixtures/fixturesTwo/fixturesTwo.m"
+                    }
+                 ]
+              }
+           ]
+        }
+      ))
       ["spec/fixtures/fixtures/fixtures.m: 3 of 6 lines (50.00%)",
       "spec/fixtures/fixturesTwo/fixturesTwo.m: 6 of 6 lines (100.00%)",
+      "Tested 9/12 statements",
       "Test Coverage: 75.00%"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
@@ -587,7 +706,7 @@ describe Slather::Project do
     let(:configuration) { 'Debug' }
     let(:project_root) { Pathname("./").realpath }
     let(:coverage_dir) { "#{project_root}/spec/DerivedData/DerivedData/Build/Intermediates/CodeCoverage" }
-    let(:search_dir) { "#{coverage_dir}/Products/#{configuration}*/fixtures*" }
+    let(:search_dir) { "#{coverage_dir}/../../Products/#{configuration}*/fixtures*" }
     let(:binary_file) { "#{coverage_dir}/Products/#{configuration}-iphonesimulator/fixtures.app/fixtures" }
 
     before do