lib/kumogata/client.rb in kumogata-0.4.1 vs lib/kumogata/client.rb in kumogata-0.4.2

@@ -37,15 +37,11 @@
     end
   end
 
   def update(path_or_url, stack_name)
     validate_stack_name(stack_name)
-
-    template = open(path_or_url) do |f|
-      evaluate_template(f)
-    end
-
+    template = open_template(path_or_url)
     add_encryption_password(template)
 
     outputs = update_stack(template, stack_name)
     @post_processing.run(:update, outputs)
 
@@ -117,11 +113,11 @@
     format = @options.format || (ruby_template?(path_or_url) ? :ruby : :json)
 
     open(path_or_url) do |f|
       case format
       when :ruby
-        evaluate_template(f)
+        evaluate_template(f, path_or_url)
       when :json
         JSON.parse(f.read)
       else
         raise "Unknown format: #{format}"
       end
@@ -130,11 +126,11 @@
 
   def ruby_template?(path_or_url)
     File.extname(path_or_url) == '.rb'
   end
 
-  def evaluate_template(template)
+  def evaluate_template(template, path_or_url)
     key_converter = proc do |key|
       key = key.to_s
       key.gsub!('__', '::') if @options.replace_underscore?
       key
     end
@@ -152,10 +148,10 @@
       :key_conv   => key_converter,
       :value_conv => value_converter,
       :scope_hook => proc {|scope|
         define_template_func(scope, template.path)
       },
-      :filename   => template.path,
+      :filename   => path_or_url,
     })
 
     @post_processing.fetch!(template)
 
     return template