haml_lint 0.43.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba176a70407bd7ef377d16813fba194a6dc56875da03952116f09250362608cc
-  data.tar.gz: 3cacf61ff442811b53be9c457519b435cda94e6dfc09bd0831e8bc4a8cc535ad
+  metadata.gz: 8d47102747f37b5169cf47af34064ea1346df32e5e530cc1d1f17c293de9a34e
+  data.tar.gz: aebecb2a1f37c6c0b20c67ec176c488bce59f667340d4f5a6cbe43736d7532bc
 SHA512:
-  metadata.gz: 370beb82cc7d8391944be45c3490aaebef0da77f9eadb621d118a86800d54560e358309eba32f3ebd63ed7b5bcc5e5e069fa636b0d08c6ffc3121603496c6116
-  data.tar.gz: 678c79722a1baae72336cf3b7d7013ae155a61c3b4389ddc2885aadd566f72b54ce692814f9e4da35b65688bdf34d899fe8acf1c05215a6e482aa8071c96e5a6
+  metadata.gz: e428d39889b5ab2857560151bea5e233d49ce80bac3fb1dc454e7f042567de7ec05471488c60d774e9506ce72399ac2e4d821d3e106126539740eafa78f2ab0f
+  data.tar.gz: efea4f7dbd70a5669f56f57871ffa29bdac38120e90943c3393ab941421ffd4cbfaf941226d71d707bbbda4800966d317350cb24f9cc15528a6418c42d4bd702

data/lib/haml_lint/configuration_loader.rb

@@ -50,11 +50,18 @@ module HamlLint
       # @return [HamlLint::Configuration]
       def load_file(file, context = {})
         context[:loaded_files] ||= []
+        context[:loaded_files].map! { |config_file| File.expand_path(config_file) }
         context[:exclude_files] ||= []
-        config = load_from_file(file)
+        context[:exclude_files].map! { |config_file| File.expand_path(config_file) }
+        config = load_from_file(File.expand_path(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 +98,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
 
@@ -129,10 +148,28 @@ module HamlLint
       # @return [HamlLint::Configuration]
       def resolve_inheritance(config, context)
         Array(config['inherits_from'])
-          .map { |config_file| resolve(config_file, context) }
+          .map { |config_file| resolve(File.expand_path(config_file), context) }
           .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.43.0'
+  VERSION = '0.45.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2023-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml