pronto-rubocop 0.11.4 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b54bb1da3b75627d89dcf30ade91899bc7841331d07aee4741dcd0dbd666bf
-  data.tar.gz: d7aa8f5af922b6ba949e4261494d28b14c870f0fc38a09a951de25eaca15aee7
+  metadata.gz: d192df5adbb4e399dd56d3c202eeb325d73b456567eb7b6db846b5168f0c1045
+  data.tar.gz: b1444cc4f6f915a547d0e43be5622fa7df6b889837da2e09474d0f864a5f741b
 SHA512:
-  metadata.gz: d66a9abf4c546eb99092f9a253f6ed6da1a38d12aa8172a77a5fb4ce043e7958efd1a25d6b26714fd1fb3c36c3f6d55e9be90aadec77746ddcb33da8905f83f4
-  data.tar.gz: 372bd0473ed8a3704b97e9b633a2238d159746d0b780641e8898261dbbc0549f6df6fe096e212b0b1c20ab5bb74ec31444c74f71174d8b059f322ca073e811cf
+  metadata.gz: 71f72f153f848cb90592bf2fe635f1bd32d0ba2749b0e095e645ea8b5f570be2e90b412a3eae40a71a4a01f330e1359ceb1fc36406433080dac383ece83e5d9f
+  data.tar.gz: a5b07e6280f14dd884f76a2f9a9ec8318a48fc0696cf4ecd075f24174531c0ecaf70616c28faf637b6f01f5f9869891469d93831dea5df113169fe7b14d722c3

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/checks.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0']
+        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
         rubocop: ['0.63.1', '0.81.0', '0.84.0', '0.85.0', '0.86.0', '0.87.0', '< 1.0', '1.0.0', '1.29.1', '1.30.0', '1.38.0', '< 2.0']
         include:
           - ruby: '2.3'
@@ -36,7 +36,7 @@ jobs:
             rubocop: '1.38.0'
       fail-fast: false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: use specific rubocop version
       run: echo "gem 'rubocop', '${{ matrix.rubocop }}'" > Gemfile.local
     - name: use specific rubocop-ast version (if required)

data/.github/workflows/push_gem.yml

@@ -0,0 +1,32 @@
+name: Publish gem to rubygems.org
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository == 'prontolabs/pronto-rubocop'
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      - uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@cbb722410c2e876e24abbe8de2cc27693e501dcb # v4.2.2
+
+      - uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
+        with:
+          bundler-cache: true
+          ruby-version: '3.4'
+
+      - uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1

data/README.md

@@ -1,8 +1,8 @@
 # Pronto runner for RuboCop
 
-[![Code Climate](https://codeclimate.com/github/prontolabs/pronto-rubocop.png)](https://codeclimate.com/github/prontolabs/pronto-rubocop)
-[![Build Status](https://travis-ci.org/prontolabs/pronto-rubocop.svg?branch=master)](https://travis-ci.org/prontolabs/pronto-rubocop)
 [![Gem Version](https://badge.fury.io/rb/pronto-rubocop.png)](http://badge.fury.io/rb/pronto-rubocop)
+[![Build Status](https://github.com/prontolabs/pronto-rubocop/actions/workflows/checks.yml/badge.svg)](https://github.com/prontolabs/pronto-rubocop/actions/workflows/checks.yml)
+[![Code Climate](https://codeclimate.com/github/prontolabs/pronto-rubocop.png)](https://codeclimate.com/github/prontolabs/pronto-rubocop)
 
 Pronto runner for [RuboCop](https://github.com/bbatsov/rubocop), ruby code
 analyzer. [What is Pronto?](https://github.com/prontolabs/pronto)

data/lib/pronto/rubocop/offense_line.rb

@@ -34,6 +34,7 @@ module Pronto
       def suggestion_text
         return unless patch_cop.runner.pronto_rubocop_config['suggestions']
         return if corrections_count.zero?
+        return if corrector.nil?  # possible after optimisation in https://github.com/rubocop/rubocop/pull/11264
         return if differing_lines_count != corrections_count
 
         @suggestion_text ||= corrected_lines[offense.line - 1]

data/lib/pronto/rubocop/patch_cop.rb

@@ -13,12 +13,9 @@ module Pronto
       def messages
         return [] unless valid?
 
-        offenses.flat_map do |offense|
-          patch
-            .added_lines
-            .select { |line| line.new_lineno == offense.line }
-            .map { |line| OffenseLine.new(self, offense, line).message }
-        end
+        offenses
+          .map { |offense| first_relevant_message(patch, offense) }
+          .compact
       end
 
       def processed_source
@@ -34,7 +31,7 @@ module Pronto
       end
 
       def registry
-        @registry ||= ::RuboCop::Cop::Registry.new(RuboCop::Cop::Cop.all)
+        @registry ||= ::RuboCop::Cop::Registry.new(all_cops)
       end
 
       def rubocop_config
@@ -49,11 +46,20 @@ module Pronto
 
       attr_reader :patch
 
+      def all_cops
+        # keep support of older Rubocop versions
+        if RuboCop::Cop.const_defined?(:Registry) && RuboCop::Cop::Registry.respond_to?(:all)
+          RuboCop::Cop::Registry.all
+        else
+          RuboCop::Cop::Cop.all
+        end
+      end
+
       def valid?
         return false if rubocop_config.file_to_exclude?(path)
         return true if rubocop_config.file_to_include?(path)
 
-        true
+        runner.ruby_file?(path)
       end
 
       def path
@@ -61,12 +67,23 @@ module Pronto
       end
 
       def offenses
-        team
-          .inspect_file(processed_source)
+        # keep support of older Rubocop versions
+        if team.respond_to?(:investigate)
+          offenses = team.investigate(processed_source).offenses
+        else
+          offenses = team.inspect_file(processed_source)
+        end
+
+        offenses
           .sort
           .reject(&:disabled?)
       end
 
+      def offense_includes?(offense, line_number)
+        offense_range = (offense.location.first_line..offense.location.last_line)
+        offense_range.include?(line_number)
+      end
+
       def team
         @team ||=
           if ::RuboCop::Cop::Team.respond_to?(:mobilize)
@@ -76,6 +93,19 @@ module Pronto
             ::RuboCop::Cop::Team.new(registry, rubocop_config)
           end
       end
+
+      def first_relevant_line(patch, offense)
+        patch.added_lines.detect do |line|
+          offense_includes?(offense, line.new_lineno)
+        end
+      end
+
+      def first_relevant_message(patch, offense)
+        offending_line = first_relevant_line(patch, offense)
+        return nil unless offending_line
+
+        OffenseLine.new(self, offense, offending_line).message
+      end
     end
   end
 end

data/lib/pronto/rubocop/version.rb

@@ -2,6 +2,6 @@
 
 module Pronto
   module RubocopVersion
-    VERSION = '0.11.4'
+    VERSION = '0.11.6'
   end
 end

data/lib/pronto/rubocop.rb

@@ -8,7 +8,9 @@ require 'pronto/rubocop/offense_line'
 module Pronto
   class Rubocop < Runner
     def run
-      ruby_patches
+      return [] unless @patches
+
+      @patches
         .select { |patch| patch.additions.positive? }
         .flat_map { |patch| PatchCop.new(patch, self).messages }
     end

data/pronto-rubocop.gemspec

@@ -10,12 +10,11 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.author = 'Mindaugas Mozūras'
   s.email = 'mindaugas.mozuras@gmail.com'
-  s.homepage = 'http://github.com/mmozuras/pronto-rubocop'
+  s.homepage = 'https://github.com/prontolabs/pronto-rubocop'
   s.summary = 'Pronto runner for Rubocop, ruby code analyzer'
 
   s.licenses = ['MIT']
   s.required_ruby_version = '>= 2.3.0'
-  s.rubygems_version = '1.8.23'
 
   s.files = `git ls-files`.split($RS).reject do |file|
     file =~ %r{^(?:
@@ -34,6 +33,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('pronto', '~> 0.11.0')
   s.add_runtime_dependency('rubocop', '>= 0.63.1', '< 2.0')
+  s.add_development_dependency('base64', '~> 0.1.2')
   s.add_development_dependency('rake', '~> 12.0')
   s.add_development_dependency('rspec', '~> 3.4')
   s.add_development_dependency('rspec-its', '~> 1.2')

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pronto-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.6
 platform: ruby
 authors:
 - Mindaugas Mozūras
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-31 00:00:00.000000000 Z
+date: 2025-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pronto
@@ -44,6 +43,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +99,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description:
 email: mindaugas.mozuras@gmail.com
 executables: []
 extensions: []
@@ -95,7 +107,9 @@ extra_rdoc_files:
 - README.md
 files:
 - ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/workflows/checks.yml"
+- ".github/workflows/push_gem.yml"
 - LICENSE
 - README.md
 - lib/pronto/rubocop.rb
@@ -103,11 +117,10 @@ files:
 - lib/pronto/rubocop/patch_cop.rb
 - lib/pronto/rubocop/version.rb
 - pronto-rubocop.gemspec
-homepage: http://github.com/mmozuras/pronto-rubocop
+homepage: https://github.com/prontolabs/pronto-rubocop
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Pronto runner for Rubocop, ruby code analyzer
 test_files: []