xcov 1.6.0 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36baa2a5175fb9d5664e322d39a9bb3110cde70e672ed6c3a5c858f725478da7
-  data.tar.gz: 34287b2a2cbf7fe408d1eaf39e8cc414c87a2ef3c873c4d6f6cd3535afcfe592
+  metadata.gz: c32dea765a1ab454e9c7cfe52e0b2c811ed95cdd298824a9d13d88d678591ac0
+  data.tar.gz: 2f36b292854842a4eaa5b5d1229c5c7fcc4df8c92bd8e51d2cbea0bea306c619
 SHA512:
-  metadata.gz: d5963ae1495ec0de0c0b10d3fda2ed1c6431319c009cb5098d54a2aacc9fae8506e30301fc6c713459934462b28deeace8d5b2c584da8d9fa9aba4c8f1c0a80b
-  data.tar.gz: 2f4277eb3eabf9433f38914ad607b9365a90c83120b738dc8bb8fb43993cda09fd67e3ef53ddc1f51adf4ce7dd6473b1a0062e2e66bde31a0c60a60ad8db6ec1
+  metadata.gz: 6ec5ec18d4ca35b5ed61f9f17ab1cd6f402f2e31e7f0d5c8a37710892884fefed6173fcd7af5ecae48c51563a28fee57d2ac93c970af5aac20313b6a8b0f1b4e
+  data.tar.gz: fefa702e5ea8344912cc37d191e6a4567d41ce50537c2456aab472fdfc6fa59efc5ffcd9ec6d754118ea4b660a3f8591df26a2a5a54fe3f3b50a971d30970cda

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

@@ -35,9 +35,16 @@ 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
+      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 +55,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 +198,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/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.6.0"
+  VERSION = "1.7.4"
   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.4
 platform: ruby
 authors:
 - Carlos Vidal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2020-08-18 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
@@ -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,11 +190,11 @@ 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: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,8 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: xcov is a friendly visualizer for Xcode's code coverage files
 test_files: []