slimcop 0.7.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e13f6191b529e4c4b0ca6bc1fbbd6d1144eb029e62158ae04f43111f4dd96e
-  data.tar.gz: 4eb2dccd29708a5de535d9fb4971eb56084e3d45644fd9ad9f0731416ad22ec7
+  metadata.gz: 75b0d9431db2adbba5b1b238af9c11bdbf95528541136714f1d09acdb226048c
+  data.tar.gz: 1bdfd90997739807a9ca4e38ad37bd29ae2d9f736fbaf0d74824aa367bbd5dd4
 SHA512:
-  metadata.gz: '09705a482591105427cf3bc97f6ba86ab317d78e845fb0ca91d677730fa7081b5466c54112449127d83dc350431aea1de288bfc67034e10045e47dfcda57a7b3'
-  data.tar.gz: '09384443d865bb4cd1edf7d44e0ee1eb84dcf6729910220b4cad9970eba1dd16b0cb00b26b40f5845223a61488097a5fd9b8c48f25c8e69349ba47d1739cea2c'
+  metadata.gz: a8bb9144ee99b9745fa1f6ae1c136ed7e438e6d433c22963ade6cb25120d4fb81780ee03f4051ed393b4d37ee7f33b5a74c603229a88f487f6646e094d13ea5f
+  data.tar.gz: 1af01925da76e7116394f222ec7b9630e842e9be4d4d3dd71ff0a2e4480d0160e5e408c4675ef28dbbcbb04dc541a162d602341b9002098829eb24ced4946519

data/CHANGELOG.md

@@ -2,7 +2,41 @@
 
 ## Unreleased
 
-### 0.7.0 - 2021-12-28
+## 0.9.1 - 2022-01-04
+
+### Fixed
+
+- Fix $LOAD_PATH at ./exe/slimcop.
+
+## 0.9.0 - 2022-01-02
+
+### Changed
+
+- Require slimi >= 0.5.1 to extract Ruby code from Ruby attribute.
+
+### Fixed
+
+- Fix -v and --version option.
+
+## 0.8.0 - 2021-12-29
+
+### Changed
+
+- Use .rubocop.yml by default.
+- Use "**/*.slim" by default.
+
+### Fixed
+
+- Fix bug that --no-color was not working.
+
+## 0.7.1 - 2021-12-29
+
+### Fixed
+
+- Exclude disabled offenses.
+- Uniq paths at PathFinder.
+
+## 0.7.0 - 2021-12-28
 
 ### Changed
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    slimcop (0.7.0)
+    slimcop (0.9.1)
       rainbow
       rubocop (>= 0.87)
-      slimi (>= 0.4)
+      slimi (>= 0.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -45,9 +45,11 @@ GEM
     rubocop-rspec (2.6.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    slimi (0.4.2)
+    slimi (0.6.0)
       temple
+      tilt
     temple (0.8.2)
+    tilt (2.0.10)
     unicode-display_width (2.1.0)
 
 PLATFORMS

data/README.md

@@ -40,7 +40,7 @@ Usage: slimcop [options] [file1, file2, ...]
 ### Example
 
 ```console
-$ slimcop "**/*.slim"
+$ slimcop
 Inspecting 1 file
 C
 

data/exe/slimcop

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'slimcop'
 
 Slimcop::Cli.new(ARGV).call

data/lib/slimcop/cli.rb

@@ -7,18 +7,17 @@ module Slimcop
   class Cli
     def initialize(argv)
       @argv = argv.dup
-      @formatter = ::RuboCop::Formatter::ProgressFormatter.new($stdout)
     end
 
     def call
       options = parse!
-      Rainbow.enabled = options[:color] if options.key?(:color)
+      formatter = ::RuboCop::Formatter::ProgressFormatter.new($stdout, color: options[:color])
       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)
+      formatter.started(file_paths)
       offenses = file_paths.flat_map do |file_path|
-        @formatter.file_started(file_path, {})
+        formatter.file_started(file_path, {})
         source = ::File.read(file_path)
         offenses_ = investigate(
           auto_correct: options[:auto_correct],
@@ -33,10 +32,10 @@ module Slimcop
             source: source
           )
         end
-        @formatter.file_finished(file_path, offenses_)
+        formatter.file_finished(file_path, offenses_)
         offenses_
       end
-      @formatter.finished(file_paths)
+      formatter.finished(file_paths)
       exit(offenses.empty? ? 0 : 1)
     end
 
@@ -73,10 +72,11 @@ module Slimcop
       options = {}
       parser = ::OptionParser.new
       parser.banner = 'Usage: slimcop [options] [file1, file2, ...]'
+      parser.version = VERSION
       parser.on('-a', '--auto-correct', 'Auto-correct offenses.') do
         options[:auto_correct] = true
       end
-      parser.on('-c', '--config=', 'Specify configuration file.') do |file_path|
+      parser.on('-c', '--config=', 'Specify configuration file. (default: .rubocop.yml if it exists)') do |file_path|
         options[:additional_config_file_path] = file_path
       end
       parser.on('--[no-]color', 'Force color output on or off.') do |value|

data/lib/slimcop/path_finder.rb

@@ -5,6 +5,10 @@ require 'pathname'
 module Slimcop
   # Collect file paths from given path patterns.
   class PathFinder
+    DEFAULT_PATH_PATTERNS = %w[
+      **/*.slim
+    ].freeze
+
     # @param [Array<String>] patterns Patterns normally given as CLI arguments (e.g. `["app/views/**/*.html.slim"]`).
     def initialize(patterns:)
       @patterns = patterns
@@ -12,9 +16,20 @@ module Slimcop
 
     # @return [Array<String>]
     def call
-      @patterns.flat_map do |pattern|
+      patterns.flat_map do |pattern|
         ::Pathname.glob(pattern).select(&:file?).map(&:to_s)
-      end.sort
+      end.uniq.sort
+    end
+
+    private
+
+    # @return [Array<String>]
+    def patterns
+      if @patterns.empty?
+        DEFAULT_PATH_PATTERNS
+      else
+        @patterns
+      end
     end
   end
 end

data/lib/slimcop/rubo_cop_config_generator.rb

@@ -4,6 +4,8 @@ require 'rubocop'
 
 module Slimcop
   class RuboCopConfigGenerator
+    DEFAULT_ADDITIONAL_CONFIG_PATH = '.rubocop.yml'
+
     # @param [String] additional_config_file_path
     def initialize(additional_config_file_path: nil)
       @additional_config_file_path = additional_config_file_path
@@ -29,13 +31,22 @@ module Slimcop
     # @return [Hash]
     def merged_config_hash
       result = slimcop_default_config
-      result = ::RuboCop::ConfigLoader.merge(result, additional_config) if @additional_config_file_path
+      result = ::RuboCop::ConfigLoader.merge(result, additional_config) if additional_config
       result
     end
 
     # @return [RuboCop::Config, nil]
     def additional_config
-      ::RuboCop::ConfigLoader.load_file(@additional_config_file_path) if @additional_config_file_path
+      if instance_variable_defined?(:@additional_config)
+        @additional_config
+      else
+        @additional_config = \
+          if @additional_config_file_path
+            ::RuboCop::ConfigLoader.load_file(@additional_config_file_path)
+          elsif ::File.exist?(DEFAULT_ADDITIONAL_CONFIG_PATH)
+            ::RuboCop::ConfigLoader.load_file(DEFAULT_ADDITIONAL_CONFIG_PATH)
+          end
+      end
     end
 
     # @return [RuboCop::Config]

data/lib/slimcop/ruby_offense_collector.rb

@@ -21,7 +21,7 @@ module Slimcop
       # Skip if invalid syntax Ruby code is given. (e.g. "- if a?")
       return [] unless rubocop_processed_source.valid_syntax?
 
-      rubocop_team.investigate(rubocop_processed_source).offenses
+      rubocop_team.investigate(rubocop_processed_source).offenses.reject(&:disabled?)
     end
 
     private

data/lib/slimcop/version.rb

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

data/slimcop.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rainbow'
   spec.add_dependency 'rubocop', '>= 0.87'
-  spec.add_dependency 'slimi', '>= 0.4'
+  spec.add_dependency 'slimi', '>= 0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimcop
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.1
 description: 
 email:
 - r7kamura@gmail.com