haml_lint 0.33.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fc0a7255015a742122d1f2f7a0e233556729ed6c4bc30b5578f52dd5e60c513
-  data.tar.gz: a9e77dcbb2da8123f1f860ed700ca097689fa94a2b460c73d2e1c000e9b03686
+  metadata.gz: 6d2be98b8d977ca5ccbcb29baf2f0fd8d1b527d44b3a9929a55c538df46d5a82
+  data.tar.gz: 7b5a39a010d171a7487b90c4cf1be92ed9d62f6dc2c223fe5e81bb2e75652be8
 SHA512:
-  metadata.gz: 41dbddb754b0b045065a913f0336d1a0713ac3b97102a8fe50cbb57b1651c3f6497fc85de11542e6ca6777e9e381765f81597a36adfd5bbb021f2f03a7775e7f
-  data.tar.gz: 4208a5f9e4a8116a0b6187fcb01870998b1d772cf9e9c66b8cbcd69f053a607d9e96d9819bac2c1973beb3d528f02ba7d054ee7f0a4d01dc874c6b2e1bc1d56f
+  metadata.gz: 16061fce86f6da8868f2f78b19b92e8184efb80e6f73fd2b0101359466c2123abea947e7cb3b1729b005ef6144ddac5604e7ac28a4646b04c3d213c6ceaf052f
+  data.tar.gz: a355b4893f8a7ada12d66ab61b25150a032b2cdfb5f69a9f3dfbf71f2b338bd946ed164e6b614a2dc6e647be5785d3268353f82a30f31b9efa5d4d4c90b6b356

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

@@ -56,7 +56,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.33.0'
+  VERSION = '0.36.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2020-10-01 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,41 +29,35 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -206,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.1
 signing_key: 
 specification_version: 4
 summary: HAML lint tool