tiller 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8dc77227116ed298ac33995aa6b389192d6917b
-  data.tar.gz: 50e4cc6c12c7f1ba0844ea776f180136b75640fa
+  metadata.gz: bbefc0c67cf35c7423c6305a42b5d54d6f22c073
+  data.tar.gz: 05f48fecc05a436549e0b133331de3eddb05517b
 SHA512:
-  metadata.gz: 721d43464aaec3feab28f9647005cc50dbfeba1f5e816d03982e35f1bce8287e3cda45d898bc3ec163513a59f371e913456efcabc1e06d1bec102cf6337f9294
-  data.tar.gz: 5802b4722771fa28f172383516ece84de346f1b6b54132c5d79d9317788d0d95604a559efa8a59e79931a655ef38c0672d683393d05f035954a54630f2fc2a12
+  metadata.gz: cc2d6e760b5ceb022b421f09aea7fc90ea68490184a07ea0e24c4f6fa5a0a42d25ca24545ea226cd21df43168d32e8256c5b329aee22773dbf34f4f108842739
+  data.tar.gz: 9eb6ea7b23a1fbecd87265aa7389fd2daae9a47e86fbda398ba066af956900324215e5b4cc2ab93ed49e09b032754b48dfa3b1e0e7b4484da58d1987a7b045d6

data/bin/tiller

@@ -8,7 +8,7 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.7.8'
+VERSION = '0.7.9'
 
 require 'erb'
 require 'ostruct'

data/lib/tiller/data/external_file.rb

@@ -0,0 +1,56 @@
+require 'pp'
+require 'yaml'
+require 'json'
+require 'tiller/util'
+
+class ExternalFileDataSource < Tiller::DataSource
+
+  def setup
+    @merged_values = Hash.new
+    if @config.has_key?('external_files')
+      files = @config['external_files']
+      files.each do |file|
+        @merged_values.merge!(parse_file(file)) do |key, old, new|
+          warn_merge(key, old, new, 'external file data', file)
+        end
+      end
+    end
+  end
+
+  def global_values
+    return @merged_values
+  end
+
+  def parse_file(filename)
+    raise("External file '#{filename}' could not be loaded") unless File.file?(filename)
+    @log.debug("#{self} : Loading #{filename}")
+    parse = nil
+
+    # First try to load it as JSON
+    if ! parse
+      begin
+        parse = JSON.parse(File.read(filename))
+        @log.debug("#{self} : #{filename} is in JSON format")
+      rescue JSON::ParserError
+      end
+    end
+
+    # Then YAML
+    if ! parse
+      begin
+        parse = YAML.load(File.read(filename))
+        @log.debug("#{self} : #{filename} is in YAML format")
+      rescue Psych::SyntaxError
+      end
+    end
+
+    # Unknown / unparsable format, bail out...
+    if ! parse
+      raise("External file '#{filename}' is in an unknown format")
+    end
+
+    return parse
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-20 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
@@ -32,6 +32,7 @@ files:
 - lib/tiller/data/defaults.rb
 - lib/tiller/data/environment.rb
 - lib/tiller/data/environment_json.rb
+- lib/tiller/data/external_file.rb
 - lib/tiller/data/file.rb
 - lib/tiller/data/http.rb
 - lib/tiller/data/random.rb