slather 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96a2924692977293e43094ff06f13424436d3e52c4703d7827753164043d65b
-  data.tar.gz: 813bb754172204b270f51b2e8548506163a7d38eddd8c8f69899bf0b5b6c789e
+  metadata.gz: 24ee530494c9f131751a85dba16a4bc09292c187d045be17b1212d9cf4038378
+  data.tar.gz: 4c5dabc3de752ebb88998ca29d87d6f072e4477a909926d4237078a2a9f73bc2
 SHA512:
-  metadata.gz: 11206bb710d0fbcdc70970113c18c250e94c009ee99b85d8b8fbc655dcd10f1d88d42c7fa29a67cad3e9b07a09ebb4b1866af70f21b54944aeeb898ddc52ffca
-  data.tar.gz: 7f0b18beaacafa3e38eaded6df28747619570f6d0a67a4546465485bfcddfcb152543185782703cd32814cd38b86dfb3f68c49876a13a9642eb02f7ae96cb224
+  metadata.gz: b7d4a1db210237adec6b9c03634774991a209c4aa64c10dea0a73208642298082b9a76f9c0e979b68a4601c6c9ff37f92d6f05bfd3c8a35429bd78cc8ac9549c
+  data.tar.gz: 9bf87cccabbd4b243e8ba9c519d491818a38924125694ca8701b3b34764a8c9ae167919b764638fa0af27b137dbbf10d9188b3e6297f93f3d1673ec07566d817

data/.gitignore

@@ -46,4 +46,8 @@ html
 *.gcno
 
 # JetBrains IDE
-.idea/
+.idea/
+
+# Test output
+report.llcov
+report.json

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## v2.4.8
+
+* Optimize performance for many binaries
+  [cltnschlosser](https://github.com/cltnschlosser)
+  [#455](https://github.com/SlatherOrg/slather/pull/455)
+
+* Don't generate line 0 in profdata_coverage_file.rb from line with error
+  [tthbalazs](https://github.com/tthbalazs)
+  [#449](https://github.com/SlatherOrg/slather/pull/449)
+
+* coveralls dependency update
+  [GRiMe2D](https://github.com/GRiMe2D)
+  [#448](https://github.com/SlatherOrg/slather/pull/448)
+
 ## v2.4.7
 
 * Update dependencies

data/README.md

@@ -67,6 +67,20 @@ If your configuration produces a universal binary you need to specify a specific
 $ slather coverage -s --arch x86_64 --scheme YourXcodeSchemeName --configuration YourBuildConfigurationName path/to/project.xcodeproj
 ```
 
+### For multiple modules
+
+If you want to run some modules, but not all (like modules created by CocoaPods) you can do it like this:
+
+```sh
+$ slather coverage --binary-basename module1 --binary-basename module2 path/to/project.xcodeproj
+```
+You can also add it to the `.slather.yml` file as an array:
+```yml
+binary_basename:
+  - module1
+  - module2
+```
+
 ### Setup for Xcode 5 and 6
 
 Run this command to enable the `Generate Test Coverage` and `Instrument Program Flow` flags for your project:

data/lib/slather/profdata_coverage_file.rb

@@ -18,7 +18,6 @@ module Slather
     end
 
     def create_line_data
-      all_lines = source_code_lines
       line_data = Hash.new
       all_lines.each { |line| line_data[line_number_in_line(line, self.line_numbers_first)] = line }
       self.line_data = line_data
@@ -26,14 +25,20 @@ module Slather
     private :create_line_data
 
     def path_on_first_line?
-      path = self.source.split("\n")[0].sub ":", ""
-      !path.lstrip.start_with?("1|")
+      !source.lstrip.start_with?("1|")
     end
 
     def source_file_pathname
       @source_file_pathname ||= begin
         if path_on_first_line?
-          path = self.source.split("\n")[0].sub ":", ""
+          end_index = self.source.index(/:?\n/)
+          if end_index != nil
+            end_index -= 1
+            path = self.source[0..end_index]
+          else
+            # Empty file, output just contains path
+            path = self.source.sub ":", ""
+          end
           path &&= Pathname(path)
         else
           # llvm-cov was run with just one matching source file
@@ -64,7 +69,16 @@ module Slather
     end
 
     def source_code_lines
-      self.source.split("\n")[(path_on_first_line? ? 1 : 0)..-1]
+      lines = self.source.split("\n")[(path_on_first_line? ? 1 : 0)..-1]
+      ignore_error_lines(lines)
+    end
+
+    def ignore_error_lines(lines, line_numbers_first = self.line_numbers_first)
+      if line_numbers_first
+        lines.reject { |line| line.lstrip.start_with?('|', '--') }
+      else
+        lines
+      end
     end
 
     def source_data
@@ -72,10 +86,7 @@ module Slather
     end
 
     def all_lines
-      if @all_lines == nil
-        @all_lines = source_code_lines
-      end
-      @all_lines
+      @all_lines ||= source_code_lines
     end
 
     def raw_source
@@ -94,6 +105,9 @@ module Slather
 
     def line_number_in_line(line, line_numbers_first = self.line_numbers_first)
       if line_numbers_first
+        # Skip regex if the number is the first thing in the line
+        fastpath_number = line.to_i
+        return fastpath_number if fastpath_number != 0
         line =~ /^(\s*)(\d*)/
         group = $2
       else
@@ -123,7 +137,7 @@ module Slather
     end
 
     def line_coverage_data
-      source_code_lines.map do |line|
+      all_lines.map do |line|
         coverage_for_line(line, self.line_numbers_first)
       end
     end

data/lib/slather/project.rb

@@ -191,36 +191,38 @@ module Slather
     end
 
     def profdata_coverage_dir
-      raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.exists?(self.build_directory)
-      dir = nil
-      if self.scheme
-        dir = Dir[File.join(build_directory,"/**/CodeCoverage/#{self.scheme}")].first
-      else
-        dir = Dir[File.join(build_directory,"/**/#{first_product_name}")].first
-      end
+      @profdata_coverage_dir ||= begin
+        raise StandardError, "The specified build directory (#{self.build_directory}) does not exist" unless File.exists?(self.build_directory)
+        dir = nil
+        if self.scheme
+          dir = Dir[File.join(build_directory,"/**/CodeCoverage/#{self.scheme}")].first
+        else
+          dir = Dir[File.join(build_directory,"/**/#{first_product_name}")].first
+        end
 
-      if dir == nil
-        # Xcode 7.3 moved the location of Coverage.profdata
-        dir = Dir[File.join(build_directory,"/**/CodeCoverage")].first
-      end
+        if dir == nil
+          # Xcode 7.3 moved the location of Coverage.profdata
+          dir = Dir[File.join(build_directory,"/**/CodeCoverage")].first
+        end
 
-      if dir == nil && Slather.xcode_version[0] >= 9
-        # Xcode 9 moved the location of Coverage.profdata
-        coverage_files = Dir[File.join(build_directory, "/**/ProfileData/*/Coverage.profdata")]
+        if dir == nil && Slather.xcode_version[0] >= 9
+          # Xcode 9 moved the location of Coverage.profdata
+          coverage_files = Dir[File.join(build_directory, "/**/ProfileData/*/Coverage.profdata")]
 
-        if coverage_files.count == 0
-          # Look up one directory
-          # The ProfileData directory is next to Intermediates.noindex (in previous versions of Xcode the coverage was inside Intermediates)
-          coverage_files = Dir[File.join(build_directory, "../**/ProfileData/*/Coverage.profdata")]
-        end
+          if coverage_files.count == 0
+            # Look up one directory
+            # The ProfileData directory is next to Intermediates.noindex (in previous versions of Xcode the coverage was inside Intermediates)
+            coverage_files = Dir[File.join(build_directory, "../**/ProfileData/*/Coverage.profdata")]
+          end
 
-        if coverage_files != nil && coverage_files.count != 0
-          dir = Pathname.new(coverage_files.first).parent()
+          if coverage_files != nil && coverage_files.count != 0
+            dir = Pathname.new(coverage_files.first).parent()
+          end
         end
-      end
 
-      raise StandardError, "No coverage directory found." unless dir != nil
-      dir
+        raise StandardError, "No coverage directory found." unless dir != nil
+        dir
+      end
     end
 
     def profdata_file

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = '2.4.7' unless defined?(Slather::VERSION)
+  VERSION = '2.4.8' unless defined?(Slather::VERSION)
 end

data/slather.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'coveralls', '~> 0'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'simplecov', '~> 0'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.8'

data/spec/slather/cocoapods_plugin_spec.rb

@@ -13,7 +13,7 @@ describe Slather do
       # Execute the post_install hook via CocoaPods
       sandbox_root = 'Pods'
       sandbox = Pod::Sandbox.new(sandbox_root)
-      context = Pod::Installer::PostInstallHooksContext.generate(sandbox, [])
+      context = Pod::Installer::PostInstallHooksContext.generate(sandbox, mock_project, [])
       Pod::HooksManager.run(:post_install, context, {'slather' => nil})
     end
   end

data/spec/slather/profdata_coverage_spec.rb

@@ -90,6 +90,23 @@ describe Slather::ProfdataCoverageFile do
     end
   end
 
+  describe '#ignore_error_lines' do
+    it 'should ignore lines starting with - when line_numbers_first is true' do
+      expect(profdata_coverage_file.ignore_error_lines(['--------'], true)).to eq([])
+      expect(profdata_coverage_file.ignore_error_lines(['--------', 'not ignored'], true)).to eq(['not ignored'])
+    end
+
+    it 'should ignore lines starting with | when line_numbers_first is true' do
+      expect(profdata_coverage_file.ignore_error_lines(['| Unexecuted instantiation'], true)).to eq([])
+      expect(profdata_coverage_file.ignore_error_lines(['| Unexecuted instantiation', 'not ignored'], true)).to eq(['not ignored'])
+    end
+
+    it 'should not ignore any lines when line_numbers_first is false' do
+      lines = ['| Unexecuted instantiation', '------']
+      expect(profdata_coverage_file.ignore_error_lines(lines, false)).to eq(lines)
+    end
+  end
+
   describe "#coverage_for_line" do
     it "should return the number of hits for the line" do
       expect(profdata_coverage_file.coverage_for_line("      10|   40|    func applicationWillTerminate(application: UIApplication) {", false)).to eq(10)
@@ -116,6 +133,10 @@ describe Slather::ProfdataCoverageFile do
       expect(profdata_coverage_file.coverage_for_line("   18|  11.8k|    return a + b;", true)).to eq(11800)
       expect(profdata_coverage_file.coverage_for_line("   18|  2.58M|    return a + b;", true)).to eq(2580000)
     end
+
+    it 'should ignore errors in profdata' do
+      expect(profdata_coverage_file.coverage_for_line('------------------', true)).to eq(nil)
+    end
   end
 
   describe "#num_lines_tested" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -337,8 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Test coverage reports for Xcode projects