rubocop_todo_corrector 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c85c8d566f2b49425a572f879680331084e81e9d3ef8de784f01d76a02405ea2
-  data.tar.gz: b42c06c055c914dd5ec4c26147c9de35f77361b08b621d3dd415d9bbbe498408
+  metadata.gz: f837600adefd9711b9b73eca485464781dcf9ba2bbf14bc2aec2f899c92c8ee5
+  data.tar.gz: cafef555598fc0f848bc739317fb3f9d507b227520f86f9fa4ffa1cc5d631b17
 SHA512:
-  metadata.gz: 30fe5e842703e0f9416d15fa5a11a36c8caf66481266381fcad1fcf422bb6b21632276119e3c442710e45a9728ca8c87c035883adb19d59a8a1c966f15d7f989
-  data.tar.gz: c8bbb8075412c6f784e39f73455371fabd593e2c3ca9409eb68abd683f54b4170aa46e94375c6f3c6db2cd5a4a72808cc7b8c6acd999e3131f7ba8efb36b155b
+  metadata.gz: 3f0a064fa54502df60aba17ed32103b55f741704336a4fe2040c9478f5925b5bb2116bbf684fb3f2e8d64e9124408302185a1070f50fadc619a864010b2d45d6
+  data.tar.gz: 42479c0a9828bfed5899f1cfb3e1f5dbb847330f09aeda1a12126f62af3b8634879fca8177e955ba098c73d56702ec4d52cb983348892217fdc5907dc567f6cd

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
 
 Metrics:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## Unreleased
 
+## 0.7.0 - 2022-05-27
+
+### Added
+
+- Support rubocop 1.30 .rubocop_todo.yml format.
+
+## 0.6.0 - 2022-05-16
+
+### Added
+
+- Add `--only-safe` option to `correct` and `pick` command (default: `true`).
+
+## 0.5.0 - 2022-05-16
+
+### Changed
+
+- Change required ruby version from 3.0 to 3.1.
+
 ## 0.4.0 - 2022-05-16
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop_todo_corrector (0.4.0)
+    rubocop_todo_corrector (0.7.0)
       bundler
       thor
       yard

data/README.md

@@ -29,7 +29,7 @@ Commands:
   rubocop_todo_corrector describe --cop-name=COP_NAME  # Output Markdown description for specified cop.
   rubocop_todo_corrector generate                      # Run `rubocop --auto-gen-config` to generate .rubocop_todo.yml.
   rubocop_todo_corrector help [COMMAND]                # Describe available commands or one specific command
-  rubocop_todo_corrector pick                          # Pick an auto-correctable Cop from .rubocop_todo.yml.
+  rubocop_todo_corrector pick                          # Output an auto-correctable Cop from .rubocop_todo.yml.
   rubocop_todo_corrector remove --cop-name=COP_NAME    # Remove section with specified cop name from .rubocop_todo.yml.
 ```
 
@@ -46,11 +46,14 @@ Run `bundle install` to install RuboCop related gems.
 ### correct
 
 ```console
-$ rubocop_todo_corrector help correct
 Usage:
   rubocop_todo_corrector correct
 
-Run `rubocop --auto-correct-all`.
+Options:
+  [--only-safe], [--no-only-safe]
+                                   # Default: true
+
+Run `rubocop --auto-correct(-all)`.
 ```
 
 ### describe
@@ -85,8 +88,10 @@ Usage:
 
 Options:
   [--mode=MODE]
-                 # Default: random
-                 # Possible values: first, last, least_occurred, most_occurred, random
+                                   # Default: random
+                                   # Possible values: first, last, least_occurred, most_occurred, random
+  [--only-safe], [--no-only-safe]
+                                   # Default: true
 
 Output an auto-correctable Cop from .rubocop_todo.yml.
 ```

data/lib/rubocop_todo_corrector/bundle_installer.rb

@@ -12,8 +12,8 @@ module RubocopTodoCorrector
         temporary_gemfile_path:
       )
         new(
-          gem_specifications: gem_specifications,
-          temporary_gemfile_path: temporary_gemfile_path
+          gem_specifications:,
+          temporary_gemfile_path:
         ).call
       end
     end

data/lib/rubocop_todo_corrector/cli.rb

@@ -14,9 +14,15 @@ module RubocopTodoCorrector
       )
     end
 
-    desc 'correct', 'Run `rubocop --auto-correct-all`.'
+    desc 'correct', 'Run `rubocop --auto-correct(-all)`.'
+    option(
+      :only_safe,
+      default: true,
+      type: :boolean
+    )
     def correct
       Commands::Correct.call(
+        only_safe: options[:only_safe],
         temporary_gemfile_path: 'tmp/Gemfile_rubocop_todo_corrector.rb'
       )
     end
@@ -42,7 +48,7 @@ module RubocopTodoCorrector
       )
     end
 
-    desc 'pick', 'Pick an auto-correctable Cop from .rubocop_todo.yml.'
+    desc 'pick', 'Output an auto-correctable Cop from .rubocop_todo.yml.'
     option(
       :mode,
       default: 'random',
@@ -55,9 +61,15 @@ module RubocopTodoCorrector
       ],
       type: :string
     )
+    option(
+      :only_safe,
+      default: true,
+      type: :boolean
+    )
     def pick
       Commands::Pick.call(
         mode: options[:mode],
+        only_safe: options[:only_safe],
         rubocop_todo_path: '.rubocop_todo.yml'
       )
     end

data/lib/rubocop_todo_corrector/commands/bundle.rb

@@ -13,9 +13,9 @@ module RubocopTodoCorrector
           temporary_gemfile_path:
         )
           new(
-            rubocop_configuration_path: rubocop_configuration_path,
-            gemfile_lock_path: gemfile_lock_path,
-            temporary_gemfile_path: temporary_gemfile_path
+            rubocop_configuration_path:,
+            gemfile_lock_path:,
+            temporary_gemfile_path:
           ).call
         end
       end
@@ -32,7 +32,7 @@ module RubocopTodoCorrector
 
       def call
         BundleInstaller.call(
-          gem_specifications: gem_specifications,
+          gem_specifications:,
           temporary_gemfile_path: @temporary_gemfile_path
         )
       end
@@ -51,9 +51,9 @@ module RubocopTodoCorrector
       def gem_specifications
         gem_names.map do |gem_name|
           {
-            gem_name: gem_name,
+            gem_name:,
             gem_version: GemVersionDetector.call(
-              gem_name: gem_name,
+              gem_name:,
               gemfile_lock_path: @gemfile_lock_path
             )
           }

data/lib/rubocop_todo_corrector/commands/correct.rb

@@ -4,28 +4,44 @@ module RubocopTodoCorrector
   module Commands
     class Correct
       class << self
+        # @param [Boolean] only_safe
         # @param [String] temporary_gemfile_path
         def call(
+          only_safe:,
           temporary_gemfile_path:
         )
           new(
-            temporary_gemfile_path: temporary_gemfile_path
+            only_safe:,
+            temporary_gemfile_path:
           ).call
         end
       end
 
       def initialize(
+        only_safe:,
         temporary_gemfile_path:
       )
+        @only_safe = only_safe
         @temporary_gemfile_path = temporary_gemfile_path
       end
 
       def call
         ::Kernel.system(
           { 'BUNDLE_GEMFILE' => @temporary_gemfile_path },
-          'bundle exec rubocop --auto-correct-all'
+          "bundle exec rubocop #{rubocop_options}"
         )
       end
+
+      private
+
+      # @return [String]
+      def rubocop_options
+        if @only_safe
+          '--auto-correct'
+        else
+          '--auto-correct-all'
+        end
+      end
     end
   end
 end

data/lib/rubocop_todo_corrector/commands/describe.rb

@@ -11,8 +11,8 @@ module RubocopTodoCorrector
           temporary_gemfile_path:
         )
           new(
-            cop_name: cop_name,
-            temporary_gemfile_path: temporary_gemfile_path
+            cop_name:,
+            temporary_gemfile_path:
           ).call
         end
       end
@@ -36,9 +36,9 @@ module RubocopTodoCorrector
         return unless cop_document
 
         description = DescriptionRenderer.call(
-          cop_document: cop_document,
+          cop_document:,
           cop_name: @cop_name,
-          cop_source_path: cop_source_path
+          cop_source_path:
         )
         ::Kernel.puts(description)
       end

data/lib/rubocop_todo_corrector/commands/generate.rb

@@ -13,8 +13,8 @@ module RubocopTodoCorrector
           temporary_gemfile_path:
         )
           new(
-            rubocop_todo_path: rubocop_todo_path,
-            temporary_gemfile_path: temporary_gemfile_path
+            rubocop_todo_path:,
+            temporary_gemfile_path:
           ).call
         end
       end

data/lib/rubocop_todo_corrector/commands/pick.rb

@@ -7,23 +7,28 @@ module RubocopTodoCorrector
     class Pick
       class << self
         # @param [String] mode
+        # @param [Boolean] only_safe
         # @param [String] rubocop_todo_path
         def call(
           mode:,
+          only_safe:,
           rubocop_todo_path:
         )
           new(
-            mode: mode,
-            rubocop_todo_path: rubocop_todo_path
+            mode:,
+            only_safe:,
+            rubocop_todo_path:
           ).call
         end
       end
 
       def initialize(
         mode:,
+        only_safe:,
         rubocop_todo_path:
       )
         @mode = mode
+        @only_safe = only_safe
         @rubocop_todo_path = rubocop_todo_path
       end
 
@@ -42,7 +47,11 @@ module RubocopTodoCorrector
       # @return [Array<Hash>]
       def auto_correctable_cops
         rubocop_todo[:cops].select do |cop|
-          cop[:auto_correctable]
+          if @only_safe
+            cop[:safe_auto_correctable]
+          else
+            cop[:auto_correctable]
+          end
         end
       end
 

data/lib/rubocop_todo_corrector/commands/remove.rb

@@ -13,8 +13,8 @@ module RubocopTodoCorrector
           rubocop_todo_path:
         )
           new(
-            cop_name: cop_name,
-            rubocop_todo_path: rubocop_todo_path
+            cop_name:,
+            rubocop_todo_path:
           ).call
         end
       end

data/lib/rubocop_todo_corrector/cop_document_parser.rb

@@ -11,7 +11,7 @@ module RubocopTodoCorrector
         source_path:
       )
         new(
-          source_path: source_path
+          source_path:
         ).call
       end
     end

data/lib/rubocop_todo_corrector/cop_source_detector.rb

@@ -13,8 +13,8 @@ module RubocopTodoCorrector
         temporary_gemfile_path:
       )
         new(
-          cop_name: cop_name,
-          temporary_gemfile_path: temporary_gemfile_path
+          cop_name:,
+          temporary_gemfile_path:
         ).call
       end
     end

data/lib/rubocop_todo_corrector/description_renderer.rb

@@ -17,9 +17,9 @@ module RubocopTodoCorrector
         cop_source_path:
       )
         new(
-          cop_document: cop_document,
-          cop_name: cop_name,
-          cop_source_path: cop_source_path
+          cop_document:,
+          cop_name:,
+          cop_source_path:
         ).call
       end
     end

data/lib/rubocop_todo_corrector/gem_names_detector.rb

@@ -8,7 +8,7 @@ module RubocopTodoCorrector
       # @param [String] rubocop_configuration_path
       # @return [Array<String>]
       def call(rubocop_configuration_path:)
-        new(rubocop_configuration_path: rubocop_configuration_path).call
+        new(rubocop_configuration_path:).call
       end
     end
 

data/lib/rubocop_todo_corrector/gem_version_detector.rb

@@ -10,8 +10,8 @@ module RubocopTodoCorrector
       # @return [String, nil]
       def call(gemfile_lock_path:, gem_name:)
         new(
-          gemfile_lock_path: gemfile_lock_path,
-          gem_name: gem_name
+          gemfile_lock_path:,
+          gem_name:
         ).call
       end
     end

data/lib/rubocop_todo_corrector/rubocop_todo_parser.rb

@@ -16,7 +16,7 @@ module RubocopTodoCorrector
       # @param [String] content
       def call(content:)
         new(
-          content: content
+          content:
         ).call
       end
     end
@@ -28,8 +28,8 @@ module RubocopTodoCorrector
     # @return [Hash]
     def call
       {
-        cops: cops,
-        previous_rubocop_command: previous_rubocop_command
+        cops:,
+        previous_rubocop_command:
       }
     end
 

data/lib/rubocop_todo_corrector/rubocop_todo_section_parser.rb

@@ -6,7 +6,7 @@ module RubocopTodoCorrector
       # @param [String] content
       def call(content:)
         new(
-          content: content
+          content:
         ).call
       end
     end
@@ -18,19 +18,18 @@ module RubocopTodoCorrector
     # @return [Hash]
     def call
       {
-        auto_correctable: auto_correctable?,
-        name: name,
-        offenses_count: offenses_count
+        auto_correctable:,
+        name:,
+        offenses_count:,
+        safe_auto_correctable:
       }
     end
 
     private
 
     # @return [Boolean]
-    def auto_correctable?
-      @content.include?('# Cop supports --auto-correct') ||
-        @content.include?('# This cop supports safe auto-correction') ||
-        @content.include?('# This cop supports unsafe auto-correction')
+    def auto_correctable
+      safe_auto_correctable || unsafe_auto_correctable
     end
 
     # @return [String, nil]
@@ -45,5 +44,17 @@ module RubocopTodoCorrector
         'offenses_count'
       ]&.to_i
     end
+
+    def safe_auto_correctable
+      @content.include?('# Cop supports --auto-correct.') || # Before rubocop 1.26
+        @content.include?('# This cop supports safe auto-correction') || # Before rubocop 1.30
+        @content.include?('# This cop supports safe autocorrection')
+    end
+
+    def unsafe_auto_correctable
+      @content.include?('# Cop supports --auto-correct-all') ||
+        @content.include?('# This cop supports unsafe auto-correction') ||
+        @content.include?('# This cop supports unsafe autocorrection')
+    end
   end
 end

data/lib/rubocop_todo_corrector/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubocopTodoCorrector
-  VERSION = '0.4.0'
+  VERSION = '0.7.0'
 end

data/rubocop_todo_corrector.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = 'Auto-correct offenses defined in .rubocop_todo.yml.'
   spec.homepage = 'https://github.com/r7kamura/rubocop_todo_corrector'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_todo_corrector
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="