pronto-undercover 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a9e88cb350120dd32a0d30c92e6cf3dd5c015413c0ee3c16a700b6a4ada53d
-  data.tar.gz: fa21ebfb5b108a702c33d4677e9dfa6d073123bce9f2f2c5181f3d6a03a72de9
+  metadata.gz: f08a3fece5d032981d425ef93209e29c3316f48ee07328206bab518e30d3b569
+  data.tar.gz: d285223a2379b7b3ae5e14f94a261a5bf882757c6c04b57a4a6ccd4fdf801cdd
 SHA512:
-  metadata.gz: 868fd2ee69c581041f33be5adce989896df204bad5fb48a263b4938cb303dffc0e03064670eefb055729fcea6c0dc62e7ce3d9199f9f3a00a2b2dd36bbd12656
-  data.tar.gz: fd26c906d8e29db5ba13962f2833e8aa30146d237a946c2b87882314a4dbae839be40c3ab7e7f21debf0907dd45eb8c2baf4bc9c4085f446c9c416d47f2f6228
+  metadata.gz: cf1d70766e0fa18715c3444798647a74d1bf5b26344b8efbe943b3c37e5c47e28e1b8bde93236c49c1d2f8232a93dd5fc920637a32f4dec667d49613e0012612
+  data.tar.gz: 462b2daee7ebadb872a76a1170f468134c939580a9fef7caff2d1f396253403b73d8cbce62074023e3d1cc973e9ab2285b3d20e0f56fd916acd22b1c5759e0fd

data/.rubocop.yml

@@ -12,6 +12,10 @@ Layout/SpaceInsideHashLiteralBraces:
   Enabled: true
   EnforcedStyle: no_space
 
+Metrics/LineLength:
+  Enabled: True
+  Max: 100
+
 Metrics/BlockLength:
   Enabled: true
   Exclude:

data/.travis.yml

@@ -1,7 +1,12 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.4
-before_install: gem install bundler -v 1.16.2
+  - 2.7.1
+  - 2.6.6
+  - 2.5.8
+before_install:
+  - gem install bundler undercover
+  - gem update --system
+script:
+  - bundle exec rake
+  - git pull origin master:master
+  - undercover --compare master

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.1.5] - 2019-03-19
+### Added
+- Use flagged_results accessor by @yassinecc
+
+## [0.1.4] - 2019-03-19
+### Added
+- This `CHANGELOG.md`
+
+### Changed
+- support `pronto >= 0.9`
+
+[Unreleased]: https://github.com/grodowski/pronto-undercover/compare/v0.1.5...HEAD
+[0.1.5]: https://github.com/grodowski/pronto-undercover/compare/v0.1.4...v0.1.5
+[0.1.4]: https://github.com/grodowski/pronto-undercover/compare/v0.1.3...v0.1.4

data/lib/pronto/patch_changeset.rb

@@ -17,6 +17,7 @@ module Pronto
     def last_modified
       mod = file_paths.map do |f|
         next T_ZERO unless File.exist?(f)
+
         File.mtime(f)
       end.max
       mod || T_ZERO

data/lib/pronto/undercover.rb

@@ -17,11 +17,12 @@ module Pronto
 
     # @return Array[Pronto::Message]
     def run
-      return [] unless @patches.first
-      report = ::Undercover::Report.new(
-        @patch_changeset, undercover_options
-      ).build
-      report.build_warnings.map(&method(:undercover_warning_to_message))
+      return [] if !@patches || @patches.count.zero?
+
+      @patches
+        .select { |patch| valid_patch?(patch) }
+        .map { |patch| patch_to_undercover_message(patch) }
+        .flatten.compact
     rescue Errno::ENOENT => e
       warn("Could not open file! #{e}")
       []
@@ -29,20 +30,44 @@ module Pronto
 
     private
 
-    # rubocop:disable Metrics/AbcSize
-    def undercover_warning_to_message(warning)
-      lines = untested_lines_for(warning)
-      msg = "#{warning.node.human_name} #{warning.node.name} missing tests" \
-        " for line#{'s' if lines.size > 1} #{lines.join(', ')}" \
-        " (coverage: #{warning.coverage_f})"
-
-      line = @patches.find_line(
-        Pathname.new(File.expand_path(warning.file_path)),
-        warning.first_line
-      )
-      Message.new(warning.file_path, line, DEFAULT_LEVEL, msg)
+    def valid_patch?(patch)
+      patch.additions.positive? && ruby_file?(patch.new_file_full_path)
+    end
+
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    def patch_to_undercover_message(patch)
+      offending_line_numbers(patch).map do |warning, msg_line_no|
+        patch
+          .added_lines
+          .select { |line| line.new_lineno == msg_line_no }
+          .map do |line|
+            lines = untested_lines_for(warning)
+            path = line.patch.delta.new_file[:path]
+            msg = "#{warning.node.human_name} #{warning.node.name} missing tests" \
+                  " for line#{'s' if lines.size > 1} #{lines.join(', ')}" \
+                  " (coverage: #{warning.coverage_f})"
+            Message.new(path, line, DEFAULT_LEVEL, msg, nil, self.class)
+          end
+      end
+    end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+    def undercover_warnings
+      @undercover_warnings ||= ::Undercover::Report.new(
+        @patch_changeset, undercover_options
+      ).build.flagged_results
+    end
+
+    def offending_line_numbers(patch)
+      patch_lines = patch.added_lines.map(&:new_lineno)
+      path = patch.new_file_full_path.to_s
+      undercover_warnings
+        .select { |warning| File.expand_path(warning.file_path) == path }
+        .map do |warning|
+          first_line_no = patch_lines.find { |l| warning.uncovered?(l) }
+          [warning, first_line_no] if first_line_no
+        end.compact
     end
-    # rubocop:enable Metrics/AbcSize
 
     def untested_lines_for(warning)
       warning.coverage.map do |ln, _cov|
@@ -50,13 +75,17 @@ module Pronto
       end.compact
     end
 
+    # rubocop:disable Metrics/AbcSize
     def undercover_options
-      config = Pronto::ConfigFile.new.to_h
+      config = Pronto::ConfigFile.new.to_h['pronto-undercover']
+      return ::Undercover::Options.new.parse([]) unless config
+
       opts = []
       opts << "-l#{config['lcov']}" if config['lcov']
       opts << "-r#{config['ruby-syntax']}" if config['ruby-syntax']
       opts << "-p#{config['path']}" if config['path']
       ::Undercover::Options.new.parse(opts)
     end
+    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module Pronto
   module UndercoverVersion
-    VERSION = '0.1.0'
+    VERSION = '0.1.5'
   end
 end

data/pronto-undercover.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'pronto', '~> 0.9.0'
-  spec.add_dependency 'undercover', '~> 0.2.0'
+  spec.add_dependency 'pronto', '>= 0.9', '< 0.11'
+  spec.add_dependency 'undercover', '~> 0.3.4'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: pronto-undercover
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Jan Grodowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pronto
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: undercover
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +167,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -188,8 +195,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: Pronto runner for Undercover - actionable code coverage