bosh-stemcell 1.1798.0 → 1.1836.0

data/lib/bosh/stemcell/agent.rb

@@ -13,9 +13,23 @@ module Bosh::Stemcell
     end
 
     class Go
+      def name
+        'go'
+      end
+
+      def ==(other)
+        name == other.name
+      end
     end
 
     class Ruby
+      def name
+        'ruby'
+      end
+
+      def ==(other)
+        name == other.name
+      end
     end
   end
 end

data/lib/bosh/stemcell/archive_filename.rb

@@ -1,15 +1,15 @@
+require 'forwardable'
+
 module Bosh::Stemcell
   class ArchiveFilename
-    # rubocop:disable ParameterLists
-    def initialize(version, infrastructure, operating_system, base_name, light, agent_name = 'ruby')
+    extend Forwardable
+
+    def initialize(version, definition, base_name, light)
       @version = version
-      @infrastructure = infrastructure
-      @operating_system = operating_system
+      @definition = definition
       @base_name = base_name
       @light = light
-      @agent_name = agent_name
     end
-    # rubocop:enable ParameterLists
 
     def to_s
       stemcell_filename_parts = [
@@ -19,7 +19,7 @@ module Bosh::Stemcell
         infrastructure.hypervisor,
         operating_system.name,
       ]
-      stemcell_filename_parts << "#{agent_name}_agent" unless agent_name == 'ruby'
+      stemcell_filename_parts << "#{agent.name}_agent" unless agent.name == 'ruby'
       "#{stemcell_filename_parts.join('-')}.tgz"
     end
 
@@ -29,13 +29,17 @@ module Bosh::Stemcell
       light ? "light-#{base_name}" : base_name
     end
 
+    def_delegators(
+      :@definition,
+      :infrastructure,
+      :operating_system,
+      :agent,
+    )
+
     attr_reader(
       :base_name,
       :version,
-      :infrastructure,
-      :operating_system,
       :light,
-      :agent_name,
     )
   end
 end

data/lib/bosh/stemcell/builder_command.rb

@@ -3,26 +3,24 @@ require 'fileutils'
 require 'bosh/core/shell'
 require 'bosh/stemcell/builder_options'
 require 'bosh/stemcell/disk_image'
-require 'bosh/stemcell/infrastructure'
-require 'bosh/stemcell/operating_system'
+require 'bosh/stemcell/definition'
 require 'bosh/stemcell/stage_collection'
 require 'bosh/stemcell/stage_runner'
 
+require 'forwardable'
+
 module Bosh::Stemcell
   class BuilderCommand
-    def initialize(env, options)
-      @environment = env
-      @infrastructure = Infrastructure.for(options.fetch(:infrastructure_name))
-      @operating_system = OperatingSystem.for(options.fetch(:operating_system_name))
-      @agent_name = options.fetch(:agent_name) || 'ruby'
+    extend Forwardable
 
+    def initialize(env, definition, version, release_tarball_path)
+      @environment = env
+      @definition = definition
       @stemcell_builder_options = BuilderOptions.new(
         env,
-        tarball: options.fetch(:release_tarball_path),
-        stemcell_version: options.fetch(:version),
-        infrastructure: infrastructure,
-        operating_system: operating_system,
-        agent_name: agent_name,
+        definition,
+        version,
+        release_tarball_path,
       )
       @shell = Bosh::Core::Shell.new
     end
@@ -40,11 +38,7 @@ module Bosh::Stemcell
 
       persist_settings_for_bash
 
-      stage_collection = StageCollection.new(
-        infrastructure: infrastructure,
-        operating_system: operating_system,
-        agent_name: agent_name,
-      )
+      stage_collection = StageCollection.new(definition)
       stage_runner = StageRunner.new(
         build_path: build_path,
         command_env: command_env,
@@ -63,12 +57,17 @@ module Bosh::Stemcell
 
     private
 
+    def_delegators(
+      :@definition,
+      :infrastructure,
+      :operating_system,
+      :agent,
+    )
+
     attr_reader(
       :shell,
       :environment,
-      :infrastructure,
-      :operating_system,
-      :agent_name,
+      :definition,
       :stemcell_builder_options
     )
 
@@ -78,7 +77,7 @@ module Bosh::Stemcell
         "STEMCELL_IMAGE=#{image_file_path}",
         "bundle exec rspec -fd#{exclude_exclusions}",
         "spec/stemcells/#{operating_system.name}_spec.rb",
-        "spec/stemcells/#{agent_name}_agent_spec.rb",
+        "spec/stemcells/#{agent.name}_agent_spec.rb",
         "spec/stemcells/#{infrastructure.name}_spec.rb",
       ].join(' ')
     end

data/lib/bosh/stemcell/builder_options.rb

@@ -2,22 +2,24 @@ require 'rbconfig'
 require 'bosh_agent/version'
 require 'bosh/stemcell/archive_filename'
 
+require 'forwardable'
+
 module Bosh::Stemcell
   class BuilderOptions
-    def initialize(env, options)
+    extend Forwardable
+
+    def initialize(env, definition, version, tarball, disk_size = nil)
       @environment = env
-      @infrastructure = options.fetch(:infrastructure)
-      @operating_system = options.fetch(:operating_system)
-      @agent_name = options.fetch(:agent_name)
+      @definition = definition
 
-      @stemcell_version = options.fetch(:stemcell_version)
-      @image_create_disk_size = options.fetch(:disk_size, infrastructure.default_disk_size)
-      @bosh_micro_release_tgz_path = options.fetch(:tarball)
+      @stemcell_version = version
+      @image_create_disk_size = disk_size || infrastructure.default_disk_size
+      @bosh_micro_release_tgz_path = tarball
     end
 
     def default
       stemcell_name = "bosh-#{infrastructure.name}-#{infrastructure.hypervisor}-#{operating_system.name}"
-      stemcell_name += "-#{agent_name}_agent" unless agent_name == 'ruby'
+      stemcell_name += "-#{agent.name}_agent" unless agent.name == 'ruby'
 
       {
         'stemcell_name' => stemcell_name,
@@ -38,12 +40,17 @@ module Bosh::Stemcell
 
     private
 
-    attr_reader(
-      :environment,
+    def_delegators(
+      :@definition,
       :infrastructure,
       :operating_system,
-      :agent_name,
+      :agent,
+    )
+
+    attr_reader(
+      :environment,
       :stemcell_version,
+      :definition,
       :image_create_disk_size,
       :bosh_micro_release_tgz_path
     )
@@ -73,7 +80,7 @@ module Bosh::Stemcell
     end
 
     def archive_filename
-      ArchiveFilename.new(stemcell_version, infrastructure, operating_system, 'bosh-stemcell', false, agent_name)
+      ArchiveFilename.new(stemcell_version, definition, 'bosh-stemcell', false)
     end
 
     def stemcell_image_name

data/lib/bosh/stemcell/definition.rb

@@ -19,5 +19,11 @@ module Bosh::Stemcell
       @operating_system = operating_system
       @agent = agent
     end
+
+    def ==(other)
+      infrastructure == other.infrastructure &&
+        operating_system == other.operating_system &&
+        agent == other.agent
+    end
   end
 end

data/lib/bosh/stemcell/infrastructure.rb

@@ -26,6 +26,13 @@ module Bosh::Stemcell
       def light?
         @supports_light_stemcell
       end
+
+      def ==(other)
+        name == other.name &&
+          hypervisor == other.hypervisor &&
+          default_disk_size == other.default_disk_size &&
+          light? == other.light?
+      end
     end
 
     class OpenStack < Base

data/lib/bosh/stemcell/operating_system.rb

@@ -14,6 +14,10 @@ module Bosh::Stemcell
       def initialize(options = {})
         @name = options.fetch(:name)
       end
+
+      def ==(other)
+        name == other.name
+      end
     end
 
     class Centos < Base

data/lib/bosh/stemcell/stage_collection.rb

@@ -1,13 +1,12 @@
-require 'bosh/stemcell/infrastructure'
-require 'bosh/stemcell/operating_system'
+require 'bosh/stemcell/definition'
+require 'forwardable'
 
 module Bosh::Stemcell
   class StageCollection
+    extend Forwardable
 
-    def initialize(options)
-      @infrastructure = options.fetch(:infrastructure)
-      @operating_system = options.fetch(:operating_system)
-      @agent_name = options.fetch(:agent_name)
+    def initialize(definition)
+      @definition = definition
     end
 
     def all_stages
@@ -16,18 +15,18 @@ module Bosh::Stemcell
 
     private
 
-    attr_reader :infrastructure, :operating_system, :agent_name
+    def_delegators :@definition, :infrastructure, :operating_system, :agent
 
     def agent_stages
-      case agent_name
-        when 'go'
+      case agent
+        when Agent::Go
           [
             :bosh_ruby,
             :bosh_go_agent,
             :bosh_micro_go,
             :aws_cli,
           ]
-        else
+        when Agent::Ruby
           [
             :bosh_ruby,
             :bosh_agent,

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.1798.0'
+    VERSION = '1.1836.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.1798.0
+  version: 1.1836.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1798.0
+        version: 1.1836.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3725339086464005117
+      hash: 1486121491974777070
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23