tiller 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbefc0c67cf35c7423c6305a42b5d54d6f22c073
-  data.tar.gz: 05f48fecc05a436549e0b133331de3eddb05517b
+  metadata.gz: 87543dcddd7ffe3367e1917fccedb35065d13f56
+  data.tar.gz: 26180fa0c8340cfaf5dc257f8b4bab72119eebc5
 SHA512:
-  metadata.gz: cc2d6e760b5ceb022b421f09aea7fc90ea68490184a07ea0e24c4f6fa5a0a42d25ca24545ea226cd21df43168d32e8256c5b329aee22773dbf34f4f108842739
-  data.tar.gz: 9eb6ea7b23a1fbecd87265aa7389fd2daae9a47e86fbda398ba066af956900324215e5b4cc2ab93ed49e09b032754b48dfa3b1e0e7b4484da58d1987a7b045d6
+  metadata.gz: 807408260d5299ab564fba2d7f84f255eb51de4a060e95203c9dbccc09c923c031fcc135c8f856bb29b4a3ec5abe5bacf06bd8601dca3301d10ff831b9e19bc1
+  data.tar.gz: ec485ee8ecc83048a7e769c42b8dd308a4125aa4686cc72e0c3dc21942d73745abea01e9679a058d176274b04775941fe496018ce9333521a1bdc7037796db11

data/bin/tiller

@@ -8,7 +8,7 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.7.9'
+VERSION = '0.7.10'
 
 require 'erb'
 require 'ostruct'
@@ -26,6 +26,9 @@ require 'tiller/util'
 require 'tiller/templatesource'
 require 'tiller/datasource'
 require 'tiller/logger'
+require 'digest/md5'
+
+EXIT_SUCCESS = 0
 
 # And we're on our way...
 module Tiller
@@ -104,7 +107,10 @@ module Tiller
 
   # Now we go through each template we've identified, and get the
   # values for each one.
-  all_templates = {}
+  all_templates       = {}
+  skipped_templates   = 0
+  updated_templates   = 0
+
   templates.each do |template, content|
 
     # Start with a hash of our global values
@@ -145,10 +151,28 @@ module Tiller
     # doesn't exist.
     target_path = File.dirname(target_values['target'])
     FileUtils.mkdir_p(target_path) unless File.directory?(target_path)
+
+    filename = target_values['target']
+
+    # MD5 checksum of templates
+    if config['md5sum'] && File.exists?(filename)
+      template_md5 = Digest::MD5.hexdigest(parsed_template)
+      log.debug("MD5 of #{template} is #{template_md5}")
+      file_md5 = Digest::MD5.hexdigest(File.read(filename))
+      log.debug("MD5 of #{filename} is #{file_md5}")
+      if template_md5 == file_md5
+        log.info("Content unchanged for #{template}, not writing anything")
+        skipped_templates += 1
+        next
+      end
+    end
+
     target = open(target_values['target'], 'w')
     target.puts(parsed_template)
     target.close
 
+    updated_templates += 1
+
     # config is redundant in target_values, remove it for the final status hash.
     all_templates[template] = {
         'merged_values' => tiller,
@@ -172,6 +196,10 @@ module Tiller
 
   end
 
+  if config['md5sum']
+    log.info("[#{updated_templates}/#{templates.size}] templates written, [#{skipped_templates}] skipped with no change")
+  end
+
   puts 'Template generation completed'
 
   # Final status structure for API
@@ -187,6 +215,12 @@ module Tiller
     config['exec'] = config[:alt_exec]
   end
 
+  # If no templates were generated and md5sum_noexec is enabled, stop here.
+  if config['md5sum'] && config['md5sum_noexec'] && skipped_templates == templates.size
+    log.info("No templates written, stopping without exec")
+    exit EXIT_SUCCESS
+  end
+
   if config[:no_exec] == false && config.key?('exec')
     # All templates created, so let's start the replacement process
     puts "Executing #{config['exec']}..."

data/lib/tiller/data/consul.rb

@@ -1,5 +1,6 @@
 require 'pp'
 require 'diplomat'
+require 'tiller/datasource'
 require 'tiller/consul.rb'
 
 class ConsulDataSource < Tiller::DataSource

data/lib/tiller/data/defaults.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'tiller/util'
+require 'tiller/datasource'
 
 # Defaults datasource for Tiller.
 

data/lib/tiller/data/environment.rb

@@ -1,10 +1,22 @@
-# Environment datasource for Tiller. This extracts all environment variables,
-# and makes them available to templates by converting to lowercase and
-# preceeding them with env_. E.G. env_home, env_logname and so on.
+require 'tiller/datasource'
+
 class EnvironmentDataSource < Tiller::DataSource
+
+  def setup
+    @plugin_config = Tiller::Environment.defaults
+    if @config.has_key? 'environment' and @config['environment'].is_a? Hash
+      @plugin_config.merge!(@config['environment'])
+    end
+  end
+
+
   def global_values
     values = Hash.new
-    ENV.each { |k, v| values["env_#{k.downcase}"] = v }
+    if @plugin_config['lowercase']
+      ENV.each { |k, v| values["#{@plugin_config['prefix']}#{k.downcase}"] = v }
+    else
+      ENV.each { |k, v| values["#{@plugin_config['prefix']}#{k}"] = v }
+    end
     values
   end
 end

data/lib/tiller/data/environment_json.rb

@@ -1,7 +1,4 @@
-# Environment JSON datasource for Tiller. This extracts all JSON from the
-# tiller_json environment variable and merges the resulting hash data
-# structure into the global_values available to templates.
-
+require 'tiller/datasource'
 require 'json'
 require 'pp'
 

data/lib/tiller/data/file.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-# File datasource for Tiller.
 
 class FileDataSource < Tiller::DataSource
   # Open and parse the environment file. Tries from v2 format common.yaml first, if that
@@ -9,7 +8,14 @@ class FileDataSource < Tiller::DataSource
       # Try and load from v2 format common.yaml
       if @config['environments'].has_key?(@config[:environment])
         @log.debug("#{self} : Using values from v2 format common.yaml")
-        @config_hash = @config['environments'][@config[:environment]]
+        if @config['environments'][@config[:environment]].is_a? Hash
+          @config_hash = @config['environments'][@config[:environment]]
+        else
+          # This permits "stub"" environments, where all the config is provided by another module e.g. defaults
+          # See https://github.com/markround/tiller/issues/29
+          @log.info("Using stub environment for #{@config[:environment]}")
+          @config_hash = Hash.new
+        end
       else
         abort("Error : Could not load environment #{@config[:environment]} from common.yaml")
       end

data/lib/tiller/data/http.rb

@@ -2,6 +2,7 @@ require 'pp'
 require 'httpclient'
 require 'timeout'
 require 'tiller/http.rb'
+require 'tiller/datasource'
 
 
 class HttpDataSource < Tiller::DataSource

data/lib/tiller/data/random.rb

@@ -1,6 +1,6 @@
+require 'tiller/datasource'
 require 'securerandom'
-# Random datasource for Tiller. Provides Base64, UUID and other useful
-# random strings.
+
 class RandomDataSource < Tiller::DataSource
   def global_values
     {

data/lib/tiller/data/xml_file.rb

@@ -1,3 +1,4 @@
+require 'tiller/datasource'
 require 'crack'
 
 # This datasource reads an XML file (xml_file_path), parses it using the crack gem and then

data/lib/tiller/data/zookeeper.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require 'zk'
 require 'pp'
 require 'timeout'
+require 'tiller/datasource'
 
 class ZookeeperDataSource < Tiller::DataSource
 

data/lib/tiller/defaults.rb

@@ -10,6 +10,8 @@ module Tiller
     :no_exec              => false,
     :verbose              => false,
     'api_enable'          => false,
+    'md5sum'              => false,
+    'md5sum_noexec'       => false,
     'api_port'            => 6275
   }
 end
@@ -68,3 +70,12 @@ module Tiller::Consul
   end
 end
 
+module Tiller::Environment
+  def self.defaults
+    {
+        'prefix'    => 'env_',
+        'lowercase' => true
+    }
+  end
+end
+

data/lib/tiller/options.rb

@@ -27,6 +27,12 @@ def parse_options(config)
     opts.on('-x', '--exec [EXEC]', 'Override the \'exec\' variable from common.yaml') do |exec|
       config[:alt_exec] = exec
     end
+    opts.on('--md5sum', 'Only write templates if MD5 checksum for content has changed') do
+      config['md5sum'] = true
+    end
+    opts.on('--md5sum-noexec', 'Do not execute a process if no templates were written or changed') do
+      config['md5sum_noexec'] = true
+    end
 
     opts.on('-h', '--help', 'Display this screen') do
       puts opts

data/lib/tiller/template/consul.rb

@@ -1,5 +1,6 @@
 require 'pp'
 require 'diplomat'
+require 'tiller/templatesource'
 require 'tiller/consul.rb'
 
 class ConsulTemplateSource < Tiller::TemplateSource
@@ -12,7 +13,7 @@ class ConsulTemplateSource < Tiller::TemplateSource
     templates = Diplomat::Kv.get(path, {:keys => true, :dc => @consul_config['dc']}, :return)
 
     if templates.is_a? Array
-      templates.map{|t| File.basename(t)}
+      templates.map { |t| File.basename(t) }
     else
       @log.warn("Consul : No templates could be fetched from #{path}")
       []

data/lib/tiller/template/file.rb

@@ -1,5 +1,3 @@
-# File template datasource for Tiller. It returns templates files present under /etc/tiller/templates
-# (or wherever the tiller_base environment is set).
 class FileTemplateSource < Tiller::TemplateSource
   def initialize(config)
     super

data/lib/tiller/template/zookeeper.rb

@@ -1,3 +1,5 @@
+require 'tiller/templatesource'
+
 class ZookeeperTemplateSource < Tiller::TemplateSource
 
   def setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-07-19 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