hiera-regex 0.2.1 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/hiera/backend/regex_backend.rb +15 -5
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 30905b94127fd76d959d08e96e44b4884338aaf5
|
|
4
|
+
data.tar.gz: 973b179c8b5786da050de29e7fa82c0682f566c8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8329748377b890709997b16615e777cfed01401ab2894d08c3a12b98745b0f6b718ba46b59335aece7b1ecb0ff872c25f0c898372724afa4db968323cb9c6dc1
|
|
7
|
+
data.tar.gz: 37b7d0b45acef2b22b8800bded67f50319c63c9ff277c4990d1e0c08bad8761e00ef119bc9cd9045da7bf90b1e256a3c538e104539ee101913979d830188c3c8
|
|
@@ -34,11 +34,22 @@ class Hiera
|
|
|
34
34
|
item.each_key do |regex_key|
|
|
35
35
|
if scope[scope_key] =~ /#{regex_key}/ and item[regex_key][key]
|
|
36
36
|
Hiera.debug("#{scope_key} with value of '#{scope[scope_key]}' matched regex /#{regex_key}/ at #{source}:#{lineno}")
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
new_answer = Backend.parse_answer(item[regex_key][key], scope)
|
|
38
|
+
case resolution_type
|
|
39
|
+
when :array
|
|
40
|
+
raise Exception, "Hiera type mismatch for key '#{key}': expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
|
|
41
|
+
answer ||= []
|
|
42
|
+
answer << new_answer
|
|
43
|
+
when :hash
|
|
44
|
+
raise Exception, "Hiera type mismatch for key '#{key}': expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
|
|
45
|
+
answer ||= {}
|
|
46
|
+
answer = Backend.merge_answer(new_answer,answer)
|
|
47
|
+
else
|
|
48
|
+
answer = new_answer
|
|
49
|
+
return answer
|
|
50
|
+
end
|
|
39
51
|
end
|
|
40
52
|
end
|
|
41
|
-
break if answer
|
|
42
53
|
end
|
|
43
54
|
end
|
|
44
55
|
return answer
|
|
@@ -67,7 +78,6 @@ class Hiera
|
|
|
67
78
|
end
|
|
68
79
|
end
|
|
69
80
|
end
|
|
70
|
-
|
|
71
81
|
end
|
|
72
82
|
end
|
|
73
|
-
end
|
|
83
|
+
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: hiera-regex
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.3.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- John Julien
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-01-
|
|
11
|
+
date: 2015-01-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: Hiera backend for looking up keys using the power of regular expressions
|
|
14
14
|
email:
|