hiera-gpg 1.0.2 → 1.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/hiera/backend/gpg_backend.rb +17 -8
  2. metadata +3 -3
@@ -46,14 +46,23 @@ class Hiera
46
46
  next unless data.include?(key)
47
47
  debug ("Key #{key} found in YAML document, Passing answer to hiera")
48
48
 
49
-
50
- case resolution_type
51
- when :array
52
- debug("Appending answer array")
53
- answer << Backend.parse_answer(data[key], scope)
54
- else
55
- debug("Assigning answer variable")
56
- answer = Backend.parse_answer(data[key], scope)
49
+ parsed_answer = Backend.parse_answer(data[key], scope)
50
+
51
+ begin
52
+ case resolution_type
53
+ when :array
54
+ debug("Appending answer array")
55
+ answer << parsed_answer
56
+ when :hash
57
+ debug("Merging answer hash")
58
+ answer = parsed_answer.merge answer
59
+ else
60
+ debug("Assigning answer variable")
61
+ answer = parsed_answer
62
+ break
63
+ end
64
+ rescue NoMethodError
65
+ raise Exception, "Resolution type is #{resolution_type} but parsed_answer is a #{parsed_answer.class}"
57
66
  end
58
67
 
59
68
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 0
8
- - 2
9
- version: 1.0.2
8
+ - 3
9
+ version: 1.0.3
10
10
  platform: ruby
11
11
  authors:
12
12
  - Craig Dunn
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2012-03-19 00:00:00 +00:00
17
+ date: 2012-04-11 00:00:00 +01:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency