slimcop 0.7.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e1bb0dc5266092a4e8b3ce5b80c993eeed1e2f3b2696e7b34c42163c78ee182
-  data.tar.gz: fdc659581227c0faa8575d00920dc1ddb2e4b2b8fad14780f967aad285ca014c
+  metadata.gz: 02e411169bcf03ec8058dab2f6c316188b78cfda2ee5b10839f2bc89e0ffbcb7
+  data.tar.gz: 3081e815ee3f7ce7a518ab6a7b384042d4d96eda53bb8c5c776f3cbe21cd90e2
 SHA512:
-  metadata.gz: 8561d1a374e3cbed80d6970270aa7d4492725b365d0660809ee726b190b4f87dbff240517c534d4770ed170bdbdc55a898adc821e26303f75041e5a5ae9d7b2e
-  data.tar.gz: dbf457519eefdbb8e1873ba60a0ae1a3109b7c74231c9bbac8b81ee254c581aa320a9c04cb68bbf53e7ff3818f6000e1b52a5ade1b1cf310f2ecf9a18ab54826
+  metadata.gz: adcd201a0fb01c9b40ec857f341bedec643648b463313433558bbc26564b2dc50742d771f68e40d8b9a4a829785e4e49cbbcda2d2ca147b94e8e61a9f5d3f183
+  data.tar.gz: 484b00bcf0e97e8980216cb70b0cd4badf5075eaf542f59657ceac2aa8de598c0059a58091210ee69c34bc09fdbe6df9ffc5d666169ccfa3da24a7a81bd10d44

data/CHANGELOG.md

@@ -2,6 +2,39 @@
 
 ## Unreleased
 
+## 0.10.0 - 2022-01-06
+
+### Added
+
+- Use .slimcop.yml as its 1st default config file.
+
+## 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

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    slimcop (0.7.1)
+    slimcop (0.10.0)
       rainbow
       rubocop (>= 0.87)
-      slimi (>= 0.4)
+      slimi (>= 0.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -45,9 +45,13 @@ GEM
     rubocop-rspec (2.6.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    slimi (0.4.2)
+    slimi (0.7.0)
       temple
+      thor
+      tilt
     temple (0.8.2)
+    thor (1.2.1)
+    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 'spec/fixtures/**/*.slim'
 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: .slimcop.yml or .rubocop.yml)') 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.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,9 @@ require 'rubocop'
 
 module Slimcop
   class RuboCopConfigGenerator
+    DEFAULT_ADDITIONAL_CONFIG_PATH1 = '.slimcop.yml'
+    DEFAULT_ADDITIONAL_CONFIG_PATH2 = '.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 +32,24 @@ 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_PATH1)
+            ::RuboCop::ConfigLoader.load_file(DEFAULT_ADDITIONAL_CONFIG_PATH1)
+          elsif ::File.exist?(DEFAULT_ADDITIONAL_CONFIG_PATH2)
+            ::RuboCop::ConfigLoader.load_file(DEFAULT_ADDITIONAL_CONFIG_PATH2)
+          end
+      end
     end
 
     # @return [RuboCop::Config]

data/lib/slimcop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Slimcop
-  VERSION = '0.7.1'
+  VERSION = '0.10.0'
 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.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-01-05 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