xcov 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7984985bdbdff4ddf35556121d63a21e039228a
-  data.tar.gz: 43adff6756fc7d8c2c6d544e86cd8daec446a60b
+  metadata.gz: da2758b99e44d950c2911d36f08b1aac504c88ef
+  data.tar.gz: 271d955103fb0d6d932a99352e44d91442809b9d
 SHA512:
-  metadata.gz: 8af9af31f32cb3352170c3b18004b3c10cdda446b023ba48034ef9970a1bf2af0867e675523ac5cc64e9601e878820bc8153699fc6fe0ac55fc958d659121692
-  data.tar.gz: 8c85209f1fa8cc3d737377c4e4d508520027187261b53dd58ee92a5c784dada13a98ed426ddcfc067bfb8359aaa3afc68ff66827ee7c18626e61779cbbfab686
+  metadata.gz: f40a3c1f8964eeea59e200af826a8b6672fe17462c9e96ca0c68356f184dc55b3990bcfe46d1ded3f9c00727162c9dde6ddda8e425ff9a9f6385b7f59bc1e2da
+  data.tar.gz: 50f0692e00f140a4d37ddaec13220094077116131caa38b3975611fda65bc3d87439b70f3ad20f931406bebc8b8db16886624f9a31ad254977a3d86d9f038e60

data/README.md

@@ -45,7 +45,7 @@ In order to make *xcov* run you must:
 </h3>
 
 ## Usage
-*xcov* analyzes the `.xccoverage` files created after running your tests therefore, before executing xcov, you need to run your tests with either `Xcode`, `xcodebuild` or [scan](https://github.com/fastlane/fastlane/tree/master/scan). Once completed, obtain your coverage report by providing a few parameters:
+*xcov* analyzes the `.xccoverage` and `.xccovreport` files created after running your tests therefore, before executing xcov, you need to run your tests with either `Xcode`, `xcodebuild` or [scan](https://github.com/fastlane/fastlane/tree/master/scan). Once completed, obtain your coverage report by providing a few parameters:
 ```
 xcov -w LystSDK.xcworkspace -s LystSDK -o xcov_output
 ```
@@ -75,6 +75,7 @@ xcov -w LystSDK.xcworkspace -s LystSDK -o xcov_output
 * `--coveralls_repo_token`: Repository token to be used by integrations not compatible with Coveralls (optional).
 * `--slack_username`: The username which is used to publish to slack (optional).
 * `--slack_message`: The message which is published together with a successful report (optional).
+* `--legacy_support`: Enables parsing coverage reports generated by Xcode 9.2 or previous versions.
 
 _**Note:** All paths you provide should be absolute and unescaped_
 

data/lib/xcov-core.rb

@@ -8,15 +8,18 @@ require 'fastlane_core'
 module Xcov
   module Core
 
-    ENV['XCOV_CORE_LIBRARY_PATH'] = File.expand_path("../xcov-core/bin", __FILE__) + "/xcov-core"
+    ENV['XCOV_CORE_BINARY_PATH'] = File.expand_path("../xcov-core/bin", __FILE__) + "/xcov-core"
+    ENV['XCOV_CORE_LEGACY_BINARY_PATH'] = File.expand_path("../xcov-core/bin", __FILE__) + "/xcov-core-legacy"
 
     class Parser
 
-      def self.parse(file, output_directory)
+      def self.parse(file, output_directory, ide_foundation_path)
         tmp_dir = File.join(output_directory, 'tmp')
         FileUtils.mkdir_p(tmp_dir) unless File.directory?(tmp_dir)
         report_output = Tempfile.new("report.json", tmp_dir)
-        command = "#{ENV['XCOV_CORE_LIBRARY_PATH'].shellescape} -s #{file.shellescape} -o #{report_output.path.shellescape} --include-lines-info"
+        binary_path = ide_foundation_path.nil? ? ENV['XCOV_CORE_LEGACY_BINARY_PATH'] : ENV['XCOV_CORE_BINARY_PATH']
+        command = "#{binary_path.shellescape} -s #{file.shellescape} -o #{report_output.path.shellescape}"
+        command << " --ide-foundation-path #{ide_foundation_path}" unless ide_foundation_path.nil?
         description = [{ prefix: "Parsing .xccoverage file: " }]
         execute_command(command, description)
         output_file = File.read(report_output.path)

data/lib/xcov-core/version.rb

@@ -1,5 +1,5 @@
 module Xcov
   module Core
-    VERSION = "0.4"
+    VERSION = "0.5"
   end
 end

data/lib/xcov/manager.rb

@@ -37,15 +37,17 @@ module Xcov
 
     def parse_xccoverage
       # Find .xccoverage file
+      extension = Xcov.config[:legacy_support] ? "xccoverage" : "xccovreport"
       test_logs_path = derived_data_path + "Logs/Test/"
-      xccoverage_files = Dir["#{test_logs_path}*.xccoverage"].sort_by { |filename| File.mtime(filename) }.reverse
+      xccoverage_files = Dir["#{test_logs_path}*.#{extension}"].sort_by { |filename| File.mtime(filename) }.reverse
 
       unless test_logs_path.directory? && !xccoverage_files.empty?
         ErrorHandler.handle_error("XccoverageFileNotFound")
       end
 
       # Convert .xccoverage file to json
-      json_report = Xcov::Core::Parser.parse(xccoverage_files.first, Xcov.config[:output_directory])
+      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)
       ErrorHandler.handle_error("UnableToParseXccoverageFile") if json_report.nil?
 
       json_report

data/lib/xcov/model/report.rb

@@ -19,17 +19,8 @@ module Xcov
       return 0 if targets.count == 0
       return targets.first.coverage if targets.count == 1
 
-      executable = targets.reduce(0) do |partial_result, target|
-        partial_result + target.executable_lines
-      end
-
-      covered = targets.reduce(0) do |partial_result, target|
-        partial_result + target.covered_lines
-      end
-
-      return 0 if executable == 0 # avoid ZeroDivisionError
-
-      covered.to_f / executable.to_f
+      acc_coverage = targets.reduce(0) { |acc, target| acc + target.coverage }
+      acc_coverage.to_f / targets.count
     end
 
     def print_description

data/lib/xcov/model/source.rb

@@ -62,16 +62,6 @@ module Xcov
       return value
     end
 
-    def number_of_executable_lines
-      return 0 if lines.nil? || lines.empty?
-      lines.select { |line| line.executable }.count
-    end
-
-    def number_of_covered_lines
-      return 0 if lines.nil? || lines.empty?
-      lines.select { |line| line.covered? }.count
-    end
-
     # Class methods
 
     def self.map(dictionary)

data/lib/xcov/model/target.rb

@@ -4,18 +4,13 @@ module Xcov
   class Target < Xcov::Base
 
     attr_accessor :name
-    attr_accessor :executable_lines # number of executable lines in target
-    attr_accessor :covered_lines # number of covered lines in target
     attr_accessor :files
     attr_accessor :file_templates
 
-    def initialize(name, executable, covered, files)
+    def initialize(name, files)
       @name = CGI::escapeHTML(name)
-      @executable_lines = executable
-      @covered_lines = covered
       @files = files
-      # we cast to floats because integers always return 0
-      @coverage = executable == 0 ? 0.0 : covered.to_f / executable # avoid ZeroDivisionError
+      @coverage = files.count  == 0 ? 0.0 : files.reduce(0) { |acc, file| acc + file.coverage.to_f } / files.count
       @displayable_coverage = self.create_displayable_coverage
       @coverage_color = self.create_coverage_color
       @id = Target.create_id(name)
@@ -60,12 +55,9 @@ module Xcov
       name = dictionary["name"]
       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)
-      executable = Target.calculate_number_of_executable_lines(non_ignored_files)
-      covered = Target.calculate_number_of_covered_lines(non_ignored_files)
 
-      Target.new(name, executable, covered, files)
+      Target.new(name, non_ignored_files)
     end
 
     def self.by_coverage_with_ignored_at_the_end
@@ -85,21 +77,5 @@ module Xcov
       files.select { |file| !file.ignored }
     end
 
-    def self.calculate_number_of_covered_lines(files)
-      return 0 if files.nil? || files.empty?
-
-      files.reduce(0) do |partial_result, file|
-        partial_result + file.number_of_covered_lines
-      end
-    end
-
-    def self.calculate_number_of_executable_lines(files)
-      return 0 if files.nil? || files.empty?
-
-      files.reduce(0) do |partial_result, file|
-        partial_result + file.number_of_executable_lines
-      end
-    end
-
   end
 end

data/lib/xcov/options.rb

@@ -220,6 +220,22 @@ module Xcov
           verify_block: proc do |value|
             UI.user_error!("File not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
           end
+        ),
+
+        # xccovreport compatibility options
+        FastlaneCore::ConfigItem.new(
+          key: :ideFoundationPath,
+          env_name: "XCOV_IDE_FOUNDATION_PATH",
+          description: "Absolute path to the IDEFoundation.framework binary",
+          optional: true,
+          default_value: File.join(`/usr/bin/xcode-select -p`.delete!("\n"), "../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation")
+        ),
+        FastlaneCore::ConfigItem.new(
+          key: :legacy_support,
+          env_name: "XCOV_LEGACY_SUPPORT",
+          description: "Whether xcov should parse a xccoverage file instead on xccovreport",
+          optional: true,
+          default_value: false
         )
       ]
     end

data/lib/xcov/version.rb

@@ -1,6 +1,6 @@
 module Xcov
 
-  VERSION = "1.3.5"
+  VERSION = "1.4.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.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Carlos Vidal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -153,6 +153,7 @@ files:
 - bin/xcov
 - lib/xcov-core.rb
 - lib/xcov-core/bin/xcov-core
+- lib/xcov-core/bin/xcov-core-legacy
 - lib/xcov-core/version.rb
 - lib/xcov.rb
 - lib/xcov/commands_generator.rb