slather 2.6.0 → 2.7.4

data/spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixtures.xcscheme

@@ -26,7 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B1E6980125F96B670086A3E2"
+            BuildableName = "FixtureFramework.framework"
+            BlueprintName = "FixtureFramework"
+            ReferencedContainer = "container:fixtures.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,8 +50,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +70,6 @@
             ReferencedContainer = "container:fixtures.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -70,6 +77,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8C9A202C195965F10013B6B3"
+            BuildableName = "libfixtures.a"
+            BlueprintName = "fixtures"
+            ReferencedContainer = "container:fixtures.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

data/spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

data/spec/slather/coverage_service/cobertura_xml_spec.rb

@@ -45,7 +45,7 @@ describe Slather::CoverageService::CoberturaXmlOutput do
       fixtures_project.post
 
       filepath = "#{fixtures_project.output_directory}/cobertura.xml"
-      expect(File.exists?(filepath)).to be_truthy
+      expect(File.exist?(filepath)).to be_truthy
 
       FileUtils.rm_rf(fixtures_project.output_directory)
     end

data/spec/slather/coverage_service/html_output_spec.rb

@@ -185,8 +185,8 @@ describe Slather::CoverageService::HtmlOutput do
       end
 
       allow(fixtures_project).to receive(:input_format).and_return("profdata")
-      allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return("./spec/fixtures/fixtures/other_fixtures.m:
-    1|     |//
+      allow(fixtures_project).to receive(:pathnames_per_binary).and_return([{"filename" => Pathname.new("./spec/fixtures/fixtures/other_fixtures.m"), "segments" => []}])
+      allow(fixtures_project).to receive(:profdata_llvm_cov_output).and_return("1|     |//
     2|     |//  other_fixtures.m
     3|     |//  fixtures
     4|     |//

data/spec/slather/coverage_service/json_spec.rb

@@ -35,7 +35,7 @@ describe Slather::CoverageService::JsonOutput do
       fixtures_project.post
 
       filepath = "#{fixtures_project.output_directory}/report.json"
-      expect(File.exists?(filepath)).to be_truthy
+      expect(File.exist?(filepath)).to be_truthy
 
       FileUtils.rm_rf(fixtures_project.output_directory)
     end

data/spec/slather/coverage_service/llvm_cov_spec.rb

@@ -38,7 +38,7 @@ describe Slather::CoverageService::LlvmCovOutput do
       fixtures_project.post
 
       filepath = "#{fixtures_project.output_directory}/report.llcov"
-      expect(File.exists?(filepath)).to be_truthy
+      expect(File.exist?(filepath)).to be_truthy
 
       FileUtils.rm_rf(fixtures_project.output_directory)
     end

data/spec/slather/coverage_service/sonarqube_xml_spec.rb

@@ -38,7 +38,7 @@ describe Slather::CoverageService::SonarqubeXmlOutput do
       fixtures_project.post
 
       filepath = "#{fixtures_project.output_directory}/sonarqube-generic-coverage.xml"
-      expect(File.exists?(filepath)).to be_truthy
+      expect(File.exist?(filepath)).to be_truthy
 
       FileUtils.rm_rf(fixtures_project.output_directory)
     end

data/spec/slather/profdata_coverage_spec.rb

@@ -157,6 +157,22 @@ describe Slather::ProfdataCoverageFile do
     end
   end
 
+  describe "#branch_coverage_data" do
+    it "should have branch data for line 19" do
+      # these segments correspond to the only statement on line 19
+      profdata_coverage_file.segments = [[19, 9, 0, true, false], [19, 20, 1, true, false]]
+      expect(profdata_coverage_file.branch_coverage_data[19]).to eq([0,1])
+    end
+    it "should have missing region data for line 19" do
+      profdata_coverage_file.segments = [[19, 9, 0, true, false], [19, 20, 1, true, false]]
+      expect(profdata_coverage_file.branch_region_data[19]).to eq([[8,11]])
+    end
+    it "should have two missing region data for line 19" do
+      profdata_coverage_file.segments = [[19, 9, 0, true, false], [19, 20, 1, true, false], [19, 30, 0, true, false], [19, 40, 1, true, true]]
+      expect(profdata_coverage_file.branch_region_data[19]).to eq([[8,11], [29,10]])
+    end
+  end
+
   describe "#ignored" do
 
     before(:each) {

data/spec/slather/project_spec.rb

@@ -243,8 +243,9 @@ describe Slather::Project do
       allow(fixtures_project).to receive(:scheme).and_return("fixtures")
       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")
+      expect(binary_file_location.count).to eq(2)
+      expect(binary_file_location.first).to end_with("Debug/FixtureFramework.framework/Versions/A/FixtureFramework")
+      expect(binary_file_location.last).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     it "should find the product path provided a workspace and scheme" do
@@ -252,8 +253,9 @@ describe Slather::Project do
       allow(fixtures_project).to receive(:scheme).and_return("fixtures")
       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")
+      expect(binary_file_location.count).to eq(2)
+      expect(binary_file_location.first).to end_with("Debug/FixtureFramework.framework/Versions/A/FixtureFramework")
+      expect(binary_file_location.last).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
     it "should find the product path for a scheme with no buildable products" do
@@ -664,10 +666,12 @@ describe Slather::Project do
               {
                  "files":[
                     {
-                       "filename":"spec/fixtures/fixtures/fixtures.m"
+                       "filename":"spec/fixtures/fixtures/fixtures.m",
+                       "segments": []
                     },
                     {
-                       "filename":"spec/fixtures/fixturesTwo/fixturesTwo.m"
+                       "filename":"spec/fixtures/fixturesTwo/fixturesTwo.m",
+                       "segments": []
                     }
                  ]
               }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.4
 platform: ruby
 authors:
 - Mark Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.13.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.13.9
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +255,12 @@ files:
 - lib/slather/project.rb
 - lib/slather/version.rb
 - slather.gemspec
+- spec/fixtures/FixtureFramework/FixtureFramework.h
+- spec/fixtures/FixtureFramework/FlashExperiment.swift
+- spec/fixtures/FixtureFramework/Info.plist
+- spec/fixtures/FixtureFrameworkTests/FixtureFrameworkTests.swift
+- spec/fixtures/FixtureFrameworkTests/FlashExperimentTests.swift
+- spec/fixtures/FixtureFrameworkTests/Info.plist
 - spec/fixtures/cobertura.xml
 - spec/fixtures/fixtures.xcodeproj/project.pbxproj
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -264,6 +270,7 @@ files:
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTestsSecond.xcscheme
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTwo.xcscheme
 - spec/fixtures/fixtures.xcworkspace/contents.xcworkspacedata
+- spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - spec/fixtures/fixtures.xcworkspace/xcshareddata/xcschemes/fixturesTestsWorkspace.xcscheme
 - spec/fixtures/fixtures/Fixtures.swift
 - spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch
@@ -334,11 +341,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Test coverage reports for Xcode projects
 test_files:
+- spec/fixtures/FixtureFramework/FixtureFramework.h
+- spec/fixtures/FixtureFramework/FlashExperiment.swift
+- spec/fixtures/FixtureFramework/Info.plist
+- spec/fixtures/FixtureFrameworkTests/FixtureFrameworkTests.swift
+- spec/fixtures/FixtureFrameworkTests/FlashExperimentTests.swift
+- spec/fixtures/FixtureFrameworkTests/Info.plist
 - spec/fixtures/cobertura.xml
 - spec/fixtures/fixtures.xcodeproj/project.pbxproj
 - spec/fixtures/fixtures.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -348,6 +361,7 @@ test_files:
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTestsSecond.xcscheme
 - spec/fixtures/fixtures.xcodeproj/xcshareddata/xcschemes/fixturesTwo.xcscheme
 - spec/fixtures/fixtures.xcworkspace/contents.xcworkspacedata
+- spec/fixtures/fixtures.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - spec/fixtures/fixtures.xcworkspace/xcshareddata/xcschemes/fixturesTestsWorkspace.xcscheme
 - spec/fixtures/fixtures/Fixtures.swift
 - spec/fixtures/fixtures/Supporting Files/fixtures-Prefix.pch