slimcop 0.10.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02e411169bcf03ec8058dab2f6c316188b78cfda2ee5b10839f2bc89e0ffbcb7
-  data.tar.gz: 3081e815ee3f7ce7a518ab6a7b384042d4d96eda53bb8c5c776f3cbe21cd90e2
+  metadata.gz: 7940460cb1e32440204359ed19e93fd6b767edeb88733f2bd27cd419a012bf85
+  data.tar.gz: 1ff28299d0f05f3cb270a051467cfcd4c53fbf5df8b66545742778fe803e6e61
 SHA512:
-  metadata.gz: adcd201a0fb01c9b40ec857f341bedec643648b463313433558bbc26564b2dc50742d771f68e40d8b9a4a829785e4e49cbbcda2d2ca147b94e8e61a9f5d3f183
-  data.tar.gz: 484b00bcf0e97e8980216cb70b0cd4badf5075eaf542f59657ceac2aa8de598c0059a58091210ee69c34bc09fdbe6df9ffc5d666169ccfa3da24a7a81bd10d44
+  metadata.gz: cf85bc72298ceec46aa702ed31c914659095fe6323cb1fc97890ea8bb06f416e16182d9243a0d036ca9d3b51d29ac204d60a33ba2a676c73fee7773ef889ffff
+  data.tar.gz: 5c9c05d471956877ad11a9522d8ee247169cb9e02a5ae69cc8261d309114fce4c5bf88922ae849a0228f5be2f86d5fcf3281a344ca44a3ad37eaa6f86f2a059e

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## Unreleased
 
+## 0.13.1 - 2022-01-18
+
+### Fixed
+
+- Fix missing some metadata in gemspec.
+
+## 0.13.0 - 2022-01-15
+
+### Changed
+
+- Use templatecop.
+
+## 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
+
+- Detect offenses from code that containing `if`, `unless`, `do`, etc.
+
 ## 0.10.0 - 2022-01-06
 
 ### Added

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    slimcop (0.10.0)
-      rainbow
-      rubocop (>= 0.87)
+    slimcop (0.13.1)
       slimi (>= 0.5.1)
+      templatecop
 
 GEM
   remote: https://rubygems.org/
@@ -49,6 +48,9 @@ GEM
       temple
       thor
       tilt
+    templatecop (0.1.0)
+      parser
+      rubocop (>= 0.87)
     temple (0.8.2)
     thor (1.2.1)
     tilt (2.0.10)

data/exe/slimcop

@@ -3,5 +3,12 @@
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'slimcop'
+require 'templatecop'
 
-Slimcop::Cli.new(ARGV).call
+Templatecop::Cli.call(
+  default_configuration_path: File.expand_path('../default.yml', __dir__),
+  default_path_patterns: %w[**/*.slim],
+  executable_name: 'slimcop',
+  implicit_configuration_paths: %w[.slimcop.yml .rubocop.yml],
+  ruby_extractor: Slimcop::RubyExtractor
+)

data/lib/slimcop/ruby_extractor.rb

@@ -1,10 +1,25 @@
 # frozen_string_literal: true
 
 require 'slimi'
+require 'templatecop'
 
 module Slimcop
-  # Extract codes from Slim source.
+  # Extract Ruby codes from Slim source.
   class RubyExtractor
+    class << self
+      # @param [String, nil] file_path
+      # @param [String] source
+      def call(
+        file_path:,
+        source:
+      )
+        new(
+          file_path: file_path,
+          source: source
+        ).call
+      end
+    end
+
     # @param [String, nil] file_path
     # @param [String] source
     def initialize(file_path:, source:)
@@ -15,10 +30,10 @@ module Slimcop
     # @return [Array<Hash>]
     def call
       ranges.map do |(begin_, end_)|
+        clipped = ::Templatecop::RubyClipper.new(@source[begin_...end_]).call
         {
-          begin_: begin_,
-          code: @source[begin_...end_],
-          end_: end_
+          code: clipped[:code],
+          offset: begin_ + clipped[:offset]
         }
       end
     end

data/lib/slimcop/version.rb

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

data/lib/slimcop.rb

@@ -3,12 +3,5 @@
 require_relative 'slimcop/version'
 
 module Slimcop
-  autoload :Cli, 'slimcop/cli'
-  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'
-  autoload :SlimOffenseCollector, 'slimcop/slim_offense_collector'
 end

data/slimcop.gemspec

@@ -27,11 +27,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.metadata = {
-    'rubygems_mfa_required' => 'true'
-  }
 
-  spec.add_dependency 'rainbow'
-  spec.add_dependency 'rubocop', '>= 0.87'
   spec.add_dependency 'slimi', '>= 0.5.1'
+  spec.add_dependency 'templatecop'
 end

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: slimcop
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  name: slimi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.87'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.87'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: slimi
+  name: templatecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
 description: 
 email:
 - r7kamura@gmail.com
@@ -74,21 +60,16 @@ files:
 - default.yml
 - exe/slimcop
 - lib/slimcop.rb
-- lib/slimcop/cli.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
-- lib/slimcop/slim_offense_collector.rb
 - lib/slimcop/version.rb
 - slimcop.gemspec
 homepage: https://github.com/r7kamura/slimcop
 licenses:
 - MIT
 metadata:
-  rubygems_mfa_required: 'true'
+  homepage_uri: https://github.com/r7kamura/slimcop
+  source_code_uri: https://github.com/r7kamura/slimcop
+  changelog_uri: https://github.com/r7kamura/slimcop/blob/main/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/slimcop/cli.rb

@@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-require 'rainbow'
-require 'rubocop'
-
-module Slimcop
-  class Cli
-    def initialize(argv)
-      @argv = argv.dup
-    end
-
-    def call
-      options = parse!
-      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)
-      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)
-      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 = {}
-      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. (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|
-        options[:color] = value
-      end
-      parser.parse!(@argv)
-      options
-    end
-  end
-end

data/lib/slimcop/offense.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-
-require 'parser'
-require 'rubocop'
-
-module Slimcop
-  class Offense
-    extend ::Forwardable
-
-    # @return [String]
-    attr_reader :file_path
-
-    # @return [Integer]
-    attr_reader :offset
-
-    delegate(
-      %i[
-        column
-        column_length
-        correctable?
-        corrected_with_todo?
-        corrected?
-        corrector
-        highlighted_area
-        line
-        message
-        real_column
-        severity
-      ] => :rubocop_offense_with_real_location
-    )
-
-    # @param [Integer] offset
-    # @param [RuboCop::Cop::Offense] rubocop_offense
-    # @param [String] source Slim code.
-    def initialize(file_path:, offset:, rubocop_offense:, source:)
-      @file_path = file_path
-      @offset = offset
-      @rubocop_offense = rubocop_offense
-      @source = source
-    end
-
-    # @return [Parser::Source::Range]
-    def location
-      @location ||= ::Parser::Source::Range.new(
-        buffer,
-        @rubocop_offense.location.begin_pos + @offset,
-        @rubocop_offense.location.end_pos + @offset
-      )
-    end
-
-    private
-
-    # @return [Parser::Source::Buffer]
-    def buffer
-      ::Parser::Source::Buffer.new(
-        file_path,
-        source: @source
-      )
-    end
-
-    # @return [RuboCop::Cop::Offense]
-    def rubocop_offense_with_real_location
-      ::RuboCop::Cop::Offense.new(
-        @rubocop_offense.severity.name,
-        location,
-        @rubocop_offense.message,
-        @rubocop_offense.cop_name,
-        @rubocop_offense.status,
-        @rubocop_offense.corrector
-      )
-    end
-  end
-end

data/lib/slimcop/path_finder.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-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
-    end
-
-    # @return [Array<String>]
-    def call
-      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

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-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
-    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
-      result
-    end
-
-    # @return [RuboCop::Config, nil]
-    def additional_config
-      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]
-    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/ruby_offense_collector.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop'
-
-module Slimcop
-  # Collect RuboCop offenses from Ruby code.
-  class RubyOffenseCollector
-    # @param [Boolean] auto_correct
-    # @param [String] file_path
-    # @param [RuboCop::Config] rubocop_config
-    # @param [String] source
-    def initialize(auto_correct:, file_path:, rubocop_config:, source:)
-      @auto_correct = auto_correct
-      @file_path = file_path
-      @rubocop_config = rubocop_config
-      @source = source
-    end
-
-    # @return [Array<RuboCop::Cop::Offense>]
-    def call
-      # 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.reject(&:disabled?)
-    end
-
-    private
-
-    # @return [RuboCop::ProcessedSource]
-    def rubocop_processed_source
-      @rubocop_processed_source ||= ::RuboCop::ProcessedSource.new(
-        @source,
-        @rubocop_config.target_ruby_version,
-        @file_path
-      )
-    end
-
-    # @return [RuboCop::Cop::Team]
-    def rubocop_team
-      ::RuboCop::Cop::Team.new(
-        ::RuboCop::Cop::Registry.new(::RuboCop::Cop::Cop.all),
-        @rubocop_config,
-        auto_correct: @auto_correct,
-        display_cop_names: true,
-        extra_details: true,
-        stdin: ''
-      )
-    end
-  end
-end

data/lib/slimcop/slim_corrector.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'parser'
-require 'rubocop/cop/legacy/corrector'
-
-module Slimcop
-  # Apply auto-corrections to Slim file.
-  class SlimCorrector
-    # @param [String] file_path
-    # @param [Array<Slimcop::Offense>] offenses
-    # @param [String] source
-    def initialize(file_path:, offenses:, source:)
-      @file_path = file_path
-      @offenses = offenses
-      @source = source
-    end
-
-    # @return [String] Rewritten Slim code.
-    def call
-      ::RuboCop::Cop::Legacy::Corrector.new(source_buffer, corrections).rewrite
-    end
-
-    private
-
-    # @return [Array<Proc>]
-    def corrections
-      @offenses.select(&:corrector).map do |offense|
-        lambda do |corrector|
-          corrector.import!(offense.corrector, offset: offense.offset)
-        end
-      end
-    end
-
-    # @return [Parser::Source::Buffer]
-    def source_buffer
-      ::Parser::Source::Buffer.new(
-        @file_path,
-        source: @source
-      )
-    end
-  end
-end

data/lib/slimcop/slim_offense_collector.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Slimcop
-  # Collect RuboCop offenses from Slim code.
-  class SlimOffenseCollector
-    # @param [Boolean] auto_correct
-    # @param [String] file_path Slim file path
-    # @param [RuboCop::Config] rubocop_config
-    # @param [String] source Slim code
-    def initialize(auto_correct:, file_path:, rubocop_config:, source:)
-      @auto_correct = auto_correct
-      @file_path = file_path
-      @rubocop_config = rubocop_config
-      @source = source
-    end
-
-    # @return [Array<Slimcop::Offense>]
-    def call
-      snippets.flat_map do |snippet|
-        RubyOffenseCollector.new(
-          auto_correct: @auto_correct,
-          file_path: @file_path,
-          rubocop_config: @rubocop_config,
-          source: snippet[:code]
-        ).call.map do |rubocop_offense|
-          Offense.new(
-            file_path: @file_path,
-            offset: snippet[:begin_],
-            rubocop_offense: rubocop_offense,
-            source: @source
-          )
-        end
-      end
-    end
-
-    private
-
-    # @return [Array<Hash>]
-    def snippets
-      RubyExtractor.new(
-        file_path: @file_path,
-        source: @source
-      ).call
-    end
-  end
-end