puppetsdb 0.0.5 → 0.0.6

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 (3) hide show
  1. data/lib/puppetsdb.rb +8 -4
  2. data/lib/puppetsdb/version.rb +1 -1
  3. metadata +51 -58
data/lib/puppetsdb.rb CHANGED
@@ -14,15 +14,19 @@ module PuppetSDB
14
14
  else
15
15
  cfg_file_paths << '~puppet/.puppetsdb/config.yml'
16
16
  end
17
- conf = {}
17
+ final_conf = {}
18
18
  cfg_file_paths.each do |file|
19
19
  file = File.expand_path(file)
20
20
  next unless File.exists?(file)
21
- conf.merge!(YAML.load(File.read(file)))
21
+ file_conf = YAML.load(File.read(file))
22
+ file_conf.keys.each do |tlevel_key|
23
+ final_conf[tlevel_key] ||= {}
24
+ final_conf[tlevel_key].merge!(file_conf[tlevel_key])
25
+ end
22
26
  end
23
27
 
24
- AWS.config(conf['aws'])
25
- domain = options[:domain] || conf['puppetsdb']['domain']
28
+ AWS.config(final_conf['aws'])
29
+ domain = options[:domain] || final_conf['puppetsdb']['domain']
26
30
  @simpledb = AWS::SimpleDB.new
27
31
  @domain = domain
28
32
  end
data/lib/puppetsdb/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module PuppetSDB
2
- VERSION = "0.0.5"
2
+ VERSION = "0.0.6"
3
3
  end
metadata CHANGED
@@ -1,88 +1,81 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: puppetsdb
3
- version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 0
7
- - 0
8
- - 5
9
- version: 0.0.5
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.0.6
5
+ prerelease:
10
6
  platform: ruby
11
- authors:
7
+ authors:
12
8
  - Brian Wong
13
9
  autorequire:
14
10
  bindir: bin
15
11
  cert_chain: []
16
-
17
- date: 2012-11-23 00:00:00 -05:00
18
- default_executable:
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2013-09-23 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: subcommand
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
24
- requirements:
25
- - - ">="
26
- - !ruby/object:Gem::Version
27
- segments:
28
- - 0
29
- version: "0"
16
+ requirement: !ruby/object:Gem::Requirement
17
+ none: false
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
30
22
  type: :runtime
31
- version_requirements: *id001
32
- - !ruby/object:Gem::Dependency
33
- name: aws-sdk
34
23
  prerelease: false
35
- requirement: &id002 !ruby/object:Gem::Requirement
36
- requirements:
37
- - - ">="
38
- - !ruby/object:Gem::Version
39
- segments:
40
- - 0
41
- version: "0"
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: aws-sdk
32
+ requirement: !ruby/object:Gem::Requirement
33
+ none: false
34
+ requirements:
35
+ - - ! '>='
36
+ - !ruby/object:Gem::Version
37
+ version: '0'
42
38
  type: :runtime
43
- version_requirements: *id002
39
+ prerelease: false
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
44
46
  description: A simple interface to Puppet's ENC stored on Amazon's SimpleDB
45
47
  email: bwong114@gmail.com
46
- executables:
48
+ executables:
47
49
  - puppetsdb
48
50
  extensions: []
49
-
50
51
  extra_rdoc_files: []
51
-
52
- files:
52
+ files:
53
53
  - lib/puppetsdb.rb
54
54
  - lib/puppetsdb/cli.rb
55
55
  - lib/puppetsdb/version.rb
56
56
  - bin/puppetsdb
57
- has_rdoc: true
58
57
  homepage: https://github.com/bwong114/puppetsdb
59
58
  licenses: []
60
-
61
59
  post_install_message:
62
60
  rdoc_options: []
63
-
64
- require_paths:
61
+ require_paths:
65
62
  - lib
66
- required_ruby_version: !ruby/object:Gem::Requirement
67
- requirements:
68
- - - ">="
69
- - !ruby/object:Gem::Version
70
- segments:
71
- - 0
72
- version: "0"
73
- required_rubygems_version: !ruby/object:Gem::Requirement
74
- requirements:
75
- - - ">="
76
- - !ruby/object:Gem::Version
77
- segments:
78
- - 0
79
- version: "0"
63
+ required_ruby_version: !ruby/object:Gem::Requirement
64
+ none: false
65
+ requirements:
66
+ - - ! '>='
67
+ - !ruby/object:Gem::Version
68
+ version: '0'
69
+ required_rubygems_version: !ruby/object:Gem::Requirement
70
+ none: false
71
+ requirements:
72
+ - - ! '>='
73
+ - !ruby/object:Gem::Version
74
+ version: '0'
80
75
  requirements: []
81
-
82
76
  rubyforge_project:
83
- rubygems_version: 1.3.6
77
+ rubygems_version: 1.8.25
84
78
  signing_key:
85
79
  specification_version: 3
86
80
  summary: Puppet ENC script stored against Amazon's SimpleDB
87
81
  test_files: []
88
-