slather 2.8.5 → 2.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b31a46c5d0af53d36513b448201896c97d6fb17724367390f65e4f7ced63101
-  data.tar.gz: c5f8496a737ec10a79294a07b6da6a45676257aa9050f70879f0b3c51aa7b0bd
+  metadata.gz: ca4e8b83423e7a0670664bc121452d3954b5a50eed6395e9df3b09eff82ea7a0
+  data.tar.gz: 4b1663cd54b9dbcc08e32334bd4f994f1934d44c3b290e271a79d15567428719
 SHA512:
-  metadata.gz: 9df9cc272e6528f31f72df7acdd8f747bd502db70785b90b388ca92a140ffb8e2fac6c10d76eecee098da6225645c5f70dc77c365a52ec7df19992d744fbc91e
-  data.tar.gz: 7bc423a81f24a7faffa30f00941ada25fb1df3b19a11e26edbb74ff7efea4ff0e239fece6ffd7698dac14ee7e128896bf048d204be5e7a851e3ec35e7de0935f
+  metadata.gz: d1984c8e3bd02944363e7f84806fd2118c98138fa0f1d017b0dafddf0e4300741f3ae66d0fece7a4f6a585e04646829c50e1e93100236eb032cb7190b4c44eef
+  data.tar.gz: 2c3b9d016a6eff481d824df68d7c0f05ecb5d34096829eceee4105d4847a5c02df6d69206458f1f8f54a092a453ea4d38265e6f1d72f6c1a66252f64dce4ad39

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # 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
+  [RoySRodney](https://github.com/RoySRodney)
+  [#579](https://github.com/SlatherOrg/slather/pull/579)
+
+* Add Swift Package support
+  [michel-moreau](https://github.com/michel-moreau)
+  [#584](https://github.com/SlatherOrg/slather/pull/584)
+
+* Bump nokogiri minimum version to fix security advisories
+  [carloskvasir](https://github.com/carloskvasir)
+  [#585](https://github.com/SlatherOrg/slather/pull/585)
+
 ## v2.8.5
 
 * Update xcodeproj to 1.27.1 to support Xcode 16 folder references

data/lib/slather/command/coverage_command.rb

@@ -113,6 +113,8 @@ class CoverageCommand < Clamp::Command
       xcodeproj_path_to_open = xcodeproj_path || Slather::Project.yml["xcodeproj"]
       if xcodeproj_path_to_open
         project = Slather::Project.open(xcodeproj_path_to_open)
+      elsif File.exist?("Package.swift")
+        project = Slather::Project.open(".")
       else
         raise StandardError, "Must provide an xcodeproj either via the 'slather [SUBCOMMAND] [PROJECT].xcodeproj' command or through .slather.yml"
       end

data/lib/slather/project.rb

@@ -50,7 +50,11 @@ module Slather
     alias_method :setup_for_coverage, :slather_setup_for_coverage
 
     def self.open(xcodeproj)
-      proj = super
+      if File.directory?(xcodeproj) && File.exist?(File.join(xcodeproj, "Package.swift"))
+        proj = self.new(xcodeproj)
+      else
+        proj = super
+      end
       proj.xcodeproj = xcodeproj
       proj
     end
@@ -86,7 +90,11 @@ module Slather
       end
 
       if derived_data_path == nil
-        derived_data_path = File.expand_path('~') + "/Library/Developer/Xcode/DerivedData/"
+        if File.exist?(File.join(self.xcodeproj, "Package.swift"))
+          derived_data_path = File.join(self.xcodeproj, ".build")
+        else
+          derived_data_path = File.expand_path('~') + "/Library/Developer/Xcode/DerivedData/"
+        end
       end
 
       derived_data_path
@@ -126,7 +134,11 @@ module Slather
         end
       end
 
-      coverage_files
+      if coverage_files.empty?
+        raise StandardError, "No coverage files found."
+      else
+        dedupe(coverage_files)
+      end
     end
     private :profdata_coverage_files
 
@@ -201,10 +213,13 @@ module Slather
     private :create_profdata
 
     def remove_extension(path)
+      return "" if self.products.nil? || self.products.empty?
       path.split(".")[0..-2].join(".")
     end
 
     def first_product_name
+      # If products is nil it means we are likely using a Swift Package and not an xcodeproj
+      return "" if self.products.nil? || self.products.empty?
       first_product = self.products.first
       # If name is not available it computes it using
       # the path by dropping the 'extension' of the path.
@@ -221,6 +236,11 @@ module Slather
           dir = Dir[File.join(build_directory,"/**/#{first_product_name}")].first
         end
 
+        if dir == nil
+          # Swift Package Manager
+          dir = Dir[File.join(build_directory,"/**/codecov")].first
+        end
+
         if dir == nil
           # Xcode 7.3 moved the location of Coverage.profdata
           dir = Dir[File.join(build_directory,"/**/CodeCoverage")].first
@@ -379,6 +399,9 @@ module Slather
     end
 
     def configure_output_directory
+      if self.source_directory.nil? && File.exist?(File.join(self.xcodeproj, "Package.swift"))
+        self.source_directory = self.xcodeproj
+      end
       self.output_directory ||= self.class.yml["output_directory"] if self.class.yml["output_directory"]
     end
 

data/lib/slather/version.rb

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

data/slather.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'clamp', '~> 1.3'
   spec.add_dependency 'xcodeproj', '~> 1.27'
-  spec.add_dependency 'nokogiri', '>= 1.14.3'
+  spec.add_dependency 'nokogiri', '>= 1.19.4'
   spec.add_dependency 'CFPropertyList', '>= 2.2', '< 4'
 
   spec.add_runtime_dependency 'activesupport'

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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.7
 platform: ruby
 authors:
 - Mark Larsen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +169,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 1.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 1.19.4
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +211,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - mark@venmo.com
 executables:
@@ -326,7 +324,6 @@ homepage: https://github.com/SlatherOrg/slather
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -341,8 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Test coverage reports for Xcode projects
 test_files: