haml_lint 0.42.0 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d676ecd18fa32156a84c6f6d2c5a062a3a74fc8bacfc5ae6ec9e2b2c5436a7
-  data.tar.gz: '038b1f81556d35a4c6037b2ec5e08428465f8d09258d3c603a3ee7cbaf4f1f55'
+  metadata.gz: bbda72cc37739238b7f8d4add64844eafa34e89381721b94863a55c401d07c3c
+  data.tar.gz: 9112d52034c50d6826c7b6574968eff1f09d648cc24618cedcfe83b120c72ea5
 SHA512:
-  metadata.gz: e69de9bbae167b9f61818498b008dfb4789a41d7b9753b04035951c544385d160e69ccde08dee04ee2a7a786efc14f4657ed468935056ade34fcf0d185d82167
-  data.tar.gz: dc2e034a37c3fb7ede287d16d83b1cdbfbc1597ee5ba96c59571b9b975585112d36880a228d9ea35585a958694d7f322e965f4d927d95de167dd5399cf93417c
+  metadata.gz: 7725e42e8f37b2b34e41c203b21f88af876b4bacc8a250be12de431dae62ac48dd5192a8280094566bd51c2f5fcb150457c9deaad6203b0cc4b7c0be67da6ece
+  data.tar.gz: 13e48778febfc59d2440f95ca4e3793dc0a46fe4a4eb11dab84032d2d17b797d4a84dccbd73c408207bf73d90eaf633b0e57acc4c124bfcc7fac75338bd9916a

data/lib/haml_lint/adapter.rb

@@ -21,7 +21,7 @@ module HamlLint
       case version
       when '~> 4.0' then HamlLint::Adapter::Haml4
       when '~> 5.0', '~> 5.1', '~> 5.2' then HamlLint::Adapter::Haml5
-      when '~> 6.0', '~> 6.0.a' then HamlLint::Adapter::Haml6
+      when '~> 6.0', '~> 6.0.a', '~> 6.1' then HamlLint::Adapter::Haml6
       else fail HamlLint::Exceptions::UnknownHamlVersion, "Cannot handle Haml version: #{version}"
       end
     end

data/lib/haml_lint/configuration_loader.rb

@@ -53,8 +53,13 @@ module HamlLint
         context[:exclude_files] ||= []
         config = load_from_file(file)
 
-        [default_configuration, resolve_inheritance(config, context), config]
-          .reduce { |acc, elem| acc.merge(elem) }
+        configs = if context[:loaded_files].any?
+                    [resolve_inheritance(config, context), config]
+                  else
+                    [default_configuration, resolve_inheritance(config, context), config]
+                  end
+
+        configs.reduce { |acc, elem| acc.merge(elem) }
       rescue Psych::SyntaxError, Errno::ENOENT => e
         raise HamlLint::Exceptions::ConfigurationError,
               "Unable to load configuration from '#{file}': #{e}",
@@ -91,6 +96,18 @@ module HamlLint
           hash['inherits_from'].concat(Array(hash.delete('inherit_from')))
         end
 
+        if hash.key?('inherit_gem')
+          hash['inherits_from'] ||= []
+
+          gems = hash.delete('inherit_gem')
+          (gems || {}).each_pair.reverse_each do |gem_name, config_path|
+            Array(config_path).reverse_each do |path|
+              # Put gem configuration first so local configuration overrides it.
+              hash['inherits_from'].unshift gem_config_path(gem_name, path)
+            end
+          end
+        end
+
         HamlLint::Configuration.new(hash, file)
       end
 
@@ -133,6 +150,24 @@ module HamlLint
           .compact
           .reduce { |acc, elem| acc.merge(elem) } || config
       end
+
+      # Resolves the config file path relative to a gem
+      #
+      # @param gem_name [String] name of the gem
+      # @param relative_config_path [String] path of the file to resolve, relative to the gem root
+      # @return [Stringg]
+      def gem_config_path(gem_name, relative_config_path)
+        if defined?(Bundler)
+          gem = Bundler.load.specs[gem_name].first
+          gem_path = gem.full_gem_path if gem
+        end
+
+        gem_path ||= Gem::Specification.find_by_name(gem_name).gem_dir
+
+        File.join(gem_path, relative_config_path)
+      rescue Gem::LoadError => e
+        raise Gem::LoadError, "Unable to find gem #{gem_name}; is the gem installed? #{e}"
+      end
     end
   end
 end

data/lib/haml_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2023-01-27 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: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement