vagrant-saltdeps 1.0.4 → 1.0.5
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 +4 -4
- data/CHANGLOG.md +6 -0
- data/lib/vagrant-saltdeps/provisioner.rb +2 -1
- data/lib/vagrant-saltdeps/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5ea6f2d70f0f5d6e544b402992ed6f6b4248b34d
|
|
4
|
+
data.tar.gz: 317c2a5a554d63f8df4c5c587e7e3e2906b4a3bb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b23757a3fc524ee12618a1af2b87edbc7993c4b40021b75d599ea41c5298b55bdbf15fa64b40a5ac8bc309d171e0d61351bea2b5697b6e05c5003095d669a59e
|
|
7
|
+
data.tar.gz: 7ac055486528f40c76723e4d2c1b002579a165fba6b0f55f7dbf880147453b224c119ef6069c31f60b43e13ddd9a1d899e1becc1b23da4c63abe23e70ff0f064
|
data/CHANGLOG.md
CHANGED
|
@@ -112,7 +112,7 @@ module VagrantPlugins
|
|
|
112
112
|
def merge(path, output)
|
|
113
113
|
local_path = File.expand_path(path, @machine.env.root_path)
|
|
114
114
|
|
|
115
|
-
merge_object =
|
|
115
|
+
merge_object = {}
|
|
116
116
|
@formula_folders.each do |folder|
|
|
117
117
|
split_host_path = folder[:host_path].split('/')
|
|
118
118
|
base_dep_path = split_host_path[0..(split_host_path.length-2)].join('/')
|
|
@@ -120,6 +120,7 @@ module VagrantPlugins
|
|
|
120
120
|
merge_object.deep_merge!(YAML.load_file(dep_path) || {}) if File.exists?(dep_path)
|
|
121
121
|
end
|
|
122
122
|
|
|
123
|
+
merge_object.deep_merge!(File.exists?(local_path) ? YAML.load_file(local_path) || {} : {})
|
|
123
124
|
File.open(output, 'w') {|f| f.write merge_object.to_yaml }
|
|
124
125
|
end
|
|
125
126
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vagrant-saltdeps
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Joseph Hughes
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-04-
|
|
11
|
+
date: 2015-04-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: git
|