bosh-director-core 1.2583.0 → 1.2596.0

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

@@ -9,7 +9,7 @@ module Bosh::Director::Core::Templates
     end
 
     def render(spec)
-      rendered_templates = templates.map do |template|
+      rendered_templates = @templates.map do |template|
         job_template_renderer = job_template_renderers[template.name]
         job_template_renderer.render(spec)
       end
@@ -20,12 +20,10 @@ module Bosh::Director::Core::Templates
     private
 
     def job_template_renderers
-      @job_template_renderers ||= templates.reduce({}) do |hash, template|
-        hash[template.name] = job_template_loader.process(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, :templates
   end
 end

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

@@ -22,15 +22,13 @@ module Bosh::Director::Core::Templates
         source_erbs << SourceErb.new(src_name, dest_name, erb_file, job_template.name)
       end
 
-      JobTemplateRenderer.new(job_template.name, monit_source_erb, source_erbs, logger)
+      JobTemplateRenderer.new(job_template.name, monit_source_erb, source_erbs, @logger)
     ensure
       FileUtils.rm_rf(template_dir) if template_dir
     end
 
     private
 
-    attr_reader :logger
-
     def extract_template(job_template)
       temp_path = job_template.download_blob
       template_dir = Dir.mktmpdir('template_dir')

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

@@ -5,7 +5,6 @@ require 'common/properties'
 
 module Bosh::Director::Core::Templates
   class JobTemplateRenderer
-
     attr_reader :monit_erb, :source_erbs
 
     def initialize(name, monit_erb, source_erbs, logger)
@@ -20,18 +19,14 @@ module Bosh::Director::Core::Templates
       job_name = spec['job']['name']
       index = spec['index']
 
-      monit = monit_erb.render(template_context, job_name, index, logger)
+      monit = monit_erb.render(template_context, job_name, index, @logger)
 
       rendered_files = source_erbs.map do |source_erb|
-        file_contents = source_erb.render(template_context, job_name, index, logger)
+        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_files)
+      RenderedJobTemplate.new(@name, monit, rendered_files)
     end
-
-    private
-
-    attr_reader :name, :logger
   end
 end

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

@@ -12,7 +12,8 @@ module Bosh::Director::Core::Templates
 
     def configuration_hash
       instance_digest = Digest::SHA1.new
-      job_templates.sort { |x, y| x.name <=> y.name }.each do |rendered_job_template|
+
+      @job_templates.sort { |x, y| x.name <=> y.name }.each do |rendered_job_template|
         bound_templates = ''
         bound_templates << rendered_job_template.monit
 
@@ -26,7 +27,7 @@ module Bosh::Director::Core::Templates
     end
 
     def template_hashes
-      job_templates.reduce({}) do |h, rendered_job_template|
+      @job_templates.reduce({}) do |h, rendered_job_template|
         h.merge(rendered_job_template.name => rendered_job_template.template_hash)
       end
     end
@@ -35,16 +36,12 @@ module Bosh::Director::Core::Templates
       file = Tempfile.new('compressed-rendered-job-templates')
 
       compressed_archive = CompressedRenderedJobTemplates.new(file.path)
-      compressed_archive.write(job_templates)
+      compressed_archive.write(@job_templates)
 
       blobstore_id = blobstore.create(compressed_archive.contents)
       RenderedTemplatesArchive.new(blobstore_id, compressed_archive.sha1)
     ensure
       file.close!
     end
-
-    private
-
-    attr_reader :job_templates
   end
 end

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

@@ -1,7 +1,7 @@
 module Bosh
   module Director
     module Core
-      VERSION = '1.2583.0'
+      VERSION = '1.2596.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director-core
 version: !ruby/object:Gem::Version
-  version: 1.2583.0
+  version: 1.2596.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-07 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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.0
 description: Bosh::Director::Core provides common Director code for Director and Microbosh
   Deployer
 email: support@cloudfoundry.com
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4215906553924810415
+      hash: 2538969673950386571
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2