vagrant-saltdeps 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a084e08cb862e706875409f3a247fd55b6145f61
-  data.tar.gz: 1fd41fb43515be16d54a97296d884ee5bd0dae47
+  metadata.gz: 5ea6f2d70f0f5d6e544b402992ed6f6b4248b34d
+  data.tar.gz: 317c2a5a554d63f8df4c5c587e7e3e2906b4a3bb
 SHA512:
-  metadata.gz: add517692243b15c96a32e829ab2bb3c055233378f442edea940ebb3dd7c8b69d244b8dd869ac46bb959f7196027c518e8a9da6f479e3e16d07af9f22aee733f
-  data.tar.gz: e92e89b63f028237bfa101fd0d431b1a5f52629b3a68b2531f889f76d33b88515f15f82fdd5a59248a46910101372a169f05d1be050a97df0ef4b83a434663fb
+  metadata.gz: b23757a3fc524ee12618a1af2b87edbc7993c4b40021b75d599ea41c5298b55bdbf15fa64b40a5ac8bc309d171e0d61351bea2b5697b6e05c5003095d669a59e
+  data.tar.gz: 7ac055486528f40c76723e4d2c1b002579a165fba6b0f55f7dbf880147453b224c119ef6069c31f60b43e13ddd9a1d899e1becc1b23da4c63abe23e70ff0f064

data/CHANGLOG.md

@@ -1,3 +1,9 @@
+## 1.0.5 (2015-04-13)
+
+BugFixes:
+
+  - change merge order so local pillars and grains overwrite dependent pillars and grains
+
 ## 1.0.4 (2015-04-03)
 
 ErrorHandling:

data/lib/vagrant-saltdeps/provisioner.rb

@@ -112,7 +112,7 @@ module VagrantPlugins
       def merge(path, output)
         local_path  = File.expand_path(path,  @machine.env.root_path)
 
-        merge_object = File.exists?(local_path)  ? YAML.load_file(local_path) || {} : {}
+        merge_object =  {}
         @formula_folders.each do |folder|
           split_host_path = folder[:host_path].split('/')
           base_dep_path = split_host_path[0..(split_host_path.length-2)].join('/')
@@ -120,6 +120,7 @@ module VagrantPlugins
           merge_object.deep_merge!(YAML.load_file(dep_path) || {}) if File.exists?(dep_path)
         end
 
+        merge_object.deep_merge!(File.exists?(local_path)  ? YAML.load_file(local_path) || {} : {})
         File.open(output,  'w') {|f| f.write merge_object.to_yaml }
       end
 

data/lib/vagrant-saltdeps/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Saltdeps
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-saltdeps
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Joseph Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git