tiller 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e822f04c4956fa8ddbc156465643fcbc481fb58d
-  data.tar.gz: b23183f8d51f4435d20e4dbd4fb02193d819ae03
+  metadata.gz: c4ca53cc681827456c07f791d7d58e558014cc7e
+  data.tar.gz: cae787837375bc7ba3b54eaf784e90b33c762385
 SHA512:
-  metadata.gz: d8cb6c32dd9eb1fb87652ec26e001e9c1fa44a9804e85457f55c6ed1b256d7569a7271601e6811bccba1371d3a62c1f7f157e77e0cf326245c5db43f8fbd8935
-  data.tar.gz: b4ddcae0335c162a4ed0673faa4fb8e8727479ae81c2015eea2d3cd68f8dff62cb3159517e0ad49277d17f04f00ba9874907dd759d7c2a0af8fbad7ed4d6580a
+  metadata.gz: c75b645fd91e5225352848b1443eaf2dbee36d8d352d5bab64e3a46fc2d098bbbdc00abce8bfd57a6895cb9840517e4bfb5688ddd2c3596bde1a1c51c849d197
+  data.tar.gz: d0a19d94b88af5e848f5d53147aeb50d3a49a788c6b567e536cc3e54bdbaf9ea418e89c6750dbf586c5157ab26e57a62154ff8bbce83fefec839a58c2eda5e37

data/bin/tiller

@@ -3,7 +3,7 @@
 # Named from the first ship-building (Docker) related term I could find that didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION='0.0.4'
+VERSION='0.0.5'
 
 require 'erb'
 require 'ostruct'
@@ -100,6 +100,10 @@ module Tiller
       end
     end
 
+    # If our data source returned no values (e.g. we don't build this template for this environment)
+    # We move onto the next one.
+    next if target_values.empty?
+
     # Now, we build the template
     tiller = values.merge(global_values) do |key, old, new|
       warn_merge(key, old, new, 'global and local', 'merged configuration')
@@ -120,7 +124,8 @@ module Tiller
     # Set permissions if we are running as root
     if Process::Sys.geteuid == 0 then
       puts "Setting ownership/permissions on #{target_values['target']}"
-      FileUtils.chmod(target_values['perms'], target_values['target']) if target_values.has_key('perms')
+      FileUtils.chmod(target_values['perms'], target_values['target']) if target_values.has_key?('perms')
+      # Don't need to check for the presence of these, as they're ignored if null.
       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']}"

data/lib/tiller/data/file.rb

@@ -9,16 +9,16 @@ class FileDataSource < Tiller::DataSource
   # We don't provide any global values, just ones specific to a template.
   def initialize(config)
     super
-    env_file = File.join(@@config[:tiller_base] , "environments" , "#{@@config[:environment]}.yaml")
+    env_file = File.join(@@config[:tiller_base], "environments", "#{@@config[:environment]}.yaml")
     @config_hash = YAML::load(open(env_file))
   end
 
   def values(template_name)
-    @config_hash[template_name]['config']
+    @config_hash.has_key?(template_name) ? @config_hash[template_name]['config'] : Hash.new
   end
 
   def target_values(template_name)
-    @config_hash[template_name]
+    @config_hash.has_key?(template_name) ? @config_hash[template_name]['config'] : Hash.new
   end
 
 end

data/lib/tiller/datasource.rb

@@ -4,7 +4,7 @@
 # about a template, e.g. target location, permissions, owner and so on)
 
 module Tiller
-	class DataSource
+  class DataSource
 
     # All subclasses get this, which is a hash containing tiller_base, tiller_lib and environment.
     @@config = Array.new
@@ -16,6 +16,7 @@ module Tiller
 
     attr_reader :global_values
 
+    # We should always return a hash; if we have no data for the given template, just return an empty hash.
     def values(template_name)
       Hash.new
     end
@@ -27,6 +28,7 @@ module Tiller
     #    'group'   => 'root',
     #    'perms'   => '0644'
     #}
+    # Again, we should always return a hash; if we have no data for the given template, just return an empty hash.
     def target_values(template_name)
       Hash.new
     end
@@ -35,5 +37,5 @@ module Tiller
       "ping!" + @@config.to_s
     end
 
-	end
+  end
 end

data/lib/tiller/template/file.rb

@@ -5,20 +5,20 @@ class FileTemplateSource < Tiller::TemplateSource
 
   def initialize(config)
     super
-    @template_dir = File.join(@@config[:tiller_base] , 'templates/')
+    @template_dir = File.join(@@config[:tiller_base], 'templates/')
   end
 
   # Simply return a list of all the templates in the $tiller_base/templates directory
   # With the preceeding directory path stripped off
   def templates
-    Dir.glob(File.join(@template_dir , '**' , '*.erb')).each do |t|
-      t.sub!(@template_dir , '')
+    Dir.glob(File.join(@template_dir, '**', '*.erb')).each do |t|
+      t.sub!(@template_dir, '')
     end
   end
 
   # Just open and return the file
   def template(template_name)
-    open(File.join(@template_dir , template_name)).read
+    open(File.join(@template_dir, template_name)).read
   end
 
 end

data/lib/tiller/templatesource.rb

@@ -2,7 +2,7 @@
 # Subclasses provide templates (an array), and individual template contents (a string containing ERB data)
 
 module Tiller
-	class TemplateSource
+  class TemplateSource
 
     # All subclasses get this, which is a hash containing tiller_base, tiller_lib and environment.
     @@config = Array.new
@@ -22,5 +22,5 @@ module Tiller
     def ping
       "ping!" + @@config.to_s
     end
-	end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-21 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.