bosh-director-core 1.1868.0 → 1.1975.0

data/lib/bosh/director/core/templates/job_instance_renderer.rb

@@ -3,15 +3,15 @@ require 'bosh/director/core/templates/rendered_job_instance'
 
 module Bosh::Director::Core::Templates
   class JobInstanceRenderer
-    def initialize(job, job_template_loader)
-      @job = job
+    def initialize(templates, job_template_loader)
+      @templates = templates
       @job_template_loader = job_template_loader
     end
 
-    def render(instance)
-      rendered_templates = job.templates.map do |template|
+    def render(spec)
+      rendered_templates = templates.map do |template|
         job_template_renderer = job_template_renderers[template.name]
-        job_template_renderer.render(job.name, instance)
+        job_template_renderer.render(spec)
       end
 
       RenderedJobInstance.new(rendered_templates)
@@ -20,12 +20,12 @@ module Bosh::Director::Core::Templates
     private
 
     def job_template_renderers
-      @job_template_renderers ||= job.templates.reduce({}) do |hash, template|
+      @job_template_renderers ||= templates.reduce({}) do |hash, template|
         hash[template.name] = job_template_loader.process(template)
         hash
       end
     end
 
-    attr_reader :job_template_loader, :job
+    attr_reader :job_template_loader, :templates
   end
 end

data/lib/bosh/director/core/templates/job_template_loader.rb

@@ -1,6 +1,6 @@
 require 'bosh/director/core/templates'
 require 'bosh/director/core/templates/job_template_renderer'
-require 'bosh/director/core/templates/src_file_template'
+require 'bosh/director/core/templates/source_erb'
 
 module Bosh::Director::Core::Templates
   class JobTemplateLoader
@@ -12,18 +12,17 @@ module Bosh::Director::Core::Templates
       template_dir = extract_template(job_template)
       manifest = Psych.load_file(File.join(template_dir, 'job.MF'))
 
-      monit_template = erb(File.join(template_dir, 'monit'))
-      monit_template.filename = File.join(job_template.name, 'monit')
+      monit_erb_file = File.read(File.join(template_dir, 'monit'))
+      monit_source_erb = SourceErb.new('monit', 'monit', monit_erb_file, job_template.name)
 
-      templates = []
+      source_erbs = []
 
       manifest.fetch('templates', {}).each_pair do |src_name, dest_name|
-        erb_file = erb(File.join(template_dir, 'templates', src_name))
-        erb_file.filename = File.join(job_template.name, src_name)
-        templates << SrcFileTemplate.new(src_name, dest_name, erb_file)
+        erb_file = File.read(File.join(template_dir, 'templates', src_name))
+        source_erbs << SourceErb.new(src_name, dest_name, erb_file, job_template.name)
       end
 
-      JobTemplateRenderer.new(job_template.name, monit_template, templates, logger)
+      JobTemplateRenderer.new(job_template.name, monit_source_erb, source_erbs, logger)
     ensure
       FileUtils.rm_rf(template_dir) if template_dir
     end
@@ -48,9 +47,5 @@ module Bosh::Director::Core::Templates
     ensure
       FileUtils.rm_f(temp_path) if temp_path
     end
-
-    def erb(path)
-      ERB.new(File.read(path))
-    end
   end
 end

data/lib/bosh/director/core/templates/job_template_renderer.rb

@@ -6,48 +6,32 @@ require 'common/properties'
 module Bosh::Director::Core::Templates
   class JobTemplateRenderer
 
-    attr_reader :monit_template, :templates
+    attr_reader :monit_erb, :source_erbs
 
-    def initialize(name, monit_template, templates, logger)
+    def initialize(name, monit_erb, source_erbs, logger)
       @name = name
-      @monit_template = monit_template
-      @templates = templates
+      @monit_erb = monit_erb
+      @source_erbs = source_erbs
       @logger = logger
     end
 
-    def render(job_name, instance)
-      template_context = Bosh::Common::TemplateEvaluationContext.new(instance.spec)
+    def render(spec)
+      template_context = Bosh::Common::TemplateEvaluationContext.new(spec)
+      job_name = spec['job']['name']
+      index = spec['index']
 
-      monit = render_erb(job_name, monit_template, template_context, instance.index)
+      monit = monit_erb.render(template_context, job_name, index, logger)
 
-      rendered_templates = templates.map do |template_file|
-        file_contents = render_erb(job_name, template_file.erb_file, template_context, instance.index)
-        RenderedFileTemplate.new(template_file.src_name, template_file.dest_name, file_contents)
+      rendered_files = source_erbs.map do |source_erb|
+        file_contents = source_erb.render(template_context, job_name, index, logger)
+        RenderedFileTemplate.new(source_erb.src_name, source_erb.dest_name, file_contents)
       end
 
-      RenderedJobTemplate.new(name, monit, rendered_templates)
+      RenderedJobTemplate.new(name, monit, rendered_files)
     end
 
     private
 
     attr_reader :name, :logger
-
-    def render_erb(job_name, template, template_context, index)
-      template.result(template_context.get_binding)
-    # rubocop:disable RescueException
-    rescue Exception => e
-      logger.debug(e.inspect)
-      job_desc = "#{job_name}/#{index}"
-      line_index = e.backtrace.index { |l| l.include?(template.filename) }
-      line = line_index ? e.backtrace[line_index] : '(unknown):(unknown)'
-      template_name, line = line.split(':')
-
-      message = "Error filling in template `#{File.basename(template_name)}' " +
-        "for `#{job_desc}' (line #{line}: #{e})"
-
-      logger.debug("#{message}\n#{e.backtrace.join("\n")}")
-      raise message
-    end
-    # rubocop:enable RescueException
   end
 end

data/lib/bosh/director/core/templates/source_erb.rb

@@ -0,0 +1,35 @@
+require 'bosh/director/core/templates'
+require 'common/properties'
+
+module Bosh::Director::Core::Templates
+  class SourceErb
+    attr_reader :src_name, :dest_name, :erb
+
+    def initialize(src_name, dest_name, erb_contents, template_name)
+      @src_name = src_name
+      @dest_name = dest_name
+      erb = ERB.new(erb_contents)
+      erb.filename = File.join(template_name, src_name)
+      @erb = erb
+    end
+
+    def render(context, job_name, index, logger)
+      erb.result(context.get_binding)
+      # rubocop:disable RescueException
+    rescue Exception => e
+      # rubocop:enable RescueException
+
+      logger.debug(e.inspect)
+      job_desc = "#{job_name}/#{index}"
+      line_index = e.backtrace.index { |l| l.include?(erb.filename) }
+      line = line_index ? e.backtrace[line_index] : '(unknown):(unknown)'
+      template_name, line = line.split(':')
+
+      message = "Error filling in template `#{File.basename(template_name)}' " +
+        "for `#{job_desc}' (line #{line}: #{e})"
+
+      logger.debug("#{message}\n#{e.backtrace.join("\n")}")
+      raise message
+    end
+  end
+end

data/lib/bosh/director/core/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Director
     module Core
-      VERSION = '1.1868.0'
+      VERSION = '1.1975.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director-core
 version: !ruby/object:Gem::Version
-  version: 1.1868.0
+  version: 1.1975.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ files:
 - lib/bosh/director/core/templates/rendered_job_template.rb
 - lib/bosh/director/core/templates/rendered_templates_archive.rb
 - lib/bosh/director/core/templates/rendered_templates_writer.rb
-- lib/bosh/director/core/templates/src_file_template.rb
+- lib/bosh/director/core/templates/source_erb.rb
 - lib/bosh/director/core/version.rb
 homepage: https://github.com/cloudfoundry/bosh
 licenses:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2612646582658106641
+      hash: -3606702560231579831
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/bosh/director/core/templates/src_file_template.rb

@@ -1,5 +0,0 @@
-require 'bosh/director/core/templates'
-
-module Bosh::Director::Core::Templates
-  SrcFileTemplate = Struct.new(:src_name, :dest_name, :erb_file)
-end