haml_lint 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63d9c83c6270872c9610d48ba7991a6abfab6136
-  data.tar.gz: 4872ffed9f0136ef62050079f44afc0071991ae2
+SHA256:
+  metadata.gz: de1778be09762f2f6e9205045f63a6bfbc1966f1bc848e57c5bc22a52a8c0488
+  data.tar.gz: ecb4cc40e34424ba773dec9b252ef7618f60b9a14e63d7afba68164f41d49681
 SHA512:
-  metadata.gz: 22cd935ac273c2fbba890698ef0f472107fdbf65c33e6ba1cf7369ff58a31d73cf3380b14e5307669d3ac8bd7ee72a8d922afe64a15e30a0666a0d79e688282b
-  data.tar.gz: 119c20bece39c162f7e1c17c17dfcee007892003cb6b0eb0cf38b2637008a571015d3f5973e12f463c44524d1d79b33b39717b6ee5d310ad83b18ebc67e6063f
+  metadata.gz: 7cdf82866d301aa55ba5891d364030f6657dcd492118be4bc06933a3158c88bb45d088fcdc6a0e60e72a983271781f5c1ab515aef5e9eff2b2a82ea23ef16cc1
+  data.tar.gz: 68ae9a3bd3c9d7c2d3514577aae4513b755479b4c63c7fc08bfd5f45a8cbb1dd5495e4d2dd7f071988e3d8b84bb44959577786860b2f4c2eb5118f2e6257bd8b

data/lib/haml_lint/cli.rb

@@ -21,8 +21,8 @@ module HamlLint
     def run(args)
       options = HamlLint::Options.new.parse(args)
       act_on_options(options)
-    rescue StandardError => ex
-      handle_exception(ex)
+    rescue StandardError => exception
+      handle_exception(exception)
     end
 
     private
@@ -62,23 +62,23 @@ module HamlLint
 
     # Outputs a message and returns an appropriate error code for the specified
     # exception.
-    def handle_exception(ex)
-      case ex
+    def handle_exception(exception)
+      case exception
       when HamlLint::Exceptions::ConfigurationError
-        log.error ex.message
+        log.error exception.message
         Sysexits::EX_CONFIG
       when HamlLint::Exceptions::InvalidCLIOption
-        log.error ex.message
+        log.error exception.message
         log.log "Run `#{APP_NAME}` --help for usage documentation"
         Sysexits::EX_USAGE
       when HamlLint::Exceptions::InvalidFilePath
-        log.error ex.message
+        log.error exception.message
         Sysexits::EX_NOINPUT
       when HamlLint::Exceptions::NoLintersError
-        log.error ex.message
+        log.error exception.message
         Sysexits::EX_NOINPUT
       else
-        print_unexpected_exception(ex)
+        print_unexpected_exception(exception)
         Sysexits::EX_SOFTWARE
       end
     end
@@ -148,9 +148,9 @@ module HamlLint
 
     # Outputs the backtrace of an exception with instructions on how to report
     # the issue.
-    def print_unexpected_exception(ex) # rubocop:disable Metrics/AbcSize
-      log.bold_error ex.message
-      log.error ex.backtrace.join("\n")
+    def print_unexpected_exception(exception) # rubocop:disable Metrics/AbcSize
+      log.bold_error exception.message
+      log.error exception.backtrace.join("\n")
       log.warning 'Report this bug at ', false
       log.info HamlLint::BUG_REPORT_URL
       log.newline

data/lib/haml_lint/configuration.rb

@@ -12,8 +12,10 @@ module HamlLint
     # Creates a configuration from the given options hash.
     #
     # @param options [Hash]
-    def initialize(options)
+    def initialize(options, file = nil)
       @hash = options
+      @config_dir = file ? File.dirname(file) : nil
+      resolve_requires
       validate
     end
 
@@ -75,6 +77,19 @@ module HamlLint
       end
     end
 
+    # Requires any extra linters / files specified in the configuration.
+    # String starting with a . are treated as relative paths
+    def resolve_requires
+      relative_require_dir = @config_dir || Dir.pwd
+      Array(@hash['require']).each do |r|
+        if r.start_with?('.')
+          require File.join(relative_require_dir, r)
+        else
+          require r
+        end
+      end
+    end
+
     # Validates the configuration for any invalid options, normalizing it where
     # possible.
     def validate

data/lib/haml_lint/configuration_loader.rb

@@ -26,7 +26,7 @@ module HamlLint
 
       # Loads the built-in default configuration.
       def default_configuration
-        @default_config ||= load_from_file(DEFAULT_CONFIG_PATH)
+        @default_configuration ||= load_from_file(DEFAULT_CONFIG_PATH)
       end
 
       # Loads a configuration, ensuring it extends the default configuration.
@@ -76,7 +76,7 @@ module HamlLint
           hash['inherits_from'].concat(Array(hash.delete('inherit_from')))
         end
 
-        HamlLint::Configuration.new(hash)
+        HamlLint::Configuration.new(hash, file)
       end
 
       # Returns a list of possible configuration files given the context of the

data/lib/haml_lint/linter/class_attribute_with_static_value.rb

@@ -29,9 +29,13 @@ module HamlLint
 
     private
 
+    def surrounded_by_braces?(code)
+      code.start_with?('{') && code.end_with?('}')
+    end
+
     def contains_class_attribute?(attributes_sources)
       attributes_sources.each do |code|
-        ast_root = parse_ruby(code.start_with?('{') ? code : "{#{code}}")
+        ast_root = parse_ruby(surrounded_by_braces?(code) ? code : "{#{code}}")
         next unless ast_root # RuboCop linter will report syntax errors
 
         ast_root.children.each do |pair|
@@ -43,7 +47,9 @@ module HamlLint
     end
 
     def static_class_attribute_value?(pair)
-      key, value = pair.children
+      return false if (children = pair.children).empty?
+
+      key, value = children
 
       STATIC_TYPES.include?(key.type) &&
         key.children.first.to_sym == :class &&

data/lib/haml_lint/tree/tag_node.rb

@@ -1,7 +1,6 @@
 module HamlLint::Tree
   # Represents a tag node in a HAML document.
-  # rubocop:disable ClassLength
-  class TagNode < Node
+  class TagNode < Node # rubocop:disable ClassLength
     # Computed set of attribute hashes code.
     #
     # This is a combination of all dynamically calculated attributes from the
@@ -97,7 +96,7 @@ module HamlLint::Tree
     #
     # @return [Hash]
     def attributes_source
-      @attr_source ||=
+      @attributes_source ||=
         begin
           _explicit_tag, static_attrs, rest =
             source_code.scan(/\A\s*(%[-:\w]+)?([-:\w\.\#]*)(.*)/m)[0]
@@ -217,11 +216,9 @@ module HamlLint::Tree
     # Whether this node had a `>` after it signifying that outer whitespace
     # should be removed.
     #
-    # rubocop:disable Style/DoubleNegation
-    #
     # @return [true,false]
     def remove_outer_whitespace?
-      !!@value[:nuke_outer_whitespace]
+      !!@value[:nuke_outer_whitespace] # rubocop:disable Style/DoubleNegation
     end
 
     # Returns the script source that will be evaluated to produce this tag's

data/lib/haml_lint/utils.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module HamlLint
   # A miscellaneous set of utility functions.
   module Utils
@@ -13,10 +15,31 @@ module HamlLint
     # @param file [String]
     # @return [Boolean]
     def any_glob_matches?(globs_or_glob, file)
-      Array(globs_or_glob).any? do |glob|
-        ::File.fnmatch?(glob, file,
-                        ::File::FNM_PATHNAME | # Wildcards don't match path separators
-                        ::File::FNM_DOTMATCH)  # `*` wildcard matches dotfiles
+      get_abs_and_rel_path(file).any? do |path|
+        Array(globs_or_glob).any? do |glob|
+          ::File.fnmatch?(glob, path,
+                          ::File::FNM_PATHNAME | # Wildcards don't match path separators
+                          ::File::FNM_DOTMATCH)  # `*` wildcard matches dotfiles
+        end
+      end
+    end
+
+    # Returns an array of two items, the first being the absolute path, the second
+    # the relative path.
+    #
+    # The relative path is relative to the current working dir. The path passed can
+    # be either relative or absolute.
+    #
+    # @param path [String] Path to get absolute and relative path of
+    # @return [Array<String>] Absolute and relative path
+    def get_abs_and_rel_path(path)
+      original_path = Pathname.new(path)
+      root_dir_path = Pathname.new(File.expand_path(Dir.pwd))
+
+      if original_path.absolute?
+        [path, original_path.relative_path_from(root_dir_path)]
+      else
+        [root_dir_path + original_path, path]
       end
     end
 

data/lib/haml_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -96,7 +96,7 @@ dependencies:
 description: Configurable tool for writing clean and consistent HAML
 email:
 - eng@brigade.com
-- shane.dasilva@brigade.com
+- shane@dasilva.io
 executables:
 - haml-lint
 extensions: []
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: HAML lint tool