undercover 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ad060fa8459db10f25f0b6d7591c8e15a7aa64aa8f13d6f6fe1e035ef1b6c90
-  data.tar.gz: e73ddbb578d770a7bed01f01e30688cfd3c6da7d9d204a5f2b4136d77e8e5f5d
+  metadata.gz: 876068f41c32798bbc3e6d2e37980021c5afebf2d7316700671741b64e4959ae
+  data.tar.gz: 55fea89d18b7e6feeac2821f97a008999c2442aac83b53239c353fb05d6875f2
 SHA512:
-  metadata.gz: 369e92ed7a0a55ac723a56a6b753529350fb97a9afa4454ae147320b659ca800c96bc88d5e2a39029c45b0632d4b42356f8d73105319410468a1057cbd190f42
-  data.tar.gz: '09987aa4687852f590257a3297c19b5e159f140cd0d97d1c8ffb6b6eeb11a645617e10281d596d802401e9e83550058f26b502571637ec9ed370a4f5530d39ed'
+  metadata.gz: 1210f2973aee4c7bea1484c9eef36dce6bf8582eec0f9f95a94585bdc03cce9df7e5f8d750f33d2838f0329fd466e636fba7f05d2080c998717048a09520172f
+  data.tar.gz: 0cc9be1fa5e3fe60009b71a9b2212c24f2f3c7f20a8df674821dcbd2c2ca5e1157dc04ece674b221d8bbbcaab3f4cfb6084846241474d664e98b644484e77e08

data/.github/workflows/ruby.yml

@@ -4,8 +4,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
-      matrix: 
-        ruby: ['2.6.x', '2.5.x', '2.4.x']
+      matrix:
+        ruby: ['2.7.x', '2.6.x', '2.5.x']
     steps:
       - uses: actions/checkout@v1
       - name: Set up Ruby ${{ matrix.ruby }}
@@ -17,5 +17,5 @@ jobs:
           gem install bundler undercover --no-doc
           bundle install --jobs 4 --retry 3
           bundle exec rake
-          git pull origin master:master
+          git fetch origin master:master
           undercover --compare master

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4.4
+  TargetRubyVersion: 2.7.0
   Exclude:
     - spec/fixtures/**/*
 
@@ -21,3 +21,12 @@ Metrics/BlockLength:
   Enabled: true
   Exclude:
     - spec/**/*
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.3.4] - 2020-04-05
+### Changed
+- Updated parsing performance by scoping `all_results` to git diff
+- Dependecy updates
+
 ## [0.3.3] - 2019-12-29
 ### Fixed
 - `.gemspec` requires `imagen >= 0.1.8` to address compatibility issues
@@ -81,7 +86,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - First release of `undercover` 🎉
 
-[Unreleased]: https://github.com/grodowski/undercover/compare/v0.3.3...HEAD
+[Unreleased]: https://github.com/grodowski/undercover/compare/v0.3.4...HEAD
+[0.3.4]: https://github.com/grodowski/undercover/compare/v0.3.3...v0.3.4
 [0.3.3]: https://github.com/grodowski/undercover/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/grodowski/undercover/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/grodowski/undercover/compare/v0.3.0...v0.3.1

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Jan Grodowski
+Copyright (c) 2018-2020 Jan Grodowski
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/undercover

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift("#{__dir__}/../lib")
+$VERBOSE = nil
 
 require 'undercover'
 require 'benchmark'

data/docs/codeship.md

@@ -12,7 +12,7 @@ gem install undercover
 
 ```
 bundle exec rspec --format documentation --color
-# pull origin/master to have a ref to compare against
+# fetch origin/master to have a ref to compare against
 git remote set-branches --add origin master
 git fetch
 undercover -c origin/master

data/docs/travis.yml

@@ -9,5 +9,5 @@ before_install:
   - gem update --system
 script:
   - bundle exec rake
-  - git pull origin master:master
+  - git fetch origin master:master
   - undercover --compare master

data/lib/undercover.rb

@@ -32,25 +32,12 @@ module Undercover
       @lcov = LcovParser.parse(File.open(opts.lcov))
       @code_dir = opts.path
       @changeset = changeset.update
+      @loaded_files = {}
       @results = {}
     end
 
-    def build
-      each_result_arg do |filename, coverage, imagen_node|
-        key = filename.gsub(/^\.\//, '')
-        results[key] ||= []
-        results[key] << Result.new(
-          imagen_node, coverage, filename
-        )
-      end
-      self
-    end
-
-    # TODO: this is experimental and might be incorrect!
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-    def build_warnings
-      flagged_results = Set.new
-
+    def build
       changeset.each_changed_line do |filepath, line_no|
         dist_from_line_no = lambda do |res|
           return BigDecimal::INFINITY if line_no < res.first_line
@@ -63,17 +50,31 @@ module Undercover
         dist_from_line_no_sorter = lambda do |res1, res2|
           dist_from_line_no[res1] <=> dist_from_line_no[res2]
         end
-        next unless results[filepath]
+        load_and_parse_file(filepath)
 
-        res = results[filepath].min(&dist_from_line_no_sorter)
-        flagged_results << res if res&.uncovered?(line_no)
+        next unless loaded_files[filepath]
+
+        res = loaded_files[filepath].min(&dist_from_line_no_sorter)
+        res.flag if res&.uncovered?(line_no)
+        results[filepath] ||= Set.new
+        results[filepath] << res
       end
-      flagged_results
+      self
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
+    def build_warnings
+      warn('Undercover::Report#build_warnings is deprecated! ' \
+           'Please use the #flagged_results accessor instead.')
+      all_results.select(&:flagged?)
+    end
+
     def all_results
-      results.values.flatten
+      results.values.map(&:to_a).flatten
+    end
+
+    def flagged_results
+      all_results.select(&:flagged?)
     end
 
     def inspect
@@ -83,20 +84,27 @@ module Undercover
 
     private
 
-    # TODO: should that start from changeset.file_paths?
-    # this way we could report things that weren't even loaded in any spec,
-    # so is this still good idea? (Rakefile, .gemspec etc)
-    def each_result_arg
-      match_all = ->(_) { true }
-      lcov.source_files.each do |relative_filename, coverage|
-        path = File.join(code_dir, relative_filename)
-        root_ast = Imagen::Node::Root.new.build_from_file(path)
-        next if root_ast.children.empty?
-
-        root_ast.children[0].find_all(match_all).each do |node|
-          yield(relative_filename, coverage, node)
-        end
+    attr_reader :loaded_files
+
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    def load_and_parse_file(filepath)
+      key = filepath.gsub(/^\.\//, '')
+      return if loaded_files[key]
+
+      coverage = lcov.coverage(filepath)
+      return if coverage.empty?
+
+      root_ast = Imagen::Node::Root.new.build_from_file(
+        File.join(code_dir, filepath)
+      )
+      return if root_ast.children.empty?
+
+      loaded_files[key] = []
+      # TODO: children[0] ignores the lonely_method (see spec fixtures)!
+      root_ast.children[0].find_all(->(_) { true }).each do |imagen_node|
+        loaded_files[key] << Result.new(imagen_node, coverage, filepath)
       end
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
   end
 end

data/lib/undercover/cli.rb

@@ -31,9 +31,9 @@ module Undercover
         return 0 if error == :no_changes
       end
 
-      warnings = report.build_warnings
-      puts Undercover::Formatter.new(warnings)
-      warnings.any? ? 1 : 0
+      flagged = report.flagged_results
+      puts Undercover::Formatter.new(flagged)
+      flagged.any? ? 1 : 0
     end
 
     def self.syntax_version(version)

data/lib/undercover/lcov_parser.rb

@@ -22,6 +22,13 @@ module Undercover
       self
     end
 
+    def coverage(filepath)
+      _filename, coverage = source_files.find do |relative_path, _|
+        relative_path == filepath
+      end
+      coverage || []
+    end
+
     private
 
     # rubocop:disable Metrics/MethodLength, Style/SpecialGlobalVars

data/lib/undercover/result.rb

@@ -8,7 +8,7 @@ module Undercover
 
     attr_reader :node, :coverage, :file_path
 
-    def_delegators :node, :first_line, :last_line
+    def_delegators :node, :first_line, :last_line, :name
 
     def initialize(node, file_cov, file_path)
       @node = node
@@ -16,6 +16,15 @@ module Undercover
         ln > first_line && ln < last_line
       end
       @file_path = file_path
+      @flagged = false
+    end
+
+    def flag
+      @flagged = true
+    end
+
+    def flagged?
+      @flagged
     end
 
     # TODO: make DRY

data/lib/undercover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Undercover
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/undercover.gemspec

@@ -25,13 +25,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'imagen', '>= 0.1.8'
   spec.add_dependency 'rainbow', '>= 2.1', '< 4.0'
-  spec.add_dependency 'rugged', '>= 0.27', '< 0.29'
+  spec.add_dependency 'rugged', '>= 0.27', '< 1.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.78.0'
+  spec.add_development_dependency 'rubocop', '~> 0.81.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-html'
   spec.add_development_dependency 'simplecov-lcov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: undercover
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Jan Grodowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-29 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: imagen
@@ -53,7 +53,7 @@ dependencies:
         version: '0.27'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '0.27'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Actionable code coverage - detects untested code blocks in recent changes