tiller 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 783e5f461315d6b6c76b7f1bdc6c8c907056c2fb
-  data.tar.gz: cf893537c943b65c6ef30c1af5a86ed53eadf984
+  metadata.gz: c32c4ca4b4639f9805d818dc47918d843cca787c
+  data.tar.gz: 482b956bea0ca02af1c91079bbd3e49b04859e07
 SHA512:
-  metadata.gz: 3d36202ffecd118009d50b7efcf908825207965ba62b1b53e8aef34c3c1b4f8187124510d6236ecf5a37223036500a0751c80badcd3e3faa8566d68b03d050fa
-  data.tar.gz: 23ed8c7bd87be72c791fc8da4aa237932b44776540d82a555ce134c69d54f3259de7a8a355c6e0cb337af066a31f88687aa53e11555a5b820fe782db28cdb92c
+  metadata.gz: 866676d926a31d6987888aa8e258d14e71fe9ba2348cac6a28e83d2082bbd55fbd5ff1022d3166a2bfc80e793c071826e146494a2e3e88c9736551cc0a05e7cb
+  data.tar.gz: ac0d422c214bcf8cbcd48734fa38d181d8911fab8176bcd7e8a32e527d88153c867e96760e57c27550089ee74849ca2c85ec360843d953aa681fb69d90516d8a

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION = '0.3.1'
+VERSION = '0.3.2'
 
 require 'erb'
 require 'ostruct'
@@ -35,6 +35,9 @@ module Tiller
   # Load the common YAML configuration file
   config.merge!(YAML.load(open(File.join(config[:tiller_base], 'common.yaml'))))
 
+  # 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"

data/examples/json/common.yaml

@@ -4,5 +4,3 @@ data_sources:
 template_sources:
   - file
 exec: sleep 600
-
-

data/lib/tiller/defaults.rb

@@ -1,14 +1,18 @@
 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
+    :tiller_base          => (ENV['tiller_base'].nil?)  ? '/etc/tiller' : ENV['tiller_base'],
+    :tiller_lib           => (ENV['tiller_lib'].nil?)   ? '/usr/local/lib' : ENV['tiller_lib'],
+    # If not specified in environment, leave it as nil, we'll pick it up later
+    # from the -e flag or set it to default_environment.
+    :environment          => (ENV['environment'].nil?)  ? nil : ENV['environment'],
+    # This can be overridden in common.yaml.
+    'default_environment' => 'production',
+    :no_exec              => false,
+    :verbose              => false,
+    'api_enable'          => false,
+    'api_port'            => 6275
   }
 
-end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-20 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.