tiller 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad52aeecb758099a50e137c5cfac27f3f3b8426
-  data.tar.gz: a6a6f0e8fa396b6588ee1172c51ad62f928e10a2
+  metadata.gz: 81f462b7034a8c815eb6e561948cba295dbf3761
+  data.tar.gz: 5254ffc7b3ea0e2811fc44be2e54f8ff80e48e65
 SHA512:
-  metadata.gz: 1140c813c8fcf4e324b09ee8dd540146a8889633fa255facadd06a40ea7ef530880185f997bb1d5be15b11c14206f2cb367dc8c464e0561c905a2e4f5c728649
-  data.tar.gz: 64e11eb53ba02884144ef9f240d99bbea81136d6b4eba96ee8c7e7a9aec5c5d9abc5aabc619b7229ac7f4fc2fe95c9360407c7c307e2ef851f9cd1ef3d313103
+  metadata.gz: 6ce3e1d4b293f1b74ddabb9e8681b62a17016e27962713a8821393572354cd8aa23bc8b81ec07144e289ccfe20b7960b593658bb624f2dfeb8e929b59c530f90
+  data.tar.gz: 8c37b29ade6d27a3fe9cad11b36d2e80ecd954f14a2b12adc3897146e727cd62ba6b25e3d38a0e28feef2c83d579656d35d6e180df475cea120a9beaf6d33508

data/bin/tiller

@@ -8,7 +8,7 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.7.3'
+VERSION = '0.7.4'
 
 require 'erb'
 require 'ostruct'
@@ -45,7 +45,7 @@ module Tiller
   begin
     common_file = File.join(config[:tiller_base], 'common.yaml')
     config.merge!(YAML.load(open(common_file)))
-  rescue Exception => e
+  rescue StandardError => e
     abort "Error : Could not open common configuration file!\n#{e}"
   end
 
@@ -152,7 +152,7 @@ module Tiller
     # config is redundant in target_values, remove it for the final status hash.
     all_templates[template] = {
         'merged_values' => tiller,
-        'target_values' => target_values.reject{|k,v| k=='config'}
+        'target_values' => target_values.reject{|k,_v| k=='config'}
     }
 
     # Set permissions if we are running as root
@@ -189,7 +189,7 @@ module Tiller
 
   if config[:no_exec] == false && config.key?('exec')
     # All templates created, so let's start the replacement process
-    puts "Executing #{config['exec'].to_s}..."
+    puts "Executing #{config['exec']}..."
 
     # Spawn and wait so API can continue to run
     child_pid = launch(config['exec'], :verbose => config[:verbose])

data/lib/tiller/api.rb

@@ -25,7 +25,7 @@ def tiller_api(tiller_api_hash)
     begin
       socket = server.accept
       request = socket.gets
-      (method, uri, http_version) = request.split
+      (method, uri, _http_version) = request.split
 
       if uri =~ /^\/v([0-9]+)\//
         api_version = uri.split('/')[1]

data/lib/tiller/api/handlers/templates.rb

@@ -4,11 +4,11 @@ require 'tiller/api/handlers/404'
 def handle_templates(api_version, tiller_api_hash)
   case api_version
     when 'v1'
-        {
-            :content => dump_json(tiller_api_hash['templates'].keys),
-            :status => '200 OK'
-        }
+      {
+          :content => dump_json(tiller_api_hash['templates'].keys),
+          :status => '200 OK'
+      }
       else
         handle_404
-      end
   end
+end

data/lib/tiller/data/defaults.rb

@@ -4,7 +4,7 @@ require 'yaml'
 # 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 }
+    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
@@ -52,7 +52,15 @@ class DefaultsDataSource < Tiller::DataSource
 
     if @defaults_hash.key?(template_name)
       values = @defaults_hash[template_name]
-      values.key?('config') ? values['config'] : values
+      if values.is_a? Hash
+        values.key?('config') ? values['config'] : values
+      else
+        # Previous versions of Tiller didn't throw an error when we had an empty
+        # template config definition in a defaults file. Tiller 0.7.3 "broke" this, so while it's arguably the
+        # correct thing to bail out, in the interests of backwards-compatibility, we now instead log a warning and continue.
+        @log.warn("Warning, empty config for #{template_name}")
+        Hash.new
+      end
     else
       Hash.new
     end
@@ -61,7 +69,13 @@ class DefaultsDataSource < Tiller::DataSource
   def target_values(template_name)
     if @defaults_hash.key?(template_name)
       values = @defaults_hash[template_name]
-      values.key?('target') ? values : Hash.new
+      if values.is_a? Hash
+        values.key?('target') ? values : Hash.new
+      else
+        # See comments for values function.
+        @log.warn("Warning, empty config for #{template_name}")
+        Hash.new
+      end
     else
       Hash.new
     end

data/lib/tiller/data/file.rb

@@ -24,7 +24,7 @@ class FileDataSource < Tiller::DataSource
                              "#{@config[:environment]}.yaml")
         @config_hash = YAML.load(open(env_file))
       rescue
-        abort ("Error : Could not load environment file #{env_file}")
+        abort("Error : Could not load environment file #{env_file}")
       end
     end
   end

data/lib/tiller/data/xml_file.rb

@@ -20,7 +20,7 @@ class XmlFileDataSource < Tiller::DataSource
       @log.info('Opening XML file : ' + path)
       begin
         xml = Crack::XML.parse(File.open(path))
-      rescue Exception => e
+      rescue StandardError => e
         abort "Error : Could not parse XML file #{path}\n#{e}"
       end
       struct = {}

data/lib/tiller/logger.rb

@@ -10,7 +10,7 @@ module Tiller
       self.level = Logger::INFO if config[:verbose]
       self.level = Logger::DEBUG if config[:debug]
 
-      self.formatter = proc do |severity, datetime, progname, msg|
+      self.formatter = proc do |_severity, _datetime, _progname, msg|
         "#{msg}\n"
       end
 

data/lib/tiller/util.rb

@@ -23,7 +23,7 @@ def signal(sig, pid, options={})
 end
 
 # Launch the replacement process.
-def launch(cmd, options={})
+def launch(cmd, _options={})
   # If an array, then we use a different form of spawn() which
   # avoids a subshell. See https://github.com/markround/tiller/issues/8
   if cmd.is_a?(Array)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-24 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
@@ -20,30 +20,6 @@ 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
-- examples/json/templates/array.erb
-- examples/json/templates/simple_keys.erb
-- examples/plugins/etc/tiller/common.yaml
-- examples/plugins/etc/tiller/environments/production.yaml
-- examples/plugins/etc/tiller/environments/staging.yaml
-- examples/plugins/etc/tiller/templates/sensu_client.erb
-- examples/plugins/lib/tiller/data/dummy.rb
-- examples/plugins/lib/tiller/data/network.rb
-- examples/plugins/lib/tiller/template/dummy.rb
 - lib/tiller/api.rb
 - lib/tiller/api/handlers/404.rb
 - lib/tiller/api/handlers/config.rb

data/examples/defaults.d/common.yaml

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

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

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

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

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

data/examples/defaults.d/defaults.yaml

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

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

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

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

@@ -1,5 +0,0 @@
-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

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

data/examples/defaults/common.yaml

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

data/examples/defaults/defaults.yaml

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

data/examples/defaults/environments/production.yaml

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

data/examples/defaults/environments/staging.yaml

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

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

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

data/examples/json/common.yaml

@@ -1,6 +0,0 @@
-data_sources:
-  - environment_json
-  - file
-template_sources:
-  - file
-exec: sleep 600

data/examples/json/environments/array.yaml

@@ -1,4 +0,0 @@
-array.erb:
-  target: /tmp/array.txt
-  config:
-    default_value: 'This may be overridden by the JSON data source'

data/examples/json/environments/simple_keys.yaml

@@ -1,4 +0,0 @@
-simple_keys.erb:
-  target: /tmp/simple_keys.txt
-  config:
-    default_value: 'This may be overridden by the JSON data source'

data/examples/json/templates/array.erb

@@ -1,4 +0,0 @@
-This is a list of all servers:
-<% servers.each do |server| %>
-    Server : <%= server -%>
-<% end %>

data/examples/json/templates/simple_keys.erb

@@ -1,4 +0,0 @@
-Default value : <%= default_value %>
-
- * Key 1 is : <%= key1 %>
- * Key 2 is : <%= key2 %>

data/examples/plugins/etc/tiller/common.yaml

@@ -1,37 +0,0 @@
-# Example configuration file, demonstrating how to use Tiller.
-#
-# These examples create two templates with different values depending on if you set the environment to
-# "production" or "staging".
-#
-# This would be called with the following environment variables set (e.g. from a bash prompt) :
-#
-# tiller_base=$PWD/examples/etc/tiller tiller_lib=$PWD/examples/lib tiller
-#
-# (Tiller uses the "production" environment if none is set). Or, for staging:
-#
-# environment=staging tiller_base=$PWD/examples/etc/tiller tiller_lib=$PWD/examples/lib tiller
-#
-# See the documentation for more details on how to use this in a Dockerfile.
-
-# exec: The executable to handover to after execution. In a Dockerfile, this would probably be /usr/bin/supervisord
-# Or some other daemon. For testing, /usr/bin/date (or similar) is a useful one-shot command that just exits,
-# so you can inspect your templates.
-exec: date
-
-# data_sources: Sources of data. Here, we're pulling in the provided FileDataSource and EnvironmentDataSource (ships with 
-# this gem), and also the NetworkDataSource under examples/lib/tiller. This is found because we set tiller_lib when we 
-# called the tiller executable. We're not pulling in the example DummyDataSource, because it also provides target_values, 
-# so would overwrite the target_values from FileDataSource - you should only have one DataSource providing this information,
-# otherwise your templates may end up in strange places you didn't expect!
-data_sources:
-  - file
-  - environment
-  - network
-
-
-# template_sources: Sources of templates, in priority order (first takes precendence). Again using the provided
-# FileTemplateSource (uses templates under <tiller_base>/templates), and also because we set tiller_lib, we can use
-# DummyTemplateSource which creates a single "dummy.erb" template.
-template_sources:
-  - file
-  - dummy

data/examples/plugins/etc/tiller/environments/production.yaml

@@ -1,27 +0,0 @@
-# Here is an example configuration file for your production environment.
-
-# We override a setting from common.yaml for this environment.
-common:
-  api_enable: true
-  exec: env
-
-# First, we define the values for an example sensu_client template :
-sensu_client.erb:
-  target: /etc/sensu/conf.d/client.json
-  config:
-    sensu_host: 'sensu.example.com'
-    sensu_subscriptions:
-      - common
-      - physical
-      - mongo
-
-# This is a dummy template provided by the DummyTemplateSource. You'll notice that because we're not pulling in
-# DummyDataSource, the dummy_global variable is not set, but the template is still built without an error (the
-# value is just left blank).
-dummy.erb:
-  target: /tmp/files/dummy.txt
-  owner: root
-  group: wheel
-  perms: 0644
-  config:
-    dummy: 'Text from a filesource - production environment'

data/examples/plugins/etc/tiller/environments/staging.yaml

@@ -1,24 +0,0 @@
-# Here is an example configuration file for your staging environment.
-
-# First, we define the values for an example sensu_client template. In this example, we changed to including a "virtual"
-# subscription instead of "physical", which was set in the production environment.
-sensu_client.erb:
-  target: /etc/sensu/conf.d/client.json
-  config:
-    sensu_host: 'sensu.example.com'
-    sensu_subscriptions:
-      - common
-      - virtual
-      - mongo
-
-# This is a dummy template provided by the DummyTemplateSource. You'll notice that because we're not pulling in
-# DummyDataSource, the dummy_global variable is not set, but the template is still built without an error (the
-# value is just left blank). Here we also write the file to a different location that the one in the production
-# environment.
-dummy.erb:
-  target: /tmp/files/dummy-staging.txt
-  owner: root
-  group: wheel
-  perms: 0644
-  config:
-    dummy: 'Text from a filesource - staging environment'

data/examples/plugins/etc/tiller/templates/sensu_client.erb

@@ -1,8 +0,0 @@
-{
-    "client": {
-        "name": "<%= fqdn %>",
-        "address": "<%= ipv4_addresses[0][3] %>",
-        "subscriptions": <%= sensu_subscriptions %>,
-        "safe_mode": "false"
-    }
-}

data/examples/plugins/lib/tiller/data/dummy.rb

@@ -1,25 +0,0 @@
-# This is a "dummy" datasource for Tiller. All it does is provide a single
-# global and local value, and shows how you can provide a hash of target values
-# to configure where templates are written.
-class DummyDataSource < Tiller::DataSource
-  def global_values
-    { 'dummy_global' => 'dummy global replacement text' }
-  end
-
-  def values(_template_name)
-    { 'dummy' => 'dummy replacement text' }
-  end
-
-  # Dummy values, useful for testing. Will just result in the template being
-  # built and written to /tmp/dummy. Remember that perms must be in octal
-  # (no quotes). Note that as you have the environment name in the @config hash,
-  # you can always return different values for different environments.
-  def target_values(template_name)
-    {
-      'target'  => "/tmp/dummy/#{template_name}",
-      'user'    => 'root',
-      'group'   => 'root',
-      'perms'   => 0644
-    }
-  end
-end

data/examples/plugins/lib/tiller/data/network.rb

@@ -1,15 +0,0 @@
-require 'socket'
-# This is a quick example of a global datasource for Tiller.
-# It shows how you might provide some basic network-related information to your
-# templates. It's a super quick and hacky, but serves as a useful example.
-# You can then do things like <%= fqdn %> or <%= ipv4_addresses[0][3] %> in
-# your templates.
-class NetworkDataSource < Tiller::DataSource
-  def global_values
-    # Note, these rely on DNS being available and configured correctly!
-    {
-      'fqdn'            =>  Socket.gethostbyname(Socket.gethostname).first,
-      'ipv4_addresses'  =>  Socket.getaddrinfo(Socket.gethostbyname(Socket.gethostname).first, nil, :INET)
-    }
-  end
-end

data/examples/plugins/lib/tiller/template/dummy.rb

@@ -1,15 +0,0 @@
-# This is another quick example of how to create a template source.
-class DummyTemplateSource < Tiller::TemplateSource
-  # Just provide a single dummy template
-  def templates
-    ['dummy.erb']
-  end
-
-  # And return some sample ERB content.
-  # Note that as you have the environment name in the @config hash, you can
-  # always return different templates for different environments.
-  def template(_template_name)
-    "This is a dummy template! <%= dummy %> \n "\
-    'Here is a global value <%= dummy_global %>'
-  end
-end