rubocop-haml 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6eb8a9ba04125842b70b2bdb2f961c38f8d4165318f5f32ee31a1813b0cc676
-  data.tar.gz: 62766ecd6bed37bb47e9ee54460b414611047a09aeb37febed18d57b36e9f314
+  metadata.gz: b355a9a76f43cc73b5e5158981f9b53a399edc2f0f0dab494592d44d6cd2caaf
+  data.tar.gz: 65e10feeea019e07542fe4bbc24438fc10b7566c417fb600ac21554252f5db2a
 SHA512:
-  metadata.gz: 9347d91bba22bb96968fc5a0d0fe3b5750e753c851dd42e8b3b2193d657bb0f79eff288c9021324be2f6374494f3f535bbc094e05891bc680c54880ec2384e14
-  data.tar.gz: 66ab05b2a753134d764967786b880390c515580b2e9596937d2b077feec3cf2181a0f891d2529ab0315bd699d5d50c7be0c0fa51cecc1c8219465d24960dc9d2
+  metadata.gz: a17a089f1af1babfaefbd066b5fe7e10d0b9e991db5b35e3e305d7504f052055d7fa8f61c665df976607cade6eaccccb6fc8c216dcd592bfdc98246a34801655
+  data.tar.gz: 126215700ed8299ffa8150cb174e1b51d146190c043c3102bd71fa818093668c7c5b2ba3b78144c1944dbc08f18470d00c26091f1e5feec11984547e3cbe68d4

data/.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-haml
   - rubocop-rake
   - rubocop-rspec
@@ -11,7 +11,7 @@ AllCops:
   Exclude:
     - spec/**/*.haml
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Gemspec/RequireMFA:
   Enabled: false

data/Gemfile.lock

@@ -1,63 +1,66 @@
 PATH
   remote: .
   specs:
-    rubocop-haml (0.2.4)
+    rubocop-haml (0.3.1)
       hamli (~> 0.5)
-      rubocop (~> 1.45)
+      lint_roller (>= 1.1)
+      rubocop (>= 1.72.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.0)
     hamli (0.5.1)
       temple
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    json (2.10.1)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.2)
-      strscan
+    regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rspec-support (3.13.2)
+    rubocop (1.72.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (3.0.3)
-      rubocop (~> 1.61)
+    rubocop-rake (0.7.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
-    strscan (3.1.0)
     temple (0.10.3)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -22,10 +22,13 @@ Require `rubocop-haml` in your RuboCop config.
 
 ```yaml
 # .rubocop.yml
-require:
+plugins:
   - rubocop-haml
 ```
 
+> [!NOTE]
+> The plugin system is supported in RuboCop 1.72+. In earlier versions, use `require` instead of `plugins`.
+
 Now you can use RuboCop also for Haml templates.
 
 ```

data/lib/rubocop/haml/plugin.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'lint_roller'
+
+module RuboCop
+  module Haml
+    # A plugin that integrates rubocop-haml with RuboCop's plugin system.
+    class Plugin < LintRoller::Plugin
+      def about
+        LintRoller::About.new(
+          name: 'rubocop-haml',
+          version: VERSION,
+          homepage: 'https://github.com/r7kamura/rubocop-haml',
+          description: 'RuboCop plugin for Haml template.'
+        )
+      end
+
+      def supported?(context)
+        context.engine == :rubocop
+      end
+
+      def rules(_context)
+        RuboCop::Runner.ruby_extractors.unshift(RuboCop::Haml::RubyExtractor)
+
+        LintRoller::Rules.new(
+          type: :path,
+          config_format: :rubocop,
+          value: Pathname.new(__dir__).join('../../../config/default.yml')
+        )
+      end
+    end
+  end
+end

data/lib/rubocop/haml/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Haml
-    VERSION = '0.2.4'
+    VERSION = '0.3.1'
   end
 end

data/lib/rubocop/haml.rb

@@ -2,12 +2,11 @@
 
 module RuboCop
   module Haml
-    autoload :ConfigLoader, 'rubocop/haml/config_loader'
     autoload :RubyClip, 'rubocop/haml/ruby_clip'
     autoload :RubyClipper, 'rubocop/haml/ruby_clipper'
     autoload :RubyExtractor, 'rubocop/haml/ruby_extractor'
   end
 end
 
-require_relative 'haml/rubocop_extension'
+require_relative 'haml/plugin'
 require_relative 'haml/version'

data/rubocop-haml.gemspec

@@ -11,11 +11,12 @@ Gem::Specification.new do |spec|
   spec.summary = 'RuboCop plugin for Haml template.'
   spec.homepage = 'https://github.com/r7kamura/rubocop-haml'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = "#{spec.homepage}/releases"
+  spec.metadata['default_lint_roller_plugin'] = 'RuboCop::Haml::Plugin'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -29,5 +30,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'hamli', '~> 0.5'
-  spec.add_dependency 'rubocop', '~> 1.45'
+  spec.add_dependency 'lint_roller', '>= 1.1'
+  spec.add_dependency 'rubocop', '>= 1.72.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-haml
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hamli
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: lint_roller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.45'
+        version: 1.72.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.45'
+        version: 1.72.1
 description: 
 email:
 - r7kamura@gmail.com
@@ -56,8 +70,7 @@ files:
 - config/default.yml
 - lib/rubocop-haml.rb
 - lib/rubocop/haml.rb
-- lib/rubocop/haml/config_loader.rb
-- lib/rubocop/haml/rubocop_extension.rb
+- lib/rubocop/haml/plugin.rb
 - lib/rubocop/haml/ruby_clip.rb
 - lib/rubocop/haml/ruby_clipper.rb
 - lib/rubocop/haml/ruby_extractor.rb
@@ -70,6 +83,7 @@ metadata:
   homepage_uri: https://github.com/r7kamura/rubocop-haml
   source_code_uri: https://github.com/r7kamura/rubocop-haml
   changelog_uri: https://github.com/r7kamura/rubocop-haml/releases
+  default_lint_roller_plugin: RuboCop::Haml::Plugin
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -78,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/rubocop/haml/config_loader.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop'
-
-module RuboCop
-  module Haml
-    # Merge default RuboCop config with plugin config.
-    class ConfigLoader
-      PLUGIN_CONFIG_PATH = ::File.expand_path(
-        '../../../config/default.yml',
-        __dir__
-      )
-
-      class << self
-        # @return [RuboCop::Config]
-        def call
-          new.call
-        end
-      end
-
-      # @return [RuboCop::Config]
-      def call
-        RuboCop::ConfigLoader.merge_with_default(
-          plugin_config,
-          PLUGIN_CONFIG_PATH
-        )
-      end
-
-      private
-
-      # @return [RuboCop::Config]
-      def plugin_config
-        config = ::RuboCop::Config.new(
-          plugin_config_hash,
-          PLUGIN_CONFIG_PATH
-        )
-        config.make_excludes_absolute
-        config
-      end
-
-      # @return [Hash]
-      def plugin_config_hash
-        ::RuboCop::ConfigLoader.send(
-          :load_yaml_configuration,
-          PLUGIN_CONFIG_PATH
-        )
-      end
-    end
-  end
-end

data/lib/rubocop/haml/rubocop_extension.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop'
-
-RuboCop::Runner.ruby_extractors.unshift(RuboCop::Haml::RubyExtractor)
-
-RuboCop::ConfigLoader.instance_variable_set(
-  :@default_configuration,
-  RuboCop::Haml::ConfigLoader.call
-)