xcov 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39093eb1a121b8746609124b8d4e7e8433127777
-  data.tar.gz: 521073d98ad4229dbbe7c2ded44235a4a236d9cc
+SHA256:
+  metadata.gz: 36baa2a5175fb9d5664e322d39a9bb3110cde70e672ed6c3a5c858f725478da7
+  data.tar.gz: 34287b2a2cbf7fe408d1eaf39e8cc414c87a2ef3c873c4d6f6cd3535afcfe592
 SHA512:
-  metadata.gz: d82f23e8a4ad93740091e26c1b5ee6defc71ecf2bd1c3ca25f2c9b2aeef87c467322a613de3c090aea80627c450a5e1f9f985e2d8a81183aba9a8d0c64b6a616
-  data.tar.gz: 4ab27e291ef1f3a6bea483911324d033624d143cc55f8c9925da8301cb7ccdeada8e6644e8b642f01eef74ba18818cde5df4b4d7c049876c5c7a18ff2e189e8d
+  metadata.gz: d5963ae1495ec0de0c0b10d3fda2ed1c6431319c009cb5098d54a2aacc9fae8506e30301fc6c713459934462b28deeace8d5b2c584da8d9fa9aba4c8f1c0a80b
+  data.tar.gz: 2f4277eb3eabf9433f38914ad607b9365a90c83120b738dc8bb8fb43993cda09fd67e3ef53ddc1f51adf4ce7dd6473b1a0062e2e66bde31a0c60a60ad8db6ec1

data/lib/xcov/manager.rb

@@ -1,11 +1,13 @@
 require 'fastlane_core'
 require 'pty'
 require 'open3'
+require 'tmpdir'
 require 'fileutils'
 require 'terminal-table'
 require 'xcov-core'
 require 'pathname'
 require 'json'
+require 'xcresult'
 
 module Xcov
   class Manager
@@ -38,18 +40,26 @@ module Xcov
     def parse_xccoverage
       # Find .xccoverage file
       # If no xccov direct path, use the old derived data path method
-      if xccov_file_direct_path.nil?
+      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
 
+        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)
+          end
+        end
+
         unless test_logs_path.directory? && !xccoverage_files.empty?
           ErrorHandler.handle_error("XccoverageFileNotFound")
         end
       else
-        xccoverage_files = ["#{xccov_file_direct_path}"]
+        xccoverage_files = xccov_file_direct_paths
       end
 
+
       # Convert .xccoverage file to json
       ide_foundation_path = Xcov.config[:legacy_support] ? nil : Xcov.config[:ideFoundationPath]
       json_report = Xcov::Core::Parser.parse(xccoverage_files.first, Xcov.config[:output_directory], ide_foundation_path)
@@ -155,12 +165,27 @@ module Xcov
       return product_builds_path.parent.parent
     end
 
-    def xccov_file_direct_path
+    def xccov_file_direct_paths
       # If xccov_file_direct_path was supplied, return
       if Xcov.config[:xccov_file_direct_path].nil?
           return nil
       end
-      return Pathname.new(Xcov.config[:xccov_file_direct_path])
+
+      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
 
   end

data/lib/xcov/options.rb

@@ -77,12 +77,12 @@ module Xcov
           key: :xccov_file_direct_path,
           short_option: "-f",
           env_name: "XCOV_FILE_DIRECT_PATH",
-          description: "The path to the xccoverage/xccovreport file to parse to generate code coverage",
+          description: "The path to the xccoverage/xccovreport/xcresult file to parse to generate code coverage",
           optional: true,
           verify_block: proc do |value|
             v = File.expand_path(value.to_s)
-            raise "xccoverage/xccovreport file does not exist".red unless File.exist?(v)
-            raise "Invalid xccov file type (must be xccoverage or xccovreport)".red unless value.end_with? "xccoverage" or value.end_with? "xccovreport"
+            raise "xccoverage/xccovreport/xcresult file does not exist".red unless File.exist?(v)
+            raise "Invalid xccov file type (must be xccoverage, xccovreport, xcresult)".red unless value.end_with? "xccoverage" or value.end_with? "xccovreport" or value.end_with? "xcresult"
           end
         ),
         FastlaneCore::ConfigItem.new(

data/lib/xcov/version.rb

@@ -1,6 +1,6 @@
 module Xcov
 
-  VERSION = "1.5.1"
+  VERSION = "1.6.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.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Carlos Vidal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xcresult
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -195,8 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: xcov is a friendly visualizer for Xcode's code coverage files