tiller 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d77cf5dbfb18a7c01748c26f85a1750db39cdf64
-  data.tar.gz: 7c6495941198eb295f8bc77aa596836ba4c1b1bb
+  metadata.gz: d19ad6cc81b20acaf13f251a62861df1bc3a7d50
+  data.tar.gz: 95c3cd5651079891d414743303672085eb901610
 SHA512:
-  metadata.gz: 62be132162a6b83147e771070d663f1e9218a83f92e0a120b74f8adc1d3e44c163eab8f6bbf5eb50106f776c50d6181f1538f451d8e039fb491b323a48c6a78a
-  data.tar.gz: 8782973e32397059a0be3406a946274f3f3afe521bf07893202c5e7f5c42f697b646419a2547ee6ee6eb2651d86c4f356ed6d0e04117802697f930671e58ef82
+  metadata.gz: a6d9446383c8025ee6d0ea10da9b3078b0675d17332829e86e3b05106a6a5072152de8f6104ee0271486e99b230336a19b77d63a489436cc4a05e841f2a01fc9
+  data.tar.gz: ddf4ac3e4fedab07bfe8a4ef1452c86b0022dd74acf9357b2f1159def7c8817a0e369f1f53cb6f25fd06d062a078845596b3b18d1d520b1940d199efa9393014

data/bin/tiller

@@ -35,6 +35,10 @@ EXIT_SUCCESS = 0
 module Tiller
 
   puts "tiller v#{VERSION} (https://github.com/markround/tiller) <github@markround.com>"
+  if RUBY_VERSION < SUPPORTED_RUBY_VERSION
+    puts "Warning : Support for Ruby versions < #{SUPPORTED_RUBY_VERSION} is deprecated."
+    puts "          See http://tiller.readthedocs.io/en/latest/requirements/"
+  end
 
   class << self
     attr_accessor :config, :log, :templates, :tiller
@@ -94,6 +98,35 @@ module Tiller
   data_classes      = loader(DataSource, config['data_sources'])
   template_classes  = loader(TemplateSource, config['template_sources'])
 
+  # dynamic_values in top-level config (https://github.com/markround/tiller/issues/58)
+  # We create a temporary copy of our config hash, and iterate over it, fetching values from each datasource in turn
+  # and then merging the values back into the main config hash as we go along.
+  # Due to needing binding functions only present in Ruby >= 2.1.0, this feature is not present on older Ruby versions.
+  # See See http://tiller.readthedocs.io/en/latest/requirements/ for Ruby support policy and background.
+  if config.assoc('dynamic_values') && RUBY_VERSION >= "2.1.0"
+    log.debug('Parsing top-level values for ERb syntax')
+    # Deep copy for our temp config
+    temp_config = Marshal.load(Marshal.dump(config))
+    data_classes.each do |data_class|
+      temp_config.deep_traverse do |path,value|
+        # We skip anything under environments block (Unless it's the "common" over-ride block) as these
+        # may contain values we want to replace with template-specific values later on.
+        next if path.include?('environments') and ! path.include?('common')
+
+        if value.is_a?(String) && value.include?('<%')
+          begin
+            parsed_value = Tiller::render(value, direct_render: true, namespace: data_class.new.global_values)
+            log.debug("Parsed ERb of #{path.join('/')} as #{parsed_value}", dedup: false)
+            config.deep_merge!((path + [parsed_value]).reverse.reduce { |s,e| { e => s } })
+          rescue NameError => e
+            # This happens if there is no value provided by the currently active datasource. If so,
+            # we simply catch the error and proceed without merging anything.
+          end
+        end
+      end
+    end
+  end
+
   log.info('Template sources loaded ' + template_classes.to_s)
   log.info('Data sources loaded ' + data_classes.to_s)
   if (config.key?('helpers'))
@@ -323,6 +356,4 @@ module Tiller
 
   end
 
-
-
 end

data/lib/tiller/data/defaults.rb

@@ -26,7 +26,7 @@ class DefaultsDataSource < Tiller::DataSource
     # If we have YAML files in defaults.d, also merge them
     # We do this even if the main defaults were loaded from the v2 format config
     if File.directory? defaults_dir
-      Dir.glob(File.join(defaults_dir,'*.yaml')).each do |d|
+      Dir.glob(File.join(defaults_dir,'*.yaml')).sort().each do |d|
         yaml = YAML.load(open(d))
         Tiller::log.debug("Loading defaults from #{d}")
         @defaults_hash.deep_merge!(yaml) if yaml != false

data/lib/tiller/logger.rb

@@ -21,15 +21,15 @@ module Tiller
     end
 
     # Quick hack to remove duplicate informational messages
-    def info(msg)
+    def info(msg, options={})
       super(msg) unless self.messages.include?(msg)
-      self.messages.push(msg)
+      self.messages.push(msg) if options.fetch(:dedup, true)
     end
 
     # Quick hack to remove duplicate informational messages
-    def debug(msg)
+    def debug(msg, options={})
       super(msg) unless self.messages.include?(msg)
-      self.messages.push(msg)
+      self.messages.push(msg) if options.fetch(:dedup, true)
     end
 
   end

data/lib/tiller/render.rb

@@ -1,20 +1,30 @@
 module Tiller
   def self.render(template, options={})
 
+    # This is only ever used when we parse top-level values for ERb syntax, we pass in each
+    # datasource's global_values as a distinct namespace
+    if options.has_key?(:namespace)
+      b = binding
+      ns =  options[:namespace]
+      ns.each { |k, v| b.local_variable_set(k, v) }
+      return ERB.new(template, nil, '-').result(ns.instance_eval { b })
+    end
+
+    ns = OpenStruct.new(Tiller::tiller)
+
     # This is used for rendering content in dynamic configuration files
     if options.has_key?(:direct_render)
       content = template
-      ns = OpenStruct.new(Tiller::tiller)
       return ERB.new(content, nil, '-').result(ns.instance_eval { binding })
     end
 
     if Tiller::templates.key?(template)
       content = Tiller::templates[template]
-      ns = OpenStruct.new(Tiller::tiller)
       ERB.new(content, nil, '-').result(ns.instance_eval { binding })
     else
       Tiller::log.warn("Warning : Requested render of non-existant template #{template}")
       ""
     end
   end
+
 end

data/lib/tiller/version.rb

@@ -1,2 +1,3 @@
 # http://semver.org/
-VERSION="1.1.0"
+VERSION="1.2.0"
+SUPPORTED_RUBY_VERSION="2.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-06-09 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