tiller 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd35e1f4954ea1c60fd5c27ea63f44fe7400eba
-  data.tar.gz: 2ec16005714189cbad10709a98a742f35fa944a4
+  metadata.gz: 863e5fa4f42ff7b9f95b538713df8c282e4fcde9
+  data.tar.gz: a5259605f1bad247aaf50f800a62a4d6be5fddbe
 SHA512:
-  metadata.gz: 0987e16d81c94e21d111a35c3241a4522cad991cbcbf65818be9966a9f82f0f3b2940ecb71f11a739dd515cbaebae1536985e85520eef31ec2efe7f0c173356b
-  data.tar.gz: 6471f8c24b1465510fb800f2ce3fc22a281ecbc2e13ea8aef968090397ee782473a2ee0bed58a3d2dc7ceea2ce790de4bc25d0147f6ac192b998c39e946fdf39
+  metadata.gz: 0be54f3062d330ef4e78a65d53ba43a700a9e64dc3c2875d42fa4e504d82a8a93dfc78a9fb36d4244757cdafd46d64e642d3968e41d96c995063e258fd0637c6
+  data.tar.gz: a1db215909d38d3d6fb3238d51ac0cced43e0a1ce6fd391aa6d28da3bb1d1b8be6ee4f8b9352ade90901cb0f7a65f6acb0d6d1b58cbadaa60af922ffa6b4eeb0

data/bin/tiller

@@ -8,8 +8,6 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.8.0'
-
 require 'erb'
 require 'ostruct'
 require 'yaml'
@@ -28,6 +26,7 @@ require 'tiller/datasource'
 require 'tiller/logger'
 require 'digest/md5'
 require 'tiller/render'
+require 'tiller/version'
 
 EXIT_SUCCESS = 0
 
@@ -82,12 +81,10 @@ module Tiller
     log.info('Helper modules loaded ' + helper_modules.to_s)
   end
 
-  # Now go through all our data sources and start to assemble our global_values
-  # hash. As hashes are getting merged, new values will take precedence over
-  # older ones, and a warning will be displayed.
-  # We also add in 'environment' to start with as it's very useful for all
-  # templates.
+  # We now don't actually use the global_values hash for anything when constructing the templates (as they can be
+  # over-ridden by template values), but it's here to keep compatibility with the v1 API.
   global_values = { 'environment' => config[:environment] }
+
   data_classes.each do |data_class|
     # Now need to see if any of the common.yaml values have been over-ridden by a datasource
     # e.g. environment-specific execs and so on. We do this first so that connection strings
@@ -97,9 +94,8 @@ module Tiller
       warn_merge(key, old, new, 'common', data_class.to_s)
     end
 
-    global_values.merge!(data_class.new.global_values) do |key, old, new|
-      warn_merge(key, old, new, 'global', data_class.to_s)
-    end
+    # Merge for the sake of the v1 API
+    global_values.merge!(data_class.new.global_values)
   end
 
   # Get all Templates for the given environment
@@ -119,16 +115,24 @@ module Tiller
   skipped_templates   = 0
   updated_templates   = 0
 
-  templates.each do |template, content|
+  templates.each do |template, _content|
 
-    # Start with a hash of our global values
-    Tiller::  tiller = Hash.new.merge(global_values)
-    target_values = {}
+    # We add in 'environment' to start with as it's very useful for all
+    # templates.
+    Tiller::tiller = { 'environment' => config[:environment] }
+    target_values  = {}
 
     # Now we add to the 'tiller' hash with values from each DataSource, warning if we
     # get duplicate values.
     data_classes.each do |data_class|
       dc = data_class.new
+
+      # First take the global values from the datasource
+      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|
           warn_merge(key, old, new, 'data', data_class.to_s)
@@ -149,7 +153,7 @@ module Tiller
     # Now, we build the template
     log.info("Building template #{template}")
 
-    # Use our re-usable render tag
+    # Use our re-usable render helper
     parsed_template = Tiller::render(template)
 
     # Write the template, and also create the directory path if it

data/lib/tiller/api.rb

@@ -8,7 +8,7 @@ require 'tiller/api/handlers/templates'
 require 'tiller/api/handlers/template'
 
 
-API_VERSION=1
+API_VERSION=2
 
 # The following is a VERY simple HTTP API, used for querying the status of Tiller
 # after it has generated templates and forked a child process.

data/lib/tiller/api/handlers/config.rb

@@ -3,7 +3,7 @@ require 'tiller/api/handlers/404'
 
 def handle_config(api_version, tiller_api_hash)
   case api_version
-    when 'v1'
+    when 'v1','v2'
       {
           :content => dump_json(tiller_api_hash['config']),
           :status => '200 OK'

data/lib/tiller/api/handlers/template.rb

@@ -3,7 +3,7 @@ require 'tiller/api/handlers/404'
 
 def handle_template(api_version, tiller_api_hash, template)
   case api_version
-    when 'v1'
+    when 'v1','v2'
       if tiller_api_hash['templates'].has_key?(template)
         {
             :content => dump_json(tiller_api_hash['templates'][template]),

data/lib/tiller/api/handlers/templates.rb

@@ -3,7 +3,7 @@ require 'tiller/api/handlers/404'
 
 def handle_templates(api_version, tiller_api_hash)
   case api_version
-    when 'v1'
+    when 'v1','v2'
       {
           :content => dump_json(tiller_api_hash['templates'].keys),
           :status => '200 OK'

data/lib/tiller/version.rb

@@ -0,0 +1 @@
+VERSION="0.9.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-07-10 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
@@ -52,6 +52,7 @@ files:
 - lib/tiller/template/zookeeper.rb
 - lib/tiller/templatesource.rb
 - lib/tiller/util.rb
+- lib/tiller/version.rb
 homepage: http://www.markround.com/blog/categories/tiller/
 licenses:
 - MIT