tiller 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ba31f3bc1bfba41e65bcd3b0ab7c5257bd8c20
-  data.tar.gz: 7c20d6ffbc5c0a518caca23a6813112990348a50
+  metadata.gz: 84545c02ddcde99810a6d2ee136b5e4adbee3e78
+  data.tar.gz: 5e020f6ed206820dac9a6ebc7d18e1c8b4664bcc
 SHA512:
-  metadata.gz: 11d659d2f809d1a6b423cf25540fcbeab9f8d4f92a6ed8fd7f3b3f5b1175b87cab66dd6c4802dfa78e85e5b4361d279014e72ce630ae25e363a39919ac5f1118
-  data.tar.gz: e80b88ded26a38fd419b6c2f84c3b1f12451ea52e878d403e5dfbcf180b70c816f4e85c0f7a25dd4f7e01212d9ded8d21741c6dcbd597020426f9db0a1ca364e
+  metadata.gz: f9995b6f18d95eb664fcc0ff5be3a2c0e877d596271e8123edbde3111c9975b773f800236fcc7fc1e98e3fcc50f5d1c1f3d56bbc22de9155bb9e406bb4ecfa50
+  data.tar.gz: e0bad75d72c44062d342aff43c2576faa154f645d85038a9127c00e1f07e8bb8aebd28ea7a74aaf63105a10752be2bea447fe562ac7875c6825538b4feb0e422

data/bin/tiller

@@ -8,7 +8,7 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.6.4'
+VERSION = '0.6.5'
 
 require 'erb'
 require 'ostruct'
@@ -92,15 +92,17 @@ module Tiller
   # values for each one.
   all_templates = {}
   templates.each do |template, content|
-    values = {}
+
+    # Start with a hash of our global values
+    tiller = global_values
     target_values = {}
 
-    # Now we populate the hash with values from each DataSource, warning if we
+    # 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(config)
       if dc.values(template) != nil
-        values.merge!(dc.values(template)) do |key, old, new|
+        tiller.merge!(dc.values(template)) do |key, old, new|
           warn_merge(key, old, new, 'data', data_class.to_s)
         end
       end
@@ -118,9 +120,6 @@ module Tiller
 
     # Now, we build the template
     puts "Building template #{template}" if config[:verbose]
-    tiller = values.merge(global_values) do |key, old, new|
-      warn_merge(key, old, new, 'global and local', 'merged configuration')
-    end
 
     # Use an OpenStruct namespace, as it's way easier than faffing around with
     # manual binding, and also non-existing values just get replaced by <nil>
@@ -137,7 +136,7 @@ module Tiller
     target.close
 
     # config is redundant in target_values, remove it for the final status hash.
-    all_templates[template]={
+    all_templates[template] = {
         'merged_values' => tiller,
         'target_values' => target_values.reject{|k,v| k=='config'}
     }
@@ -162,7 +161,7 @@ module Tiller
   puts 'Template generation completed'
 
   # Final status structure for API
-  tiller_api_hash={'config' => config, 'global_values' => global_values, 'templates' => all_templates}
+  tiller_api_hash = {'config' => config, 'global_values' => global_values, 'templates' => all_templates}
 
   if config['api_enable']
     Thread.start{ tiller_api(tiller_api_hash) }
@@ -171,7 +170,7 @@ module Tiller
   # Override the exec if run with -x (see options.rb)
   if config.has_key?(:alt_exec)
     puts "Overriding exec parameter [#{config['exec']}] with [#{config[:alt_exec]}]" if config[:verbose]
-    config['exec']=config[:alt_exec]
+    config['exec'] = config[:alt_exec]
   end
 
   if config[:no_exec] == false && config.key?('exec')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-07 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