haml_lint 0.37.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68b2308ea5b74941d9db3d5dfe22fa181bac800f89049c61db6ed533f381ca8
-  data.tar.gz: 78fc8f6241ad3cccace23abd95818ba461097ef4a11e51d5ec091de82de9e2ac
+  metadata.gz: 8ef9ca7cc6bbd3b5f9663a2bda75669062b25efeb53af9e32cf152fd7f5aee6c
+  data.tar.gz: 35e34d39d55e13910ec90f9ee7ece9a4baa2d6bc44f2f6962b230f6387519174
 SHA512:
-  metadata.gz: 145a57a93ecf9960435ccd40fb02819e560bf4557be450494b5d3d1c920e65089925959b2377156172ed5cb10cbfbfd79a690b6b7c0ea99eb282ce2a3c7f5cd0
-  data.tar.gz: 81e45f26624c737b2cf750027aaca241d3c4c08ab0c05ad0233d802e75f4de803d5401ccf90c527416aec7987d00b1fe5a8ce8856c7bedba70a86243c5d3b26b
+  metadata.gz: 376df9f9c0de3c0949bd2187bb1ba9f3bc5e381644a93c827ca085125ac2922f59f98d048d8bf548b379ebe5def5180f9b182628030f4e66454f3edf71478f9f
+  data.tar.gz: fa1a9ad202224e1059dd7802b1aea08db8b9d11570feca891a31650dc3b10f0b991b2585ad27faa4425bc2165a2b23e799075c944250a43568e1d17c7f83f8b1

data/config/default.yml

@@ -93,6 +93,7 @@ linters:
       - Lint/Void
       - Layout/AlignHash # renamed to Layout/HashAlignment in rubocop 0.77
       - Layout/AlignParameters # renamed to Layout/ParameterAlignment in rubocop 0.77
+      - Layout/ArgumentAlignment
       - Layout/CaseIndentation
       - Layout/ElseAlignment
       - Layout/EndOfLine

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 Layout/LineLength
+        HamlLint::Reporter::DisabledConfigReporter.new(log, limit: options[:auto_gen_exclude_limit] || 15)
       else
         options.fetch(:reporter, HamlLint::Reporter::DefaultReporter).new(log)
       end

data/lib/haml_lint/configuration.rb

@@ -97,7 +97,7 @@ module HamlLint
     def validate
       ensure_exclude_option_array_exists
       ensure_linter_section_exists
-      ensure_linter_include_exclude_arrays_exist
+      ensure_linter_include_exclude_arrays_valid
       ensure_linter_severity_valid
     end
 
@@ -113,11 +113,11 @@ module HamlLint
 
     # Ensure `include` and `exclude` options for linters are arrays
     # (since users can specify a single string glob pattern for convenience)
-    def ensure_linter_include_exclude_arrays_exist
+    def ensure_linter_include_exclude_arrays_valid
       @hash['linters'].each_key do |linter_name|
         %w[include exclude].each do |option|
           linter_config = @hash['linters'][linter_name]
-          linter_config[option] = Array(linter_config[option])
+          linter_config[option] = Array(linter_config[option]) if linter_config[option]
         end
       end
     end

data/lib/haml_lint/linter/rubocop.rb

@@ -27,8 +27,6 @@ module HamlLint
       find_lints(extracted_source.source, extracted_source.source_map)
     end
 
-    private
-
     # A single CLI instance is shared between files to avoid RuboCop
     # having to repeatedly reload .rubocop.yml.
     def self.rubocop_cli
@@ -37,6 +35,8 @@ module HamlLint
       @rubocop_cli ||= ::RuboCop::CLI.new
     end
 
+    private
+
     # Executes RuboCop against the given Ruby code and records the offenses as
     # lints.
     #

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/PerceivedComplexity
+    def visit_tag(node) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       # If this tag has inline script
       return unless node.contains_script?
 

data/lib/haml_lint/linter/space_inside_hash_attributes.rb

@@ -9,15 +9,15 @@ module HamlLint
     STYLE = {
       'no_space' => {
         start_regex: /\A\{[^ ]/,
-        end_regex: /[^ ]\}\z/,
+        end_regex: /(?:^\s*\}|[^ ]\})\z/,
         start_message: 'Hash attribute should start with no space after the opening brace',
-        end_message: 'Hash attribute should end with no space before the closing brace'
+        end_message: 'Hash attribute should end with no space before the closing brace or be on its own line'
       },
       'space' => {
-        start_regex: /\A\{ [^ ]/,
-        end_regex: /[^ ] \}\z/,
+        start_regex: /\A\{(?: [^ ]|$)/,
+        end_regex: /(?:^\s*\}|[^ ] \})\z/,
         start_message: 'Hash attribute should start with one space after the opening brace',
-        end_message: 'Hash attribute should end with one space before the closing brace'
+        end_message: 'Hash attribute should end with one space before the closing brace or be on its own line'
       }
     }.freeze
 

data/lib/haml_lint/linter_selector.rb

@@ -64,7 +64,7 @@ module HamlLint
     def run_linter_on_file?(config, linter, file)
       linter_config = config.for_linter(linter)
 
-      if linter_config['include'].any? &&
+      if linter_config['include'] &&
          !HamlLint::Utils.any_glob_matches?(linter_config['include'], file)
         return false
       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 Layout/LineLength
+                'Number of failures to allow in the TODO list before the entire rule is excluded') do |limit|
         @options[:auto_gen_exclude_limit] = limit
       end
 
@@ -62,7 +62,7 @@ module HamlLint
       parser.on('-r', '--reporter reporter', String,
                 'Specify which reporter you want to use to generate the output. One of:',
                 *reporters.map { |name| "  - #{name}" }) do |reporter|
-        @options[:reporter] = load_reporter_class(reporter.capitalize)
+        @options[:reporter] = load_reporter_class(reporter.split('-').map(&:capitalize).join)
       end
 
       parser.on('--fail-fast', 'Fail after the first file with lint at or above the fail level') do

data/lib/haml_lint/reporter/offense_count_reporter.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: false
+
+module HamlLint
+  # Outputs the a list of lints with a count of how many of each were found.
+  # Ordered by descending count
+  class Reporter::OffenseCountReporter < Reporter
+    def display_report(report)
+      lints = report.lints
+      total_count = lints.count
+      return if total_count.zero?
+
+      lints.group_by { |l| lint_type_group(l) }
+           .map { |linter, lints_for_this_linter| [linter, lints_for_this_linter.size] }.to_h
+           .sort_by { |_linter, lint_count| -lint_count }
+           .each do |linter, lint_count|
+        log.log "#{lint_count.to_s.ljust(total_count.to_s.length + 2)} #{linter}"
+      end
+
+      log.log '--'
+      log.log "#{total_count}  Total"
+    end
+
+    private
+
+    def lint_type_group(lint)
+      "#{lint.linter.name}#{offense_type(lint)}"
+    end
+
+    def offense_type(lint)
+      ": #{lint.message.to_s.split(':')[0]}" if lint.linter.name == 'RuboCop'
+    end
+  end
+end

data/lib/haml_lint/reporter.rb

@@ -32,7 +32,13 @@ module HamlLint
     #
     # @return [String]
     def self.cli_name
-      name.split('::').last.sub(/Reporter$/, '').downcase
+      name
+        .split('::')
+        .last
+        .sub(/Reporter$/, '')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1-\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1-\2')
+        .downcase
     end
 
     # Creates the reporter that will display the given report.

data/lib/haml_lint/utils.rb

@@ -52,7 +52,7 @@ module HamlLint
     #   the text.
     # @yieldparam interpolated_code [String] code that was interpolated
     # @yieldparam line [Integer] line number code appears on in text
-    def extract_interpolated_values(text) # rubocop:disable Metrics/AbcSize
+    def extract_interpolated_values(text)
       dumped_text = text.dump
       newline_positions = extract_substring_positions(dumped_text, '\\\n')
 

data/lib/haml_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -158,6 +158,7 @@ files:
 - lib/haml_lint/reporter/hash_reporter.rb
 - lib/haml_lint/reporter/hooks.rb
 - lib/haml_lint/reporter/json_reporter.rb
+- lib/haml_lint/reporter/offense_count_reporter.rb
 - lib/haml_lint/reporter/progress_reporter.rb
 - lib/haml_lint/reporter/utils.rb
 - lib/haml_lint/ruby_extractor.rb
@@ -200,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: HAML lint tool