vagrant-config_builder 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ODkzZWVlNDVkOGVjNWZjN2I0OWU0Zjg4OTllMTJjNmFhMGM5Y2Y0Zg==
4
+ OGY5Y2JhMzAxMmUxMjU0NjIxMDIyNWFiYzUxY2Y3Y2NlYjg5OWYzZQ==
5
5
  data.tar.gz: !binary |-
6
- Mzc0NzNmZmZhNzE5MzMwMWI1NzgzYTRjOTY5N2I1NzcwNzYzOWZhNQ==
6
+ MDVmMjllYTcwYjIwMzBhOTA4ZGQxZDMzM2EwN2QwMmRmMTdhZGNhNA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- M2YzNjQ2NzNkY2M3ZjQyYTlkMTdiYWQ4YWU1YTNhZGRkNDE0NjAyMWY0NDM5
10
- ZjU2NWQxYWQyNmU3MWUzYjkyZDllYWVhODU1MTM4MTk3YjVkMDVmMjUwNmVl
11
- NDA1NTczNjhiMDM3ZmVjMTIxZjY1Yzg5OGE1MjE5M2VkMThlYmQ=
9
+ ZGU3MjdjNGUwMmMwNmI0OGFkY2EzZWUxNTllNDRmZTIxMjVhNGJjMmJkMjE2
10
+ NWNlMzhlNzU5NmNhNWU5MTc5OGE3MzQ2ZmVjZmM4NTY4YjMwNjlmMTllZjc0
11
+ OTg1MTZmYzlmNzI2NmU2MDQxMmM1OTYwYzhlN2I4ZjBmYTE1OTc=
12
12
  data.tar.gz: !binary |-
13
- YjViZjQ1MDU0MmU3MTlkMzY3YzQ1YzlkMjlmMmI0NDQ2NmJiZGRjMGIyNjQz
14
- YTc0OTI3NzFiNGQ1ZDBkZTZkNGNiZWEyMTlhZTIwMTA0N2VjMzA0YWU1NDY0
15
- N2M5YzkxZGQyYTVlYmY2ZGNkMjUzMWYzYThmMDJlNjk1MmZhM2Y=
13
+ NWZlNTA2ZGJkNDJiY2I2ZDZjMDE0Y2IyMjRmYmI1NjZhYzE3ZjM3ZDk5NmZh
14
+ NzIwMDVhYmQxZWZiNDI0OTY0MDkwZjI3YmI0MWZjNDNlMTI3ZTNhMDFkYjcz
15
+ YjExZjJiM2E3ZmYwNWM5YjY0MzMwZGI0YTAxNWUyM2JjYjY0YTY=
data/CHANGELOG CHANGED
@@ -1,6 +1,17 @@
1
1
  CHANGELOG
2
2
  =========
3
3
 
4
+ 0.7.1
5
+ -----
6
+
7
+ 2014-04-22
8
+
9
+ * (GH-17) Call DeepMerge directly to avoid shadowing during loading
10
+
11
+ ### Thanks
12
+
13
+ Thanks to Charlie Sharpsteen creating this release.
14
+
4
15
  0.7.0
5
16
  -----
6
17
 
@@ -1,5 +1,5 @@
1
1
  require 'yaml'
2
- require 'deep_merge'
2
+ require 'deep_merge/core'
3
3
 
4
4
  class ConfigBuilder::Loader::YAML
5
5
 
@@ -24,7 +24,7 @@ class ConfigBuilder::Loader::YAML
24
24
  files.each do |file|
25
25
  contents = ::YAML.load_file(file)
26
26
  if contents.is_a? Hash
27
- rv.deep_merge! contents
27
+ rv = DeepMerge::deep_merge!(contents, rv, {:preserve_unmergables => false})
28
28
  end
29
29
  end
30
30
 
@@ -1,3 +1,3 @@
1
1
  module ConfigBuilder
2
- VERSION = '0.7.0'
2
+ VERSION = '0.7.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-config_builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adrien Thebo
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-19 00:00:00.000000000 Z
11
+ date: 2014-04-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: deep_merge