rubocop-rake 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a878d5ccc2eec701b39d7d2ee54cbee2eeafc822d0fdd9ebb1bd24174f62eb6e
-  data.tar.gz: 137d23f7a93f25c027872cff22cca183e87b3c57a34b63a970a6687101a2ea69
+  metadata.gz: 73918e72f7bf532b0f7135573441db1a9ef24e238643fc17ea994590f66324f6
+  data.tar.gz: fb2e221a24d9137951a0a44da94c321640014a76d4c7708c64a98b881152174d
 SHA512:
-  metadata.gz: 67ef6e06e7704cac677af3256d2a14c15729b521a2873d971bf0339eed83bdb04019ea7302cc35b8a461469c52c77382da35d2fca1e7d022cd471a10a832bfa4
-  data.tar.gz: 111a3788568c30c1588e4aa4108cce2c5d8a4eae21d9f11d897f19fa44495486933edbd8ca0945d63b8daefcc1551e74e69197a02c7006c1f1bf0f57da79f9fa
+  metadata.gz: '038cf12d0dfc8ab1961ab51a8cb6338cd8b2eca829a2c31c356fc93934cc36c27ec7877c092068ed2f6b3da5cdb32b63a055328440606ae5e04749eaab3dd35a'
+  data.tar.gz: bb96859209d55b15b99ff079870d7845dc06b572623c497227f1ef1562cf507be2960eb1e2c180cf937584210ef3af9483636b825660a87356c213e7285248b3

data/.github/workflows/main.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+          - "3.4"
+          - ruby-head
+    name: "Ruby ${{ matrix.ruby }}: spec"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "${{ matrix.ruby }}"
+          bundler-cache: true
+      - run: bundle exec rake

data/.rubocop.yml

@@ -1,16 +1,22 @@
 inherit_from: .rubocop_todo.yml
 
-require:
-  - rubocop/cop/internal_affairs
+plugins:
+  - rubocop-internal_affairs
   - rubocop-rake
+
+require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  NewCops: enable
+  TargetRubyVersion: 2.7
 
 InternalAffairs/NodeMatcherDirective:
   Enabled: false
 
+InternalAffairs/OnSendWithoutOnCSend:
+  Enabled: false
+
 Layout/LineLength:
   Enabled: false
 
@@ -43,14 +49,16 @@ Style/PercentLiteralDelimiters:
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
 
-RSpec/ExampleLength:
-  Enabled: false
-
 Naming/FileName:
   Exclude:
     - 'lib/rubocop-rake.rb'
 
-# This disabling is a workaround for https://github.com/rubocop-hq/rubocop-rspec/issues/1068.
-# The cop has been disabled because FactoryBot is not used in this repository.
-RSpec/FactoryBot/CreateList:
+RSpec:
+  Language:
+    Expectations:
+      - expect_correction
+      - expect_no_offenses
+      - expect_offense
+
+RSpec/ExampleLength:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## master (unreleased)
 
+## 0.7.1 (2025-02-16)
+
+### Bug fixes
+
+* [#59](https://github.com/rubocop/rubocop-rake/pull/59): Fix incorrect plugin version when displaing `rubocop -V`. ([@koic][])
+
+## 0.7.0 (2025-02-16)
+
+### New features
+
+* [#58](https://github.com/rubocop/rubocop-rake/pull/58): Pluginfy RuboCop Rake. ([@koic][])
+
+### Changes
+
+* [#57](https://github.com/rubocop/rubocop-rake/pull/57): Drop support Ruby 2.5 and 2.6 for runtime environment. ([@koic][])
+
 ## 0.6.0 (2021-06-29)
 
 ### Changes

data/Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in rubocop-rake.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem 'rspec'
-gem 'rubocop', '>= 0.76'
+gem 'rubocop', '>= 1.72.1'
 gem 'rubocop-rspec'

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rubocop-rake.svg)](https://rubygems.org/gems/rubocop-rake)
-[![CircleCI](https://circleci.com/gh/rubocop/rubocop-rake.svg?style=svg)](https://circleci.com/gh/rubocop/rubocop-rake)
+![CI](https://github.com/rubocop/rubocop-rake/workflows/main.yml/badge.svg)
 
 # RuboCop Rake
 
@@ -23,12 +23,48 @@ Or install it yourself as:
 
 ## Usage
 
+You need to tell RuboCop to load the Rake extension. There are three
+ways to do this:
+
+### RuboCop configuration file
+
 Put this into your `.rubocop.yml`.
 
 ```yaml
-require: rubocop-rake
+plugins: rubocop-rake
+```
+
+Alternatively, use the following array notation when specifying multiple extensions.
+
+```yaml
+plugins:
+  - rubocop-other-extension
+  - rubocop-rake
+```
+
+Now you can run `rubocop` and it will automatically load the RuboCop Rake
+cops together with the standard cops.
+
+> [!NOTE]
+> The plugin system is supported in RuboCop 1.72+. In earlier versions, use `require` instead of `plugins`.
+
+### Command line
+
+```bash
+rubocop --plugin rubocop-rake
 ```
 
+### Rake task
+
+```ruby
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new do |task|
+  task.plugins << 'rubocop-rake'
+end
+```
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -38,4 +74,3 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/rubocop/rubocop-rake.
-

data/lib/rubocop/cop/rake/class_definition_in_task.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Rake
-      # This cop detects class or module definition in a task or namespace,
+      # Detects class or module definition in a task or namespace,
       # because it is defined to the top level.
       # It is confusing because the scope looks in the task or namespace,
       # but actually it is defined to the top level.

data/lib/rubocop/cop/rake/desc.rb

@@ -74,7 +74,7 @@ module RuboCop
         end
 
         private def can_insert_desc_to?(parent)
-          parent.begin_type? || parent.block_type? || parent.kwbegin_type?
+          parent.type?(:begin, :block, :kwbegin)
         end
       end
     end

data/lib/rubocop/cop/rake/duplicate_namespace.rb

@@ -74,7 +74,7 @@ module RuboCop
         end
 
         def source_location(node)
-          range = node.location.expression
+          range = node.source_range
           path = smart_path(range.source_buffer.name)
           "#{path}:#{range.line}"
         end

data/lib/rubocop/cop/rake/duplicate_task.rb

@@ -73,7 +73,7 @@ module RuboCop
         end
 
         def source_location(node)
-          range = node.location.expression
+          range = node.source_range
           path = smart_path(range.source_buffer.name)
           "#{path}:#{range.line}"
         end

data/lib/rubocop/cop/rake/helper/on_task.rb

@@ -7,6 +7,8 @@ module RuboCop
         module OnTask
           extend NodePattern::Macros
 
+          RESTRICT_ON_SEND = %i[task].freeze
+
           def_node_matcher :task?, <<~PATTERN
             (send nil? :task ...)
           PATTERN

data/lib/rubocop/cop/rake/helper/task_name.rb

@@ -8,7 +8,7 @@ module RuboCop
           extend self
 
           def task_name(node)
-            first_arg = node.arguments[0]
+            first_arg = node.first_argument
             case first_arg&.type
             when :sym, :str
               first_arg.value.to_sym

data/lib/rubocop/cop/rake/method_definition_in_task.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Rake
-      # This cop detects method definition in a task or namespace,
+      # Detects method definition in a task or namespace,
       # because it is defined to the top level.
       # It is confusing because the scope looks in the task or namespace,
       # but actually it is defined to the top level.

data/lib/rubocop/rake/plugin.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'lint_roller'
+
+module RuboCop
+  module Rake
+    # A plugin that integrates RuboCop Rake with RuboCop's plugin system.
+    class Plugin < LintRoller::Plugin
+      def about
+        LintRoller::About.new(
+          name: 'rubocop-rake',
+          version: VERSION,
+          homepage: 'https://github.com/rubocop/rubocop-rake',
+          description: 'A RuboCop plugin for Rake.',
+        )
+      end
+
+      def supported?(context)
+        context.engine == :rubocop
+      end
+
+      def rules(_context)
+        LintRoller::Rules.new(
+          type: :path,
+          config_format: :rubocop,
+          value: Pathname.new(__dir__).join('../../../config/default.yml'),
+        )
+      end
+    end
+  end
+end

data/lib/rubocop/rake/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Rake
-    VERSION = "0.6.0"
+    VERSION = "0.7.1"
   end
 end

data/lib/rubocop/rake.rb

@@ -6,11 +6,5 @@ module RuboCop
   # :nodoc:
   module Rake
     class Error < StandardError; end
-
-    PROJECT_ROOT   = Pathname.new(__dir__).parent.parent.expand_path.freeze
-    CONFIG_DEFAULT = PROJECT_ROOT.join('config', 'default.yml').freeze
-    CONFIG         = YAML.safe_load(CONFIG_DEFAULT.read).freeze
-
-    private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
   end
 end

data/lib/rubocop-rake.rb

@@ -4,9 +4,7 @@ require 'rubocop'
 
 require_relative 'rubocop/rake'
 require_relative 'rubocop/rake/version'
-require_relative 'rubocop/rake/inject'
-
-RuboCop::Rake::Inject.defaults!
+require_relative 'rubocop/rake/plugin'
 
 require_relative 'rubocop/cop/rake/helper/class_definition'
 require_relative 'rubocop/cop/rake/helper/on_task'

data/rubocop-rake.gemspec

@@ -11,14 +11,17 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{A RuboCop plugin for Rake}
   spec.description   = %q{A RuboCop plugin for Rake}
   spec.homepage      = "https://github.com/rubocop/rubocop-rake"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
   spec.licenses = ['MIT']
 
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "https://github.com/rubocop/rubocop-rake/blob/master/CHANGELOG.md"
+  spec.metadata = {
+    'allowed_push_host' => 'https://rubygems.org',
+    'homepage_uri' => spec.homepage,
+    'source_code_uri' => spec.homepage,
+    'changelog_uri' => "https://github.com/rubocop/rubocop-rake/blob/master/CHANGELOG.md",
+    'rubygems_mfa_required' => 'true',
+    'default_lint_roller_plugin' => 'RuboCop::Rake::Plugin'
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -29,5 +32,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rubocop', '~> 1.0'
+  spec.add_dependency 'lint_roller', '~> 1.1'
+  spec.add_dependency 'rubocop', '>= 1.72.1'
 end

metadata

@@ -1,29 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rake
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2025-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: lint_roller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.72.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.72.1
 description: A RuboCop plugin for Rake
 email:
 - kuwabara@pocke.me
@@ -31,7 +44,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -57,7 +70,7 @@ files:
 - lib/rubocop/cop/rake/method_definition_in_task.rb
 - lib/rubocop/cop/rake_cops.rb
 - lib/rubocop/rake.rb
-- lib/rubocop/rake/inject.rb
+- lib/rubocop/rake/plugin.rb
 - lib/rubocop/rake/version.rb
 - rubocop-rake.gemspec
 homepage: https://github.com/rubocop/rubocop-rake
@@ -68,7 +81,8 @@ metadata:
   homepage_uri: https://github.com/rubocop/rubocop-rake
   source_code_uri: https://github.com/rubocop/rubocop-rake
   changelog_uri: https://github.com/rubocop/rubocop-rake/blob/master/CHANGELOG.md
-post_install_message:
+  rubygems_mfa_required: 'true'
+  default_lint_roller_plugin: RuboCop::Rake::Plugin
 rdoc_options: []
 require_paths:
 - lib
@@ -76,15 +90,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
-signing_key:
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: A RuboCop plugin for Rake
 test_files: []

data/.circleci/config.yml

@@ -1,44 +0,0 @@
-version: 2
-
-steps: &steps
-  steps:
-    - checkout
-    - run: bundle install
-    - run: bundle exec rake
-
-jobs:
-
-  ruby-2.5:
-    docker:
-      - image: circleci/ruby:2.5
-    <<: *steps
-
-  ruby-2.6:
-    docker:
-      - image: circleci/ruby:2.6
-    <<: *steps
-
-  ruby-2.7:
-    docker:
-      - image: circleci/ruby:2.7
-    <<: *steps
-
-  ruby-3.0:
-    docker:
-      - image: circleci/ruby:3.0
-    <<: *steps
-
-  ruby-head:
-    docker:
-      - image: rubocophq/circleci-ruby-snapshot:latest
-    <<: *steps
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - ruby-2.5
-      - ruby-2.6
-      - ruby-2.7
-      - ruby-3.0
-      - ruby-head

data/lib/rubocop/rake/inject.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-# The original code is from https://github.com/rubocop/rubocop-rspec/blob/master/lib/rubocop/rspec/inject.rb
-# See https://github.com/rubocop/rubocop-rspec/blob/master/MIT-LICENSE.md
-module RuboCop
-  module Rake
-    # Because RuboCop doesn't yet support plugins, we have to monkey patch in a
-    # bit of our configuration.
-    module Inject
-      def self.defaults!
-        path = CONFIG_DEFAULT.to_s
-        hash = ConfigLoader.send(:load_yaml_configuration, path)
-        config = Config.new(hash, path)
-        puts "configuration from #{path}" if ConfigLoader.debug?
-        config = ConfigLoader.merge_with_default(config, path)
-        ConfigLoader.instance_variable_set(:@default_configuration, config)
-      end
-    end
-  end
-end