tiller 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 229d9c3cbd2cff1fe603fe9d20db766e1a6bad96
-  data.tar.gz: 0de31645801e2b972cd404c18cf4f41ea1d5bedd
+  metadata.gz: 27d12e01d34394a6fad400842d4aa83ebc197e3a
+  data.tar.gz: 0ee3df3eff85b7a044198b81722943fefde97207
 SHA512:
-  metadata.gz: 949a96b21b1e35ca1eeecf02bec3b48ba9ec030151212e39d9d1713878bf5971d3c624909b71323fbb50b5a316328980ae8d3c6225ffdb8b9fdc852f7c00d048
-  data.tar.gz: 2a00433767683191bb3c1caf52bdb074fa23486183027cffce2955fa026f924e05062e3645344efeedc133b038d5d8434bff477dd0bb9401fd898c84ce86f05a
+  metadata.gz: ef5413950dc0402cbcbad9d2644678e8f09977e0a06fc791eb4cbc612fd0d774a773a622b0dd06bc808f730aa2a4fc0be1f321c9563b9d80b99df7cae8e9ec3a
+  data.tar.gz: 05c0e4a79290f4defc0d7434363f992086bf49c0360147da85f9baaa57b4c20adaba00e4b7e402ca0ba51901cd94b429193f97f298ce41630b12f0f5b9b1f702

data/bin/tiller

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

data/lib/tiller/data/environment_json.rb

@@ -6,19 +6,50 @@ require 'json'
 require 'pp'
 
 class EnvironmentJsonDataSource < Tiller::DataSource
-  def global_values
 
+  VERSION_KEY='_version'
+
+  def setup
     if ENV.has_key?('tiller_json')
       begin
-        json_structure = JSON.parse(ENV['tiller_json'])
-        json_structure if json_structure.is_a?(Hash)
+        parse = JSON.parse(ENV['tiller_json'])
+        @json_structure = parse.is_a?(Hash) ? parse : Hash.new
+        if @json_structure[VERSION_KEY].is_a? Integer
+          @json_version = @json_structure[VERSION_KEY]
+          @log.debug("Using v#{@json_version} tiller_json format")
+        else
+          @json_version = 1
+        end
       rescue JSON::ParserError
         @log.warn('Warning : Error parsing tiller_json environment variable')
-        Hash.new
       end
     else
-      Hash.new
+      @json_structure = Hash.new
+    end
+  end
+
+  def global_values
+    if @json_version < 2
+      @json_structure
+    else
+      if @json_structure.has_key?('global')
+        @json_structure['global']
+      else
+        Hash.new
+      end
+    end
+  end
+
+  def values(template_name)
+    if @json_version < 2
+      return Hash.new
     end
 
+    if @json_structure.has_key?(template_name)
+      return @json_structure[template_name]
+    else
+      return Hash.new
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-04-21 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
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dynamic configuration file generation