config_reader 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca158dc16e7204d57e033aa7cde6d0b8b38934a
-  data.tar.gz: fca1444d32ab8484f947f46d10e71cb6ddc0dc02
+  metadata.gz: 02627114450472254b226d2ffc7092a276ab4179
+  data.tar.gz: 053954bea858dcd8b10895371f791130b72dbc07
 SHA512:
-  metadata.gz: 517ef5738ce9a2c00269282ec34724ea1a838eefc5f1bfea923945668bd2ced247beea8ecb77eb8905229b444e45e2ac2c68a9f72d8b202111c67fa2dee5e202
-  data.tar.gz: fbe04606c602d4ab4dc1ce9874400569832cc6d09caec9c53fc8428f6a23f864c6321c680dca4464680df472bb3039c9ed1e859f23860a6100f5ba92d5971c2d
+  metadata.gz: 6baee2f52c7b2c2eede17cffc14c4981aa886e555195e48a77dd42ba2ce582f00f93ae789ea76cbf259e792f8576881a4b4d73317d3866392c095ebd98dbb79a
+  data.tar.gz: 2c5bbc7636e67d247d57883a4f8e377d9d7087d00763bf5457dc949db1b2d0bf6dfca1cbdce38d2751f0f47caa4e2aa15db604fe8e614ce2a625a8e03aa6e03e

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    config_reader (1.0.2)
+    config_reader (1.0.3)
+      deep_merge
 
 GEM
   remote: http://rubygems.org/
@@ -11,6 +12,7 @@ GEM
     coderay (1.1.0)
     coerce (0.0.6)
       chronic (>= 0.6.2)
+    deep_merge (1.1.1)
     fattr (2.2.2)
     highline (1.6.21)
     main (6.0.0)
@@ -43,3 +45,6 @@ DEPENDENCIES
   rake
   rspec (= 1.3.2)
   sekrets (~> 1.7.0)
+
+BUNDLED WITH
+   1.15.1

data/History.rdoc

@@ -1,3 +1,6 @@
+== 1.0.3 2017-06-20
+* add the deep_merge gem so all keys don't need to be duplicated across env sections
+
 == 0.0.9 2012-02-03
 * Stop abusing Hash, it's not nice
 * convert all keys to symbols internally

data/config_reader.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # specify any dependencies here; for example:
+  s.add_dependency 'deep_merge'
+
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '1.3.2'
   s.add_development_dependency 'sekrets', '~> 1.7.0'

data/lib/config_reader/version.rb

@@ -1,3 +1,3 @@
 class ConfigReader
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/config_reader.rb

@@ -1,6 +1,7 @@
 require "config_reader/version"
 require "config_reader/magic_hash"
 require 'yaml'
+require 'deep_merge'
 
 begin
   require 'erb'
@@ -102,9 +103,9 @@ class ConfigReader
 
     def merge_configs(env, conf, sekrets)
       _conf = conf['defaults']
-      _conf.merge!(sekrets['defaults']) if sekrets && sekrets['defaults']
-      _conf.merge!(conf[env]) if conf[env]
-      _conf.merge!(sekrets[env]) if sekrets && sekrets[env]
+      _conf.deep_merge!(sekrets['defaults']) if sekrets && sekrets['defaults']
+      _conf.deep_merge!(conf[env]) if conf[env]
+      _conf.deep_merge!(sekrets[env]) if sekrets && sekrets[env]
       ConfigReader::MagicHash.convert_hash(_conf)
     end
   end

data/spec/config_reader_spec.rb

@@ -94,6 +94,10 @@ describe "ConfigReader" do
       it "should find sekrets only nested values using [] and a string" do
         SekretsConfig['nested_key']['value'].should == 'test_sekret'
       end
+
+      it "shouldn't need to have all keys duplicated in the environment section" do
+        SekretsConfig.nested_key.only_in_test_env.should == true
+      end
     end
   end
 end

data/spec/test_config.yml

@@ -6,3 +6,5 @@ defaults:
 
 test:
   app_name: test_app
+  nested_key:
+    only_in_test_env: true

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: config_reader
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Michael Moen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: config_reader
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides a way to manage environment specific configuration settings.