tiller 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84545c02ddcde99810a6d2ee136b5e4adbee3e78
-  data.tar.gz: 5e020f6ed206820dac9a6ebc7d18e1c8b4664bcc
+  metadata.gz: 12faf0d88c087dc054ed45bd12efa2bfa00d2855
+  data.tar.gz: d6090c27d9b79d5e81d8ab28caa6813e63353b4d
 SHA512:
-  metadata.gz: f9995b6f18d95eb664fcc0ff5be3a2c0e877d596271e8123edbde3111c9975b773f800236fcc7fc1e98e3fcc50f5d1c1f3d56bbc22de9155bb9e406bb4ecfa50
-  data.tar.gz: e0bad75d72c44062d342aff43c2576faa154f645d85038a9127c00e1f07e8bb8aebd28ea7a74aaf63105a10752be2bea447fe562ac7875c6825538b4feb0e422
+  metadata.gz: be7556477a6d78f0aa09802039c3a3fba01b10b1cb5a94569ac25dd459d9e8ebdaf0bca6b14752f0f162f4265a598b0d76d988b38cffb62a4e27874fa180e624
+  data.tar.gz: 818392cdf2ceb0b306bad4acdf22790e06fd8d3e7c0c208142bcd9e89441ea67e96f6a714b2372886a16a3eb7427d52e0102c11978ef01c0d412b60e3a8ae70a

data/bin/tiller

@@ -8,7 +8,7 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.6.5'
+VERSION = '0.7.0'
 
 require 'erb'
 require 'ostruct'
@@ -25,6 +25,7 @@ require 'tiller/options'
 require 'tiller/util'
 require 'tiller/templatesource'
 require 'tiller/datasource'
+require 'tiller/logger'
 
 # And we're on our way...
 module Tiller
@@ -32,30 +33,43 @@ module Tiller
   puts "tiller v#{VERSION} (https://github.com/markround/tiller) <github@markround.com>"
 
   config = parse_options(Tiller::Defaults)
+  log = Tiller::Logger.new(config)
+
+  log.debug("Executable: #{__FILE__}")
+
 
   # 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])
 
   # Load the common YAML configuration file
-  config.merge!(YAML.load(open(File.join(config[:tiller_base], 'common.yaml'))))
+  begin
+    common_file = File.join(config[:tiller_base], 'common.yaml')
+    config.merge!(YAML.load(open(common_file)))
+  rescue Exception => e
+    abort "Error : Could not open common configuration file!\n#{e}"
+  end
+
+  # Check for keys only present in v2 format (everything in one common.yaml)
+  if [ 'environments' , 'defaults'].any? { |k| config.has_key?(k) }
+    log.info("Using common.yaml v2 format configuration file")
+    config[:config_version] = 2
+  else
+    config[:config_version] = 1
+  end
 
   # Set the environment if not already done through ENV or -e flag
   config[:environment] = config['default_environment'] if config[:environment].nil?
 
-  if config[:verbose]
-    puts "Using configuration from #{config[:tiller_base]}"
-    puts "Using plugins from #{config[:tiller_lib]}/tiller"
-    puts "Using environment #{config[:environment]}"
-  end
+  log.info("Using configuration from #{config[:tiller_base]}")
+  log.info("Using plugins from #{config[:tiller_lib]}/tiller")
+  log.info("Using environment #{config[:environment]}")
 
   # Now load all our plugins
   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
+  log.info('Template sources loaded ' + template_classes.to_s)
+  log.info('Data sources loaded ' + data_classes.to_s)
 
   # 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
@@ -86,7 +100,7 @@ module Tiller
     end
   end
 
-  puts "Templates to build #{templates.keys}" if config[:verbose]
+  log.info("Templates to build #{templates.keys}")
 
   # Now we go through each template we've identified, and get the
   # values for each one.
@@ -97,6 +111,8 @@ module Tiller
     tiller = global_values
     target_values = {}
 
+    # Todo: add in our values from common.yaml here if they exist
+
     # Now we add to the 'tiller' hash with values from each DataSource, warning if we
     # get duplicate values.
     data_classes.each do |data_class|
@@ -119,7 +135,7 @@ module Tiller
     next if target_values.empty?
 
     # Now, we build the template
-    puts "Building template #{template}" if config[:verbose]
+    log.info("Building template #{template}")
 
     # Use an OpenStruct namespace, as it's way easier than faffing around with
     # manual binding, and also non-existing values just get replaced by <nil>
@@ -143,7 +159,7 @@ module Tiller
 
     # Set permissions if we are running as root
     if Process::Sys.geteuid == 0
-      puts "Setting ownership/permissions on #{target_values['target']}" if config[:verbose]
+      log.info("Setting ownership/permissions on #{target_values['target']}")
       if target_values.key?('perms')
         FileUtils.chmod(target_values['perms'], target_values['target'])
       end
@@ -152,8 +168,8 @@ module Tiller
       FileUtils.chown(target_values['user'], target_values['group'],
                       target_values['target'])
     else
-      puts 'Not running as root, so not setting ownership/permissions on ' \
-        "#{target_values['target']}" if config[:verbose]
+      log.info('Not running as root, so not setting ownership/permissions on ' \
+        "#{target_values['target']}")
     end
 
   end
@@ -169,7 +185,7 @@ module Tiller
 
   # Override the exec if run with -x (see options.rb)
   if config.has_key?(:alt_exec)
-    puts "Overriding exec parameter [#{config['exec']}] with [#{config[:alt_exec]}]" if config[:verbose]
+    log.info("Overriding exec parameter [#{config['exec']}] with [#{config[:alt_exec]}]")
     config['exec'] = config[:alt_exec]
   end
 
@@ -180,7 +196,7 @@ module Tiller
     # Spawn and wait so API can continue to run
     child_pid = launch(config['exec'], :verbose => config[:verbose])
 
-    puts "Child process forked with PID #{child_pid}." if config[:verbose]
+    log.info("Child process forked with PID #{child_pid}.")
 
     # Catch signals and send them on to the child process
     [ :INT, :TERM, :HUP ].each do |sig|
@@ -189,7 +205,7 @@ module Tiller
 
     Process.wait(child_pid)
 
-    puts 'Child process finished, Tiller is stopping.' if config[:verbose]
+    log.info('Child process finished, Tiller is stopping.')
   end
 
 end

data/lib/tiller/data/defaults.rb

@@ -16,17 +16,25 @@ class DefaultsDataSource < Tiller::DataSource
     defaults_dir  = File.join(@config[:tiller_base], 'defaults.d')
     @defaults_hash = Hash.new
 
-    # Read defaults in from defaults file
-    # Handle empty files - if YAML didn't parse, it returns false so we skip them
-    if File.file? defaults_file
-      yaml = YAML.load(open(defaults_file))
-      @defaults_hash.deep_merge!(yaml) if yaml != false
+    # First, try and load defaults from v2 config
+    if @config.has_key?('defaults')
+      @log.debug("#{self} : Using values from v2 format common.yaml")
+      @defaults_hash.deep_merge!(@config['defaults'])
+    else
+      # Read defaults in from defaults file if no v2 config
+      # Handle empty files - if YAML didn't parse, it returns false so we skip them
+      if File.file? defaults_file
+        yaml = YAML.load(open(defaults_file))
+        @defaults_hash.deep_merge!(yaml) if yaml != false
+      end
     end
 
     # 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|
         yaml = YAML.load(open(d))
+        @log.debug("Loading defaults from #{d}")
         @defaults_hash.deep_merge!(yaml) if yaml != false
       end
     end

data/lib/tiller/data/environment_json.rb

@@ -13,7 +13,7 @@ class EnvironmentJsonDataSource < Tiller::DataSource
         json_structure = JSON.parse(ENV['tiller_json'])
         json_structure if json_structure.is_a?(Hash)
       rescue JSON::ParserError
-        puts "Warning : Error parsing tiller_json environment variable"
+        @log.warn('Warning : Error parsing tiller_json environment variable')
         Hash.new
       end
     else

data/lib/tiller/data/file.rb

@@ -6,11 +6,27 @@ require 'yaml'
 #
 # We also don't provide any global values, just ones specific to a template.
 class FileDataSource < Tiller::DataSource
-  # Open and parse the environment file
+  # Open and parse the environment file. Tries from v2 format common.yaml first, if that
+  # failes, then it looks for separate environment files.
   def setup
-    env_file = File.join(@config[:tiller_base], 'environments',
-                         "#{@config[:environment]}.yaml")
-    @config_hash = YAML.load(open(env_file))
+    if @config.has_key?('environments')
+      # 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]]
+      else
+        abort("Error : Could not load environment #{@config[:environment]} from common.yaml")
+      end
+    else
+      # Try and load from v1 format files
+      begin
+        env_file = File.join(@config[:tiller_base], 'environments',
+                             "#{@config[:environment]}.yaml")
+        @config_hash = YAML.load(open(env_file))
+      rescue
+        abort ("Error : Could not load environment file #{env_file}")
+      end
+    end
   end
 
   def common

data/lib/tiller/data/zookeeper.rb

@@ -36,7 +36,7 @@ class ZookeeperDataSource < Tiller::DataSource
 
   def global_values
     path = @zk_config['values']['global'].gsub('%e',@config[:environment])
-    puts "Fetching Zookeeper globals from #{path}" if @config[:verbose]
+    @log.info("Fetching Zookeeper globals from #{path}")
     get_values(path)
   end
 

data/lib/tiller/datasource.rb

@@ -1,3 +1,5 @@
+require 'tiller/logger'
+
 # Tiller data source base class.
 module Tiller
   # Subclasses provide global_values and/or values (things local to a specific
@@ -10,6 +12,7 @@ module Tiller
 
     def initialize(config)
       @config = config
+      @log = Tiller::Logger.new(config)
       setup
     end
 

data/lib/tiller/http.rb

@@ -23,14 +23,14 @@ module Tiller::HttpCommon
 
     # Basic auth for resource
     if @http_config.has_key?('username')
-      puts 'HTTP: Using basic authentication' if @config[:debug]
+      @log.debug('HTTP: Using basic authentication')
       raise 'HTTP: Missing password for authentication' unless @http_config.has_key?('password')
       @client.set_auth(nil, @http_config['username'], @http_config['password'])
     end
 
     # Basic auth for proxy
     if @http_config.has_key?('proxy_username')
-      puts 'HTTP: Using proxy basic authentication' if @config[:debug]
+      @log.debug('HTTP: Using proxy basic authentication')
       raise 'HTTP: Missing password for proxy authentication' unless @http_config.has_key?('proxy_password')
       @client.set_proxy_auth(@http_config['proxy_username'], @http_config['proxy_password'])
     end
@@ -42,7 +42,7 @@ module Tiller::HttpCommon
     uri.gsub!('%e', @config[:environment])
     uri.gsub!('%t', interpolate[:template]) if interpolate[:template]
 
-    puts "HTTP: Fetching #{uri}" if @config[:debug]
+    @log.debug("HTTP: Fetching #{uri}")
     resp = @client.get(uri, :follow_redirect => true)
     raise "HTTP: Server responded with status #{resp.status} for #{uri}" if resp.status != 200
     resp.body
@@ -53,7 +53,7 @@ module Tiller::HttpCommon
   def parse(content)
     case @http_config['parser']
       when 'json'
-        puts 'HTTP: Using JSON parser' if @config[:debug]
+        @log.debug("HTTP: Using JSON parser")
         JSON.parse(content)
       else
         raise "HTTP: Unsupported parser '#{@http_config['parser']}'"

data/lib/tiller/logger.rb

@@ -0,0 +1,20 @@
+require 'logger'
+
+module Tiller
+
+  class Logger < Logger
+    def initialize(config)
+      super(STDOUT)
+
+      self.level = Logger::WARN
+      self.level = Logger::INFO if config[:verbose]
+      self.level = Logger::DEBUG if config[:debug]
+
+      self.formatter = proc do |severity, datetime, progname, msg|
+        "#{msg}\n"
+      end
+
+    end
+  end
+
+end

data/lib/tiller/template/zookeeper.rb

@@ -23,7 +23,7 @@ class ZookeeperTemplateSource < Tiller::TemplateSource
 
   def templates
     path = @zk_config['templates'].gsub('%e',@config[:environment])
-    puts "Fetching Zookeeper templates from #{path}" if @config[:verbose]
+    @log.info("Fetching Zookeeper templates from #{path}")
     templates = []
     if @zk.exists?(path)
       templates = @zk.children(path)

data/lib/tiller/templatesource.rb

@@ -1,3 +1,5 @@
+require 'tiller/logger'
+
 # Tiller template source base class
 module Tiller
   # Subclasses provide templates (an array), and individual template contents
@@ -9,6 +11,7 @@ module Tiller
 
     def initialize(config)
       @config = config
+      @log = Tiller::Logger.new(config)
       setup
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-09-07 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
@@ -63,6 +63,7 @@ files:
 - lib/tiller/http.rb
 - lib/tiller/json.rb
 - lib/tiller/loader.rb
+- lib/tiller/logger.rb
 - lib/tiller/options.rb
 - lib/tiller/template/file.rb
 - lib/tiller/template/http.rb
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Dynamic configuration file generation