tiller 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94f34b60987dff612b49a337676c7498f0fa2c2
-  data.tar.gz: 070f1cb472cebb7e4c52806dad6e0b521ffeafc7
+  metadata.gz: 6aa333d19e0893f11f9eb96e2b676beb5e5cc453
+  data.tar.gz: 99928301c66ea05edaa4ad90da59cb56d550008c
 SHA512:
-  metadata.gz: 13427f9196656d8cf30f5c45c64bdd457c157201ef2e45be85603526834e8c77280135f5e1dfe26c50b18d6919970d3008c39d4ec875c447c3468164589e8201
-  data.tar.gz: 1756029ede9afbe58b1474dcfb152ec96b05ba215b66d91f77b2f241ec5e0445c163fc3bcc5100d7ef0d0a2034c1d0eed89ea20cfa5eb71df06e9f30fb6e87a6
+  metadata.gz: 3b2c666d5b7ca26051c2cbb1fa22da3eae3d47e6a44772d938284f145bc71b4b31da3e25d4586496a5ff6f77a08ae8f56f6b808c6689fff5b30a383afc8c3e08
+  data.tar.gz: 6e2f2f1a075669c1918ae2005bef7b8a33654a8af8e0c27a693aeebc205d5346bb6e26eab672049229cf5a6e0994bda106e5bb5b7c07e32a63b3530f77061c39

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION = '0.2.5'
+VERSION = '0.3.0'
 
 require 'erb'
 require 'ostruct'
@@ -105,17 +105,36 @@ module Tiller
   data_sources = Array.new
   template_sources |= config['template_sources']
   data_sources |= config['data_sources']
-  template_sources.each { |t| require "tiller/template/#{t}.rb" }
-  data_sources.each { |t| require "tiller/data/#{t}.rb" }
+
+  # This looks a little counter-intuitive, but it's for a reason.
+  # We load things this way so that we get an array (data_sources, for example)
+  # That contains all the classes loaded, *in the order specified in common.yaml*
+  # This is very important, as it means we can specify the defaults DataSource
+  # first, for example and then let later DataSources override values from it.
+  # Otherwise, iterating through the available classes results in them being
+  # returned in no particular useful order.
+  template_classes = Array.new
+  template_sources.each do |t|
+    require "tiller/template/#{t}.rb"
+    template_classes |= TemplateSource.subclasses
+  end
+
+  data_classes = Array.new
+  data_sources.each do |d|
+    require "tiller/data/#{d}.rb"
+    data_classes |= DataSource.subclasses
+  end
+
 
   if config[:verbose]
-    puts 'Template sources loaded ' + TemplateSource.subclasses.to_s
-    puts 'Data sources loaded ' + DataSource.subclasses.to_s
+    puts 'Template sources loaded ' + template_classes.to_s
+    puts 'Data sources loaded ' + data_classes.to_s
   end
 
+
   # Get all Templates for the given environment
   templates = Hash.new
-  TemplateSource.subclasses.each do |template_class|
+  template_classes.each do |template_class|
     ts = template_class.new(config)
     ts.templates.each do |t|
       templates[t] = ts.template(t)
@@ -130,7 +149,7 @@ module Tiller
   # We also add in 'environment' to start with as it's very useful for all
   # templates.
   global_values = { 'environment' => config[:environment] }
-  DataSource.subclasses.each do |data_class|
+  data_classes.each do |data_class|
     global_values.merge!(data_class.new(config).global_values) do |key, old, new|
       warn_merge(key, old, new, 'global', data_class.to_s)
     end
@@ -145,7 +164,7 @@ module Tiller
 
     # Now we populate the hash with values from each DataSource, warning if we
     # get duplicate values.
-    DataSource.subclasses.each do |data_class|
+    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|

data/examples/defaults.d/common.yaml

@@ -0,0 +1,9 @@
+exec: date
+
+data_sources:
+  - defaults
+  - file
+  - environment
+
+template_sources:
+  - file

data/examples/defaults.d/defaults.d/app.conf.yaml

@@ -0,0 +1,2 @@
+app.conf.erb:
+  port: '8080'

data/examples/defaults.d/defaults.d/global.yaml

@@ -0,0 +1,2 @@
+global:
+  domain_name: 'example.com'

data/examples/defaults.d/defaults.yaml

@@ -0,0 +1,5 @@
+global:
+  domain_name: 'example.com'
+
+app.conf.erb:
+  port: '8080'

data/examples/defaults.d/environments/production.yaml

@@ -0,0 +1,4 @@
+app.conf.erb:
+  target: /tmp/app.conf
+  config:
+    database: 'prd-db-1.example.com'

data/examples/defaults.d/environments/staging.yaml

@@ -0,0 +1,5 @@
+app.conf.erb:
+  target: /tmp/app.conf
+  config:
+    port: '8081'
+    database: 'stg-db-1.dev.example.com'

data/examples/defaults.d/templates/app.conf.erb

@@ -0,0 +1,9 @@
+[http]
+http.port=<%= port %>
+http.hostname=<%= environment %>.<%= domain_name %>
+
+[smtp]
+mail_domain_name=<%= domain_name %>
+
+[db]
+db.host=<%= database %>

data/examples/defaults/common.yaml

@@ -0,0 +1,9 @@
+exec: date
+
+data_sources:
+  - defaults
+  - file
+  - environment
+
+template_sources:
+  - file

data/examples/defaults/defaults.yaml

@@ -0,0 +1,5 @@
+global:
+  domain_name: 'example.com'
+
+app.conf.erb:
+  port: '8080'

data/examples/defaults/environments/production.yaml

@@ -0,0 +1,4 @@
+app.conf.erb:
+  target: /tmp/app.conf
+  config:
+    database: 'prd-db-1.example.com'

data/examples/defaults/environments/staging.yaml

@@ -0,0 +1,5 @@
+app.conf.erb:
+  target: /tmp/app.conf
+  config:
+    port: '8081'
+    database: 'stg-db-1.dev.example.com'

data/examples/defaults/templates/app.conf.erb

@@ -0,0 +1,9 @@
+[http]
+http.port=<%= port %>
+http.hostname=<%= environment %>.<%= domain_name %>
+
+[smtp]
+mail_domain_name=<%= domain_name %>
+
+[db]
+db.host=<%= database %>

data/lib/tiller/data/defaults.rb

@@ -0,0 +1,40 @@
+require 'yaml'
+# Defaults datasource for Tiller.
+
+# Thanks, StackOverflow ;)
+class ::Hash
+  def deep_merge!(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+    self.merge!(second, &merger)
+  end
+end
+
+
+class DefaultsDataSource < Tiller::DataSource
+  def setup
+    defaults_file = File.join(@config[:tiller_base], 'defaults.yaml')
+    defaults_dir  = File.join(@config[:tiller_base], 'defaults.d')
+    @defaults_hash = Hash.new
+
+    # Read defaults in from defaults file
+    if File.file? defaults_file
+      @defaults_hash.deep_merge!(YAML.load(open(defaults_file)))
+    end
+
+    # If we have YAML files in defaults.d, also merge them
+    if File.directory? defaults_dir
+      Dir.glob(File.join(defaults_dir,'*.yaml')).each do |d|
+        @defaults_hash.deep_merge!(YAML.load(open(d)))
+      end
+    end
+  end
+
+  def global_values
+    @defaults_hash.key?('global') ? @defaults_hash['global'] : Hash.new
+  end
+
+  def values(template_name)
+    @defaults_hash.key?(template_name) ? @defaults_hash[template_name] : Hash.new
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies: []
 description: A tool to create configuration files in Docker containers from a variety
   of sources. See https://github.com/markround/tiller for examples and documentation.
@@ -19,6 +19,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/tiller
+- examples/defaults.d/common.yaml
+- examples/defaults.d/defaults.d/app.conf.yaml
+- examples/defaults.d/defaults.d/global.yaml
+- examples/defaults.d/defaults.yaml
+- examples/defaults.d/environments/production.yaml
+- examples/defaults.d/environments/staging.yaml
+- examples/defaults.d/templates/app.conf.erb
+- examples/defaults/common.yaml
+- examples/defaults/defaults.yaml
+- examples/defaults/environments/production.yaml
+- examples/defaults/environments/staging.yaml
+- examples/defaults/templates/app.conf.erb
 - examples/json/common.yaml
 - examples/json/environments/array.yaml
 - examples/json/environments/simple_keys.yaml
@@ -38,6 +50,7 @@ files:
 - lib/tiller/api/handlers/ping.rb
 - lib/tiller/api/handlers/template.rb
 - lib/tiller/api/handlers/templates.rb
+- lib/tiller/data/defaults.rb
 - lib/tiller/data/environment.rb
 - lib/tiller/data/environment_json.rb
 - lib/tiller/data/file.rb