slather 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a719230361994fdcfc33ef801d05bf5fa68714efdaa477d1aed4fdad05ee07
-  data.tar.gz: 54bb876601b8aa9e0030e8e29b3e75663d5a3c38855b3f2b56db0b23b1f4377d
+  metadata.gz: 5b2390d1df8d9295fc1239bcaba55dcc176a8d31a755fab5e4e1185ee27bc1a7
+  data.tar.gz: 3f85d92eaf943f25c799b70798b7f86f2196e51e44470ba84ea4adc02b919d52
 SHA512:
-  metadata.gz: 91f45c65454ba75daf6b34529287c7cda4978e60b84ba37cf2e758977382ecc1aa8b13f5e81b6d5616778d2339f2422df4b6a85f539f3922dcd40088d562b9e6
-  data.tar.gz: 50c23e7d3d92d380c0ad385e21ee04fccc9f2b012c4db1657758fc428bbbc6c389e03ec40c2df420f6f493819b2ea98b754d74a678a484d8338f8c7c975934a4
+  metadata.gz: d47d53bd5a72e09598140ff646dcd7cde3581387433edbd4d30d49ff468956f446d85fe9a4800092b54ab133b95ac8738c79168836f1562b7c394a9696c71bf0
+  data.tar.gz: 85da0669f94911b362e2d5dd23789a540762e2c3b40cd880ac8b274aa253249bb71525735d5ec72289ecb8926755a7b4067d2b7803f42e9a7a2ec3d38f4fc439

data/.gitignore

@@ -59,4 +59,8 @@ DerivedData
 
 # Test output
 report.llcov
-report.json
+report.json
+
+# VSCode
+.vscode
+.rdbgrc*

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # CHANGELOG
 
-## v2.8.3 
+## v2.8.4
+
+* Don't crash when 0% coverage is causing empty JSON
+  [jarrodlombardo-EventBase](https://github.com/jarrodlombardo-EventBase)
+  [#570](https://github.com/SlatherOrg/slather/pull/570)
+
+* Xcode 16 compatibility (as of beta 5)
+  [ksuther](https://github.com/ksuther)
+  [#568](https://github.com/SlatherOrg/slather/pull/568)
+
+## v2.8.3
 
 * Fix coverage_file.source_file_pathname
   [alfredofernandes](https://github.com/alfredofernandes)

data/lib/slather/project.rb

@@ -132,21 +132,26 @@ module Slather
 
     def pathnames_per_binary(binary_path)
       coverage_json_string = llvm_cov_export_output(binary_path)
-      coverage_json = JSON.parse(coverage_json_string)
-      coverage_json["data"].reduce([]) do |result, chunk|
-        result.concat(chunk["files"].map do |file|
-          filename = file["filename"]
-          path = Pathname(filename)
-          # Don't crash if the file doesn't exist on disk.
-          # This may happen for autogenerated files that have been deleted.
-          filename = path.exist? ? path.realpath : filename
-          {"filename" => filename, "segments" => file["segments"]}
-        end)
+      if coverage_json_string.strip != ""
+        # JSON.parse will crash on an empty string, so just skip everything if the string is empty.
+        coverage_json = JSON.parse(coverage_json_string)
+        coverage_json["data"].reduce([]) do |result, chunk|
+          result.concat(chunk["files"].map do |file|
+            filename = file["filename"]
+            path = Pathname(filename)
+            # Don't crash if the file doesn't exist on disk.
+            # This may happen for autogenerated files that have been deleted.
+            filename = path.exist? ? path.realpath : filename
+            {"filename" => filename, "segments" => file["segments"]}
+          end)
+        end
       end
     end
     private :pathnames_per_binary
 
     def create_coverage_files_for_binary(binary_path, pathnames_per_binary)
+      return [] unless pathnames_per_binary != nil
+
       coverage_files = []
 
       begin
@@ -482,7 +487,16 @@ module Slather
     def find_binary_file_in_bundle(bundle_file)
       if File.directory? bundle_file
         bundle_file_noext = File.basename(bundle_file, File.extname(bundle_file))
-        Dir["#{bundle_file}/**/#{bundle_file_noext}"].first
+
+        # Search for .debug.dylib binaries
+        # See https://developer.apple.com/documentation/xcode/build-settings-reference#Enable-Debug-Dylib-Support for details
+        debug_dylib_matches = Dir["#{bundle_file}/**/#{bundle_file_noext}.debug.dylib"]
+
+        if debug_dylib_matches.length() > 0
+          debug_dylib_matches.first
+        else
+          Dir["#{bundle_file}/**/#{bundle_file_noext}"].first
+        end
       else
         bundle_file
       end

data/lib/slather/version.rb

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

data/slather.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'equivalent-xml', '~> 0.6'
 
   spec.add_dependency 'clamp', '~> 1.3'
-  spec.add_dependency 'xcodeproj', '~> 1.21'
+  spec.add_dependency 'xcodeproj', '~> 1.25'
   spec.add_dependency 'nokogiri', '>= 1.14.3'
   spec.add_dependency 'CFPropertyList', '>= 2.2', '< 4'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - Mark Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-29 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Test coverage reports for Xcode projects