tiller 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d1e95b4ed6d8c7c7e65adbf5787aaff5d30fe8b
-  data.tar.gz: 28ab01c02e3c27788fcf6e5b66f4e108cc446abe
+  metadata.gz: de1c0f1f8381638d2568818134f335b4184a0b1c
+  data.tar.gz: 3613aa2b175fa801b671fab200b234153bfc698b
 SHA512:
-  metadata.gz: c2425f1fc476a59129657a3e14e91b1d25550f3c78444f05e7a3bea813c3c01fd7f990f3a54238ac0b9c47f702ca6761626b9e2de53764d04fbf8cf76a186e0b
-  data.tar.gz: 6ed9f45e89fcb49380d1e1889d91caf238a59d2241b9359185f81f6e424b3885dacf9a28a65ffb453f479a429febf20669417c8eb68dfeafe0f686f2b5a2de2f
+  metadata.gz: ff24474771f4041cede5a6fdedf6ee47c63f43288a57e9fa77a67f2472257f55d9e14cd496469ecf2f78a596b5f964a9d859721363f9f957c0c18b0d20a42039
+  data.tar.gz: de08322c4b9ecbf1cc2976e0a65fea61a1b8971c26caf3b01c0b90b3e7ae7dce35946b20b44e79b7ff3ad96fc391432ea8b2d5692ed996da31c0ba0a5ef0a8b9

data/bin/tiller

@@ -1,10 +1,14 @@
 #!/usr/bin/env ruby
-# Tiller - Dynamic configuration generator, intended for use in Dockerfiles
+# A tool to create configuration files from a variety of sources, particularly 
+# useful for Docker containers. See https://github.com/markround/tiller for 
+# examples and documentation.
+#
 # Named from the first ship-building (Docker) related term I could find that
 # didn't have an existing gem named after it!
+#
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.6.0'
+VERSION = '0.6.1'
 
 require 'erb'
 require 'ostruct'

data/lib/tiller/data/http.rb

@@ -0,0 +1,23 @@
+require 'pp'
+require 'httpclient'
+require 'timeout'
+require 'tiller/http.rb'
+
+
+class HttpDataSource < Tiller::DataSource
+
+  include Tiller::HttpCommon
+
+  def values(template_name)
+    parse(get_uri(@http_config['uri'] + @http_config['values']['template'], :template => template_name))
+  end
+
+  def global_values
+    parse(get_uri(@http_config['uri'] + @http_config['values']['global']))
+  end
+
+  def target_values(template_name)
+    parse(get_uri(@http_config['uri'] + @http_config['values']['target'], :template => template_name))
+  end
+
+end

data/lib/tiller/defaults.rb

@@ -32,3 +32,23 @@ module Tiller::Zookeeper
 
 end
 
+
+# Defaults for the HTTP data and template sources
+module Tiller::Http
+
+  Defaults = {
+      'timeout'   => 5,
+      'proxy'     => '',
+      'templates' => '/tiller/environments/%e/templates',
+      'template_content' => '/tiller/templates/%t/content',
+      'parser'    => 'json',
+
+      'values'    => {
+          'global'    => '/tiller/globals',
+          'template'  => '/tiller/templates/%t/values/%e',
+          'target'    => '/tiller/templates/%t/target_values/%e'
+      }
+  }
+
+end
+

data/lib/tiller/http.rb

@@ -0,0 +1,64 @@
+# Common methods for HTTP plugins
+
+require 'httpclient'
+require 'timeout'
+require 'pp'
+require 'tiller/defaults.rb'
+require 'json'
+
+module Tiller::HttpCommon
+
+  def setup
+    # Set our defaults if not specified
+    @http_config = Tiller::Http::Defaults
+
+    raise 'No HTTP configuration block' unless @config.has_key?('http')
+    @http_config.merge!(@config['http'])
+
+    # Sanity check
+    ['uri'].each {|c| raise "HTTP: Missing HTTP configuration #{c}" unless @http_config.has_key?(c)}
+
+    # Create the client used for all requests
+    @client = HTTPClient.new(@http_config['proxy'])
+
+    # Basic auth for resource
+    if @http_config.has_key?('username')
+      puts 'HTTP: Using basic authentication' if @config[:debug]
+      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]
+      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
+  end
+
+
+  # Interpolate the placeholders and return content from a URI
+  def get_uri(uri, interpolate={})
+    uri.gsub!('%e', @config[:environment])
+    uri.gsub!('%t', interpolate[:template]) if interpolate[:template]
+
+    puts "HTTP: Fetching #{uri}" if @config[:debug]
+    resp = @client.get(uri, :follow_redirect => true)
+    raise "HTTP: Server responded with status #{resp.status} for #{uri}" if resp.status != 200
+    resp.body
+  end
+
+
+  # Wrap parsing here, so we can implement XML and other parsers later
+  def parse(content)
+    case @http_config['parser']
+      when 'json'
+        puts 'HTTP: Using JSON parser' if @config[:debug]
+        JSON.parse(content)
+      else
+        raise "HTTP: Unsupported parser '#{@http_config['parser']}'"
+    end
+  end
+
+
+end

data/lib/tiller/options.rb

@@ -6,6 +6,9 @@ def parse_options(config)
     opts.on('-v', '--verbose', 'Display verbose output') do
       config[:verbose] = true
     end
+    opts.on('-d', '--debug', 'Display debug output') do
+      config[:debug] = true
+    end
     opts.on('-a', '--api', 'Enable HTTP API') do
       config['api_enable'] = true
     end

data/lib/tiller/template/http.rb

@@ -0,0 +1,20 @@
+require 'pp'
+require 'httpclient'
+require 'timeout'
+require 'tiller/http.rb'
+
+
+
+class HttpTemplateSource < Tiller::TemplateSource
+
+  include Tiller::HttpCommon
+
+  def templates
+    parse(get_uri(@http_config['uri'] + @http_config['templates']))
+  end
+
+  def template(template_name)
+    get_uri(@http_config['uri'] + @http_config['template_content'], :template => template_name)
+  end
+
+end

metadata

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