hiera-gpg 1.0.3 → 1.1.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.
Files changed (2) hide show
  1. data/lib/hiera/backend/gpg_backend.rb +17 -13
  2. metadata +16 -9
@@ -19,7 +19,7 @@ class Hiera
19
19
  def lookup(key, scope, order_override, resolution_type)
20
20
 
21
21
  debug("Lookup called, key #{key} resolution type is #{resolution_type}")
22
- answer = Backend.empty_answer(resolution_type)
22
+ answer = nil
23
23
 
24
24
  # This should compute ~ on both *nix and *doze
25
25
  homes = ["HOME", "HOMEPATH"]
@@ -49,18 +49,22 @@ class Hiera
49
49
  parsed_answer = Backend.parse_answer(data[key], scope)
50
50
 
51
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
52
+ case resolution_type
53
+ when :array
54
+ debug("Appending answer array")
55
+ raise Exception, "Hiera type mismatch: expected Array and got #{parsed_answer.class}" unless parsed_answer.kind_of? Array or parsed_answer.kind_of? String
56
+ answer ||= []
57
+ answer << parsed_answer
58
+ when :hash
59
+ debug("Merging answer hash")
60
+ raise Exception, "Hiera type mismatch: expected Hash and got #{parsed_answer.class}" unless parsed_answer.kind_of? Hash
61
+ answer ||= {}
62
+ answer = parsed_answer.merge answer
63
+ else
64
+ debug("Assigning answer variable")
65
+ answer = parsed_answer
66
+ break
67
+ end
64
68
  rescue NoMethodError
65
69
  raise Exception, "Resolution type is #{resolution_type} but parsed_answer is a #{parsed_answer.class}"
66
70
  end
metadata CHANGED
@@ -1,12 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hiera-gpg
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: false
4
+ hash: 19
5
+ prerelease:
5
6
  segments:
6
7
  - 1
8
+ - 1
7
9
  - 0
8
- - 3
9
- version: 1.0.3
10
+ version: 1.1.0
10
11
  platform: ruby
11
12
  authors:
12
13
  - Craig Dunn
@@ -14,36 +15,39 @@ autorequire:
14
15
  bindir: bin
15
16
  cert_chain: []
16
17
 
17
- date: 2012-04-11 00:00:00 +01:00
18
- default_executable:
18
+ date: 2012-10-22 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
- name: hiera
22
21
  prerelease: false
23
22
  requirement: &id001 !ruby/object:Gem::Requirement
23
+ none: false
24
24
  requirements:
25
25
  - - ">="
26
26
  - !ruby/object:Gem::Version
27
+ hash: 23
27
28
  segments:
28
29
  - 0
29
30
  - 2
30
31
  - 0
31
32
  version: 0.2.0
32
33
  type: :runtime
34
+ name: hiera
33
35
  version_requirements: *id001
34
36
  - !ruby/object:Gem::Dependency
35
- name: gpgme
36
37
  prerelease: false
37
38
  requirement: &id002 !ruby/object:Gem::Requirement
39
+ none: false
38
40
  requirements:
39
41
  - - ">="
40
42
  - !ruby/object:Gem::Version
43
+ hash: 15
41
44
  segments:
42
45
  - 2
43
46
  - 0
44
47
  - 0
45
48
  version: 2.0.0
46
49
  type: :runtime
50
+ name: gpgme
47
51
  version_requirements: *id002
48
52
  description: Hiera backend for storing secret data and decrypting with GPG
49
53
  email: craig@craigdunn.org
@@ -55,7 +59,6 @@ extra_rdoc_files: []
55
59
 
56
60
  files:
57
61
  - lib/hiera/backend/gpg_backend.rb
58
- has_rdoc: true
59
62
  homepage: http://github.com/crayfishx/hiera-gpg
60
63
  licenses: []
61
64
 
@@ -65,23 +68,27 @@ rdoc_options: []
65
68
  require_paths:
66
69
  - lib
67
70
  required_ruby_version: !ruby/object:Gem::Requirement
71
+ none: false
68
72
  requirements:
69
73
  - - ">="
70
74
  - !ruby/object:Gem::Version
75
+ hash: 3
71
76
  segments:
72
77
  - 0
73
78
  version: "0"
74
79
  required_rubygems_version: !ruby/object:Gem::Requirement
80
+ none: false
75
81
  requirements:
76
82
  - - ">="
77
83
  - !ruby/object:Gem::Version
84
+ hash: 3
78
85
  segments:
79
86
  - 0
80
87
  version: "0"
81
88
  requirements: []
82
89
 
83
90
  rubyforge_project:
84
- rubygems_version: 1.3.6
91
+ rubygems_version: 1.8.24
85
92
  signing_key:
86
93
  specification_version: 3
87
94
  summary: GPG backend for Hiera