haml_lint 0.44.0 → 0.45.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/haml_lint/configuration_loader.rb +4 -2
- data/lib/haml_lint/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8d47102747f37b5169cf47af34064ea1346df32e5e530cc1d1f17c293de9a34e
|
4
|
+
data.tar.gz: aebecb2a1f37c6c0b20c67ec176c488bce59f667340d4f5a6cbe43736d7532bc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e428d39889b5ab2857560151bea5e233d49ce80bac3fb1dc454e7f042567de7ec05471488c60d774e9506ce72399ac2e4d821d3e106126539740eafa78f2ab0f
|
7
|
+
data.tar.gz: efea4f7dbd70a5669f56f57871ffa29bdac38120e90943c3393ab941421ffd4cbfaf941226d71d707bbbda4800966d317350cb24f9cc15528a6418c42d4bd702
|
@@ -50,8 +50,10 @@ module HamlLint
|
|
50
50
|
# @return [HamlLint::Configuration]
|
51
51
|
def load_file(file, context = {})
|
52
52
|
context[:loaded_files] ||= []
|
53
|
+
context[:loaded_files].map! { |config_file| File.expand_path(config_file) }
|
53
54
|
context[:exclude_files] ||= []
|
54
|
-
|
55
|
+
context[:exclude_files].map! { |config_file| File.expand_path(config_file) }
|
56
|
+
config = load_from_file(File.expand_path(file))
|
55
57
|
|
56
58
|
configs = if context[:loaded_files].any?
|
57
59
|
[resolve_inheritance(config, context), config]
|
@@ -146,7 +148,7 @@ module HamlLint
|
|
146
148
|
# @return [HamlLint::Configuration]
|
147
149
|
def resolve_inheritance(config, context)
|
148
150
|
Array(config['inherits_from'])
|
149
|
-
.map { |config_file| resolve(config_file, context) }
|
151
|
+
.map { |config_file| resolve(File.expand_path(config_file), context) }
|
150
152
|
.compact
|
151
153
|
.reduce { |acc, elem| acc.merge(elem) } || config
|
152
154
|
end
|
data/lib/haml_lint/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: haml_lint
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.45.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Shane da Silva
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-01-
|
11
|
+
date: 2023-01-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: haml
|