rubocop_auto_corrector 0.1.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d32f8ff541acd263deda1ff9dc9e9d623c8c25eba206d0936f5ca5d2c73a3096
-  data.tar.gz: a9161a2f2925fd33ebb75bbb1afba16b1bf0cd1b74613b7116372ed033133bfd
+  metadata.gz: 11a12e8bf21d53f7aa83c186b3230db612841612c148872d7e3368291ed02e6d
+  data.tar.gz: e9af4a19ee58ac527c89f088038e3470e65e2ae1f4ec23dba24dd8221d14ec99
 SHA512:
-  metadata.gz: 6d3cca7fd0d545b954453bf20136ca36ba04b316c6c4fbee4cbcc43345bfabaac3b6c6fa57de78237793bd9b3303f58a23991e6d6a40f219750f0b9b62bc7a8e
-  data.tar.gz: 7a9a0fd09136ac3b2bf5bbc2f2ce76eabddbf03781f96f9131d5d51415c65ffac54e4a9245820ea1334305ad0a1419ac29c7ec81eec70990d841ec2688b5f52b
+  metadata.gz: 0a53fd7dca79bbcea054873c0270363e4d7bba8b165afb9c56b766f20c87fd18093a66d4a194cf99d945d3f2fe57fc93e966fbbcb82c2119d574d8d9dd882eb2
+  data.tar.gz: 55b8554127b2387e0aba60c4bae279ea80c0ccf3c69a260a0f371563638167f325d83ad031cb7d0917ca336f28a3bf7b36651368aa966362599ab51640ee4027

data/.github/workflows/test.yml

@@ -0,0 +1,113 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "0 10 * * 5" # JST 19:00 (Fri)
+
+env:
+  CI: "true"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    container: ${{ matrix.ruby }}
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - ruby:2.5
+          - ruby:2.6
+          - ruby:2.7
+          - ruby:3.0
+          - rubylang/ruby:master-nightly-bionic
+        include:
+          - ruby: rubylang/ruby:master-nightly-bionic
+            allow_failures: "true"
+
+    steps:
+      - uses: actions/checkout@v2
+
+
+      - name: Cache vendor/bundle
+        uses: actions/cache@v1
+        id: cache_gem
+        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' }}
+
+      - name: bundle update
+        run: |
+          set -xe
+          bundle config path vendor/bundle
+          bundle update --jobs $(nproc) --retry 3
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - name: Setup Code Climate Test Reporter
+        uses: aktions/codeclimate-test-reporter@v1
+        with:
+          codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
+          command: before-build
+        continue-on-error: true
+
+      - name: Set up git
+        run: |
+          set -xe
+          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' }}
+
+      - name: Teardown Code Climate Test Reporter
+        uses: aktions/codeclimate-test-reporter@v1
+        with:
+          codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
+          command: after-build
+        continue-on-error: true
+
+      - name: Slack Notification (not success)
+        uses: lazy-actions/slatify@master
+        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 }}
+
+  notify:
+    needs:
+      - test
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Slack Notification (success)
+        uses: lazy-actions/slatify@master
+        if: always()
+        continue-on-error: true
+        with:
+          job_name: '*build*'
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop.yml

@@ -1,18 +1,25 @@
-require: rubocop-rspec
-
 AllCops:
-  TargetRubyVersion: 2.2
+  # rubocop 1.13.0+ requires ruby 2.5+
+  TargetRubyVersion: 2.5
 
   Exclude:
-    - 'spec/dummy/**/*.rb'
+    - 'spec/dummy/**/*'
 
-    # via. https://github.com/rubocop-hq/rubocop/blob/v0.60.0/config/default.yml#L60
+    # c.f. https://github.com/rubocop-hq/rubocop/blob/v0.72.0/config/default.yml#L60-L63
     - 'node_modules/**/*'
     - 'vendor/**/*'
     - '.git/**/*'
 
-Layout/IndentHeredoc:
-  Enabled: false
+  NewCops: enable
+  SuggestExtensions: false
+
+Metrics/BlockLength:
+  Exclude:
+    - '*.gemspec'
+    - 'spec/**/*_spec.rb'
+
+Layout/LineLength:
+  Max: 110
 
-RSpec/DescribedClass:
+Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 ## master
-[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.1.0...master)
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.4.2...master)
+
+## v0.4.2
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.4.1...v0.4.2)
+
+* Requires rubocop v1.13.0+ and drop ruby 2.4
+  * https://github.com/sue445/rubocop_auto_corrector/pull/43
+
+## v0.4.1
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.4.0...v0.4.1)
+
+* Fixed. `auto_correctable?` doesn't work when cop has `.support_autocorrect?` and doesn't have `#autocorrect`
+  * https://github.com/sue445/rubocop_auto_corrector/pull/35
+
+## v0.4.0
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.3.0...v0.4.0)
+
+* Add `--all` option for `rubocop --auto-correct-all`
+  * https://github.com/sue445/rubocop_auto_corrector/pull/34
+  * When `--all` arg is passed to `rubocop_auto_corrector` (e.g. `rubocop_auto_corrector --all`), run `rubocop --auto-correct-all && git commit` with each cop.
+* Upgrade rubocop and drop support ruby 2.3
+  * https://github.com/sue445/rubocop_auto_corrector/pull/31
+
+## v0.3.0
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.2.0...v0.3.0)
+
+* Support `rubocop-rails` gem (requires rubocop 0.72.0+ and ruby 2.3.0+)
+  * https://github.com/sue445/rubocop_auto_corrector/pull/18
+
+## v0.2.0
+[full changelog](http://github.com/sue445/rubocop_auto_corrector/compare/v0.1.0...v0.2.0)
+
+* Support `rubocop-performance` gem
+  * https://github.com/sue445/rubocop_auto_corrector/pull/16
 
 ## v0.1.0
 * first release

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/README.md

@@ -3,19 +3,25 @@
 Run `rubocop --auto-correct && git commit` with each cop.
 
 [![Gem Version](https://badge.fury.io/rb/rubocop_auto_corrector.svg)](https://badge.fury.io/rb/rubocop_auto_corrector)
-[![Build Status](https://travis-ci.org/sue445/rubocop_auto_corrector.svg?branch=master)](https://travis-ci.org/sue445/rubocop_auto_corrector)
+[![Build Status](https://github.com/sue445/rubocop_auto_corrector/workflows/test/badge.svg?branch=master)](https://github.com/sue445/rubocop_auto_corrector/actions?query=workflow%3Atest)
 [![Maintainability](https://api.codeclimate.com/v1/badges/384834e50f94e344c439/maintainability)](https://codeclimate.com/github/sue445/rubocop_auto_corrector/maintainability)
 [![Coverage Status](https://coveralls.io/repos/github/sue445/rubocop_auto_corrector/badge.svg?branch=master)](https://coveralls.io/github/sue445/rubocop_auto_corrector?branch=master)
 
-# Example
+## Example
 See https://github.com/sue445/rubocop_auto_corrector/pull/3/commits
 
+## Requirements
+* Ruby
+* git
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rubocop_auto_corrector'
+group :development do
+  gem 'rubocop_auto_corrector', require: false
+end
 ```
 
 And then execute:
@@ -36,6 +42,7 @@ $ bundle exec rubocop_auto_corrector
 $ bundle exec rubocop_auto_corrector --help
 Usage: rubocop_auto_corrector [options]
         --auto-correct-count COUNT   Run `rubocop --auto-correct` and `git commit` for this number of times. (default. 2)
+        --all                        Whether run `rubocop` with `--auto-correct-all`. (default. run with `--auto-correct`)
 ```
 
 ## Development

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'rubocop_auto_corrector'

data/exe/rubocop_auto_corrector

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rubocop_auto_corrector/cli'
 require 'rubocop_auto_corrector/version'
@@ -6,16 +7,27 @@ require 'optparse'
 
 opt = OptionParser.new
 params = {
-  auto_correct_count: 2
+  auto_correct_count: 2,
+  auto_correct_all: false
 }
 
 Version = RubocopAutoCorrector::VERSION
-opt.on('--auto-correct-count COUNT', 'Run `rubocop --auto-correct` and `git commit` for this number of times. (default. 2)') { |v| params[:auto_correct_count] = v.to_i }
+
+opt.on(
+  '--auto-correct-count COUNT',
+  'Run `rubocop --auto-correct` and `git commit` for this number of times. (default. 2)'
+) do |v|
+  params[:auto_correct_count] = v.to_i
+end
+
+opt.on('--all', 'Whether run `rubocop` with `--auto-correct-all`. (default. run with `--auto-correct`)') do
+  params[:auto_correct_all] = true
+end
 
 opt.parse!(ARGV)
 
 cli = RubocopAutoCorrector::CLI.new
 
 params[:auto_correct_count].times do
-  cli.perform
+  cli.perform(params[:auto_correct_all])
 end

data/lib/rubocop_auto_corrector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubocop_auto_corrector/version'
 require 'rubocop_auto_corrector/cop_finder'
 

data/lib/rubocop_auto_corrector/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubocopAutoCorrector
   require 'json'
   require 'yaml'
@@ -13,11 +15,11 @@ module RubocopAutoCorrector
       @exclude_cops = data['exclude_cops']
     end
 
-    def perform
-      cop_names =
-        collect_offense_cop_names
-        .select { |cop_name| auto_correctable?(cop_name) }
-        .sort_by { |cop_name| [cop_order(cop_name), cop_name] }
+    def perform(auto_collect_all)
+      rubocop_option = auto_collect_all ? '--auto-correct-all' : '--auto-correct'
+
+      cop_names = collect_offense_cop_names.select { |cop_name| auto_correctable?(cop_name) }
+                                           .sort_by { |cop_name| [cop_order(cop_name), cop_name] }
 
       cop_names.each do |cop_name|
         if (reason = exclude_reason(cop_name))
@@ -25,7 +27,7 @@ module RubocopAutoCorrector
           next
         end
 
-        run_and_commit "rubocop --auto-correct --only #{cop_name}"
+        run_and_commit "rubocop #{rubocop_option} --only #{cop_name}"
       end
     end
 

data/lib/rubocop_auto_corrector/cop_finder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubocopAutoCorrector
   class CopFinder
     attr_reader :cop_name
@@ -10,11 +12,21 @@ module RubocopAutoCorrector
     # Whether this cop is auto correctable
     # @return [Boolean]
     def auto_correctable?
-      Object.new.instance_eval <<-RUBY
+      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)
+
         begin
           require '#{gem_name}'
         rescue LoadError
         end
+
+        return #{cop_class_name}.support_autocorrect? if #{cop_class_name}.respond_to?(:support_autocorrect?)
         #{cop_class_name}.new.respond_to?(:autocorrect)
       RUBY
     rescue NameError
@@ -35,6 +47,7 @@ module RubocopAutoCorrector
 
     private
 
+    # rubocop:disable Metrics/MethodLength
     def rubocop_cop_info
       cop_class_suffix = cop_name.gsub('/', '::')
 
@@ -43,7 +56,7 @@ module RubocopAutoCorrector
         ['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|Performance|Rails|Security|Style|Bundler|Gemspec)/}
+      when %r{^(Layout|Lint|Metrics|Naming|Security|Style|Bundler|Gemspec)/}
         # Official cops
         ['rubocop', "::RuboCop::Cop::#{cop_class_suffix}"]
       else
@@ -53,5 +66,6 @@ module RubocopAutoCorrector
         ["rubocop-#{department_snake}", "::RuboCop::Cop::#{cop_class_suffix}"]
       end
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/rubocop_auto_corrector/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RubocopAutoCorrector
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.4.2'
 end

data/rubocop_auto_corrector.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rubocop_auto_corrector/version'
@@ -33,14 +35,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubocop', '>= 0.49.0'
+  spec.required_ruby_version = '>= 2.5.0'
+
+  spec.add_dependency 'rubocop', '>= 1.13.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'bundler', '>= 1.17'
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-parameterized'
   spec.add_development_dependency 'rspec-temp_dir', '>= 1.1.0'
   spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '< 0.18.0'
+  spec.add_development_dependency 'unparser', '>= 0.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_auto_corrector
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.2
 platform: ruby
 authors:
 - sue445
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,18 +124,32 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+- !ruby/object:Gem::Dependency
+  name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.5
 description: Run `rubocop --auto-correct && git commit` with each cop.
 email:
 - sue445@sue445.net
@@ -145,10 +159,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -170,7 +184,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
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,16 +192,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Run `rubocop --auto-correct && git commit` with each cop.
 test_files: []

data/.travis.yml

@@ -1,34 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - ruby-head
-bundler_args: "--jobs=4"
-before_install:
-  - gem update --system --no-document
-  - gem install bundler --no-document
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - bundle exec rspec
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-branches:
-  only:
-    - master
-notifications:
-  email: false
-  slack:
-    secure: StdMcwf2erVzwfR45Rsw8hKmzaCdg7xl6UzEyPkyrNi1eKS/qeys8Ga1Q5I4HFlmybpBuOTk8dwiya0svGIJtABPUeIe7UjkmGDhS6Q+K+Gk8tNayrvOXgS71JJlqPdTVoWCPqNeqs/a+G9xa/T/TcQgZhh+57Jl9fH4hz/UaXhO0uVuL5LwHvKW6UX35xbAnIdPqMXF7finqF8nxU8nzaGvZ+UrUmnLDIRBeeW1eSopWQP7O+89BM+Nr7vC0oC/fJDcszTnZwYk6b38z9kD8Rvb3H0BktERmeR4QROdokq8BeXKj7uNluHZcr7KQc8qhJA7jAhx326A2oi8C+Yyl4Mz75WsQ+a+JFnVwYgpTXjd4/DnTEA5JUokO2DzsDmcPgnvOgOzAVWdtx3Q96GIcs9vU4X1HuIlctye05ylwVUbOE6up4m47NYLkVmjfYgUq3YVGrqprrlv5gqDqTPb8Il7l+plEobvZhM2cjGx+A/HkpVDgiqfE2IwP3BBeZp5Nkn2P4XUAoFtHkVuTVly55b/Jtnvo83UTv6qJWvTKjM7EorQT9+NlsWe64z5T6VVM6Z5FYHIofFpyRdqSTxcP2AHVpHFckw19px3tC4WiwZzgj4PuMvwcHsgK80wErYOJxlkVAUKuw1nh7g8KZpHjHXp1bCwM6pIK4F9PGMFY/g=
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-env:
-  global:
-    - CC_TEST_REPORTER_ID=ae386af24f1ca076680045ecadf328fc77fd71bf6c014b5503d406d8bd87c42a