slather 2.8.6 → 2.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563be2e4074d110c301911497e05aafc0d08d167bcd31c7e5dc071a4f15cc15d
-  data.tar.gz: a8b335702c8fdc46378eed147e08f29a8a460b223a896b3e5185b1c68c9ee61d
+  metadata.gz: ca4e8b83423e7a0670664bc121452d3954b5a50eed6395e9df3b09eff82ea7a0
+  data.tar.gz: 4b1663cd54b9dbcc08e32334bd4f994f1934d44c3b290e271a79d15567428719
 SHA512:
-  metadata.gz: b261def42ccc80ef74fbf08a84a4cdf907eb1ca3c4dc2f5d7213f88b93e0dfebc8d9d0616d89bac919679e9fc2e6dc92be85e26948483c95e89d0354c2b52ade
-  data.tar.gz: 87e365c0986fa63a2098db6f77bcd539a10e031e8333b5144c967942e547870b784d770a4d1760d06e7bfad4c44813d9674dea2d917b0ccb98b04ee4bb1035d8
+  metadata.gz: d1984c8e3bd02944363e7f84806fd2118c98138fa0f1d017b0dafddf0e4300741f3ae66d0fece7a4f6a585e04646829c50e1e93100236eb032cb7190b4c44eef
+  data.tar.gz: 2c3b9d016a6eff481d824df68d7c0f05ecb5d34096829eceee4105d4847a5c02df6d69206458f1f8f54a092a453ea4d38265e6f1d72f6c1a66252f64dce4ad39

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v2.8.7
+
+* Restore scheme coverage directory lookup in profdata_coverage_dir
+  [MirekNalepa](https://github.com/MirekNalepa)
+  [#587](https://github.com/SlatherOrg/slather/pull/587)
+
 ## v2.8.6
 
 * Apply dedupe to profdata coverage as well

data/lib/slather/project.rb

@@ -231,10 +231,7 @@ module Slather
         raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.exist?(self.build_directory)
         dir = nil
         if self.scheme
-          product_name = first_product_name
-          if !product_name.empty?
-            dir = Dir[File.join(build_directory,"/**/#{product_name}")].first
-          end.first
+          dir = Dir[File.join(build_directory,"/**/CodeCoverage/#{self.scheme}")].first
         else
           dir = Dir[File.join(build_directory,"/**/#{first_product_name}")].first
         end

data/lib/slather/version.rb

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

data/spec/slather/project_spec.rb

@@ -188,6 +188,31 @@ describe Slather::Project do
     end
   end
 
+  describe "#profdata_coverage_dir" do
+    before(:each) do
+      fixtures_project.build_directory = "/some/build"
+      fixtures_project.scheme = "fixtures"
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with("/some/build").and_return(true)
+      allow(Dir).to receive(:[]).and_call_original
+    end
+
+    it "should return the CodeCoverage scheme directory when a scheme is set" do
+      allow(Dir).to receive(:[]).with("/some/build/**/CodeCoverage/fixtures").and_return(["/some/build/Build/Intermediates/CodeCoverage/fixtures"])
+      expect(fixtures_project.profdata_coverage_dir).to eq("/some/build/Build/Intermediates/CodeCoverage/fixtures")
+    end
+
+    it "should fall back to the ProfileData directory when a scheme is set on Xcode 9 and later" do
+      allow(Slather).to receive(:xcode_version).and_return([16, 0])
+      allow(Dir).to receive(:[]).with("/some/build/**/CodeCoverage/fixtures").and_return([])
+      allow(Dir).to receive(:[]).with("/some/build/**/codecov").and_return([])
+      allow(Dir).to receive(:[]).with("/some/build/**/CodeCoverage").and_return([])
+      allow(Dir).to receive(:[]).with("/some/build/**/ProfileData/*/Coverage.profdata").and_return(["/some/build/ProfileData/ABC/Coverage.profdata"])
+      expect(Dir).not_to receive(:[]).with("/some/build/**/fixtures")
+      expect(fixtures_project.profdata_coverage_dir).to eq(Pathname.new("/some/build/ProfileData/ABC"))
+    end
+  end
+
   describe "#invalid_characters" do
     it "should correctly encode invalid characters" do
       allow(fixtures_project).to receive(:input_format).and_return("profdata")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.8.7
 platform: ruby
 authors:
 - Mark Larsen