mixlib-config 3.0.5 → 3.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 542f1c9f7daff1297b70799397e6f44dba7896522e89334e71496db690802013
-  data.tar.gz: f2383ad0c71049dab95ceeac81d39d7b8ed1d8cb2e9a6ed45ac29acaa0d63838
+  metadata.gz: 244c4985aca98893235fd40849494fffac378dfc1e3814c99eeb2315fb378d38
+  data.tar.gz: 616f2fff1b715bdd98451cabbcc97c1f41bfcbef2fd9c1196548fe59070ece73
 SHA512:
-  metadata.gz: d4137a9a0747261ad42cc1f3035ab6136823ee3c89666e7adf041e36190cd24179e0eee5711686011ab7c1e7efead2242aef88c6f9c0e03bfee8ef41509492be
-  data.tar.gz: 22248d0a227c55598fa81debb29a0eaa9436d27192bfbd45beb091b0ace555b4abd4783f09ef7c1febca965b386320268dada9fe5f45a94485cc266695144a9b
+  metadata.gz: 9d83d13b43d723dc8f516d525388d2d089859fbd8d98ba2ca8d6910af64c75a4e9749daea1c3399da9b7bdc7058a78e38e517a5a149bcf2b0ff2810fc98c51c6
+  data.tar.gz: 33edd2c26ac7be09708384a2113d2087861a3d43f1b2b9d185367a5247098d1b6df7dbf13a41e7bcf5fd9279a908cef11362c52fdfd15aa21ebef201ca653a38

data/lib/mixlib/config/version.rb

@@ -19,7 +19,7 @@
 module Mixlib
   module Config
 
-    VERSION = "3.0.5".freeze
+    VERSION = "3.0.27".freeze
 
   end
 end

data/lib/mixlib/config.rb

@@ -18,11 +18,11 @@
 # limitations under the License.
 #
 
-require "mixlib/config/version"
-require "mixlib/config/configurable"
-require "mixlib/config/unknown_config_option_error"
-require "mixlib/config/reopened_config_context_with_configurable_error"
-require "mixlib/config/reopened_configurable_with_config_context_error"
+require_relative "config/version"
+require_relative "config/configurable"
+require_relative "config/unknown_config_option_error"
+require_relative "config/reopened_config_context_with_configurable_error"
+require_relative "config/reopened_configurable_with_config_context_error"
 
 module Mixlib
   module Config
@@ -69,7 +69,7 @@ module Mixlib
     # === Parameters
     # filename<String>:: A filename to read from
     def from_yaml(filename)
-      require "yaml"
+      require "yaml" unless defined?(YAML)
       from_hash(YAML.load(IO.read(filename)))
     end
 
@@ -78,12 +78,12 @@ module Mixlib
     # === Parameters
     # filename<String>:: A filename to read from
     def from_json(filename)
-      require "json"
+      require "json" unless defined?(JSON)
       from_hash(JSON.parse(IO.read(filename)))
     end
 
     def from_toml(filename)
-      require "tomlrb"
+      require "tomlrb" unless defined?(Tomlrb)
       from_hash(Tomlrb.parse(IO.read(filename), symbolize_keys: true))
     end
 
@@ -565,10 +565,13 @@ module Mixlib
     # the #to_dotted_hash method above.
     #
     # === Parameters
-    # hash<Hash>:: The hash to apply to the config oject
+    # hash<Hash>:: The hash to apply to the config object
     def apply_nested_hash(hash)
       hash.each do |k, v|
-        if v.is_a? Hash
+        if v.is_a?(Hash) && internal_get(k.to_sym).is_a?(Hash)
+          # If it is a plain config key (not a context) and the value is a Hash, plain merge the Hashes.
+          internal_set(k.to_sym, internal_get(k.to_sym).merge(v))
+        elsif v.is_a? Hash
           # If loading from hash, and we reference a context that doesn't exist
           # and warning/strict is off, we need to create the config context that we expected to be here.
           context = internal_get(k.to_sym) || config_context(k.to_sym)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-config
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.27
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -50,14 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A class based configuration library