tiller 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a1ee91c5860d98da73e05ec9e78430309dc9062
-  data.tar.gz: 15300fffec069df95fab3cbd081ce471ee6c40d1
+  metadata.gz: 0faa026bbfbb368fe8d689c233cf79614e5dc9e1
+  data.tar.gz: 3f90927d1e6c1185fb41f70a7f543f11c36a04a0
 SHA512:
-  metadata.gz: 6ce64fe320bff5680c8b8ed103656c267b145ea0d66b80b338e5110a2ac3eee1f938afd42fdf931c897720da7c30eca758bd292897999a67b3487fc884964564
-  data.tar.gz: e3a55abb0cf59af863abc9752e966ea315a9c46bc4ec14e51239e0eea6a60fbd048669d69e136891c1bc44a2b56cea69f383dd9ef2288aa185c49ffc048fce0a
+  metadata.gz: 283636ada09058f6ecaa3c2ed1064f50d25a6354815eca4579e4d452663dcb1f576d34eb0d94f9c3f26a27866497d1aaadf64314530fcdfdcd4b1661d1dc9084
+  data.tar.gz: a7645f090d7eba2e112b83c2ea96996fda23e10fe5b95d7e4e9fd8fc9e601e6aebab2c8a83c7cd234a3cfc7fc6860450cb94cef9c6acc95df94a046f80617c70

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.8'
+VERSION='0.1.0'
 
 require 'erb'
 require 'ostruct'

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

@@ -3,11 +3,8 @@
 
 class DummyDataSource < Tiller::DataSource
 
-  def initialize(config)
-    super
-    @global_values = {
-        'dummy_global' => 'dummy global replacement text'
-    }
+  def global_values
+    { 'dummy_global' => 'dummy global replacement text' }
   end
 
   def values(template_name)

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

@@ -6,14 +6,12 @@ require 'socket'
 
 class NetworkDataSource < Tiller::DataSource
 
-  def initialize(config)
-    super
+  def global_values
     # Note, these rely on DNS being available and configured correctly!
-    @global_values = {
+    {
         'fqdn'            =>  Socket.gethostbyname(Socket.gethostname).first,
         'ipv4_addresses'  =>  Socket.getaddrinfo(Socket.gethostbyname(Socket.gethostname).first, nil, :INET)
     }
   end
 
-
 end

data/lib/tiller/data/environment.rb

@@ -4,8 +4,9 @@
 class EnvironmentDataSource < Tiller::DataSource
 
   def global_values
-    ENV.each { |k,v| @global_values["env_#{k.downcase}"] = v }
-    @global_values
+    values = Hash.new
+    ENV.each { |k,v| values["env_#{k.downcase}"] = v }
+    values
   end
 
 end

data/lib/tiller/data/file.rb

@@ -1,14 +1,16 @@
 # File datasource for Tiller. This works the same way as the default behaviour in Runner.rb - it loads your
 # <environment>.yaml file and provides data from it. See examples/etc/tiller/environments/production.yaml to see
 # what this file looks like.
+#
+# We also don't provide any global values, just ones specific to a template.
+
 
 require 'yaml'
 
 class FileDataSource < Tiller::DataSource
 
-  # We don't provide any global values, just ones specific to a template.
-  def initialize(config)
-    super
+  # Open and parse the environment file
+  def setup
     env_file = File.join(@@config[:tiller_base], "environments", "#{@@config[:environment]}.yaml")
     @config_hash = YAML::load(open(env_file))
   end

data/lib/tiller/datasource.rb

@@ -11,10 +11,16 @@ module Tiller
 
     def initialize(config)
       @@config = config
-      @global_values = Hash.new
+      self.setup
     end
 
-    attr_reader :global_values
+    # This is where any post-initialisation logic happens (connecting to a database etc.)
+    def setup
+    end
+
+    def global_values
+      Hash.new
+    end
 
     # We should always return a hash; if we have no data for the given template, just return an empty hash.
     def values(template_name)

data/lib/tiller/templatesource.rb

@@ -11,6 +11,10 @@ module Tiller
       @@config = config
     end
 
+    # This is where any post-initialisation logic happens (connecting to a database etc.)
+    def setup
+    end
+
     def templates
       Hash.new
     end

metadata

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