slimcop 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b967da47ab7a5721d082f4d1a4e9bb84006431c5acb5992a27f8246bdcfd904
-  data.tar.gz: 6e260866461bc31ddef835279d647905f17f87890b63af229bd98557699e0d8f
+  metadata.gz: dd949a834535638a785282759fe46fb6fd368282d3030d17a113fa5253755bd7
+  data.tar.gz: 70be88bc581d8ba538879cffabcef3c58e21bbddda4ce8c7812c32e465ab5108
 SHA512:
-  metadata.gz: 62cbf9db3a9f0fc741714afdd4f886b61efb4bed1e3f4ca54e6e7caa03b3cf2e8f3141aec2456b3b13f7fe0999e5a7ab9a7578a6700225a220db08200f9b2f96
-  data.tar.gz: c6742245998d9fbd23dca47dbf55be3e8717722daa7515df5afab77baca05d1c2ddc26d80a62bbbc97a7cfa06332a5c6fb3bc078a7d3853479598f7cb86c36ea
+  metadata.gz: 377b550717a43db56aefd5c66eb78622e2945c93436a45de5c50b8c9a61312a9d62d3e37d25108238788a5c08e0a4964dcc0401bd34531a620f02e62917091d3
+  data.tar.gz: db3cb5e5f9bf3ea5cf56d0a3e15bd430907721b2d33dd7d0e59bb2bd65e2d1fe78d8e51aee8ada603c8b92142694dc415921ce16e7e08e70633f918ef8ea830f

data/CHANGELOG.md

@@ -2,11 +2,16 @@
 
 ## Unreleased
 
+## 0.12.0 - 2022-01-12
+
+### Changed
+
+- Keep trying auto-correction up to 7 times until no offense detected.
+
 ## 0.11.0 - 2022-01-10
 
 ### Changed
 
-- Use :offset instead of :begin_ at RubyExtractor.
 - Detect offenses from code that containing `if`, `unless`, `do`, etc.
 
 ## 0.10.0 - 2022-01-06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slimcop (0.11.0)
+    slimcop (0.12.0)
       rainbow
       rubocop (>= 0.87)
       slimi (>= 0.5.1)

data/lib/slimcop/cli.rb

@@ -15,58 +15,18 @@ module Slimcop
       rubocop_config = RuboCopConfigGenerator.new(additional_config_file_path: options[:additional_config_file_path]).call
       file_paths = PathFinder.new(patterns: @argv).call
 
-      formatter.started(file_paths)
-      offenses = file_paths.flat_map do |file_path|
-        formatter.file_started(file_path, {})
-        source = ::File.read(file_path)
-        offenses_ = investigate(
-          auto_correct: options[:auto_correct],
-          file_path: file_path,
-          rubocop_config: rubocop_config,
-          source: source
-        )
-        if options[:auto_correct]
-          correct(
-            file_path: file_path,
-            offenses: offenses_,
-            source: source
-          )
-        end
-        formatter.file_finished(file_path, offenses_)
-        offenses_
-      end
-      formatter.finished(file_paths)
+      offenses = Runner.new(
+        auto_correct: options[:auto_correct],
+        file_paths: file_paths,
+        formatter: formatter,
+        rubocop_config: rubocop_config
+      ).call
+
       exit(offenses.empty? ? 0 : 1)
     end
 
     private
 
-    # @param [String] file_path
-    # @param [Array<Slimcop::Offense>] offenses
-    # @param [String] source
-    def correct(file_path:, offenses:, source:)
-      rewritten_source = SlimCorrector.new(
-        file_path: file_path,
-        offenses: offenses,
-        source: source
-      ).call
-      ::File.write(file_path, rewritten_source)
-    end
-
-    # @param [Boolean] auto_correct
-    # @param [String] file_path
-    # @param [String] rubocop_config
-    # @param [String] source
-    # @return [Array<Slimcop::Offense>]
-    def investigate(auto_correct:, file_path:, rubocop_config:, source:)
-      SlimOffenseCollector.new(
-        auto_correct: auto_correct,
-        file_path: file_path,
-        rubocop_config: rubocop_config,
-        source: source
-      ).call
-    end
-
     # @return [Hash]
     def parse!
       options = {}

data/lib/slimcop/runner.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Slimcop
+  # Run investigation and auto-correcttion.
+  class Runner
+    # @param [Boolean] auto_correct
+    # @param [Array<String>] file_paths
+    # @param [Object] formatter
+    # @param [RuboCop::Config] rubocop_config
+    def initialize(
+      auto_correct:,
+      file_paths:,
+      formatter:,
+      rubocop_config:
+    )
+      @auto_correct = auto_correct
+      @file_paths = file_paths
+      @formatter = formatter
+      @rubocop_config = rubocop_config
+    end
+
+    # @return [Array<RuboCop::Cop::Offense>]
+    def call
+      on_started
+      offenses = investigate_and_correct
+      on_finished
+      offenses
+    end
+
+    private
+
+    # @param [String] file_path
+    # @param [Array<Slimcop::Offense>] offenses
+    # @param [String] source
+    def correct(file_path:, offenses:, source:)
+      rewritten_source = SlimCorrector.new(
+        file_path: file_path,
+        offenses: offenses,
+        source: source
+      ).call
+      ::File.write(file_path, rewritten_source)
+    end
+
+    # @param [Boolean] auto_correct
+    # @param [String] file_path
+    # @param [String] rubocop_config
+    # @param [String] source
+    # @return [Array<Slimcop::Offense>]
+    def investigate(auto_correct:, file_path:, rubocop_config:, source:)
+      SlimOffenseCollector.new(
+        auto_correct: auto_correct,
+        file_path: file_path,
+        rubocop_config: rubocop_config,
+        source: source
+      ).call
+    end
+
+    # @return [Array<RuboCop::Cop::Offense>]
+    def investigate_and_correct
+      @file_paths.flat_map do |file_path|
+        offenses_per_file = []
+        max_trials_count.times do
+          on_file_started(file_path)
+          source = ::File.read(file_path)
+          offenses = investigate(
+            auto_correct: @auto_correct,
+            file_path: file_path,
+            rubocop_config: @rubocop_config,
+            source: source
+          )
+          offenses_per_file += offenses
+          break if offenses.empty?
+
+          next unless @auto_correct
+
+          correct(
+            file_path: file_path,
+            offenses: offenses,
+            source: source
+          )
+        end
+        on_file_finished(file_path, offenses_per_file)
+        offenses_per_file
+      end
+    end
+
+    # @return [Integer]
+    def max_trials_count
+      if @auto_correct
+        7 # What a heuristic number.
+      else
+        1
+      end
+    end
+
+    def on_started
+      @formatter.started(@file_paths)
+    end
+
+    # @param [String] file_path
+    def on_file_started(file_path)
+      @formatter.file_started(file_path, {})
+    end
+
+    # @param [String] file_path
+    # @param [Array<RuboCop::Cop::Offenses]
+    def on_file_finished(file_path, offenses)
+      @formatter.file_finished(file_path, offenses)
+    end
+
+    def on_finished
+      @formatter.finished(@file_paths)
+    end
+  end
+end

data/lib/slimcop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Slimcop
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/lib/slimcop.rb

@@ -10,6 +10,7 @@ module Slimcop
   autoload :RubyClipper, 'slimcop/ruby_clipper'
   autoload :RubyExtractor, 'slimcop/ruby_extractor'
   autoload :RubyOffenseCollector, 'slimcop/ruby_offense_collector'
+  autoload :Runner, 'slimcop/runner'
   autoload :SlimCorrector, 'slimcop/slim_corrector'
   autoload :SlimOffenseCollector, 'slimcop/slim_offense_collector'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimcop
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -81,6 +81,7 @@ files:
 - lib/slimcop/ruby_clipper.rb
 - lib/slimcop/ruby_extractor.rb
 - lib/slimcop/ruby_offense_collector.rb
+- lib/slimcop/runner.rb
 - lib/slimcop/slim_corrector.rb
 - lib/slimcop/slim_offense_collector.rb
 - lib/slimcop/version.rb