tiller 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a79593ff72893e226851e957c3f49af44e5fda
-  data.tar.gz: 7f728d0a3c74c8cebb04d6019bba64a558a7667e
+  metadata.gz: 2d1e95b4ed6d8c7c7e65adbf5787aaff5d30fe8b
+  data.tar.gz: 28ab01c02e3c27788fcf6e5b66f4e108cc446abe
 SHA512:
-  metadata.gz: e7358cf1ee71f5053670d80ef9d7e79c26a3ec1e15cae529a84e3b7a2e1c022b7953758e6e933b3abf20d5f03f2237c849336b3bdca9b915146d562569942ff6
-  data.tar.gz: 772dd50066fe32b171cf9b1ee60acc83907b86a0d483f866d4742f9afbd362e374724ab82f7060d2610a07ee54bcc20a04e40dcc7e7c6d5c327ace429bf10a9f
+  metadata.gz: c2425f1fc476a59129657a3e14e91b1d25550f3c78444f05e7a3bea813c3c01fd7f990f3a54238ac0b9c47f702ca6761626b9e2de53764d04fbf8cf76a186e0b
+  data.tar.gz: 6ed9f45e89fcb49380d1e1889d91caf238a59d2241b9359185f81f6e424b3885dacf9a28a65ffb453f479a429febf20669417c8eb68dfeafe0f686f2b5a2de2f

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.5.2'
+VERSION = '0.6.0'
 
 require 'erb'
 require 'ostruct'
@@ -53,17 +53,6 @@ module Tiller
     puts 'Data sources loaded ' + data_classes.to_s
   end
 
-  # Get all Templates for the given environment
-  templates = {}
-  template_classes.each do |template_class|
-    ts = template_class.new(config)
-    ts.templates.each do |t|
-      templates[t] = ts.template(t)
-    end
-  end
-
-  puts "Templates to build #{templates.keys}" if config[:verbose]
-
   # 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.
@@ -71,17 +60,30 @@ module Tiller
   # templates.
   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
+    # to datasources (e.g. zookeeper) can be included in the config before we obtain any
+    # values.
+    config.merge!(data_class.new(config).common) do |key, old, new|
+      warn_merge(key, old, new, 'common', data_class.to_s)
+    end
+
     global_values.merge!(data_class.new(config).global_values) do |key, old, new|
       warn_merge(key, old, new, 'global', data_class.to_s)
     end
+  end
 
-    # 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.
-    config.merge!(data_class.new(config).common) do |key, old, new|
-      warn_merge(key, old, new, 'common', data_class.to_s)
+  # Get all Templates for the given environment
+  templates = {}
+  template_classes.each do |template_class|
+    ts = template_class.new(config)
+    ts.templates.each do |t|
+      templates[t] = ts.template(t)
     end
   end
 
+  puts "Templates to build #{templates.keys}" if config[:verbose]
+
   # Now we go through each template we've identified, and get the
   # values for each one.
   all_templates = {}

data/lib/tiller/data/zookeeper.rb

@@ -0,0 +1,63 @@
+require 'yaml'
+require 'zk'
+require 'pp'
+require 'timeout'
+
+class ZookeeperDataSource < Tiller::DataSource
+
+  def setup
+    # Set our defaults if not specified
+    @zk_config = Tiller::Zookeeper::Defaults
+
+    raise 'No zookeeper configuration block' unless @config.has_key?('zookeeper')
+    @zk_config.merge!(@config['zookeeper'])
+
+    # Sanity check
+    ['uri'].each {|c| raise "Missing Zookeeper configuration #{c}" unless @zk_config.has_key?(c)}
+
+    uri = @zk_config['uri']
+    timeout = @zk_config['timeout']
+
+    begin
+      @zk = Timeout::timeout(timeout) { ZK.new(uri) }
+    rescue
+      raise "Could not connect to Zookeeper cluster : #{uri}"
+    end
+
+  end
+
+  def values(template_name)
+    path = @zk_config['values']['template']
+      .gsub('%e',@config[:environment])
+      .gsub('%t',template_name)
+
+    get_values(path)
+  end
+
+  def global_values
+    path = @zk_config['values']['global'].gsub('%e',@config[:environment])
+    puts "Fetching Zookeeper globals from #{path}" if @config[:verbose]
+    get_values(path)
+  end
+
+  def target_values(template_name)
+    path = @zk_config['values']['target']
+      .gsub('%e',@config[:environment])
+      .gsub('%t',template_name)
+    get_values(path)
+  end
+
+  # Helper method, not used by DataSource API
+  def get_values(path)
+    values = {}
+    if @zk.exists?(path)
+      keys = @zk.children(path)
+      keys.each do |key|
+        value =  @zk.get("#{path}/#{key}")
+        values[key] = value[0]
+      end
+    end
+    values
+  end
+
+end

data/lib/tiller/datasource.rb

@@ -4,9 +4,9 @@ module Tiller
   # template) and target_values (meta data about a template, e.g. target
   # location, permissions, owner and so on)
   class DataSource
-    # All subclasses get this, which is a hash containing tiller_base,
-    # tiller_lib and environment.
-    @config = Array.new
+
+    # Every plugin gets this hash, which is the full parsed config
+    @config ={}
 
     def initialize(config)
       @config = config
@@ -19,7 +19,8 @@ module Tiller
     end
 
     # This is where we override any of the common.yaml settings per environment.
-    # EG, the exec: parameter and so on.
+    # EG, the exec: parameter and so on. Also can be used for things like
+    # network service connection strings (e.g. Zookeeper) and so on.
     def common
       {}
     end

data/lib/tiller/defaults.rb

@@ -16,3 +16,19 @@ module Tiller
 
 end
 
+# Defaults for the Zookeeper data and template sources
+module Tiller::Zookeeper
+
+  Defaults = {
+    'timeout'   => 5,
+    'templates' => '/tiller/%e',
+
+    'values'    => {
+        'global'    => '/tiller/globals',
+        'template'  => '/tiller/%e/%t/values',
+        'target'    => '/tiller/%e/%t/target_values'
+    }
+  }
+
+end
+

data/lib/tiller/template/zookeeper.rb

@@ -0,0 +1,41 @@
+class ZookeeperTemplateSource < Tiller::TemplateSource
+
+  def setup
+    # Set our defaults if not specified
+    @zk_config = Tiller::Zookeeper::Defaults
+
+    raise 'No zookeeper configuration block' unless @config.has_key?('zookeeper')
+    @zk_config.merge!(@config['zookeeper'])
+
+    # Sanity check
+    ['uri'].each {|c| raise "Missing Zookeeper configuration #{c}" unless @zk_config.has_key?(c)}
+
+    uri = @zk_config['uri']
+    timeout = @zk_config['timeout']
+
+    begin
+      @zk = Timeout::timeout(timeout) { ZK.new(uri) }
+    rescue
+      raise "Could not connect to Zookeeper cluster : #{uri}"
+    end
+
+  end
+
+  def templates
+    path = @zk_config['templates'].gsub('%e',@config[:environment])
+    puts "Fetching Zookeeper templates from #{path}" if @config[:verbose]
+    templates = []
+    if @zk.exists?(path)
+      templates = @zk.children(path)
+    end
+
+    templates
+  end
+
+  def template(template_name)
+    path = @zk_config['templates'].gsub('%e',@config[:environment]) + "/#{template_name}"
+    @zk.get(path)[0]
+  end
+
+
+end

data/lib/tiller/templatesource.rb

@@ -3,12 +3,13 @@ module Tiller
   # Subclasses provide templates (an array), and individual template contents
   # (a string containing ERB data)
   class TemplateSource
-    # All subclasses get this, which is a hash containing tiller_base,
-    # tiller_lib and environment.
-    @config = Array.new
+
+    # Every plugin gets this hash, which is the full parsed config
+    @config = {}
 
     def initialize(config)
       @config = config
+      setup
     end
 
     # This is where any post-initialisation logic happens
@@ -17,11 +18,11 @@ module Tiller
     end
 
     def templates
-      Hash.new
+      {}
     end
 
     def template
-      String.new
+      ""
     end
 
     def ping

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-20 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
@@ -56,12 +56,14 @@ files:
 - lib/tiller/data/environment_json.rb
 - lib/tiller/data/file.rb
 - lib/tiller/data/random.rb
+- lib/tiller/data/zookeeper.rb
 - lib/tiller/datasource.rb
 - lib/tiller/defaults.rb
 - lib/tiller/json.rb
 - lib/tiller/loader.rb
 - lib/tiller/options.rb
 - lib/tiller/template/file.rb
+- lib/tiller/template/zookeeper.rb
 - lib/tiller/templatesource.rb
 - lib/tiller/util.rb
 homepage: http://www.markround.com