autostacker24 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40c75af3b46bd97e4a98ccfd51d967e974cf094
-  data.tar.gz: d0e77352fac3529d7eb83f8703b4b52e2d7051bd
+  metadata.gz: 7b54d10abfc1294e6facf1bdf9dac7dc91268cac
+  data.tar.gz: b07933b181619c692bcd0ac28859bfed468b0b79
 SHA512:
-  metadata.gz: 165a99326d1e8b764845a4d33f7d84f9c9823682adcca19aee7f1e47b4bb009d44d0677a709c5f1f450f6d9d819698ce06721a8a81b0b561465c0b251a048b4a
-  data.tar.gz: d5355356201f33f8e7b076aa71dd55078b0bc0ca8691907b69e2de3bf2529c671d955e98dd39fb13a9cb62979360a6b93c530e08ad4432ed5efb987b6c446140
+  metadata.gz: 3d877ff8f8b12e32b179135069eff7d5a3d6d5caa5fda5aabda6cebc1021cb37bbf06f01ce97f859501f7a4f97393ddc445dc1df2ef13c5f94260f72e5fec470
+  data.tar.gz: aa35982f679d5bb82c3084e0934b79e8defc3e211fcfae1285155ac8b4d57aa673ce3f71775fe47d14174dc727db5532fb2331be3f3e36d8b776fbdea82086bb

data/lib/autostacker24/stacker.rb

@@ -28,6 +28,14 @@ module Stacker
     end
   end
 
+  # set custom cloudformation parameters
+  def cloud_formation_params=(params)
+    unless params == @cloud_formation_params
+      @lazy_cloud_formation = nil
+      @cloud_formation_params = params
+    end
+  end
+
   def create_or_update_stack(stack_name, template, parameters, parent_stack_name = nil, tags = nil, timeout_in_minutes = DEFAULT_TIMEOUT)
     if find_stack(stack_name).nil?
       create_stack(stack_name, template, parameters, parent_stack_name, tags, timeout_in_minutes)
@@ -173,7 +181,7 @@ module Stacker
 
   def cloud_formation # lazy CloudFormation client
     unless @lazy_cloud_formation
-      params = {}
+      params = @cloud_formation_params || {}
       params[:credentials] = @credentials if @credentials
       params[:region] = @region if @region
       @lazy_cloud_formation = Aws::CloudFormation::Client.new(params)
@@ -182,8 +190,14 @@ module Stacker
   end
 
   def template_body(template)
-    template = File.read(template) if File.exists?(template)
+    wd = Dir.getwd()
+    if File.exists?(template) # template is a valid filename
+      template = File.read(template)
+      Dir.chdir(File.dirname(template))
+    end
     AutoStacker24::Preprocessor.preprocess(template)
+  ensure
+    Dir.chdir(wd)
   end
 
   extend self

data/lib/autostacker24/template_preprocessor.rb

@@ -111,14 +111,10 @@ module AutoStacker24
         i = s.index('@', i + 1)
         return s, '' if i.nil?
 
-        file_match = /\A@file:\/\/([^@\s]+)@?/.match(s[i..-1])
-        file_curly_match = /\A@\{file:\/\/([^\}]+)\}/.match(s[i..-1])
+        file_match = /\A@file:\/\/([^@\s]+)@?/.match(s[i..-1]) || /\A@\{file:\/\/([^\}]+)\}/.match(s[i..-1])
         if file_match # inline file
           s = s[0, i] + File.read(file_match[1]) + file_match.post_match
           i -= 1
-        elsif file_curly_match # inline file with curly braces
-          s = s[0, i] + File.read(file_curly_match[1]) + file_curly_match.post_match
-          i -= 1
         elsif s[i, 2] =~ /\A@@/ # escape
           s = s[0, i] + s[i+1..-1]
         elsif s[i, 2] =~ /\A@(\w|\{)/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core