rubocop_auto_corrector 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91fedba37711c0aefe1699507efe76c79e3951cf51225f90f9ba4b6c67bae46
-  data.tar.gz: fc9a30691023ff02f207e4f2ba159c8be0d63af1fe7ef0da7cf7a8854eee8608
+  metadata.gz: 64e6102fe91fd3839e15fb4eb332a0b4fbeb294a5da572dbaef62fafe7743161
+  data.tar.gz: 53f1dbbbf0415180b4bae3db5446d787d42a08fed7c021fa8adecd05b78d2393
 SHA512:
-  metadata.gz: da0aba556ff5725420c63ccfc01f3a4deee3aed45a3f8d861c7823a85a06d719da999965d8323beff578fbb5268fe727865d15aa7b6fa71469c2cf2bad7f43cb
-  data.tar.gz: fc17bd65c9937e3c503d37c3a7c53c864940e0fe6955a1c7aa282ea864f5c55ec5bb8bea5f88b113e5846248f59ba0e3d86a823b6b7296ab336aa86cc756652e
+  metadata.gz: '09a1afa77bfbfec27f59b2a8661ac41fc320b868263e52c4721b071d0f9afefde6d9b0aff35e4bb70c19777743468d0b0cd935df4e4a952df3f9eaedab97fd59'
+  data.tar.gz: a05f259099b5f21bcf1f1835bdc9698518e53cd0ef43f907f0e0f36b1f489b38bfe83e60c4b11f3639d5704fc9ef1d1514bd84cfa224b1ba11adb5a450a2b4a1

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+# c.f. https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+version: 2
+
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    assignees:
+      - sue445

data/.github/workflows/pages.yml

@@ -0,0 +1,59 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches:
+      - master
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler-cache: true
+
+      - run: bundle exec yard
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: './doc'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@main
+
+      - name: Slack Notification (not success)
+        uses: act10ns/slack@v2
+        if: "! success()"
+        continue-on-error: true
+        with:
+          status: ${{ job.status }}
+          webhook-url: ${{ secrets.SLACK_WEBHOOK }}

data/.github/workflows/test.yml

@@ -16,41 +16,27 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: ${{ matrix.ruby }}
-
     strategy:
       fail-fast: false
 
       matrix:
         ruby:
-          - ruby:2.6
-          - ruby:2.7
-          - ruby:3.0
-          - ruby:3.1
-          - rubylang/ruby:master-nightly-bionic
-        include:
-          - ruby: rubylang/ruby:master-nightly-bionic
-            allow_failures: "true"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Cache vendor/bundle
-        uses: actions/cache@v1
-        id: cache_gem
+      - uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: v1-gem-${{ runner.os }}-${{ matrix.ruby }}-${{ github.sha }}
-          restore-keys: |
-            v1-gem-${{ runner.os }}-${{ matrix.ruby }}-
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
-      - name: bundle update
-        run: |
-          set -xe
-          bundle config path vendor/bundle
-          bundle update --jobs $(nproc) --retry 3
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+      - run: bundle update --jobs $(nproc) --retry 3
 
       - name: Setup Code Climate Test Reporter
         uses: aktions/codeclimate-test-reporter@v1
@@ -65,12 +51,8 @@ jobs:
           git config --global user.email "github-runner@example.com"
           git config --global user.name "github runner"
 
-      - name: Run test
-        run: |
-          set -xe
-          bundle exec rspec
-          bundle exec rubocop -P
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+      - run: bundle exec rspec
+      - run: bundle exec rubocop -P
 
       - name: Teardown Code Climate Test Reporter
         uses: aktions/codeclimate-test-reporter@v1
@@ -80,15 +62,13 @@ jobs:
         continue-on-error: true
 
       - name: Slack Notification (not success)
-        uses: lazy-actions/slatify@master
+        uses: act10ns/slack@v2
         if: "! success()"
         continue-on-error: true
         with:
-          job_name: ${{ format('*build* ({0})', matrix.ruby) }}
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          webhook-url: ${{ secrets.SLACK_WEBHOOK }}
+          matrix: ${{ toJson(matrix) }}
 
   notify:
     needs:
@@ -98,12 +78,9 @@ jobs:
 
     steps:
       - name: Slack Notification (success)
-        uses: lazy-actions/slatify@master
+        uses: act10ns/slack@v2
         if: always()
         continue-on-error: true
         with:
-          job_name: '*build*'
-          type: ${{ job.status }}
-          icon_emoji: ":octocat:"
-          url: ${{ secrets.SLACK_WEBHOOK }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          webhook-url: ${{ secrets.SLACK_WEBHOOK }}

data/.rubocop.yml

@@ -13,6 +13,9 @@ AllCops:
   NewCops: enable
   SuggestExtensions: false
 
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
+
 Metrics/BlockLength:
   Exclude:
     - '*.gemspec'
@@ -23,3 +26,7 @@ Layout/LineLength:
 
 Style/Documentation:
   Enabled: false
+
+Style/IfUnlessModifier:
+  Exclude:
+    - Gemfile

data/.yardopts

@@ -0,0 +1,2 @@
+--markup markdown
+--no-private

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## master
-[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.4.4...master)
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.5.0...master)
+
+## v0.5.0
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.4.5...v0.5.0)
+
+* Support rubocop-rspec v3+
+  * https://github.com/sue445/rubocop_auto_corrector/pull/69
+
+## v0.4.5
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.4.4...v0.4.5)
+
+* Requires rubocop 1.30.0+
+  * https://github.com/sue445/rubocop_auto_corrector/pull/67
 
 ## v0.4.4
 [full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.4.3...v0.4.4)

data/Gemfile

@@ -6,3 +6,9 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in rubocop_auto_corrector.gemspec
 gemspec
+
+# rubocop:disable Gemspec/DevelopmentDependencies
+if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.7.0')
+  gem 'rubocop-factory_bot'
+end
+# rubocop:enable Gemspec/DevelopmentDependencies

data/lib/rubocop_auto_corrector/cop_finder.rb

@@ -11,63 +11,100 @@ module RubocopAutoCorrector
 
     # Whether this cop is auto correctable
     # @return [Boolean]
-    def auto_correctable?
-      Object.new.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
-        # begin
-        #   require 'rubocop-rspec'
-        # rescue LoadError
-        # end
-        #
-        # return ::RuboCop::Cop::RSpec::AlignLeftLetBrace.support_autocorrect? if ::RuboCop::Cop::RSpec::AlignLeftLetBrace.respond_to?(:support_autocorrect?)
-        # ::RuboCop::Cop::RSpec::AlignLeftLetBrace.new.respond_to?(:autocorrect)
+    def auto_correctable? # rubocop:disable Metrics/MethodLength
+      cop_candidacies.any? do |cop_candidacy|
+        gem_name = cop_candidacy[:gem_name]
+        cop_class_name = cop_candidacy[:cop_class_name]
 
-        begin
-          require '#{gem_name}'
-        rescue LoadError
-        end
+        Object.new.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
+          # begin
+          #   require 'rubocop-rspec'
+          # rescue LoadError
+          # end
+          #
+          # return ::RuboCop::Cop::RSpec::AlignLeftLetBrace.support_autocorrect? if ::RuboCop::Cop::RSpec::AlignLeftLetBrace.respond_to?(:support_autocorrect?)
+          # ::RuboCop::Cop::RSpec::AlignLeftLetBrace.new.respond_to?(:autocorrect)
 
-        return #{cop_class_name}.support_autocorrect? if #{cop_class_name}.respond_to?(:support_autocorrect?)
-        #{cop_class_name}.new.respond_to?(:autocorrect)
-      RUBY
-    rescue NameError
-      false
-    end
-
-    # @return [String]
-    def gem_name
-      gem_name, = rubocop_cop_info
-      gem_name
-    end
+          begin
+            require '#{gem_name}'
+          rescue LoadError
+          end
 
-    # @return [String]
-    def cop_class_name
-      _, cop_class = rubocop_cop_info
-      cop_class
+          return #{cop_class_name}.support_autocorrect? if #{cop_class_name}.respond_to?(:support_autocorrect?)
+          #{cop_class_name}.new.respond_to?(:autocorrect)
+        RUBY
+      rescue NameError
+        false
+      end
     end
 
-    private
-
     # rubocop:disable Metrics/MethodLength
-    def rubocop_cop_info
-      return @rubocop_cop_info if @rubocop_cop_info
-
+    # @return [Array<Hash<Symbol, String>>]
+    def cop_candidacies
       cop_class_suffix = cop_name.gsub('/', '::')
 
-      @rubocop_cop_info =
-        case cop_name
-        when %r{^RSpec/}
-          ['rubocop-rspec', "::RuboCop::Cop::#{cop_class_suffix}"]
-        when %r{^(FactoryBot|Capybara)/}, 'Rails/HttpStatus'
-          ['rubocop-rspec', "::RuboCop::Cop::RSpec::#{cop_class_suffix}"]
-        when %r{^(Layout|Lint|Metrics|Naming|Security|Style|Bundler|Gemspec)/}
-          # Official cops
-          ['rubocop', "::RuboCop::Cop::#{cop_class_suffix}"]
-        else
-          # Unknown cops
-          department_camel = cop_name.split('/').first
-          department_snake = department_camel.gsub(/(?<=.)([A-Z])/) { |s| "_#{s}" }.downcase
-          ["rubocop-#{department_snake}", "::RuboCop::Cop::#{cop_class_suffix}"]
-        end
+      case cop_name
+      when %r{^RSpec/}
+        [
+          {
+            gem_name: 'rubocop-rspec',
+            cop_class_name: "::RuboCop::Cop::#{cop_class_suffix}"
+          }
+        ]
+      when 'Rails/HttpStatus'
+        [
+          # for rubocop-rspec < 2.28.0
+          {
+            gem_name: 'rubocop-rspec',
+            cop_class_name: "::RuboCop::Cop::RSpec::#{cop_class_suffix}"
+          }
+        ]
+      when %r{^FactoryBot/}
+        [
+          # for rubocop-rspec < 2.0.0
+          {
+            gem_name: 'rubocop-rspec',
+            cop_class_name: "::RuboCop::Cop::RSpec::#{cop_class_suffix}"
+          },
+          # for rubocop-rspec v3+
+          {
+            gem_name: 'rubocop-factory_bot',
+            cop_class_name: "::RuboCop::Cop::#{cop_class_suffix}"
+          }
+        ]
+      when %r{^Capybara/}
+        [
+          # for rubocop-rspec < 2.0.0
+          {
+            gem_name: 'rubocop-rspec',
+            cop_class_name: "::RuboCop::Cop::RSpec::#{cop_class_suffix}"
+          },
+          # for rubocop-rspec v3+
+          {
+            gem_name: 'rubocop-capybara',
+            cop_class_name: "::RuboCop::Cop::#{cop_class_suffix}"
+          }
+        ]
+      when %r{^(Layout|Lint|Metrics|Naming|Security|Style|Bundler|Gemspec)/}
+        # Official cops
+        [
+          {
+            gem_name: 'rubocop',
+            cop_class_name: "::RuboCop::Cop::#{cop_class_suffix}"
+          }
+        ]
+      else
+        # Unknown cops
+        department_camel = cop_name.split('/').first
+        department_snake = department_camel.gsub(/(?<=.)([A-Z])/) { |s| "_#{s}" }.downcase
+
+        [
+          {
+            gem_name: "rubocop-#{department_snake}",
+            cop_class_name: "::RuboCop::Cop::#{cop_class_suffix}"
+          }
+        ]
+      end
     end
     # rubocop:enable Metrics/MethodLength
   end

data/lib/rubocop_auto_corrector/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubocopAutoCorrector
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

data/rubocop_auto_corrector.gemspec

@@ -15,17 +15,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/sue445/rubocop_auto_corrector'
   spec.license       = 'MIT'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = spec.homepage
-    spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/master/CHANGELOG.md"
-    spec.metadata['rubygems_mfa_required'] = 'true'
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-          'public gem pushes.'
-  end
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/master/CHANGELOG.md"
+  spec.metadata['documentation_uri'] = 'https://sue445.github.io/rubocop_auto_corrector/'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   # 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.
@@ -38,10 +32,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_dependency 'rubocop', '>= 1.3.0'
+  spec.add_dependency 'rubocop', '>= 1.30.0'
 
   spec.add_development_dependency 'bundler', '>= 1.17'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'coveralls_reborn'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-parameterized'
@@ -50,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov', '< 0.18.0'
   spec.add_development_dependency 'unparser', '>= 0.4.5'
+  spec.add_development_dependency 'yard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_auto_corrector
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - sue445
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.30.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Run `rubocop --autocorrect && git commit` with each cop.
 email:
 - sue445@sue445.net
@@ -173,10 +187,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/pages.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -198,6 +215,7 @@ metadata:
   homepage_uri: https://github.com/sue445/rubocop_auto_corrector
   source_code_uri: https://github.com/sue445/rubocop_auto_corrector
   changelog_uri: https://github.com/sue445/rubocop_auto_corrector/blob/master/CHANGELOG.md
+  documentation_uri: https://sue445.github.io/rubocop_auto_corrector/
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -214,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Run `rubocop --autocorrect && git commit` with each cop.