config_reader 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c70acd1692b08bdedb8f5f0ed7647cdbecda42d7
-  data.tar.gz: 852b2bddd711ab21984d0049701e38e83295d3f8
+SHA256:
+  metadata.gz: d62b191e4d30a81325a11a994d3d663eb2f528bc02307731baae267f2fa08948
+  data.tar.gz: ad668aaecbf1670c81f11d277caa7567630d241b0ee6f94cef5d76c2121001b0
 SHA512:
-  metadata.gz: 81654334867c8598084c0b66bdbd27abf9af5c4970c049b5b898da732509e1badb07fbebb53721422ce04caacecaa61ebb478b834327390138ab691d6a1c7f1a
-  data.tar.gz: 1cdb20047b97d4162bc966f2afa7e1235fe80198671bf0509da480ad33da712e50fc1db8a3c5d4f2d20924cbe15af53ba22335d01360a1091c8f6a46e3b2f844
+  metadata.gz: 06e2530d3e104ecc1251283aa2e85b9d0a26b4f42eaf8478c8ec34d6d85e2c9a65ba1f0c3da7dec5b75e276591f7dde37fd19ee1aae0a9c8e866fe0852066c71
+  data.tar.gz: 63cbd8684f90f35a78c42b91ddb6f88872704b8c5468d5f0d485672c601d73105b2fb11c9083458112030101d5a854cda1f4d2d43723f785ca6d119bd7051560

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - '1.9.3'
-  - '2.0.0'
-  - '2.1.1'
+  - "2.3.8"
+  - "2.4.5"
+  - "2.5.3"
+  - "2.6.1"

data/CHANGELOG.md

@@ -0,0 +1,63 @@
+### 2.0.2 2023-03-11
+
+- remove deep-merge dependency
+
+### 2.0.1 2010-03-19
+
+- update dependencies
+
+### 1.0.5 2018-02-01
+
+- pass ignore_missing_keys to nested hashes during conversion
+
+### 1.0.4 2018-02-01
+
+- add a config option for Key Error behavior
+
+### 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
+- move to a bundler style gem
+
+### 0.0.8 2011-05-12
+
+- Silence RAILS_ENV deprecation, thanks jeanmartin
+
+### 0.0.7 2010-02-14
+
+- moved to jeweler
+- removed the annoying post install message
+- updated specs
+
+### 0.0.6 2009-04-02
+
+- handle keys as ['foo'], [:foo] and .foo for real this time
+- return nil on non-existent key instead of error
+
+### 0.0.5 2009-01-29
+
+- handle keys as ['foo'], [:foo] and .foo
+- return nil on non-existent key instead of error
+
+### 0.0.4 2008-12-08
+
+- fix the environment merging issue, for real this time
+
+### 0.0.3 2008-12-02
+
+- fix the environment merging issue
+
+### 0.0.2 2008-09-10
+
+- have find_config return the file if it exists instead of looking in . and
+  ./config
+
+### 0.0.1 2008-08-06
+
+- 1 major enhancement:
+  - Initial release

data/Gemfile.lock

@@ -1,40 +1,49 @@
 PATH
   remote: .
   specs:
-    config_reader (2.0.0)
-      deep_merge
+    config_reader (2.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     arrayfields (4.9.2)
     chronic (0.10.2)
-    coderay (1.1.0)
+    coderay (1.1.3)
     coerce (0.0.8)
       chronic (>= 0.6.2)
-    deep_merge (1.1.1)
-    fattr (2.3.0)
+    diff-lcs (1.5.0)
+    fattr (2.4.0)
     highline (1.7.10)
-    main (6.2.2)
-      arrayfields (~> 4.7, >= 4.7.4)
-      chronic (~> 0.6, >= 0.6.2)
-      fattr (~> 2.2, >= 2.2.0)
-      map (~> 6.1, >= 6.1.0)
+    main (6.3.0)
+      arrayfields (~> 4.9, >= 4.9.2)
+      chronic (~> 0.10, >= 0.10.2)
+      fattr (~> 2.4, >= 2.4.0)
+      map (~> 6.6, >= 6.6.0)
     map (6.6.0)
-    method_source (0.8.2)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (0.9.2.2)
-    rspec (1.3.2)
-    sekrets (1.10.0)
+    method_source (1.0.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    sekrets (1.13.0)
       coerce (~> 0.0.3)
       fattr (~> 2.2)
       highline (~> 1.6)
       main (~> 6.1)
       map (~> 6.3)
-    slop (3.5.0)
 
 PLATFORMS
   ruby
@@ -43,8 +52,8 @@ DEPENDENCIES
   config_reader!
   pry
   rake
-  rspec (= 1.3.2)
+  rspec (~> 3.9)
   sekrets (~> 1)
 
 BUNDLED WITH
-   1.16.1
+   2.3.13

data/Rakefile

@@ -1,9 +1,3 @@
 require 'bundler/gem_tasks'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
 task :default => :spec

data/checksums/config_reader-2.0.2.gem.sha512

@@ -0,0 +1 @@
+ecd65abf0eef2de025cf028a84de56bddeb3f6fae18c78565e8f647a3bc79eec777b542c5de26bb74c1c5f7b5cf2ad6eaf71e8061f3729141ac6d38e48367aa7

data/config_reader.gemspec

@@ -11,18 +11,13 @@ Gem::Specification.new do |s|
   s.summary     = %q{Provides a way to manage environment specific configuration settings.}
   s.description = %q{Provides a way to manage environment specific configuration settings.}
 
-  s.rubyforge_project = 'config_reader'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   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 'rspec', '~> 3.9'
   s.add_development_dependency 'sekrets', '~> 1'
   s.add_development_dependency 'pry'
 

data/lib/config_reader/version.rb

@@ -1,3 +1,3 @@
 class ConfigReader
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

data/lib/config_reader.rb

@@ -1,7 +1,6 @@
 require 'config_reader/version'
 require 'config_reader/magic_hash'
 require 'yaml'
-require 'deep_merge'
 
 begin
   require 'erb'
@@ -83,9 +82,9 @@ class ConfigReader
       env = configuration.environment
 
       _conf = conf['defaults']
-      _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]
+      deep_merge!(_conf, sekrets['defaults']) if sekrets && sekrets['defaults']
+      deep_merge!(_conf, conf[env]) if conf[env]
+      deep_merge!(_conf, sekrets[env]) if sekrets && sekrets[env]
 
       MagicHash.convert_hash(_conf, configuration.ignore_missing_keys)
     end
@@ -99,6 +98,15 @@ class ConfigReader
       @configuration ||= Configuration.new
     end
 
+    def deep_merge!(hash, other_hash)
+      hash.merge!(other_hash) do |key, this_val, other_val|
+        if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+          deep_merge!(this_val, other_val)
+        else
+          other_val
+        end
+      end
+    end
   end
 
   class Configuration

data/spec/config_reader_spec.rb

@@ -6,13 +6,13 @@ describe "ConfigReader" do
     it "should fail with []=" do
       expect {
         TestConfig[:app_name] = 'test_app'
-      }.to raise_error
+      }.to raise_error(ArgumentError)
     end
 
     it "should fail with #key =" do
       expect {
         TestConfig.app_name = 'test_app'
-      }.to raise_error
+      }.to raise_error(ArgumentError)
     end
   end
 
@@ -70,39 +70,39 @@ describe "ConfigReader" do
 
   describe "parsing a YAML file" do
     it "should find values with method_missing" do
-      TestConfig.app_name.should == 'test_app'
+      expect(TestConfig.app_name).to eq('test_app')
     end
 
     it "should find values using [] and a string" do
-      TestConfig['app_name'].should == 'test_app'
+      expect(TestConfig['app_name']).to eq('test_app')
     end
 
     it "should find values using [] and a symbol" do
-      TestConfig[:app_name].should == 'test_app'
+      expect(TestConfig[:app_name]).to eq('test_app')
     end
 
     it "should find nested values using method_missing" do
-      TestConfig.nested_key.value.should == 'test'
+      expect(TestConfig.nested_key.value).to eq('test')
     end
 
     it "should find nested values using [] and a symbol" do
-      TestConfig[:nested_key][:value].should == 'test'
+      expect(TestConfig[:nested_key][:value]).to eq('test')
     end
 
     it "should find nested values using [] and a string" do
-      TestConfig['nested_key']['value'].should == 'test'
+      expect(TestConfig['nested_key']['value']).to eq('test')
     end
 
     it "should not find sekrets only nested values using method_missing" do
-      lambda { TestConfig.sekrets_only }.should raise_error
+      expect { TestConfig.sekrets_only }.to raise_error(KeyError)
     end
 
     it "should not find sekrets only nested values using [] and a symbol" do
-      lambda { TestConfig[:sekrets_only][:value] }.should raise_error
+      expect { TestConfig[:sekrets_only][:value] }.to raise_error(KeyError)
     end
 
     it "should not find sekrets only nested values using [] and a string" do
-      lambda { TestConfig['sekrets_only']['value'] }.should raise_error
+      expect { TestConfig['sekrets_only']['value'] }.to raise_error(KeyError)
     end
 
   end
@@ -110,43 +110,43 @@ describe "ConfigReader" do
   context 'using sekrets' do
     describe "parsing a YAML file" do
       it "should find values with method_missing" do
-        SekretsConfig.app_name.should == 'test_app_sekret'
+        expect(SekretsConfig.app_name).to eq('test_app_sekret')
       end
 
       it "should find values using [] and a string" do
-        SekretsConfig['app_name'].should == 'test_app_sekret'
+        expect(SekretsConfig['app_name']).to eq('test_app_sekret')
       end
 
       it "should find values using [] and a symbol" do
-        SekretsConfig[:app_name].should == 'test_app_sekret'
+        expect(SekretsConfig[:app_name]).to eq('test_app_sekret')
       end
 
       it "should find nested values using method_missing" do
-        SekretsConfig.nested_key.value.should == 'test_sekret'
+        expect(SekretsConfig.nested_key.value).to eq('test_sekret')
       end
 
       it "should find nested values using [] and a symbol" do
-        SekretsConfig[:nested_key][:value].should == 'test_sekret'
+        expect(SekretsConfig[:nested_key][:value]).to eq('test_sekret')
       end
 
       it "should find nested values using [] and a string" do
-        SekretsConfig['nested_key']['value'].should == 'test_sekret'
+        expect(SekretsConfig['nested_key']['value']).to eq('test_sekret')
       end
 
       it "should find sekrets only nested values using method_missing" do
-        SekretsConfig.nested_key.value.should == 'test_sekret'
+        expect(SekretsConfig.nested_key.value).to eq('test_sekret')
       end
 
       it "should find sekrets only nested values using [] and a symbol" do
-        SekretsConfig[:nested_key][:value].should == 'test_sekret'
+        expect(SekretsConfig[:nested_key][:value]).to eq('test_sekret')
       end
 
       it "should find sekrets only nested values using [] and a string" do
-        SekretsConfig['nested_key']['value'].should == 'test_sekret'
+        expect(SekretsConfig['nested_key']['value']).to eq('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
+        expect(SekretsConfig.nested_key.only_in_test_env).to be true
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'spec'
+
 require 'config_reader'
 require 'test_config'
 require 'sekrets_config'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: config_reader
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Michael Moen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2023-03-11 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
@@ -42,16 +28,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: sekrets
   requirement: !ruby/object:Gem::Requirement
@@ -89,12 +75,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- History.rdoc
 - License.txt
 - README.rdoc
 - Rakefile
+- checksums/config_reader-2.0.2.gem.sha512
 - config_reader.gemspec
 - lib/config_reader.rb
 - lib/config_reader/magic_hash.rb
@@ -125,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: config_reader
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Provides a way to manage environment specific configuration settings.
 test_files:

data/History.rdoc

@@ -1,44 +0,0 @@
-== 1.0.5 2018-02-01
-* pass ignore_missing_keys to nested hashes during conversion
-
-== 1.0.4 2018-02-01
-* add a config option for Key Error behavior
-
-== 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
-* move to a bundler style gem
-
-== 0.0.8 2011-05-12
-* Silence RAILS_ENV deprecation, thanks jeanmartin
-
-== 0.0.7 2010-02-14
-* moved to jeweler
-* removed the annoying post install message
-* updated specs
-
-== 0.0.6 2009-04-02
-* handle keys as ['foo'], [:foo] and .foo for real this time
-* return nil on non-existent key instead of error
-
-== 0.0.5 2009-01-29
-* handle keys as ['foo'], [:foo] and .foo
-* return nil on non-existent key instead of error
-
-== 0.0.4 2008-12-08
-* fix the environment merging issue, for real this time
-
-== 0.0.3 2008-12-02
-* fix the environment merging issue
-
-== 0.0.2 2008-09-10
-* have find_config return the file if it exists instead of looking in . and
-./config
-
-== 0.0.1 2008-08-06
-
-* 1 major enhancement:
-  * Initial release