tiller 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e3b43a954c568746d1b2e987616ee2c02bac87
-  data.tar.gz: 04bba1376ebe4e065e69c6d7ce7a97b97e324d55
+  metadata.gz: cf773d678bba89ec6157521d7bddf05d22681e74
+  data.tar.gz: 5546392bad1250d0747fc4fc93aa7659af25dc03
 SHA512:
-  metadata.gz: d431b978f3ae55d9cc9e0e24ad265440a0e2c8e806b88767d61a1c054c2779e7baca9ee796359351b191ff930dd709c0c9790d0965199504301f486eab2441c1
-  data.tar.gz: 9165c94883002d36df0020e211be9771a20b28e1a82054c1a8073615d1e3a29a5f516071e126f49bd363f26632916d87dfa07c39f0af21b3f63149027755a648
+  metadata.gz: e1c32ea6fd357a09ecf9d56cee9cd245d81941e0094241fec971da01b3ee98dee1b7fd76073a00dd403a8dad76a94e62d8832e1beed9ebffa5c38f1e16dee5af
+  data.tar.gz: 36a15edabd7c35851f8b8e49d834b00910e5fc1d60b5b9b8f440fb51ecbf7896001cfa0d16716367a904685f790f2242977f8058539efb66865965341d2f8b71

data/bin/tiller

@@ -4,7 +4,7 @@
 # didn't have an existing gem named after it!
 # Mark Round <github@markround.com>
 
-VERSION = '0.1.3'
+VERSION = '0.1.4'
 
 require 'erb'
 require 'ostruct'
@@ -13,7 +13,7 @@ require 'fileutils'
 require 'optparse'
 require 'pp'
 
-# This is needed so we can enumarate all the loaded plugins later
+# This is needed so we can enumerate all the loaded plugins later
 class Class
   def subclasses
     ObjectSpace.each_object(Class).select { |c| c < self }
@@ -49,9 +49,20 @@ module Tiller
     opts.on('-v', '--verbose', 'Display verbose output') do
       config[:verbose] = true
     end
+    opts.on('-b', '--base-dir [BASE_DIR]', 'Override the tiller_base environment variable') do |base_dir|
+      config[:tiller_base] = base_dir
+    end
+    opts.on('-l', '--lib-dir [LIB_DIR]', 'Override the tiller_lib environment variable') do |lib_dir|
+      config[:tiller_lib] = lib_dir
+    end
+    opts.on('-e', '--environment [ENV]', 'Override the \'environment\' environment variable') do |environment|
+      config[:environment] = environment
+    end
+
     opts.on('-h', '--help', 'Display this screen') do
       puts opts
-      puts 'Tiller also uses the environment variables tiller_base and tiller_lib.'
+      puts 'Tiller also uses the environment variables tiller_base, environment'
+      puts 'and tiller_lib (or they can be provided using the arguments shown above).'
       puts 'See https://github.com/markround/tiller for documentation and usage.'
       puts 'Current configuration hash follows :'
       pp config

data/examples/json/common.yaml

@@ -0,0 +1,5 @@
+data_sources:
+  - environment_json
+  - file
+template_sources:
+  - file

data/examples/json/environments/array.yaml

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

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

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

data/examples/json/templates/simple_keys.erb

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

data/examples/{etc → plugins/etc}/tiller/common.yaml

@@ -28,6 +28,7 @@ data_sources:
   - 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.

data/lib/tiller/data/environment_json.rb

@@ -0,0 +1,24 @@
+# Environment JSON datasource for Tiller. This extracts all JSON from the
+# tiller_json environment variable and merges the resulting hash data
+# structure into the global_values available to templates.
+
+require 'json'
+require 'pp'
+
+class EnvironmentJsonDataSource < Tiller::DataSource
+  def global_values
+
+    if ENV.has_key?('tiller_json')
+      begin
+        json_structure = JSON.parse(ENV['tiller_json'])
+        json_structure if json_structure.is_a?(Hash)
+      rescue JSON::ParserError
+        puts "Warning : Error parsing tiller_json environment variable"
+        Hash.new
+      end
+    else
+      Hash.new
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-17 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.
@@ -19,14 +19,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/tiller
-- examples/etc/tiller/common.yaml
-- examples/etc/tiller/environments/production.yaml
-- examples/etc/tiller/environments/staging.yaml
-- examples/etc/tiller/templates/sensu_client.erb
-- examples/lib/tiller/data/dummy.rb
-- examples/lib/tiller/data/network.rb
-- examples/lib/tiller/template/dummy.rb
+- 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/data/environment.rb
+- lib/tiller/data/environment_json.rb
 - lib/tiller/data/file.rb
 - lib/tiller/data/random.rb
 - lib/tiller/datasource.rb