vagrant-config_builder 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODkzZWVlNDVkOGVjNWZjN2I0OWU0Zjg4OTllMTJjNmFhMGM5Y2Y0Zg==
+    OGY5Y2JhMzAxMmUxMjU0NjIxMDIyNWFiYzUxY2Y3Y2NlYjg5OWYzZQ==
   data.tar.gz: !binary |-
-    Mzc0NzNmZmZhNzE5MzMwMWI1NzgzYTRjOTY5N2I1NzcwNzYzOWZhNQ==
+    MDVmMjllYTcwYjIwMzBhOTA4ZGQxZDMzM2EwN2QwMmRmMTdhZGNhNA==
 SHA512:
   metadata.gz: !binary |-
-    M2YzNjQ2NzNkY2M3ZjQyYTlkMTdiYWQ4YWU1YTNhZGRkNDE0NjAyMWY0NDM5
-    ZjU2NWQxYWQyNmU3MWUzYjkyZDllYWVhODU1MTM4MTk3YjVkMDVmMjUwNmVl
-    NDA1NTczNjhiMDM3ZmVjMTIxZjY1Yzg5OGE1MjE5M2VkMThlYmQ=
+    ZGU3MjdjNGUwMmMwNmI0OGFkY2EzZWUxNTllNDRmZTIxMjVhNGJjMmJkMjE2
+    NWNlMzhlNzU5NmNhNWU5MTc5OGE3MzQ2ZmVjZmM4NTY4YjMwNjlmMTllZjc0
+    OTg1MTZmYzlmNzI2NmU2MDQxMmM1OTYwYzhlN2I4ZjBmYTE1OTc=
   data.tar.gz: !binary |-
-    YjViZjQ1MDU0MmU3MTlkMzY3YzQ1YzlkMjlmMmI0NDQ2NmJiZGRjMGIyNjQz
-    YTc0OTI3NzFiNGQ1ZDBkZTZkNGNiZWEyMTlhZTIwMTA0N2VjMzA0YWU1NDY0
-    N2M5YzkxZGQyYTVlYmY2ZGNkMjUzMWYzYThmMDJlNjk1MmZhM2Y=
+    NWZlNTA2ZGJkNDJiY2I2ZDZjMDE0Y2IyMjRmYmI1NjZhYzE3ZjM3ZDk5NmZh
+    NzIwMDVhYmQxZWZiNDI0OTY0MDkwZjI3YmI0MWZjNDNlMTI3ZTNhMDFkYjcz
+    YjExZjJiM2E3ZmYwNWM5YjY0MzMwZGI0YTAxNWUyM2JjYjY0YTY=

data/CHANGELOG

@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+0.7.1
+-----
+
+2014-04-22
+
+  * (GH-17) Call DeepMerge directly to avoid shadowing during loading
+
+### Thanks
+
+Thanks to Charlie Sharpsteen creating this release.
+
 0.7.0
 -----
 

data/lib/config_builder/loader/yaml.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'deep_merge'
+require 'deep_merge/core'
 
 class ConfigBuilder::Loader::YAML
 
@@ -24,7 +24,7 @@ class ConfigBuilder::Loader::YAML
     files.each do |file|
       contents = ::YAML.load_file(file)
       if contents.is_a? Hash
-        rv.deep_merge! contents
+        rv = DeepMerge::deep_merge!(contents, rv, {:preserve_unmergables => false})
       end
     end
 

data/lib/config_builder/version.rb

@@ -1,3 +1,3 @@
 module ConfigBuilder
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-config_builder
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge