puppetsdb 0.0.5 → 0.0.6

data/lib/puppetsdb.rb

@@ -14,15 +14,19 @@ module PuppetSDB
       else
         cfg_file_paths << '~puppet/.puppetsdb/config.yml'
       end
-      conf = {}
+      final_conf = {}
       cfg_file_paths.each do |file|
         file = File.expand_path(file)
         next unless File.exists?(file)
-        conf.merge!(YAML.load(File.read(file)))
+        file_conf = YAML.load(File.read(file))
+        file_conf.keys.each do |tlevel_key|
+          final_conf[tlevel_key] ||= {}
+          final_conf[tlevel_key].merge!(file_conf[tlevel_key]) 
+        end
       end
 
-      AWS.config(conf['aws'])
-      domain = options[:domain] || conf['puppetsdb']['domain']
+      AWS.config(final_conf['aws'])
+      domain = options[:domain] || final_conf['puppetsdb']['domain']
       @simpledb = AWS::SimpleDB.new
       @domain = domain
     end

data/lib/puppetsdb/version.rb

@@ -1,3 +1,3 @@
 module PuppetSDB
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,88 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puppetsdb
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+version: !ruby/object:Gem::Version
+  version: 0.0.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brian Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-23 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: subcommand
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: aws-sdk
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple interface to Puppet's ENC stored on Amazon's SimpleDB
 email: bwong114@gmail.com
-executables: 
+executables:
 - puppetsdb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/puppetsdb.rb
 - lib/puppetsdb/cli.rb
 - lib/puppetsdb/version.rb
 - bin/puppetsdb
-has_rdoc: true
 homepage: https://github.com/bwong114/puppetsdb
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Puppet ENC script stored against Amazon's SimpleDB
 test_files: []
-