stack_master 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd66f0ae759e197674b37f60c86753379a27b3d
-  data.tar.gz: 6ef5f772326ac2128d0d21667b1aa88cc4f066af
+  metadata.gz: 6427d9e4a3e305c6d57efd44e015b5e83a415abe
+  data.tar.gz: e9509b938fa0646f8c35571c74278b370c4d4512
 SHA512:
-  metadata.gz: fd853147d8aa925242872f9fcc24fa3e79572c6b23a3009a721303126afb0a34b411d18d41b90d2377371155bc61a93557b0367a29d1537a1a7bb30d2f905590
-  data.tar.gz: 39f780912d2be5c8176b2ae36d185fcd2736ebb3f3448ea89d1629299e2cfc7a9141dd8d4f78e6d45be1b0874c8bf1c53c43b223b34975fd354c73eddeac7cf5
+  metadata.gz: d32fa9ae827d12afeef460c724a8db1beac7ef6b645533d621ab2bb5ecfef3e15c4b2a8eec1720a4b6f5f2b184bc1bfb532bac3b56cd0cb08c33609d0117fbad
+  data.tar.gz: 2c7dbc03cb04804fb152b5f0040aa68b1d631d874ec3ca620698758de8f3e21b661561598fe14cdacc193d258728d9f6af419c07ab16e0f7a7bfb39b79752b27

data/lib/stack_master/sparkle_formation/template_file.rb

@@ -23,24 +23,30 @@ module StackMaster
       include ::SparkleFormation::SparkleAttribute::Aws
       include ::SparkleFormation::Utils::TypeCheckers
 
-      def self.build(vars)
+      def self.build(vars, prefix)
         ::Class.new(self).tap do |klass|
           vars.each do |key, value|
             klass.send(:define_method, key) do
               value
             end
           end
-        end.new(vars)
+
+        end.new(vars, prefix)
       end
 
-      def initialize(vars)
+      def initialize(vars, prefix)
         self._camel_keys = true
         @vars = vars
+        @prefix = prefix
       end
 
       def has_var?(var_key)
         @vars.include?(var_key)
       end
+
+      def render(file_name, vars = {})
+        Template.render(@prefix, file_name, vars)
+      end
     end
 
     # Splits up long strings with multiple lines in them to multiple strings
@@ -80,7 +86,7 @@ module StackMaster
       def self.render(prefix, file_name, vars)
         file_path = File.join(::SparkleFormation.sparkle_path, prefix, file_name)
         template = File.read(file_path)
-        template_context = TemplateContext.build(vars)
+        template_context = TemplateContext.build(vars, prefix)
         compiled_template = SfEruby.new(template).evaluate(template_context)
         CloudFormationLineFormatter.format(compiled_template)
       rescue Errno::ENOENT => e

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/stack_master/sparkle_formation/template_file_spec.rb

@@ -69,6 +69,44 @@ echo $REGION
       }.to raise_error(StackMaster::SparkleFormation::TemplateFileNotFound)
     end
   end
+
+  context 'with nested templates' do
+    let(:inner_user_data) do
+      <<-EOS
+REGION=<%= region! %>
+<%= test1 %>
+<%= has_var?(:test2) ? 'yes' : 'no' %>
+      EOS
+    end
+
+    let(:outer_user_data) do
+      <<-EOS
+#!/bin/bash
+<%= test1 %> <%= test2 %>
+<%= render 'inner.sh.erb', test1: 'inner1' %>
+      EOS
+    end
+
+    let(:expected_hash) do
+      {"Fn::Base64"=>{"Fn::Join"=>["", [
+        "#!/bin/bash\n",
+        "outer1", " ", "outer2", "\n",
+        "REGION=", {"Ref"=>"AWS::Region"}, "\n",
+        "inner1", "\n",
+        "no", "\n", "\n"
+      ]]}}
+    end
+
+    before do
+      allow(File).to receive(:read).and_call_original
+      allow(File).to receive(:read).with('/templates_dir/user_data/outer.sh.erb').and_return(outer_user_data)
+      allow(File).to receive(:read).with('/templates_dir/user_data/inner.sh.erb').and_return(inner_user_data)
+    end
+
+    it 'renders the outer template, including the inner template with its own var context' do
+      expect(@attr.user_data_file!('outer.sh.erb', test1: :outer1, test2: 'outer2')).to eq expected_hash
+    end
+  end
 end
 
 RSpec.describe SparkleFormation::SparkleAttribute::Aws, '#joined_file!' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler