tiller 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863e5fa4f42ff7b9f95b538713df8c282e4fcde9
-  data.tar.gz: a5259605f1bad247aaf50f800a62a4d6be5fddbe
+  metadata.gz: 3c450c51691e1827110da4424059b99622150087
+  data.tar.gz: 067aa0392a0c56809bcebcf6b8680716b5e9e889
 SHA512:
-  metadata.gz: 0be54f3062d330ef4e78a65d53ba43a700a9e64dc3c2875d42fa4e504d82a8a93dfc78a9fb36d4244757cdafd46d64e642d3968e41d96c995063e258fd0637c6
-  data.tar.gz: a1db215909d38d3d6fb3238d51ac0cced43e0a1ce6fd391aa6d28da3bb1d1b8be6ee4f8b9352ade90901cb0f7a65f6acb0d6d1b58cbadaa60af922ffa6b4eeb0
+  metadata.gz: cce13ddaa2bf06a36194779e948814abdff12eb6ceac0504eb25ea0af65851114c1db5fbacc48e1bdbba5258446d56190b8d4a7e806bbb2e86658444ea9c3b39
+  data.tar.gz: 965ff02a04f6501cab2479e3913facbb4e8a054cdbcbbffd6572a8d47c1a7043f8d1d4c554816246615486ec61425021f861532317593adbb5c932db3f417585

data/bin/tiller

@@ -128,20 +128,20 @@ module Tiller
       dc = data_class.new
 
       # First take the global values from the datasource
-      tiller.merge!(data_class.new.global_values) do |key, old, new|
+      tiller.tiller_merge!(data_class.new.global_values) do |key, old, new|
         warn_merge(key, old, new, 'data', data_class.to_s)
       end
 
       # Then merge template values over the top of them
       if dc.values(template) != nil
-        tiller.merge!(dc.values(template)) do |key, old, new|
+        tiller.tiller_merge!(dc.values(template)) do |key, old, new|
           warn_merge(key, old, new, 'data', data_class.to_s)
         end
       end
 
       # Now get target_values (where the file should be installed to,
       # permissions and so on)
-      target_values.merge!(dc.target_values(template)) do |key, old, new|
+      target_values.tiller_merge!(dc.target_values(template)) do |key, old, new|
         warn_merge(key, old, new, 'target', data_class.to_s)
       end
     end

data/lib/tiller/defaults.rb

@@ -12,6 +12,7 @@ module Tiller
     'api_enable'          => false,
     'md5sum'              => false,
     'md5sum_noexec'       => false,
+    'deep_merge'          => false,
     'api_port'            => 6275
   }
 end

data/lib/tiller/util.rb

@@ -1,5 +1,14 @@
-# Thanks, StackOverflow ;)
 class ::Hash
+
+  def tiller_merge!(second)
+    if Tiller::config['deep_merge']
+      self.deep_merge!(second)
+    else
+      self.merge!(second){ |key , v1 , v2| yield key, v1, v2 if block_given? }
+    end
+  end
+
+
   def deep_merge!(second)
     merger = proc { |_key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
     self.merge!(second, &merger)

data/lib/tiller/version.rb

@@ -1 +1 @@
-VERSION="0.9.0"
+VERSION="0.9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-10 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies: []
 description: A tool to create configuration files from a variety of sources, particularly
   useful for Docker containers. See https://github.com/markround/tiller for examples