config_reader 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293f77efe1f96f50dd209d5eb2616ed29888d200f10d1efb52ef547e95cc0055
-  data.tar.gz: 6aff83748853778695ba42e8c87ed27c2b4a22aaaa6813ff6e553fa3528e0719
+  metadata.gz: d62b191e4d30a81325a11a994d3d663eb2f528bc02307731baae267f2fa08948
+  data.tar.gz: ad668aaecbf1670c81f11d277caa7567630d241b0ee6f94cef5d76c2121001b0
 SHA512:
-  metadata.gz: eae9857ff8a8c1334f628604e08efaca93633b97183cdcae52fff8664ab3de9c50ea9854b504f8a1cb14e3ff7a457b6857c66373c121458a588a706b1bebbc00
-  data.tar.gz: 7c712ea091fa301ef77037163f4490a8ccad1a9d5ad425b7c6e9a4aa23b7b6f0a4b416fdaf8900f6d7f6206f107a3f448a07db68c28f7fb8589ac3a7b080024c
+  metadata.gz: 06e2530d3e104ecc1251283aa2e85b9d0a26b4f42eaf8478c8ec34d6d85e2c9a65ba1f0c3da7dec5b75e276591f7dde37fd19ee1aae0a9c8e866fe0852066c71
+  data.tar.gz: 63cbd8684f90f35a78c42b91ddb6f88872704b8c5468d5f0d485672c601d73105b2fb11c9083458112030101d5a854cda1f4d2d43723f785ca6d119bd7051560

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.0.2 2023-03-11
+
+- remove deep-merge dependency
+
 ### 2.0.1 2010-03-19
 
 - update dependencies

data/Gemfile.lock

@@ -1,45 +1,43 @@
 PATH
   remote: .
   specs:
-    config_reader (2.0.1)
-      deep_merge
+    config_reader (2.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     arrayfields (4.9.2)
     chronic (0.10.2)
-    coderay (1.1.2)
+    coderay (1.1.3)
     coerce (0.0.8)
       chronic (>= 0.6.2)
-    deep_merge (1.2.1)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     fattr (2.4.0)
     highline (1.7.10)
-    main (6.2.3)
-      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.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    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.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     sekrets (1.13.0)
       coerce (~> 0.0.3)
       fattr (~> 2.2)
@@ -58,4 +56,4 @@ DEPENDENCIES
   sekrets (~> 1)
 
 BUNDLED WITH
-   1.17.2
+   2.3.13

data/checksums/config_reader-2.0.2.gem.sha512

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

data/config_reader.gemspec

@@ -16,9 +16,6 @@ Gem::Specification.new do |s|
   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', '~> 3.9'
   s.add_development_dependency 'sekrets', '~> 1'

data/lib/config_reader/version.rb

@@ -1,3 +1,3 @@
 class ConfigReader
-  VERSION = "2.0.1"
+  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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: config_reader
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Michael Moen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-19 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
@@ -95,6 +81,7 @@ files:
 - 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,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Provides a way to manage environment specific configuration settings.
 test_files: