xcov 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32dea765a1ab454e9c7cfe52e0b2c811ed95cdd298824a9d13d88d678591ac0
-  data.tar.gz: 2f36b292854842a4eaa5b5d1229c5c7fcc4df8c92bd8e51d2cbea0bea306c619
+  metadata.gz: ad78b9f52d699c7e6bf5dcc683bc4667554fc69195715a82421e94857c8d423b
+  data.tar.gz: d7bd573a388548e5c4a5db7dae2ccadb15f2af07f8320d1306501bee2060075e
 SHA512:
-  metadata.gz: 6ec5ec18d4ca35b5ed61f9f17ab1cd6f402f2e31e7f0d5c8a37710892884fefed6173fcd7af5ecae48c51563a28fee57d2ac93c970af5aac20313b6a8b0f1b4e
-  data.tar.gz: fefa702e5ea8344912cc37d191e6a4567d41ce50537c2456aab472fdfc6fa59efc5ffcd9ec6d754118ea4b660a3f8591df26a2a5a54fe3f3b50a971d30970cda
+  metadata.gz: 6b85d2d86d36d973ea3c5c1955d65f52f49025e69ad3fa9f9cdd9ad04f448a7fbd51fab37be40d1d80c8ec11a08dede70e9283b3807917d8f2551685463173c0
+  data.tar.gz: 7a7cbc59f9f5294e1ecdf0e897b42dc8cadcf21766c117f0b0063a6a7bcbc6e2eaa3c160c8007510bb69fd8193add232adbbf62c9fe22d5eb41e31839297c694

data/lib/xcov/manager.rb

@@ -49,11 +49,13 @@ module Xcov
       # If no xccov direct path, use the old derived data path method
       if xccov_file_direct_paths.nil?
         extension = Xcov.config[:legacy_support] ? "xccoverage" : "xccovreport"
+        
         test_logs_path = derived_data_path + "Logs/Test/"
-        xccoverage_files = Dir["#{test_logs_path}*.#{extension}", "#{test_logs_path}*.xcresult/*/action.#{extension}"].sort_by { |filename| File.mtime(filename) }.reverse
-
+        UI.important("Derived content from #{Dir["#{test_logs_path}/*"]}")
+        
+        xccoverage_files = Dir["#{test_logs_path}*.#{extension}", "#{test_logs_path}*.xcresult/*/action.#{extension}"]
         if xccoverage_files.empty?
-          xcresult_paths = Dir["#{test_logs_path}*.xcresult"].sort_by { |filename| File.mtime(filename) }.reverse
+          xcresult_paths = Dir["#{test_logs_path}*.xcresult"]
           xcresult_paths.each do |xcresult_path|
             xcresults_to_parse_and_export << xcresult_path
           end
@@ -77,6 +79,7 @@ module Xcov
       # Iterates over xcresults
       # Exports .xccovarchives
       # Exports .xccovreports and collects the paths
+      # Merge .xccovreports if multiple exists and return merged report
       unless xcresults_to_parse_and_export.empty?
         xccoverage_files = process_xcresults!(xcresults_to_parse_and_export)
       end
@@ -88,6 +91,7 @@ module Xcov
 
       # Convert .xccoverage file to json
       ide_foundation_path = Xcov.config[:legacy_support] ? nil : Xcov.config[:ideFoundationPath]
+      xccoverage_files = xccoverage_files.sort_by {|filename| File.mtime(filename)}.reverse
       json_report = Xcov::Core::Parser.parse(xccoverage_files.first, Xcov.config[:output_directory], ide_foundation_path)
       ErrorHandler.handle_error("UnableToParseXccoverageFile") if json_report.nil?
 
@@ -204,30 +208,66 @@ module Xcov
     def process_xcresults!(xcresult_paths)
       output_path = Xcov.config[:output_directory]
       FileUtils.mkdir_p(output_path)
-
-      return xcresult_paths.flat_map do |xcresult_path|
+      
+      result_path = ""
+      index = 0
+      
+      xcresult_paths.flat_map do |xcresult_path|
         begin
           parser = XCResult::Parser.new(path: xcresult_path)
-
+          
           # Exporting to same directory as xcresult
-          archive_paths = parser.export_xccovarchives(destination: output_path)
-          report_paths = parser.export_xccovreports(destination: output_path)
-
-          # Informating user of export paths
-          archive_paths.each do |path|
-            UI.important("Copying .xccovarchive to #{path}") 
+          tmp_archive_paths = parser.export_xccovarchives(destination: output_path)
+          tmp_report_paths = parser.export_xccovreports(destination: output_path)
+
+          # Rename each file with global index
+          tmp_report_paths.each_with_index do |item, i|
+            File.rename(tmp_archive_paths[i], "#{output_path}/xccovarchive-#{index + i}.xccovarchive")
+            File.rename(item, "#{output_path}/xccovreport-#{index + i}.xccovreport")
+            index += 1
           end
-          report_paths.each do |path|
-            UI.important("Copying .xccovreport to #{path}") 
-          end
-
-          report_paths
         rescue
           UI.error("Error occured while exporting xccovreport from xcresult '#{xcresult_path}'")
           UI.error("Make sure you have both Xcode 11 selected and pointing to the correct xcresult file")
           UI.crash!("Failed to export xccovreport from xcresult'")
         end
       end
+      
+      # Grab paths from the directory instead of parser
+      report_paths = Dir["#{output_path}/*.xccovreport"]
+      archive_paths = Dir["#{output_path}/*.xccovarchive"]
+          
+      # Merge coverage reports
+      if report_paths.length > 1 then 
+        # Creating array of paths for merging
+        paths = ""
+        for i in 0..report_paths.length
+          paths += " #{report_paths[i]} #{archive_paths[i]}"
+        end
+            
+        UI.important("Merging multiple coverage reports with #{paths}") 
+        if system ( "xcrun xccov merge --outReport #{output_path}/out.xccovreport --outArchive #{output_path}/out.xccovarchive #{paths}" ) then
+          result_path = "#{output_path}/out.xccovreport"
+        else
+          UI.error("Error occured during merging multiple coverage reports")
+        end
+      end
+
+      if result_path == "" then
+        # Informating user of export paths
+        archive_paths.each do |path|
+          UI.important("Copying .xccovarchive to #{path}") 
+        end
+        report_paths.each do |path|
+          UI.important("Copying .xccovreport to #{path}") 
+        end
+            
+        # Return array of report_paths if coverage reports were not merged
+        return report_paths
+      else
+        # Return merged xccovreport
+        return [result_path]
+      end
     end
   end
 end

data/lib/xcov/version.rb

@@ -1,6 +1,6 @@
 module Xcov
 
-  VERSION = "1.7.4"
+  VERSION = "1.7.5"
   DESCRIPTION = "xcov is a friendly visualizer for Xcode's code coverage files"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcov
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Carlos Vidal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: xcov is a friendly visualizer for Xcode's code coverage files