bump undercover and pronto dependencies

Author: grodowski

lib/pronto/patch_changeset.rb

@@ -29,6 +29,9 @@ def file_paths
 
     def each_changed_line
       @patches.each do |patch|
+        filepath = patch.delta.new_file[:path]
+        next if @filter_set && !@filter_set.include?(filepath)
+
         patch.added_lines.each do |line|
           yield patch.delta.new_file[:path].to_s, line.new_lineno
         end
@@ -40,5 +43,9 @@ def validate(lcov_report_path)
 
       :stale_coverage if last_modified > File.mtime(lcov_report_path)
     end
+
+    def filter_with(filter_set)
+      @filter_set = filter_set
+    end
   end
 end

lib/pronto/undercover.rb

@@ -54,10 +54,20 @@ def patch_to_undercover_message(patch)
 
     def undercover_warnings
       @undercover_warnings ||= ::Undercover::Report.new(
-        @patch_changeset, undercover_options
+        @patch_changeset, undercover_options, coverage_adapter
       ).build.flagged_results
     end
 
+    def coverage_adapter
+      if undercover_options.simplecov_resultset
+        ::Undercover::SimplecovResultAdapter.parse(File.open(undercover_options.simplecov_resultset),
+                                                   undercover_options)
+      else
+        # TODO: lcov will be deprecated end of 2025 and we'll be able to refactor harder
+        ::Undercover::LcovParser.parse(File.open(undercover_options.lcov), undercover_options)
+      end
+    end
+
     def offending_line_numbers(patch)
       patch_lines = patch.added_lines.map(&:new_lineno)
       path = patch.new_file_full_path.to_s
@@ -91,7 +101,7 @@ def undercover_options
 
       opts = []
       OPTS_MAPPING.each { |key, flag| opts << "#{flag}#{config[key]}" if config[key] }
-      ::Undercover::Options.new.parse(opts)
+      @undercover_options ||= ::Undercover::Options.new.parse(opts)
     end
   end
 end

pronto-undercover.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.5'
 
-  spec.add_dependency 'pronto', '>= 0.9', '< 0.12'
-  spec.add_dependency 'undercover', '~> 0.7'
+  spec.add_dependency 'pronto', '>= 0.11', '< 0.12'
+  spec.add_dependency 'undercover', '~> 0.8'
 
   spec.add_dependency 'base64'
   spec.add_dependency 'bigdecimal'

spec/pronto/patch_changeset_spec.rb

@@ -12,7 +12,7 @@
       collection = []
       changeset.each_changed_line { |file, ln| collection << [file, ln] }
 
-      expect(collection).to include(*((1..19).map { |line| ['class.rb', line] }))
+      expect(collection).to include(*(1..19).map { |line| ['class.rb', line] })
     end
   end
 

spec/pronto/undercover_spec.rb

@@ -54,14 +54,14 @@
         write_config(valid_config)
 
         expect(Undercover::Report)
-          .to receive(:new).and_wrap_original do |m, changeset, opts|
+          .to receive(:new).and_wrap_original do |m, changeset, opts, coverage_adapter|
           expect(opts.lcov).to eq('coverage/lcov/fixtures.lcov')
           expect(opts.path).to eq('.')
           expect(opts.syntax_version).to eq('ruby34')
           expect(opts.glob_allow_filters).to eq(['*.rb', 'Rakefile'])
           expect(opts.glob_reject_filters).to eq(['db/*'])
           expect(opts.max_warnings_limit).to eq(100)
-          m.call(changeset, opts)
+          m.call(changeset, opts, coverage_adapter)
         end
 
         Pronto.run(:staged, 'test.git', nil)
@@ -100,10 +100,7 @@
 
       context 'with JSON formatter option' do
         it 'correctly reports on a patch inside of a changed file from JSON report' do
-          config = valid_config.merge(
-            'simplecov' => 'coverage/fixtures_coverage.json',
-            'lcov' => nil
-          )
+          config = valid_config.merge('simplecov' => 'coverage/fixtures_coverage.json')
           write_config(config)
 
           expect_any_instance_of(Undercover::LcovParser).to receive(:coverage).never
@@ -126,6 +123,23 @@
           delete_config
         end
       end
+
+      it 'accepts include-files and exclude-files options' do
+        config = valid_config.merge(
+          'simplecov' => 'coverage/fixtures_coverage.json',
+          'include-files' => '*.rb',
+          'exclude-files' => 'module.rb'
+        )
+        write_config(config)
+
+        results = Pronto.run(:unstaged, 'test.git', nil)
+
+        matched_files = results.map { _1.path }
+        expect(matched_files).to include('patch.rb')
+        expect(matched_files).not_to include('module.rb')
+
+        delete_config
+      end
     end
   end