xcov 1.7.0 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b96135c42bcad3bc99bd0a7bd8a703311df3455e99c8c3b303bc20b7b43d1fe
-  data.tar.gz: af66a0c17ae43ced2ddce57187c7baf9764e48d90f2c9836f01e371a11265adb
+  metadata.gz: ad78b9f52d699c7e6bf5dcc683bc4667554fc69195715a82421e94857c8d423b
+  data.tar.gz: d7bd573a388548e5c4a5db7dae2ccadb15f2af07f8320d1306501bee2060075e
 SHA512:
-  metadata.gz: 2ecbcbdd82fd7abaef6c34c2f7631ca88af1482d77c85074e2a6e7c07bce6fab54dc25bddaf7c676794e8203bf4fe8937b4ee03449577926eb03d11a96f422da
-  data.tar.gz: b185daa8cb390aab36b322bb8b127668f036a0ebba509d43aa43c1ae8228845e54e69a18e6fa1bd207470c2e9a0f5d39c52005982404b2ace02364a85d3564d6
+  metadata.gz: 6b85d2d86d36d973ea3c5c1955d65f52f49025e69ad3fa9f9cdd9ad04f448a7fbd51fab37be40d1d80c8ec11a08dede70e9283b3807917d8f2551685463173c0
+  data.tar.gz: 7a7cbc59f9f5294e1ecdf0e897b42dc8cadcf21766c117f0b0063a6a7bcbc6e2eaa3c160c8007510bb69fd8193add232adbbf62c9fe22d5eb41e31839297c694

data/lib/xcov/manager.rb

@@ -35,6 +35,8 @@ module Xcov
       submit_to_coveralls(report)
       tmp_dir = File.join(Xcov.config[:output_directory], 'tmp')
       FileUtils.rm_rf(tmp_dir) if File.directory?(tmp_dir)
+
+      json_report
     end
 
     def parse_xccoverage
@@ -47,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
@@ -75,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
@@ -86,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?
 
@@ -202,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/model/source.rb

@@ -8,14 +8,18 @@ module Xcov
     attr_accessor :type
     attr_accessor :ignored
     attr_accessor :coverage
+    attr_accessor :coveredLines
+    attr_accessor :executableLines
     attr_accessor :functions
     attr_accessor :function_templates
     attr_accessor :lines
 
-    def initialize(name, location, coverage, functions, lines = nil)
+    def initialize(name, location, coverage, coveredLines, executableLines, functions, lines = nil)
       @name = CGI::escapeHTML(name)
       @location = CGI::escapeHTML(location)
       @coverage = coverage
+      @coveredLines = coveredLines
+      @executableLines = executableLines
       @functions = functions
       @ignored = Xcov.ignore_handler.should_ignore_file_at_path(location)
       @displayable_coverage = self.create_displayable_coverage
@@ -52,6 +56,7 @@ module Xcov
     def json_value
       value = {
         "name" => @name,
+        "path" => @location,
         "coverage" => @coverage,
         "type" => @type,
         "functions" => @functions ? @functions.map{ |function| function.json_value } : []
@@ -68,9 +73,11 @@ module Xcov
       name = dictionary["name"]
       location = dictionary["location"]
       coverage = dictionary["coverage"]
+      coveredLines = dictionary["coveredLines"]
+      executableLines = dictionary["executableLines"]
       functions = dictionary["functions"].map { |function| Function.map(function)}
       lines = map_lines(dictionary["lines"])
-      Source.new(name, location, coverage, functions, lines)
+      Source.new(name, location, coverage, coveredLines, executableLines, functions, lines)
     end
 
     def self.map_lines(dictionaries)

data/lib/xcov/model/target.rb

@@ -7,10 +7,12 @@ module Xcov
     attr_accessor :files
     attr_accessor :file_templates
 
-    def initialize(name, coverage, files)
+    def initialize(name, files)
       @name = CGI::escapeHTML(name)
       @files = files
-      @coverage = coverage
+      totalCoveredLines = files.reduce(0) { |acc, file| acc + file.coveredLines }
+      totalExecutableLines = files.reduce(0) { |acc, file| acc + file.executableLines }
+      @coverage = files.count == 0 || totalExecutableLines == 0 ? 0.0 : totalCoveredLines.to_f / totalExecutableLines.to_f
       @displayable_coverage = self.create_displayable_coverage
       @coverage_color = self.create_coverage_color
       @id = Target.create_id(name)
@@ -53,12 +55,11 @@ module Xcov
 
     def self.map(dictionary)
       name = dictionary["name"]
-      coverage = dictionary["coverage"]
       files = dictionary["files"].map { |file| Source.map(file)}
       files = files.sort &by_coverage_with_ignored_at_the_end
       non_ignored_files = Target.select_non_ignored_files(files)
 
-      Target.new(name, coverage, non_ignored_files)
+      Target.new(name, non_ignored_files)
     end
 
     def self.by_coverage_with_ignored_at_the_end

data/lib/xcov/options.rb

@@ -93,6 +93,14 @@ module Xcov
           default_value: File.join(containing, "xcov_report"),
           default_value_dynamic: true
         ),
+        FastlaneCore::ConfigItem.new(
+          key: :cloned_source_packages_path,
+          short_option: "-C",
+          env_name: "XCOV_CLONED_SOURCE_PACKAGES_PATH",
+          description: "Sets a custom path for Swift Package Manager dependencies",
+          type: String,
+          optional: true
+        ),
 
         # Report options
         FastlaneCore::ConfigItem.new(

data/lib/xcov/version.rb

@@ -1,6 +1,6 @@
 module Xcov
 
-  VERSION = "1.7.0"
+  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.0
+  version: 1.7.5
 platform: ruby
 authors:
 - Carlos Vidal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.82.0
+        version: 2.141.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.82.0
+        version: 2.141.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -194,7 +194,7 @@ homepage: https://github.com/fastlane-community/xcov
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,9 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: xcov is a friendly visualizer for Xcode's code coverage files
 test_files: []