haml_lint 0.58.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6962d4b0d9f7f60b473641303f1ef1b8962797bf7abdeb8db4e57b36df65f7d3
-  data.tar.gz: 214c0ccb902d9c742af8df5f4e65fc221f6ae9bec572b7a535df0ee682b5dfac
+  metadata.gz: 8bf4b2b435129bea13f5c1b32aabf202f5e8731264df179e3e7a9c16017b8654
+  data.tar.gz: 34a95aa1ac68c54a513d9431be449f5a53963d77e7d451cfa532c60ff08fe08f
 SHA512:
-  metadata.gz: b161dc044d6a5a22be918384f7cde7b0fd9b20dc2f4408f4a535ae72ed0b7fab75b96f885db83e92ae4cce769b811118978412bbba819e6f38178fb261f040f1
-  data.tar.gz: fb2af5b891147f8588cf9ffcd17fccc7ef0674bf11127327addbca55c9a8c094c6e53f8f268550dc160955d4c1c889948d7285fc39027287781d3abba7f66873
+  metadata.gz: a65d869de4f21555cc165baccae390ae09202de3d6aea707404806d0ee40bdd1d5916d7ab3ae9a7b4a0d35c1a4a5a8c89da3cb317389877460e03f48b5577c54
+  data.tar.gz: 84ccd1349eb889e3b516f42e4919eb0003566f01ba62a01b05cce28aeb801138c6f725eac054c23073997f0e67e452765ac78c03bfe710639c9742828b85521d

data/config/forced_rubocop_config.yml

@@ -45,6 +45,18 @@ Layout/EndAlignment:
 Layout/EndOfLine:
   Enabled: false
 
+# Complying with this lint requires the use of pipes which causes a conflict with MultilinePipe.
+Layout/FirstArrayElementLineBreak:
+  Enabled: false
+
+# Complying with this lint requires the use of pipes which causes a conflict with MultilinePipe.
+Layout/FirstHashElementLineBreak:
+  Enabled: false
+
+# Complying with this lint requires the use of pipes which causes a conflict with MultilinePipe.
+Layout/FirstMethodArgumentLineBreak:
+  Enabled: false
+
 # Turning this cop on can turn
 # = content_tag(:span) do
 #   - foo

data/lib/haml_lint/adapter.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'haml_lint/adapter/haml_5'
-require 'haml_lint/adapter/haml_6'
-require 'haml_lint/exceptions'
+require_relative 'adapter/haml_5'
+require_relative 'adapter/haml_6'
+require_relative 'exceptions'
 
 module HamlLint
   # Determines the adapter to use for the current Haml version

data/lib/haml_lint/cli.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'haml_lint'
-require 'haml_lint/options'
+require_relative '../haml_lint'
+require_relative 'options'
 
 require 'sysexits'
 

data/lib/haml_lint/document.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/adapter'
+require_relative 'adapter'
 
 module HamlLint
   # Represents a parsed Haml document and its associated metadata.

data/lib/haml_lint/extensions/haml_util_unescape_interpolation_tracking.rb

@@ -14,7 +14,7 @@ module Haml::Util
     Thread.current[:haml_lint_unescape_interpolation_to_original_cache] ||= {}
   end
 
-  # As soon as a HamlLint::Document has finished processing a HAML souce, this gets called to
+  # As soon as a HamlLint::Document has finished processing a HAML source, this gets called to
   # get a copy of this cache and clear up for the next HAML processing
   def self.unescape_interpolation_to_original_cache_take_and_wipe
     value = unescape_interpolation_to_original_cache.dup

data/lib/haml_lint/linter/instance_variables.rb

@@ -21,7 +21,7 @@ module HamlLint
       return unless enabled?
 
       if node.parsed_script.contains_instance_variables?
-        record_lint(node, "Avoid using instance variables in #{file_types} views")
+        record_lint(node, failure_message)
       end
     end
 
@@ -41,10 +41,27 @@ module HamlLint
 
       visit_script(node) ||
         if node.parsed_attributes.contains_instance_variables?
-          record_lint(node, "Avoid using instance variables in #{file_types} views")
+          record_lint(node, failure_message)
         end
     end
 
+    # Checks for instance variables in :ruby filters when the linter is enabled.
+    #
+    # @param [HamlLint::Tree::FilterNode]
+    # @return [void]
+    def visit_filter(node)
+      return unless enabled?
+      return unless node.filter_type == 'ruby'
+      return unless ast = parse_ruby(node.text)
+
+      ast.each_node do |i|
+        if i.type == :ivar
+          record_lint(node, failure_message)
+          break
+        end
+      end
+    end
+
     private
 
     # Tracks whether the linter is enabled for the file.
@@ -75,5 +92,13 @@ module HamlLint
     def matcher
       @matcher ||= Regexp.new(config['matchers'][file_types] || '\A_.*\.haml\z')
     end
+
+    # The error message when an ivar is found
+    #
+    # @api private
+    # @return [String]
+    def failure_message
+      "Avoid using instance variables in #{file_types} views"
+    end
   end
 end

data/lib/haml_lint/linter/rubocop.rb

@@ -117,7 +117,7 @@ module HamlLint
         # so the lints will be recorded then.
         @lints = []
 
-        msg = "Corrections couldn't be transfered: #{e.message} - Consider linting the file " \
+        msg = "Corrections couldn't be transferred: #{e.message} - Consider linting the file " \
               'without auto-correct and doing the changes manually.'
         if ENV['HAML_LINT_DEBUG'] == 'true'
           msg = "#{msg} DEBUG: Rubocop corrected Ruby code follows:\n#{new_ruby_code}\n------"

data/lib/haml_lint/options.rb

@@ -10,7 +10,7 @@ module HamlLint
     # @param args [Array<String>] arguments passed via the command line
     # @return [Hash] parsed options
     def parse(args)
-      @options = {}
+      @options = default_options
 
       OptionParser.new do |parser|
         parser.banner = "Usage: #{APP_NAME} [options] [file1, file2, ...]"
@@ -32,6 +32,10 @@ module HamlLint
 
     private
 
+    def default_options
+      { parallel: true }
+    end
+
     def add_linter_options(parser) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       parser.on('--auto-gen-config', 'Generate a configuration file acting as a TODO list') do
         @options[:auto_gen_config] = true
@@ -56,6 +60,10 @@ module HamlLint
         @options[:parallel] = true
       end
 
+      parser.on('--no-parallel', 'Disable parallel linter runs') do
+        @options[:parallel] = false
+      end
+
       parser.on('-a', '--auto-correct', 'Auto-correct offenses (only when it’s safe)') do
         @options[:autocorrect] = :safe
       end

data/lib/haml_lint/rake_task.rb

@@ -2,7 +2,8 @@
 
 require 'rake'
 require 'rake/tasklib'
-require 'haml_lint/constants'
+
+require_relative 'constants'
 
 module HamlLint
   # Rake task interface for haml-lint command line interface.
@@ -93,7 +94,7 @@ module HamlLint
 
       task(name, [:files]) do |_task, task_args|
         # Lazy-load so task doesn't affect Rakefile load time
-        require 'haml_lint/cli'
+        require_relative 'cli'
 
         run_cli(task_args)
       end

data/lib/haml_lint/reporter/default_reporter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/reporter/utils'
+require_relative 'utils'
 
 module HamlLint
   # Outputs lints in a simple format with the filename, line number, and lint

data/lib/haml_lint/reporter/disabled_config_reporter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/reporter/progress_reporter'
+require_relative 'progress_reporter'
 
 module HamlLint
   # Outputs a YAML configuration file based on existing violations.

data/lib/haml_lint/reporter/json_reporter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/reporter/hash_reporter'
+require_relative 'hash_reporter'
 
 module HamlLint
   # Outputs report as a JSON document.

data/lib/haml_lint/reporter/progress_reporter.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require 'rainbow'
-require 'haml_lint/reporter/utils'
+
+require_relative 'utils'
 
 module HamlLint
   # Outputs files as they are output as a simple symbol, then outputs

data/lib/haml_lint/reporter/utils.rb

@@ -96,7 +96,7 @@ module HamlLint
       # Prints a summary of the number of lints found in a report.
       #
       # @param report [HamlLint::Report] the report to print
-      # @param is_append [Boolean] if this is appending to a line. Will preffix with ", ".
+      # @param is_append [Boolean] if this is appending to a line. Will prefix with ", ".
       # @return [void]
       def print_summary_lints(report, is_append:)
         log.log ', ', false if is_append
@@ -114,7 +114,7 @@ module HamlLint
       # Prints a summary of the number of lints corrected in a report.
       #
       # @param report [HamlLint::Report] the report to print
-      # @param is_append [Boolean] if this is appending to a line. Will preffix with ", ".
+      # @param is_append [Boolean] if this is appending to a line. Will prefix with ", ".
       # @return [void]
       def print_summary_corrected_lints(report, is_append:)
         lint_count = report.lints.count(&:corrected)

data/lib/haml_lint/reporter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/reporter/hooks'
+require_relative 'reporter/hooks'
 
 module HamlLint
   # Abstract lint reporter. Subclass and override {#display_report} to

data/lib/haml_lint/ruby_extraction/base_chunk.rb

@@ -63,7 +63,7 @@ module HamlLint::RubyExtraction
       transfer_correction_logic(coordinator, to_ruby_lines, haml_lines)
     end
 
-    # To be overriden by subclasses.
+    # To be overridden by subclasses.
     #
     # Logic to transfer the corrections that turned from_ruby_lines into to_ruby_lines.
     #

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -678,7 +678,7 @@ module HamlLint::RubyExtraction
 
     def self.anonymous_block?(code)
       # Don't start with a comment and end with a `do`
-      # Definetly not perfect for the comment handling, but otherwise a more advanced parsing system is needed.
+      # Definitely not perfect for the comment handling, but otherwise a more advanced parsing system is needed.
       # Move the comment to its own line if it's annoying.
       code !~ /\A\s*#/ &&
         code =~ /\bdo\s*(\|[^|]*\|\s*)?(#.*)?\z/

data/lib/haml_lint/runner.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'parallel'
+
 require_relative 'source'
 
 module HamlLint

data/lib/haml_lint/spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/spec/normalize_indent'
-require 'haml_lint/spec/shared_linter_context'
-require 'haml_lint/spec/shared_rubocop_autocorrect_context'
-require 'haml_lint/spec/matchers/report_lint'
+require_relative 'spec/normalize_indent'
+require_relative 'spec/shared_linter_context'
+require_relative 'spec/shared_rubocop_autocorrect_context'
+require_relative 'spec/matchers/report_lint'

data/lib/haml_lint/tree/haml_comment_node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/directive'
+require_relative '../directive'
 
 module HamlLint::Tree
   # Represents a HAML comment node.

data/lib/haml_lint/tree/node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/comment_configuration'
+require_relative '../comment_configuration'
 
 module HamlLint::Tree
   # Decorator class that provides a convenient set of helpers for HAML's

data/lib/haml_lint/tree/root_node.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'haml_lint/tree/null_node'
+require_relative 'null_node'
 
 module HamlLint::Tree
   # Represents the root node of a HAML document that contains all other nodes.
   class RootNode < Node
-    # The name fo the file parsed to build this tree.
+    # The name of the file parsed to build this tree.
     #
     # @return [String] a file name
     def file

data/lib/haml_lint/tree/script_node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'haml_lint/parsed_ruby'
+require_relative '../parsed_ruby'
 
 module HamlLint::Tree
   # Represents a node which produces output based on Ruby code.

data/lib/haml_lint/utils.rb

@@ -116,7 +116,7 @@ module HamlLint
 
     # Returns indexes of all occurrences of a substring within a string.
     #
-    # Note, this will not return overlaping substrings, so searching for "aa"
+    # Note, this will not return overlapping substrings, so searching for "aa"
     # in "aaa" will only find one substring, not two.
     #
     # @param text [String] the text to search

data/lib/haml_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.58.0'
+  VERSION = '0.60.0'
 end

data/lib/haml_lint.rb

@@ -3,26 +3,26 @@
 # Need to load haml before we can reference some Haml modules in our code
 require 'haml'
 
-require 'haml_lint/constants'
-require 'haml_lint/exceptions'
-require 'haml_lint/configuration'
-require 'haml_lint/configuration_loader'
-require 'haml_lint/document'
-require 'haml_lint/haml_visitor'
-require 'haml_lint/lint'
-require 'haml_lint/linter_registry'
-require 'haml_lint/ruby_parser'
-require 'haml_lint/linter'
-require 'haml_lint/logger'
-require 'haml_lint/reporter'
-require 'haml_lint/report'
-require 'haml_lint/linter_selector'
-require 'haml_lint/file_finder'
-require 'haml_lint/runner'
-require 'haml_lint/utils'
-require 'haml_lint/version'
-require 'haml_lint/version_comparer'
-require 'haml_lint/severity'
+require_relative 'haml_lint/constants'
+require_relative 'haml_lint/exceptions'
+require_relative 'haml_lint/configuration'
+require_relative 'haml_lint/configuration_loader'
+require_relative 'haml_lint/document'
+require_relative 'haml_lint/haml_visitor'
+require_relative 'haml_lint/lint'
+require_relative 'haml_lint/linter_registry'
+require_relative 'haml_lint/ruby_parser'
+require_relative 'haml_lint/linter'
+require_relative 'haml_lint/logger'
+require_relative 'haml_lint/reporter'
+require_relative 'haml_lint/report'
+require_relative 'haml_lint/linter_selector'
+require_relative 'haml_lint/file_finder'
+require_relative 'haml_lint/runner'
+require_relative 'haml_lint/utils'
+require_relative 'haml_lint/version'
+require_relative 'haml_lint/version_comparer'
+require_relative 'haml_lint/severity'
 
 # Lead all extensions to external source code
 Dir[File.expand_path('haml_lint/extensions/*.rb', File.dirname(__FILE__))].sort.each do |file|
@@ -30,8 +30,8 @@ Dir[File.expand_path('haml_lint/extensions/*.rb', File.dirname(__FILE__))].sort.
 end
 
 # Load all parse tree node classes
-require 'haml_lint/tree/node'
-require 'haml_lint/node_transformer'
+require_relative 'haml_lint/tree/node'
+require_relative 'haml_lint/node_transformer'
 Dir[File.expand_path('haml_lint/tree/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end
@@ -47,7 +47,7 @@ Dir[File.expand_path('haml_lint/reporter/*.rb', File.dirname(__FILE__))].sort.ea
 end
 
 # Load all the chunks for RubyExtraction
-require 'haml_lint/ruby_extraction/base_chunk'
+require_relative 'haml_lint/ruby_extraction/base_chunk'
 Dir[File.expand_path('haml_lint/ruby_extraction/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Shane da Silva
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-27 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -201,7 +200,6 @@ homepage: https://github.com/sds/haml-lint
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: HAML lint tool
 test_files: []