tiller 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23cb72e7fababe5a22673372565626bf2f12d7cc
-  data.tar.gz: 087415e292aabae4501b67597691731531b4e7c8
+  metadata.gz: 7ad52aeecb758099a50e137c5cfac27f3f3b8426
+  data.tar.gz: a6a6f0e8fa396b6588ee1172c51ad62f928e10a2
 SHA512:
-  metadata.gz: 03c72384821731e643492147b7e8cc6ac303b78a56dcfeff21aab927ad537936fac54cadfabf684b0ac7609f7ad4c0a129aa144a8467cb67ce6bdfdd6d76e635
-  data.tar.gz: 031b42444defb5241356e4a96d778d19b6858927dfbeaf9398bb6f69b481548b322c229af6131aad70556099b1e79c426fb6f4385b17d499e5b8e559c1c6b4cb
+  metadata.gz: 1140c813c8fcf4e324b09ee8dd540146a8889633fa255facadd06a40ea7ef530880185f997bb1d5be15b11c14206f2cb367dc8c464e0561c905a2e4f5c728649
+  data.tar.gz: 64e11eb53ba02884144ef9f240d99bbea81136d6b4eba96ee8c7e7a9aec5c5d9abc5aabc619b7229ac7f4fc2fe95c9360407c7c307e2ef851f9cd1ef3d313103

data/bin/tiller

@@ -8,7 +8,7 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.7.2'
+VERSION = '0.7.3'
 
 require 'erb'
 require 'ostruct'

data/lib/tiller/data/defaults.rb

@@ -45,7 +45,26 @@ class DefaultsDataSource < Tiller::DataSource
   end
 
   def values(template_name)
-    @defaults_hash.key?(template_name) ? @defaults_hash[template_name] : Hash.new
+    # Backwards compatibility stuff here. This datasource didn't use to return target_values, so
+    # all values were just stored as top-level keys instead of under a separate config: block
+    # If a config: block exists, we should use that in preference to the top-level keys, but
+    # if not we still return them all so we don't break anything using the old behaviour.
+
+    if @defaults_hash.key?(template_name)
+      values = @defaults_hash[template_name]
+      values.key?('config') ? values['config'] : values
+    else
+      Hash.new
+    end
+  end
+
+  def target_values(template_name)
+    if @defaults_hash.key?(template_name)
+      values = @defaults_hash[template_name]
+      values.key?('target') ? values : Hash.new
+    else
+      Hash.new
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-28 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