haml_lint 0.34.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec144420e79ce50d60ef7cb159e51c33d6cd3d59a0dea8034a049c43f25ae189
-  data.tar.gz: 1cff96bc9d0f2a77f4beaca14a872c56074a3aad5bf91785b711e55ed58c0f92
+  metadata.gz: a68b2308ea5b74941d9db3d5dfe22fa181bac800f89049c61db6ed533f381ca8
+  data.tar.gz: 78fc8f6241ad3cccace23abd95818ba461097ef4a11e51d5ec091de82de9e2ac
 SHA512:
-  metadata.gz: 04ad57edca1e5b50a0206832bfd83bb8c482255b14a066389a98ac10163863adda72b66a0b97223a68fe8dea4104a7ad71420aa1b318823fa15bf3932273bfa6
-  data.tar.gz: b34d5ac36b8b4cbba5b76982731af8f2b4d55cbcc01105144f1a6a8cb3fe9d2dd218bdb624940c5c2e767f11552891885380bdedabcb719685053f622bffe865
+  metadata.gz: 145a57a93ecf9960435ccd40fb02819e560bf4557be450494b5d3d1c920e65089925959b2377156172ed5cb10cbfbfd79a690b6b7c0ea99eb282ce2a3c7f5cd0
+  data.tar.gz: 81e45f26624c737b2cf750027aaca241d3c4c08ab0c05ad0233d802e75f4de803d5401ccf90c527416aec7987d00b1fe5a8ce8856c7bedba70a86243c5d3b26b

data/config/default.yml

@@ -91,13 +91,17 @@ linters:
       - Lint/BlockAlignment
       - Lint/EndAlignment
       - Lint/Void
-      - Layout/AlignHash
-      - Layout/AlignParameters
+      - Layout/AlignHash # renamed to Layout/HashAlignment in rubocop 0.77
+      - Layout/AlignParameters # renamed to Layout/ParameterAlignment in rubocop 0.77
       - Layout/CaseIndentation
       - Layout/ElseAlignment
       - Layout/EndOfLine
+      - Layout/HashAlignment
       - Layout/IndentationWidth
-      - Layout/TrailingBlankLines
+      - Layout/LineLength # renamed from Metrics/LineLength in rubocop 0.79.0
+      - Layout/ParameterAlignment
+      - Layout/TrailingBlankLines # renamed to Layout/TrailingEmptyLines in rubocop 0.77
+      - Layout/TrailingEmptyLines
       - Layout/TrailingWhitespace
       - Metrics/BlockLength
       - Metrics/BlockNesting

data/lib/haml_lint.rb

@@ -26,16 +26,16 @@ require 'haml_lint/severity'
 # Load all parse tree node classes
 require 'haml_lint/tree/node'
 require 'haml_lint/node_transformer'
-Dir[File.expand_path('haml_lint/tree/*.rb', File.dirname(__FILE__))].each do |file|
+Dir[File.expand_path('haml_lint/tree/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end
 
 # Load all linters
-Dir[File.expand_path('haml_lint/linter/*.rb', File.dirname(__FILE__))].each do |file|
+Dir[File.expand_path('haml_lint/linter/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end
 
 # Load all reporters
-Dir[File.expand_path('haml_lint/reporter/*.rb', File.dirname(__FILE__))].each do |file|
+Dir[File.expand_path('haml_lint/reporter/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end

data/lib/haml_lint/adapter.rb

@@ -19,7 +19,7 @@ module HamlLint
       version = haml_version
       case version
       when '~> 4.0' then HamlLint::Adapter::Haml4
-      when '~> 5.0', '~> 5.1' then HamlLint::Adapter::Haml5
+      when '~> 5.0', '~> 5.1', '~> 5.2' then HamlLint::Adapter::Haml5
       else fail HamlLint::Exceptions::UnknownHamlVersion, "Cannot handle Haml version: #{version}"
       end
     end

data/lib/haml_lint/cli.rb

@@ -94,7 +94,7 @@ module HamlLint
     # @return [HamlLint::Reporter]
     def reporter_from_options(options)
       if options[:auto_gen_config]
-        HamlLint::Reporter::DisabledConfigReporter.new(log, limit: options[:auto_gen_exclude_limit] || 15) # rubocop:disable Metrics/LineLength
+        HamlLint::Reporter::DisabledConfigReporter.new(log, limit: options[:auto_gen_exclude_limit] || 15) # rubocop:disable Layout/LineLength
       else
         options.fetch(:reporter, HamlLint::Reporter::DefaultReporter).new(log)
       end

data/lib/haml_lint/file_finder.rb

@@ -40,7 +40,7 @@ module HamlLint
     #
     # @param patterns [Array<String>]
     # @return [Array<String>]
-    def extract_files_from(patterns) # rubocop:disable MethodLength
+    def extract_files_from(patterns) # rubocop:disable Metrics/MethodLength
       files = []
 
       patterns.each do |pattern|

data/lib/haml_lint/linter/repeated_id.rb

@@ -17,7 +17,7 @@ module HamlLint
 
       nodes = (id_map[id] << node)
       case nodes.size
-      when 1 then return
+      when 1 then nil
       when 2 then add_lints_for_first_duplications(nodes)
       else add_lint(node, id)
       end

data/lib/haml_lint/linter/rubocop.rb

@@ -29,6 +29,14 @@ module HamlLint
 
     private
 
+    # A single CLI instance is shared between files to avoid RuboCop
+    # having to repeatedly reload .rubocop.yml.
+    def self.rubocop_cli
+      # The ivar is stored on the class singleton rather than the Linter instance
+      # because it can't be Marshal.dump'd (as used by Parallel.map)
+      @rubocop_cli ||= ::RuboCop::CLI.new
+    end
+
     # Executes RuboCop against the given Ruby code and records the offenses as
     # lints.
     #
@@ -36,8 +44,6 @@ module HamlLint
     # @param source_map [Hash] map of Ruby code line numbers to original line
     #   numbers in the template
     def find_lints(ruby, source_map)
-      rubocop = ::RuboCop::CLI.new
-
       filename =
         if document.file
           "#{document.file}.rb"
@@ -46,7 +52,7 @@ module HamlLint
         end
 
       with_ruby_from_stdin(ruby) do
-        extract_lints_from_offenses(lint_file(rubocop, filename), source_map)
+        extract_lints_from_offenses(lint_file(self.class.rubocop_cli, filename), source_map)
       end
     end
 
@@ -56,7 +62,12 @@ module HamlLint
     # @param file [String]
     # @return [Array<RuboCop::Cop::Offense>]
     def lint_file(rubocop, file)
-      rubocop.run(rubocop_flags << file)
+      status = rubocop.run(rubocop_flags << file)
+      unless [::RuboCop::CLI::STATUS_SUCCESS, ::RuboCop::CLI::STATUS_OFFENSES].include?(status)
+        raise HamlLint::Exceptions::ConfigurationError,
+              "RuboCop exited unsuccessfully with status #{status}." \
+              ' Check the stack trace to see if there was a misconfiguration.'
+      end
       OffenseCollector.offenses
     end
 

data/lib/haml_lint/linter/space_before_script.rb

@@ -9,7 +9,7 @@ module HamlLint
 
     ALLOWED_SEPARATORS = [' ', '#'].freeze
 
-    def visit_tag(node) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/LineLength, Metrics/PerceivedComplexity
+    def visit_tag(node) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       # If this tag has inline script
       return unless node.contains_script?
 

data/lib/haml_lint/linter/unnecessary_string_output.rb

@@ -35,7 +35,7 @@ module HamlLint
       return unless tree = parse_ruby(script_node.script)
       %i[str dstr].include?(tree.type) &&
         !starts_with_reserved_character?(tree.children.first)
-    rescue ::Parser::SyntaxError # rubocop:disable Lint/HandleExceptions
+    rescue ::Parser::SyntaxError # rubocop:disable Lint/SuppressedException
       # Gracefully ignore syntax errors, as that's managed by a different linter
     end
 
@@ -43,7 +43,7 @@ module HamlLint
     # given special treatment, thus making enclosing it in a string necessary.
     def starts_with_reserved_character?(stringish)
       string = stringish.respond_to?(:children) ? stringish.children.first : stringish
-      string =~ %r{\A\s*[/#-=%~]}
+      string =~ %r{\A\s*[/#-=%~]} if string.is_a?(String)
     end
   end
 end

data/lib/haml_lint/options.rb

@@ -38,7 +38,7 @@ module HamlLint
       end
 
       parser.on('--auto-gen-exclude-limit limit', Integer,
-                'Number of failures to allow in the TODO list before the entire rule is excluded') do |limit| # rubocop:disable Metrics/LineLength
+                'Number of failures to allow in the TODO list before the entire rule is excluded') do |limit| # rubocop:disable Layout/LineLength
         @options[:auto_gen_exclude_limit] = limit
       end
 
@@ -51,6 +51,10 @@ module HamlLint
                 "Specify which linters you don't want to run") do |linters|
         @options[:excluded_linters] = linters
       end
+
+      parser.on('-p', '--parallel', 'Run linters in parallel using available CPUs') do
+        @options[:parallel] = true
+      end
     end
 
     def add_report_options(parser)

data/lib/haml_lint/runner.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'parallel'
+
 module HamlLint
   # Responsible for running the applicable linters against the desired files.
   class Runner
@@ -21,6 +23,7 @@ module HamlLint
       @files = extract_applicable_files(config, options)
       @linter_selector = HamlLint::LinterSelector.new(config, options)
       @fail_fast = options.fetch(:fail_fast, false)
+      @cache = {}
 
       report(options)
     end
@@ -121,7 +124,7 @@ module HamlLint
     # @param report [HamlLint::Report]
     # @return [void]
     def process_file(file, report)
-      lints = collect_lints(file, linter_selector, config)
+      lints = @cache[file] || collect_lints(file, linter_selector, config)
       lints.each { |lint| report.add_lint(lint) }
       report.finish_file(file, lints)
     end
@@ -134,8 +137,20 @@ module HamlLint
     def report(options)
       report = HamlLint::Report.new(reporter: options[:reporter], fail_level: options[:fail_level])
       report.start(@files)
+      warm_cache if options[:parallel]
       process_files(report)
       report
     end
+
+    # Cache the result of processing lints in parallel.
+    #
+    # @return [void]
+    def warm_cache
+      results = Parallel.map(files) do |file|
+        lints = collect_lints(file, linter_selector, config)
+        [file, lints]
+      end
+      @cache = results.to_h
+    end
   end
 end

data/lib/haml_lint/tree/root_node.rb

@@ -17,7 +17,9 @@ module HamlLint::Tree
     # @param line [Integer] the line number of the node
     # @return [HamlLint::Node]
     def node_for_line(line)
-      find(-> { HamlLint::Tree::NullNode.new }) { |node| node.line_numbers.cover?(line) }
+      find(-> { HamlLint::Tree::NullNode.new }) do |node|
+        node.line_numbers.cover?(line) && node != self
+      end
     end
   end
 end

data/lib/haml_lint/tree/tag_node.rb

@@ -2,7 +2,7 @@
 
 module HamlLint::Tree
   # Represents a tag node in a HAML document.
-  class TagNode < Node # rubocop:disable ClassLength
+  class TagNode < Node # rubocop:disable Metrics/ClassLength
     # Computed set of attribute hashes code.
     #
     # This is a combination of all dynamically calculated attributes from the

data/lib/haml_lint/utils.rb

@@ -66,7 +66,7 @@ module HamlLint
         dumped_interpolated_str = Haml::Util.balance(scan, '{', '}', 1)[0][0...-1]
 
         # Hacky way to turn a dumped string back into a regular string
-        yield [eval('"' + dumped_interpolated_str + '"'), line] # rubocop:disable Eval
+        yield [eval('"' + dumped_interpolated_str + '"'), line] # rubocop:disable Security/Eval
       end
     end
 

data/lib/haml_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,21 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: HAML lint tool