yutani 0.1.12 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a8429b5ebef83eb6a439a01fb542973221d0386
-  data.tar.gz: 49d5ea9b1161aacc544489bca25d8e6b07c93c60
+  metadata.gz: 483c5e58654c42e69d8e7e788857ce69fd1b7e86
+  data.tar.gz: b54ada05a35257c53244c48c8de8875e177ecc57
 SHA512:
-  metadata.gz: 4a3c7679596ea8d4602586701ac439e84c4cbf0bb92dc475fbc6817bf194c70ef1b632705e6153c434dd53810bc813c88fbd1b5a1c71aa272f74c98a9d7c7cd9
-  data.tar.gz: 305d1813cc2929ecda7dcd3ddb71dbff4433337dddd9ac36241cf41cecd37b7994efe9eb689462723f66993f4995be2ad9ab3f8b47cc6d2711ac85897853bc99
+  metadata.gz: 68fe75b176ce425ec09c835c5156e040b46f5b3ef36f1f34d6c810af6f3ba5055da50902acdc6aafefe8246b9183352164f8f86594a3b6a8f2e4e350c2b0b931
+  data.tar.gz: dc0b8699b5b7269b02e6c5bee8673d667315394171f38b267ae0acc821d82ff51266aee34481bad849390b889a0bfad0ad75f5b7e55925c69d8c486a7a7034cb

data/lib/yutani/cli.rb

@@ -44,7 +44,11 @@ module Yutani
     # * the glob  - this is hardcoded to *.rb
     desc 'watch', 'Run build upon changes to scripts'
     def watch
-      Listen.to(Yutani::Config::DEFAULTS['scripts_dir']) do |m, a, d|
+      Listen.to(
+        Yutani::Config::DEFAULTS['scripts_dir'],
+        Yutani::Config::DEFAULTS['includes_dir']
+      ) do |m, a, d|
+
         Yutani.logger.info "Re-build triggered: #{m} modified" unless m.empty?
         Yutani.logger.info "Re-build triggered: #{a} added" unless a.empty?
         Yutani.logger.info "Re-build triggered: #{d} deleted" unless d.empty?

data/lib/yutani/config.rb

@@ -6,6 +6,7 @@ module Yutani
     DEFAULTS = Config[{
       "scripts_dir" => "scripts",
       "includes_dir" => "includes",
+      "templates_dir" => "templates",
       "terraform_dir" => "terraform",
       "hiera_config"  => {
         :backends  => ["yaml"],

data/lib/yutani/hiera.rb

@@ -9,6 +9,10 @@ module Yutani
 
     @scopes = []
 
+    def hiera(k)
+      Hiera.lookup(k)
+    end
+
     class << self
       attr_accessor :hiera, :scopes
 

data/lib/yutani/provider.rb

@@ -1,5 +1,7 @@
 module Yutani
-  class Provider < DSLEntity
+  class Provider
+    include Hiera
+
     attr_accessor :provider_name, :fields
 
     def initialize(provider_name, **scope, &block)
@@ -26,7 +28,7 @@ module Yutani
 
     def method_missing(name, *args, &block)
       if block_given?
-        raise StandardError, 
+        raise StandardError,
           "provider properties do not accept blocks as parameters"
       else
         @fields[name] = args.first

data/lib/yutani/resource.rb

@@ -1,5 +1,7 @@
 module Yutani
-  class Resource < DSLEntity
+  class Resource
+    include Hiera
+
     attr_accessor :resource_type, :namespace, :fields
 
     def initialize(resource_type, *namespace, &block)
@@ -26,6 +28,10 @@ module Yutani
       "${%s}" % [resource_type, namespace.join('_'), attr].join('.')
     end
 
+    def template(path, **kv)
+      Template.new(kv).render(path)
+    end
+
     def respond_to_missing?(method_name, include_private = false)
       true
     end
@@ -45,7 +51,7 @@ module Yutani
     end
   end
 
-  class SubResource < Resource 
+  class SubResource < Resource
     def initialize
       @fields = {}
     end

data/lib/yutani/stack.rb

@@ -1,7 +1,9 @@
 require 'json'
 
 module Yutani
-  class Stack < DSLEntity
+  class Stack
+    include Hiera
+
     attr_accessor :resources, :providers, :outputs, :variables
 
     def initialize(*namespace, &block)

data/lib/yutani/template.rb

@@ -0,0 +1,27 @@
+require 'erb'
+
+module Yutani
+  class TemplateNotFoundError < StandardError; end
+
+  # an openstruct is useful because it lets us take a hash
+  # and turn its k/v's into local variables inside the tmpl
+  class Template < OpenStruct
+    include Hiera
+
+    class << self
+      def templates_path
+        Yutani.config['templates_dir']
+      end
+    end
+
+    def render(path)
+      full_path = File.join(Template.templates_path, path)
+
+      unless File.exists?(full_path)
+        raise TemplateNotFoundError, full_path
+      end
+
+      ERB.new(File.read(full_path)).result binding
+    end
+  end
+end

data/lib/yutani/version.rb

@@ -1,3 +1,3 @@
 module Yutani
-  VERSION = '0.1.12'
+  VERSION = '0.1.15'
 end

data/lib/yutani.rb

@@ -7,11 +7,11 @@ require 'yutani/version'
 require 'yutani/config'
 require 'yutani/hiera'
 require 'yutani/cli'
-require 'yutani/dsl_entity'
 require 'yutani/directory_tree'
 require 'yutani/stack'
 require 'yutani/resource'
 require 'yutani/provider'
+require 'yutani/template'
 require 'yutani/utils'
 
 module Yutani

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yutani
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.15
 platform: ruby
 authors:
 - Louis Garman
@@ -173,11 +173,11 @@ files:
 - lib/yutani/cli.rb
 - lib/yutani/config.rb
 - lib/yutani/directory_tree.rb
-- lib/yutani/dsl_entity.rb
 - lib/yutani/hiera.rb
 - lib/yutani/provider.rb
 - lib/yutani/resource.rb
 - lib/yutani/stack.rb
+- lib/yutani/template.rb
 - lib/yutani/utils.rb
 - lib/yutani/version.rb
 homepage: https://github.com/leg100/yutani

data/lib/yutani/dsl_entity.rb

@@ -1,7 +0,0 @@
-module Yutani
-  class DSLEntity
-    def hiera(k)
-      Yutani::Hiera.lookup(k)
-    end
-  end
-end