slimcop 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294e38d0a479f35dc2d3c6c2c042af57645927ec17cc2b91b6e6c68107defd40
-  data.tar.gz: 5f65145f2f89a7fbae3341228bc5d3b2ac8c53c065748ed2dc2e86a1f49d8d95
+  metadata.gz: 8f5970bfa12ccffdb04b26f3b827b8102e035cb95ddd7f6d2ad70f1ff53d240f
+  data.tar.gz: d293f0d5c72e0e96c21f515ed16c6f0dbe9bf0aae745e42cec20186e654922a0
 SHA512:
-  metadata.gz: cd736f85dafc680f45a77ab81f791620909eda2c23523cf0d7ce4e999587c464946c14a77a2e1853cd4f14da26e9cd2fd17b444ef0d53e031ae38220adef9998
-  data.tar.gz: 840ee9ef8e7db1c8fb6590b36c157114784c51c20de7adad8a947fc4df305bb54b838fd63faadcbfafb52f715533effaaa95d5fd408a5be81fea546456dfaf95
+  metadata.gz: b2423cffaf849c867d335df2d3fec06645f5578aecc9597a9d218d5cc99989a86be664609b364c6092695ad391825ce9ff244387d3dd6d77710d5c820d02d5f1
+  data.tar.gz: 294f4adb1bc4e8198a2d0b6fb79b810561a57a90fb01ebcfdfe0d3d057278e67ca3c8f77c5063b1bbadb55c36e84b7363db4b39d3004de2d7884f1afcb5f6cca

data/CHANGELOG.md

@@ -2,12 +2,24 @@
 
 ## Unreleased
 
+## 0.6.0 - 2021-12-28
+
+### Added
+
+- Add -c, --config CLI option to customize RuboCop config.
+
+### Changed
+
+- Not investigate all files then auto-correct them, but do it for each file.
+- Sort processed files in alphabetical order.
+- Disable Lint/UselessAssignment by default.
+
 ## 0.5.0 - 2021-12-27
 
 ### Changed
 
-- Ignore Lint/EmptyFile by default.
-- Ignore Style/RescueModifier by default.
+- Disable Lint/EmptyFile by default.
+- Disable Style/RescueModifier by default.
 
 ### Fixed
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slimcop (0.5.0)
+    slimcop (0.6.0)
       rainbow
       rubocop (>= 0.87)
       slimi (>= 0.4)
@@ -45,7 +45,7 @@ GEM
     rubocop-rspec (2.6.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    slimi (0.4.1)
+    slimi (0.4.2)
       temple
     temple (0.8.2)
     unicode-display_width (2.1.0)

data/default.yml

@@ -79,6 +79,9 @@ Layout/TrailingEmptyLines:
 Layout/TrailingWhitespace:
   Enabled: false
 
+Lint/UselessAssignment:
+  Enabled: false
+
 Lint/Void:
   Enabled: false
 

data/lib/slimcop/cli.rb

@@ -6,51 +6,62 @@ module Slimcop
   class Cli
     def initialize(argv)
       @argv = argv.dup
-      @configuration = Configuration.new
       @formatter = Formatter.new
     end
 
     def call
       options = parse!
-      slim_file_paths = PathFinder.new(patterns: @argv).call
-
       Rainbow.enabled = options[:color] if options.key?(:color)
+      rubocop_config = RuboCopConfigGenerator.new(additional_config_file_path: options[:additional_config_file_path]).call
+      file_paths = PathFinder.new(patterns: @argv).call
 
-      offenses_set = investigate(auto_correct: options[:auto_correct], slim_file_paths: slim_file_paths)
-      correct(offenses_set) if options[:auto_correct]
-      offenses = offenses_set.flat_map { |(_, _, array)| array }
+      offenses = file_paths.flat_map do |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
+        offenses_
+      end
       report(offenses)
       exit(offenses.empty? ? 0 : 1)
     end
 
     private
 
-    # @param [Array] offenses_set
-    def correct(offenses_set)
-      offenses_set.each do |(file_path, source, offenses)|
-        rewritten_source = SlimCorrector.new(
-          file_path: file_path,
-          offenses: offenses,
-          source: source
-        ).call
-        ::File.write(file_path, rewritten_source)
-      end
+    # @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 [Array] slim_file_paths
-    # @return [Array]
-    def investigate(auto_correct:, slim_file_paths:)
-      slim_file_paths.map do |file_path|
-        source = ::File.read(file_path)
-        offenses = SlimOffenseCollector.new(
-          auto_correct: auto_correct,
-          file_path: file_path,
-          rubocop_config: @configuration.rubocop_config,
-          source: source
-        ).call
-        [file_path, source, offenses]
-      end
+    # @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
 
     # @param [Array<Slimcop::Offense>] offenses
@@ -74,6 +85,9 @@ module Slimcop
       parser.on('-a', '--auto-correct', 'Auto-correct offenses.') do
         options[:auto_correct] = true
       end
+      parser.on('-c', '--config=', 'Specify configuration file.') do |file_path|
+        options[:additional_config_file_path] = file_path
+      end
       parser.on('--[no-]color', 'Force color output on or off.') do |value|
         options[:color] = value
       end

data/lib/slimcop/path_finder.rb

@@ -14,7 +14,7 @@ module Slimcop
     def call
       @patterns.flat_map do |pattern|
         ::Pathname.glob(pattern).select(&:file?).map(&:to_s)
-      end
+      end.sort
     end
   end
 end

data/lib/slimcop/rubo_cop_config_generator.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rubocop'
+
+module Slimcop
+  class RuboCopConfigGenerator
+    # @param [String] additional_config_file_path
+    def initialize(additional_config_file_path: nil)
+      @additional_config_file_path = additional_config_file_path
+    end
+
+    # @return [RuboCop::Config]
+    def call
+      ::RuboCop::ConfigLoader.merge_with_default(merged_config, loaded_path)
+    end
+
+    private
+
+    # @return [String]
+    def loaded_path
+      @additional_config_file_path || slimcop_default_config_file_path
+    end
+
+    # @return [RuboCop::Config]
+    def merged_config
+      ::RuboCop::Config.create(merged_config_hash, loaded_path)
+    end
+
+    # @return [Hash]
+    def merged_config_hash
+      result = slimcop_default_config
+      result = ::RuboCop::ConfigLoader.merge(result, additional_config) if @additional_config_file_path
+      result
+    end
+
+    # @return [RuboCop::Config, nil]
+    def additional_config
+      ::RuboCop::ConfigLoader.load_file(@additional_config_file_path) if @additional_config_file_path
+    end
+
+    # @return [RuboCop::Config]
+    def slimcop_default_config
+      ::RuboCop::ConfigLoader.load_file(slimcop_default_config_file_path)
+    end
+
+    # @return [String]
+    def slimcop_default_config_file_path
+      @slimcop_default_config_file_path ||= ::File.expand_path('../../default.yml', __dir__)
+    end
+  end
+end

data/lib/slimcop/version.rb

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

data/lib/slimcop.rb

@@ -4,10 +4,10 @@ require_relative 'slimcop/version'
 
 module Slimcop
   autoload :Cli, 'slimcop/cli'
-  autoload :Configuration, 'slimcop/configuration'
   autoload :Formatter, 'slimcop/formatter'
   autoload :Offense, 'slimcop/offense'
   autoload :PathFinder, 'slimcop/path_finder'
+  autoload :RuboCopConfigGenerator, 'slimcop/rubo_cop_config_generator'
   autoload :RubyExtractor, 'slimcop/ruby_extractor'
   autoload :RubyOffenseCollector, 'slimcop/ruby_offense_collector'
   autoload :SlimCorrector, 'slimcop/slim_corrector'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimcop
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-26 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -75,10 +75,10 @@ files:
 - exe/slimcop
 - lib/slimcop.rb
 - lib/slimcop/cli.rb
-- lib/slimcop/configuration.rb
 - lib/slimcop/formatter.rb
 - lib/slimcop/offense.rb
 - lib/slimcop/path_finder.rb
+- lib/slimcop/rubo_cop_config_generator.rb
 - lib/slimcop/ruby_extractor.rb
 - lib/slimcop/ruby_offense_collector.rb
 - lib/slimcop/slim_corrector.rb

data/lib/slimcop/configuration.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop'
-
-module Slimcop
-  class Configuration
-    # @return [RuboCop::Config]
-    def rubocop_config
-      @rubocop_config ||= begin
-        config_path = ::File.expand_path('../../default.yml', __dir__)
-        config = ::RuboCop::ConfigLoader.load_file(config_path)
-        ::RuboCop::ConfigLoader.merge_with_default(config, config_path)
-      end
-    end
-  end
-end