xcov 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36baa2a5175fb9d5664e322d39a9bb3110cde70e672ed6c3a5c858f725478da7
-  data.tar.gz: 34287b2a2cbf7fe408d1eaf39e8cc414c87a2ef3c873c4d6f6cd3535afcfe592
+  metadata.gz: 0b96135c42bcad3bc99bd0a7bd8a703311df3455e99c8c3b303bc20b7b43d1fe
+  data.tar.gz: af66a0c17ae43ced2ddce57187c7baf9764e48d90f2c9836f01e371a11265adb
 SHA512:
-  metadata.gz: d5963ae1495ec0de0c0b10d3fda2ed1c6431319c009cb5098d54a2aacc9fae8506e30301fc6c713459934462b28deeace8d5b2c584da8d9fa9aba4c8f1c0a80b
-  data.tar.gz: 2f4277eb3eabf9433f38914ad607b9365a90c83120b738dc8bb8fb43993cda09fd67e3ef53ddc1f51adf4ce7dd6473b1a0062e2e66bde31a0c60a60ad8db6ec1
+  metadata.gz: 2ecbcbdd82fd7abaef6c34c2f7631ca88af1482d77c85074e2a6e7c07bce6fab54dc25bddaf7c676794e8203bf4fe8937b4ee03449577926eb03d11a96f422da
+  data.tar.gz: b185daa8cb390aab36b322bb8b127668f036a0ebba509d43aa43c1ae8228845e54e69a18e6fa1bd207470c2e9a0f5d39c52005982404b2ace02364a85d3564d6

data/lib/xcov-core/version.rb

@@ -1,5 +1,5 @@
 module Xcov
   module Core
-    VERSION = "0.7"
+    VERSION = "0.8"
   end
 end

data/lib/xcov/manager.rb

@@ -38,6 +38,11 @@ module Xcov
     end
 
     def parse_xccoverage
+      xccoverage_files = []
+
+      # xcresults to parse and export after collecting
+      xcresults_to_parse_and_export = []
+
       # Find .xccoverage file
       # If no xccov direct path, use the old derived data path method
       if xccov_file_direct_paths.nil?
@@ -48,17 +53,36 @@ module Xcov
         if xccoverage_files.empty?
           xcresult_paths = Dir["#{test_logs_path}*.xcresult"].sort_by { |filename| File.mtime(filename) }.reverse
           xcresult_paths.each do |xcresult_path|
-            xccoverage_files += export_paths_from_xcresult!(xcresult_path)
+            xcresults_to_parse_and_export << xcresult_path
           end
         end
 
-        unless test_logs_path.directory? && !xccoverage_files.empty?
+        unless test_logs_path.directory?
           ErrorHandler.handle_error("XccoverageFileNotFound")
         end
       else
-        xccoverage_files = xccov_file_direct_paths
+        # Iterate over direct paths and find .xcresult files
+        # that need to be processed before getting coverage
+        xccov_file_direct_paths.each do |path|
+          if File.extname(path) == '.xcresult'
+            xcresults_to_parse_and_export << path
+          else
+            xccoverage_files << path
+          end
+        end
+      end
+
+      # Iterates over xcresults
+      # Exports .xccovarchives
+      # Exports .xccovreports and collects the paths
+      unless xcresults_to_parse_and_export.empty?
+        xccoverage_files = process_xcresults!(xcresults_to_parse_and_export)
       end
 
+      # Errors if no coverage files were found
+      if xccoverage_files.empty?
+        ErrorHandler.handle_error("XccoverageFileNotFound")
+      end
 
       # Convert .xccoverage file to json
       ide_foundation_path = Xcov.config[:legacy_support] ? nil : Xcov.config[:ideFoundationPath]
@@ -172,21 +196,36 @@ module Xcov
       end
 
       path = Xcov.config[:xccov_file_direct_path]
-      if File.extname(path) == '.xcresult'
-        return export_paths_from_xcresult!(path)
-      end
-
       return [Pathname.new(path).to_s]
     end
 
-    def export_paths_from_xcresult!(path)
-      parser = XCResult::Parser.new(path: path)
-      return parser.export_xccovreports(destination: Dir.mktmpdir)
-    rescue
-      UI.error("Error occured while exporting xccovreport from 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
+    def process_xcresults!(xcresult_paths)
+      output_path = Xcov.config[:output_directory]
+      FileUtils.mkdir_p(output_path)
+
+      return 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}") 
+          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
+    end
   end
 end

data/lib/xcov/version.rb

@@ -1,6 +1,6 @@
 module Xcov
 
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
   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.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Carlos Vidal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ files:
 - views/function.erb
 - views/report.erb
 - views/target.erb
-homepage: https://github.com/nakiostudio/xcov
+homepage: https://github.com/fastlane-community/xcov
 licenses:
 - MIT
 metadata: {}
@@ -209,7 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: xcov is a friendly visualizer for Xcode's code coverage files