tiller 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa333d19e0893f11f9eb96e2b676beb5e5cc453
-  data.tar.gz: 99928301c66ea05edaa4ad90da59cb56d550008c
+  metadata.gz: 783e5f461315d6b6c76b7f1bdc6c8c907056c2fb
+  data.tar.gz: cf893537c943b65c6ef30c1af5a86ed53eadf984
 SHA512:
-  metadata.gz: 3b2c666d5b7ca26051c2cbb1fa22da3eae3d47e6a44772d938284f145bc71b4b31da3e25d4586496a5ff6f77a08ae8f56f6b808c6689fff5b30a383afc8c3e08
-  data.tar.gz: 6e2f2f1a075669c1918ae2005bef7b8a33654a8af8e0c27a693aeebc205d5346bb6e26eab672049229cf5a6e0994bda106e5bb5b7c07e32a63b3530f77061c39
+  metadata.gz: 3d36202ffecd118009d50b7efcf908825207965ba62b1b53e8aef34c3c1b4f8187124510d6236ecf5a37223036500a0751c80badcd3e3faa8566d68b03d050fa
+  data.tar.gz: 23ed8c7bd87be72c791fc8da4aa237932b44776540d82a555ce134c69d54f3259de7a8a355c6e0cb337af066a31f88687aa53e11555a5b820fe782db28cdb92c

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION = '0.3.0'
+VERSION = '0.3.1'
 
 require 'erb'
 require 'ostruct'
@@ -15,85 +15,26 @@ require 'pp'
 require 'json'
 require 'socket'
 require 'tiller/api'
-
-# This is needed so we can enumerate all the loaded plugins later
-class Class
-  def subclasses
-    ObjectSpace.each_object(Class).select { |c| c < self }
-  end
-end
-
-def warn_merge(key, old, new, type, source)
-  puts "Warning, merging duplicate #{type} values."
-  puts "#{key} => '#{old}' being replaced by : '#{new}' from #{source}"
-  new
-end
+require 'tiller/defaults'
+require 'tiller/loader'
+require 'tiller/options'
+require 'tiller/util'
+require 'tiller/templatesource'
+require 'tiller/datasource'
 
 # And we're on our way...
 module Tiller
-  # Set these two environment variables if you want to debug a configuration
-  # in a temporary directory, or use the -b and -l arguments.
-  # EG: $ ./bin/tiller -b /tmp/tiller/etc -l /tmp/tiller/lib
-  config = {
-    :tiller_base  => (ENV['tiller_base'].nil?)  ? '/etc/tiller' : ENV['tiller_base'],
-    :tiller_lib   => (ENV['tiller_lib'].nil?)   ? '/usr/local/lib' : ENV['tiller_lib'],
-    # This is the main variable, usually the only one you pass into Docker.
-    :environment  => (ENV['environment'].nil?)  ? 'production' : ENV['environment']
-  }
-
-  # Parse command-line arguments
-  config[:no_exec] = false
-  config[:verbose] = false
-  config['api_enable'] = false
-  config['api_port'] = 6275
-
-  optparse = OptionParser.new do |opts|
-    opts.on('-n', '--no-exec', 'Do not execute a replacement process') do
-      config[:no_exec] = true
-    end
-    opts.on('-v', '--verbose', 'Display verbose output') do
-      config[:verbose] = true
-    end
-    opts.on('-a', '--api', 'Enable HTTP API') do
-      config['api_enable'] = true
-    end
-    opts.on('-p', '--api-port [API_PORT]', 'HTTP API port') do |api_port|
-      config['api_port'] = api_port
-    end
-    opts.on('-b', '--base-dir [BASE_DIR]', 'Override the tiller_base environment variable') do |base_dir|
-      config[:tiller_base] = base_dir
-    end
-    opts.on('-l', '--lib-dir [LIB_DIR]', 'Override the tiller_lib environment variable') do |lib_dir|
-      config[:tiller_lib] = lib_dir
-    end
-    opts.on('-e', '--environment [ENV]', 'Override the \'environment\' environment variable') do |environment|
-      config[:environment] = environment
-    end
 
-    opts.on('-h', '--help', 'Display this screen') do
-      puts opts
-      puts 'Tiller also uses the environment variables tiller_base, environment'
-      puts 'and tiller_lib (or they can be provided using the arguments shown above).'
-      puts 'See https://github.com/markround/tiller for documentation and usage.'
-      puts 'Current configuration hash follows :'
-      pp config
-      exit
-    end
-  end
+  puts "tiller v#{VERSION} (https://github.com/markround/tiller) <github@markround.com>"
 
-  optparse.parse!
+  config = parse_options(Tiller::Defaults)
 
   # Add tiller_lib to the LOAD PATH so we can pull in user-defined plugins
   $LOAD_PATH.unshift(config[:tiller_lib]) unless $LOAD_PATH.include?(config[:tiller_lib])
 
-  require 'tiller/templatesource.rb'
-  require 'tiller/datasource.rb'
-
   # Load the common YAML configuration file
   config.merge!(YAML.load(open(File.join(config[:tiller_base], 'common.yaml'))))
 
-  puts "tiller v#{VERSION} (https://github.com/markround/tiller) <github@markround.com>"
-
   if config[:verbose]
     puts "Using configuration from #{config[:tiller_base]}"
     puts "Using plugins from #{config[:tiller_lib]}/tiller"
@@ -101,39 +42,16 @@ module Tiller
   end
 
   # Now load all our plugins
-  template_sources = Array.new
-  data_sources = Array.new
-  template_sources |= config['template_sources']
-  data_sources |= config['data_sources']
-
-  # 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
-
+  data_classes      = loader(DataSource, config['data_sources'])
+  template_classes  = loader(TemplateSource, config['template_sources'])
 
   if config[:verbose]
     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
+  templates = {}
   template_classes.each do |template_class|
     ts = template_class.new(config)
     ts.templates.each do |t|
@@ -157,10 +75,10 @@ module Tiller
 
   # Now we go through each template we've identified, and get the
   # values for each one.
-  all_templates = Hash.new
+  all_templates = {}
   templates.each do |template, content|
-    values = Hash.new
-    target_values = Hash.new
+    values = {}
+    target_values = {}
 
     # Now we populate the hash with values from each DataSource, warning if we
     # get duplicate values.

data/lib/tiller/defaults.rb

@@ -0,0 +1,14 @@
+module Tiller
+
+  Defaults = {
+    :tiller_base  => (ENV['tiller_base'].nil?)  ? '/etc/tiller' : ENV['tiller_base'],
+    :tiller_lib   => (ENV['tiller_lib'].nil?)   ? '/usr/local/lib' : ENV['tiller_lib'],
+    # This is the main variable, usually the only one you pass into Docker.
+    :environment  => (ENV['environment'].nil?)  ? 'production' : ENV['environment'],
+    :no_exec      => false,
+    :verbose      => false,
+    'api_enable'  => false,
+    'api_port'    => 6275
+  }
+
+end

data/lib/tiller/loader.rb

@@ -0,0 +1,31 @@
+require 'tiller/templatesource'
+require 'tiller/datasource'
+
+def loader(type,sources)
+
+  case type.to_s
+    when 'Tiller::DataSource'
+      source_path = 'tiller/data'
+    when 'Tiller::TemplateSource'
+      source_path = 'tiller/template'
+    else
+      raise "Unsupported by loader : #{type}"
+  end
+
+  # This looks a little counter-intuitive, but it's for a reason.
+  # We load things this way so that we get an array 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.
+
+  classes = []
+  sources.each do |s|
+    require File.join(source_path,"#{s}.rb")
+    classes |= type.subclasses
+  end
+
+  classes
+
+end

data/lib/tiller/options.rb

@@ -0,0 +1,39 @@
+def parse_options(config)
+  optparse = OptionParser.new do |opts|
+    opts.on('-n', '--no-exec', 'Do not execute a replacement process') do
+      config[:no_exec] = true
+    end
+    opts.on('-v', '--verbose', 'Display verbose output') do
+      config[:verbose] = true
+    end
+    opts.on('-a', '--api', 'Enable HTTP API') do
+      config['api_enable'] = true
+    end
+    opts.on('-p', '--api-port [API_PORT]', 'HTTP API port') do |api_port|
+      config['api_port'] = api_port
+    end
+    opts.on('-b', '--base-dir [BASE_DIR]', 'Override the tiller_base environment variable') do |base_dir|
+      config[:tiller_base] = base_dir
+    end
+    opts.on('-l', '--lib-dir [LIB_DIR]', 'Override the tiller_lib environment variable') do |lib_dir|
+      config[:tiller_lib] = lib_dir
+    end
+    opts.on('-e', '--environment [ENV]', 'Override the \'environment\' environment variable') do |environment|
+      config[:environment] = environment
+    end
+
+    opts.on('-h', '--help', 'Display this screen') do
+      puts opts
+      puts 'Tiller also uses the environment variables tiller_base, environment'
+      puts 'and tiller_lib (or they can be provided using the arguments shown above).'
+      puts 'See https://github.com/markround/tiller for documentation and usage.'
+      puts 'Current configuration hash follows :'
+      pp config
+      exit
+    end
+  end
+
+  optparse.parse!
+
+  config
+end

data/lib/tiller/util.rb

@@ -0,0 +1,13 @@
+# This is needed so we can enumerate all the loaded plugins later
+class Class
+  def subclasses
+    ObjectSpace.each_object(Class).select { |c| c < self }
+  end
+end
+
+# Warn if values are being merged
+def warn_merge(key, old, new, type, source)
+  puts "Warning, merging duplicate #{type} values."
+  puts "#{key} => '#{old}' being replaced by : '#{new}' from #{source}"
+  new
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-19 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.
@@ -56,9 +56,13 @@ files:
 - lib/tiller/data/file.rb
 - lib/tiller/data/random.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/templatesource.rb
+- lib/tiller/util.rb
 homepage: http://www.markround.com
 licenses:
 - MIT