haml_lint 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd94eae8ee22841c46e2d3af6beb0a8b3083c305
-  data.tar.gz: 209d59375ccc51443638795414ca08cbb15a9ce1
+  metadata.gz: 63d9c83c6270872c9610d48ba7991a6abfab6136
+  data.tar.gz: 4872ffed9f0136ef62050079f44afc0071991ae2
 SHA512:
-  metadata.gz: 37f51cc96857c95b8e32eab1cdc8bd992f8264c371869e56ce8b3eb304e80f0a8c90a313b9ad4ca2f1c8879a4a7e713d23a7c8cba38e0752c4b4ee6c75112f5f
-  data.tar.gz: affb71eddfa8eaf47096af284fa57c4d115072904e0c4b78934df1e0dc3eb4675a864b02b0d8343e0d80be6982456266c51c1a0dd12700dbd0619c629fc0bce8
+  metadata.gz: 22cd935ac273c2fbba890698ef0f472107fdbf65c33e6ba1cf7369ff58a31d73cf3380b14e5307669d3ac8bd7ee72a8d922afe64a15e30a0666a0d79e688282b
+  data.tar.gz: 119c20bece39c162f7e1c17c17dfcee007892003cb6b0eb0cf38b2637008a571015d3f5973e12f463c44524d1d79b33b39717b6ee5d310ad83b18ebc67e6063f

data/config/default.yml

@@ -92,16 +92,15 @@ linters:
       - Lint/EndAlignment
       - Lint/Void
       - Layout/AlignParameters
+      - Layout/ElseAlignment
+      - Layout/EndOfLine
       - Layout/IndentationWidth
       - Layout/TrailingBlankLines
       - Layout/TrailingWhitespace
       - Metrics/BlockLength
+      - Metrics/BlockNesting
       - Metrics/LineLength
-      - Style/BlockNesting
-      - Style/ElseAlignment
-      - Style/EndOfLine
-      - Style/FileName
-      - Style/FinalNewline
+      - Naming/FileName
       - Style/FrozenStringLiteralComment
       - Style/IfUnlessModifier
       - Style/Next

data/lib/haml_lint/cli.rb

@@ -21,7 +21,7 @@ module HamlLint
     def run(args)
       options = HamlLint::Options.new.parse(args)
       act_on_options(options)
-    rescue => ex
+    rescue StandardError => ex
       handle_exception(ex)
     end
 

data/lib/haml_lint/configuration.rb

@@ -97,7 +97,7 @@ 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
-      @hash['linters'].keys.each do |linter_name|
+      @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])

data/lib/haml_lint/linter/rubocop.rb

@@ -6,6 +6,16 @@ module HamlLint
   class Linter::RuboCop < Linter
     include LinterRegistry
 
+    # Maps the ::RuboCop::Cop::Severity levels to our own levels.
+    SEVERITY_MAP = {
+      error: :error,
+      fatal: :error,
+
+      convention: :warning,
+      refactor: :warning,
+      warning: :warning,
+    }.freeze
+
     def visit_root(_node)
       extractor = HamlLint::RubyExtractor.new
       extracted_source = extractor.extract(document)
@@ -58,10 +68,21 @@ module HamlLint
 
       offenses.reject { |offense| Array(config['ignored_cops']).include?(offense.cop_name) }
               .each do |offense|
-        record_lint(dummy_node.new(source_map[offense.line]), offense.message)
+        record_lint(dummy_node.new(source_map[offense.line]), offense.message,
+                    offense.severity.name)
       end
     end
 
+    # Record a lint for reporting back to the user.
+    #
+    # @param node [#line] node to extract the line number from
+    # @param message [String] error/warning to display to the user
+    # @param severity [Symbol] RuboCop severity level for the offense
+    def record_lint(node, message, severity)
+      @lints << HamlLint::Lint.new(self, @document.file, node.line, message,
+                                   SEVERITY_MAP.fetch(severity, :warning))
+    end
+
     # Returns flags that will be passed to RuboCop CLI.
     #
     # @return [Array<String>]

data/lib/haml_lint/report.rb

@@ -16,7 +16,7 @@ module HamlLint
     # @param files [Array<String>] files that were linted
     # @param fail_level [Symbol] the severity level to fail on
     # @param reporter [HamlLint::Reporter] the reporter for the report
-    def initialize(lints = [], files = [], fail_level = :warning, reporter: nil)
+    def initialize(lints: [], files: [], fail_level: :warning, reporter: nil)
       @lints = lints.sort_by { |l| [l.filename, l.line] }
       @files = files
       @fail_level = Severity.new(fail_level)
@@ -29,7 +29,7 @@ module HamlLint
     # @return [void]
     def add_lint(lint)
       lints << lint
-      @reporter.added_lint(lint)
+      @reporter.added_lint(lint, self)
     end
 
     # Displays the report via the configured reporter.

data/lib/haml_lint/reporter/default_reporter.rb

@@ -6,8 +6,8 @@ module HamlLint
   class Reporter::DefaultReporter < Reporter
     include Reporter::Utils
 
-    def added_lint(lint)
-      print_lint(lint)
+    def added_lint(lint, report)
+      print_lint(lint) if lint.severity >= report.fail_level
     end
 
     def display_report(report)

data/lib/haml_lint/reporter/hooks.rb

@@ -5,8 +5,9 @@ module HamlLint
       # A hook that is called for each lint as it is detected.
       #
       # @param _lint [HamlLint::Lint] the lint added to the report
+      # @param _report [HamlLint::Report] the report that contains the lint
       # @return [void]
-      def added_lint(_lint); end
+      def added_lint(_lint, _report); end
 
       # A hook that is called for each file as it is finished processing.
       #

data/lib/haml_lint/ruby_extractor.rb

@@ -173,7 +173,7 @@ module HamlLint
 
       indent = (' ' * 2 * indent_level)
 
-      @source_lines << indent + code
+      @source_lines << indent_code(code, indent)
 
       original_line =
         node_or_line.respond_to?(:line) ? node_or_line.line : node_or_line
@@ -187,6 +187,11 @@ module HamlLint
       end
     end
 
+    def indent_code(code, indent)
+      codes = code.split("\n")
+      codes.map { |c| indent + c }.join("\n")
+    end
+
     def anonymous_block?(text)
       text =~ /\bdo\s*(\|\s*[^\|]*\s*\|)?(\s*#.*)?\z/
     end

data/lib/haml_lint/runner.rb

@@ -127,7 +127,7 @@ module HamlLint
     # @option options :reporter [HamlLint::Reporter] the reporter to report with
     # @return [HamlLint::Report]
     def report(options)
-      report = HamlLint::Report.new(reporter: options[:reporter])
+      report = HamlLint::Report.new(reporter: options[:reporter], fail_level: options[:fail_level])
       report.start(@files)
       process_files(report)
       report

data/lib/haml_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.26.0'.freeze
+  VERSION = '0.27.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.50.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -205,9 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: HAML lint tool
 test_files: []
-has_rdoc: