tiller 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d19ad6cc81b20acaf13f251a62861df1bc3a7d50
-  data.tar.gz: 95c3cd5651079891d414743303672085eb901610
+  metadata.gz: 32429bd0fb6b6c9f3c012e74bb55f0ff52ba7c24
+  data.tar.gz: a8758eef551cca3b0df1fc548700e9f8b9f6c712
 SHA512:
-  metadata.gz: a6d9446383c8025ee6d0ea10da9b3078b0675d17332829e86e3b05106a6a5072152de8f6104ee0271486e99b230336a19b77d63a489436cc4a05e841f2a01fc9
-  data.tar.gz: ddf4ac3e4fedab07bfe8a4ef1452c86b0022dd74acf9357b2f1159def7c8817a0e369f1f53cb6f25fd06d062a078845596b3b18d1d520b1940d199efa9393014
+  metadata.gz: 68551eaa414c82d97bcaed63412d8ea8cfbcd50a43b83536801f9160fecca459556b63b44cb729613ac613fd9e283a019e1769f4070d0520e6b9570f90855699
+  data.tar.gz: d6ba1f1b0ddd4a921bb314e268b325a44f60502d9d08186dccb611cc354f3910e91e470f712f88410677cad8fa80fb629666427826de780c941c1cf85d0a4780

data/bin/tiller

@@ -212,7 +212,7 @@ module Tiller
             # Proper Ruby voodoo here.
             # See http://stackoverflow.com/questions/19304135/deep-nest-a-value-into-a-hash-given-a-path-array for
             # explanation.
-            tiller.merge!((path + [parsed_value]).reverse.reduce { |s,e| { e => s } })
+            tiller.deep_merge!((path + [parsed_value]).reverse.reduce { |s,e| { e => s } })
           end
         end
         target_values.each do |key ,value|

data/lib/tiller/data/environment.rb

@@ -2,6 +2,8 @@ require 'tiller/datasource'
 
 class EnvironmentDataSource < Tiller::DataSource
 
+  @plugin_api_versions = [ 1, 2 ]
+
   def setup
     @plugin_config = Tiller::Environment.defaults
     if Tiller::config.has_key? 'environment' and Tiller::config['environment'].is_a? Hash

data/lib/tiller/data/file.rb

@@ -1,6 +1,9 @@
 require 'yaml'
 
 class FileDataSource < Tiller::DataSource
+
+  @plugin_api_versions = [1, 2]
+
   # Open and parse the environment file. Tries from v2 format common.yaml first, if that
   # failes, then it looks for separate environment files.
   def setup
@@ -41,11 +44,26 @@ class FileDataSource < Tiller::DataSource
   end
 
   def values(template_name)
-    @config_hash.key?(template_name) ? @config_hash[template_name]['config'] : {}
+    if (Tiller::config['plugin_api_version'] == 2)
+      # Everything comes from the values method in V2
+      if @config_hash.key?(template_name)
+        all_values=[]
+        @config_hash[template_name].each { |values| all_values << values }
+        return all_values
+      end
+    else
+      return @config_hash.key?(template_name) ? @config_hash[template_name]['config'] : {}
+    end
+
   end
 
   def target_values(template_name)
-    # The config element is redundant (not a target value)
-    @config_hash.key?(template_name) ? @config_hash[template_name] : {}
+    if (Tiller::config['plugin_api_version'] == 2)
+      Tiller::log.fatal("Deprecated : We should never get here")
+      exit
+    else
+      return @config_hash.key?(template_name) ? @config_hash[template_name] : {}
+    end
   end
+
 end

data/lib/tiller/datasource.rb

@@ -1,3 +1,5 @@
+require 'tiller/util.rb'
+
 # Tiller data source base class.
 module Tiller
   # Subclasses provide global_values and/or values (things local to a specific
@@ -5,6 +7,10 @@ module Tiller
   # location, permissions, owner and so on)
   class DataSource
 
+    include ClassLevelInheritableAttributes
+    inheritable_attributes :plugin_api_versions
+    @plugin_api_versions = [ 1 ]
+
     def initialize
       setup
     end

data/lib/tiller/defaults.rb

@@ -13,7 +13,8 @@ module Tiller
     'md5sum'              => false,
     'md5sum_noexec'       => false,
     'deep_merge'          => false,
-    'api_port'            => 6275
+    'api_port'            => 6275,
+    'plugin_api_version'  => 1
   }
 end
 

data/lib/tiller/loader.rb

@@ -25,6 +25,16 @@ def loader(type,sources)
     classes |= type.subclasses
   end
 
+  # Versioning check - if any of the loaded modules do not support the specified API version, we stop immediately.
+  classes.each do |c|
+    api_version = Tiller::config['plugin_api_version']
+    if ! c.plugin_api_versions.include?(api_version)
+      Tiller::log.fatal("ERROR : Plugin #{c} does not support specified API version #{api_version}")
+      exit(EXIT_FAIL)
+    end
+  end
+
+
   classes
 end
 

data/lib/tiller/options.rb

@@ -33,6 +33,9 @@ def parse_options(config)
     opts.on('--md5sum-noexec', 'Do not execute a process if no templates were written or changed') do
       config['md5sum_noexec'] = true
     end
+    opts.on('--plugin-api-version [VERS]', 'Specify the plugin API version to use') do |plugin_api_version|
+      config['plugin_api_version'] = plugin_api_version
+    end
 
     opts.on('-h', '--help', 'Display this screen') do
       puts opts

data/lib/tiller/template/file.rb

@@ -1,4 +1,7 @@
 class FileTemplateSource < Tiller::TemplateSource
+
+  @plugin_api_versions = [ 1, 2 ]
+
   def initialize
     super
     @template_dir = File.join(Tiller::config[:tiller_base], 'templates/')

data/lib/tiller/templatesource.rb

@@ -1,9 +1,15 @@
+require 'tiller/util'
+
 # Tiller template source base class
 module Tiller
   # Subclasses provide templates (an array), and individual template contents
   # (a string containing ERB data)
   class TemplateSource
 
+    include ClassLevelInheritableAttributes
+    inheritable_attributes :plugin_api_versions
+    @plugin_api_versions = [ 1 ]
+
     def initialize
       setup
     end

data/lib/tiller/util.rb

@@ -68,4 +68,31 @@ def launch(cmd)
   end
 
   pid
+end
+
+# Module for inheritable attributes in data sources (e.g. api_version)
+module ClassLevelInheritableAttributes
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def inheritable_attributes(*args)
+      @inheritable_attributes ||= [:inheritable_attributes]
+      @inheritable_attributes += args
+      args.each do |arg|
+        class_eval %(
+          class << self; attr_accessor :#{arg} end
+        )
+      end
+      @inheritable_attributes
+    end
+
+    def inherited(subclass)
+      @inheritable_attributes.each do |inheritable_attribute|
+        instance_var = "@#{inheritable_attribute}"
+        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+      end
+    end
+  end
 end

data/lib/tiller/version.rb

@@ -1,3 +1,3 @@
 # http://semver.org/
-VERSION="1.2.0"
+VERSION="1.3.0"
 SUPPORTED_RUBY_VERSION="2.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2018-04-10 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
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Dynamic configuration file generation