bosh-stemcell 1.2175.0 → 1.2200.0

data/lib/bosh/stemcell/agent.rb

@@ -6,12 +6,24 @@ module Bosh::Stemcell
           Go.new
         when 'ruby'
           Ruby.new
+        when 'null'
+          NullAgent.new
         else
           raise ArgumentError.new("invalid agent: #{name}")
       end
 
     end
 
+    class NullAgent
+      def name
+        'null'
+      end
+
+      def ==(other)
+        name == other.name
+      end
+    end
+
     class Go
       def name
         'go'

data/lib/bosh/stemcell/archive_handler.rb

@@ -0,0 +1,11 @@
+module Bosh::Stemcell
+  class ArchiveHandler
+    def initialize
+      @shell = Bosh::Core::Shell.new
+    end
+
+    def compress(directory, archive_filename)
+      @shell.run("sudo tar -cz -f #{archive_filename} -C #{directory} .")
+    end
+  end
+end

data/lib/bosh/stemcell/{builder_command.rb → build_environment.rb}

@@ -1,79 +1,48 @@
-require 'fileutils'
-
 require 'bosh/core/shell'
 require 'bosh/stemcell/builder_options'
-require 'bosh/stemcell/disk_image'
-require 'bosh/stemcell/definition'
-require 'bosh/stemcell/stage_collection'
-require 'bosh/stemcell/stage_runner'
-
 require 'forwardable'
 
 module Bosh::Stemcell
-  class BuilderCommand
+  class BuildEnvironment
     extend Forwardable
 
-    def initialize(env, definition, version, release_tarball_path)
+    STEMCELL_BUILDER_SOURCE_DIR = File.join(File.expand_path('../../../../..', __FILE__), 'stemcell_builder')
+    STEMCELL_SPECS_DIR = File.expand_path('../../..', File.dirname(__FILE__))
+
+    def initialize(env, definition, version, release_tarball_path, os_image_tarball_path)
       @environment = env
       @definition = definition
+      @os_image_tarball_path = os_image_tarball_path
       @stemcell_builder_options = BuilderOptions.new(
-        env,
-        definition,
-        version,
-        release_tarball_path,
+        env: env,
+        definition: definition,
+        version: version,
+        release_tarball: release_tarball_path,
+        os_image_tarball: os_image_tarball_path,
       )
       @shell = Bosh::Core::Shell.new
     end
 
-    def build
+    def prepare_build
       sanitize
-
-      prepare_build_root
-
       prepare_build_path
-
       copy_stemcell_builder_to_build_path
-
       prepare_work_root
-
       persist_settings_for_bash
-
-      stage_collection = StageCollection.new(definition)
-      stage_runner = StageRunner.new(
-        build_path: build_path,
-        command_env: command_env,
-        settings_file: settings_path,
-        work_path: work_root
-      )
-      stage_runner.configure_and_apply(stage_collection.all_stages)
-      system(rspec_command) || raise('Stemcell specs failed')
-
-      stemcell_file
     end
 
-    def chroot_dir
-      File.join(work_path, 'chroot')
+    def os_image_rspec_command
+      [
+        "cd #{STEMCELL_SPECS_DIR};",
+        "OS_IMAGE=#{os_image_tarball_path}",
+        'bundle exec rspec -fd',
+        "spec/os_image/#{operating_system.name}_spec.rb",
+      ].join(' ')
     end
 
-    private
-
-    def_delegators(
-      :@definition,
-      :infrastructure,
-      :operating_system,
-      :agent,
-    )
-
-    attr_reader(
-      :shell,
-      :environment,
-      :definition,
-      :stemcell_builder_options
-    )
-
-    def rspec_command
+    def stemcell_rspec_command
       [
-        "cd #{File.expand_path('../../..', File.dirname(__FILE__))};",
+        "cd #{STEMCELL_SPECS_DIR};",
         "STEMCELL_IMAGE=#{image_file_path}",
         "bundle exec rspec -fd#{exclude_exclusions}",
         "spec/stemcells/#{operating_system.name}_spec.rb",
@@ -82,80 +51,69 @@ module Bosh::Stemcell
       ].join(' ')
     end
 
-    def exclude_exclusions
-      case infrastructure.name
-        when 'vsphere'
-          ' --tag ~exclude_on_vsphere'
-        when 'vcloud'
-          ' --tag ~exclude_on_vcloud'
-        else
-          ''
-      end
+    def build_path
+      File.join(build_root, 'build')
     end
 
-    def image_file_path
-      File.join(work_path, settings['stemcell_image_name'])
+    def stemcell_file
+      File.join(work_path, settings['stemcell_tgz'])
     end
 
-    def image_mount_point
-      File.join(work_path, 'mnt')
+    def chroot_dir
+      File.join(work_path, 'chroot')
     end
 
-    def sanitize
-      FileUtils.rm_rf('*.tgz')
-
-      system("sudo umount #{File.join(work_path, 'mnt/tmp/grub', settings['stemcell_image_name'])} 2> /dev/null")
-      system("sudo umount #{image_mount_point} 2> /dev/null")
-      system("sudo rm -rf #{base_directory}")
+    def settings_path
+      File.join(build_path, 'etc', 'settings.bash')
     end
 
-    def settings
-      stemcell_builder_options.default
+    def work_path
+      File.join(work_root, 'work')
     end
 
-    def base_directory
-      File.join('/mnt', 'stemcells', infrastructure.name, infrastructure.hypervisor, operating_system.name)
+    def command_env
+      "env #{hash_as_bash_env(proxy_settings_from_environment)}"
     end
 
-    def build_root
-      File.join(base_directory, 'build')
-    end
+    private
 
-    def work_root
-      File.join(base_directory, 'work')
-    end
+    def_delegators(
+      :@definition,
+      :infrastructure,
+      :operating_system,
+      :agent,
+    )
 
-    def prepare_build_root
-      FileUtils.mkdir_p(build_root, verbose: true)
-    end
+    attr_reader(
+      :shell,
+      :environment,
+      :definition,
+      :stemcell_builder_options,
+      :os_image_tarball_path,
+    )
 
-    def prepare_work_root
-      FileUtils.mkdir_p(work_root, verbose: true)
-    end
+    def sanitize
+      FileUtils.rm(Dir.glob('*.tgz'))
 
-    def build_path
-      File.join(build_root, 'build')
-    end
+      shell.run("sudo umount #{File.join(work_path, 'mnt/tmp/grub', settings['stemcell_image_name'])} 2> /dev/null",
+                { ignore_failures: true })
 
-    def work_path
-      File.join(work_root, 'work')
+      shell.run("sudo umount #{image_mount_point} 2> /dev/null", { ignore_failures: true })
+
+      shell.run("sudo rm -rf #{base_directory}", { ignore_failures: true })
     end
 
     def prepare_build_path
-      FileUtils.rm_rf(build_path, verbose: true) if Dir.exists?(build_path)
+      FileUtils.rm_rf(build_path, verbose: true) if File.exist?(build_path)
       FileUtils.mkdir_p(build_path, verbose: true)
     end
 
-    def stemcell_builder_source_dir
-      File.join(File.expand_path('../../../../..', __FILE__), 'stemcell_builder')
-    end
-
     def copy_stemcell_builder_to_build_path
-      FileUtils.cp_r(Dir.glob("#{stemcell_builder_source_dir}/*"), build_path, preserve: true, verbose: true)
+      FileUtils.cp_r(Dir.glob("#{STEMCELL_BUILDER_SOURCE_DIR}/*"), build_path, preserve: true, verbose: true)
     end
 
-    def settings_path
-      File.join(build_path, 'etc', 'settings.bash')
+    def prepare_work_root
+      FileUtils.mkdir_p(work_root, verbose: true)
     end
 
     def persist_settings_for_bash
@@ -167,12 +125,39 @@ module Bosh::Stemcell
       end
     end
 
-    def command_env
-      "env #{hash_as_bash_env(proxy_settings_from_environment)}"
+    def exclude_exclusions
+      case infrastructure.name
+      when 'vsphere'
+        ' --tag ~exclude_on_vsphere'
+      when 'vcloud'
+        ' --tag ~exclude_on_vcloud'
+      else
+        ''
+      end
     end
 
-    def stemcell_file
-      File.join(work_path, settings['stemcell_tgz'])
+    def image_file_path
+      File.join(work_path, settings['stemcell_image_name'])
+    end
+
+    def image_mount_point
+      File.join(work_path, 'mnt')
+    end
+
+    def settings
+      stemcell_builder_options.default
+    end
+
+    def base_directory
+      File.join('/mnt', 'stemcells', infrastructure.name, infrastructure.hypervisor, operating_system.name)
+    end
+
+    def build_root
+      File.join(base_directory, 'build')
+    end
+
+    def work_root
+      File.join(base_directory, 'work')
     end
 
     def proxy_settings_from_environment

data/lib/bosh/stemcell/builder_options.rb

@@ -8,13 +8,14 @@ module Bosh::Stemcell
   class BuilderOptions
     extend Forwardable
 
-    def initialize(env, definition, version, tarball, disk_size = nil)
-      @environment = env
-      @definition = definition
-
-      @stemcell_version = version
-      @image_create_disk_size = disk_size || infrastructure.default_disk_size
-      @bosh_micro_release_tgz_path = tarball
+    def initialize(dependencies = {})
+      @environment = dependencies.fetch(:env)
+      @definition = dependencies.fetch(:definition)
+
+      @stemcell_version = dependencies.fetch(:version)
+      @image_create_disk_size = dependencies.fetch(:disk_size, infrastructure.default_disk_size)
+      @bosh_micro_release_tgz_path = dependencies.fetch(:release_tarball)
+      @os_image_tgz_path = dependencies.fetch(:os_image_tarball)
     end
 
     def default
@@ -34,7 +35,8 @@ module Bosh::Stemcell
         'bosh_release_src_dir' => File.join(source_root, 'release/src/bosh'),
         'bosh_agent_src_dir' => File.join(source_root, 'bosh_agent'),
         'go_agent_src_dir' => File.join(source_root, 'go_agent'),
-        'image_create_disk_size' => image_create_disk_size
+        'image_create_disk_size' => image_create_disk_size,
+        'os_image_tgz' => os_image_tgz_path,
       }.merge(bosh_micro_options).merge(environment_variables).merge(ovf_options)
     end
 
@@ -52,7 +54,8 @@ module Bosh::Stemcell
       :stemcell_version,
       :definition,
       :image_create_disk_size,
-      :bosh_micro_release_tgz_path
+      :bosh_micro_release_tgz_path,
+      :os_image_tgz_path,
     )
 
     def ovf_options

data/lib/bosh/stemcell/infrastructure.rb

@@ -10,6 +10,8 @@ module Bosh::Stemcell
           Vsphere.new
         when 'vcloud'
           Vcloud.new
+        when 'null'
+          NullInfrastructure.new
         else
           raise ArgumentError.new("invalid infrastructure: #{name}")
       end
@@ -37,6 +39,12 @@ module Bosh::Stemcell
       end
     end
 
+    class NullInfrastructure < Base
+      def initialize
+        super(name: 'null', hypervisor: 'null', default_disk_size: -1)
+      end
+    end
+
     class OpenStack < Base
       def initialize
         super(name: 'openstack', hypervisor: 'kvm', default_disk_size: 10240)

data/lib/bosh/stemcell/os_image_builder.rb

@@ -0,0 +1,20 @@
+module Bosh::Stemcell
+  class OsImageBuilder
+    def initialize(dependencies = {})
+      @environment = dependencies.fetch(:environment)
+      @collection = dependencies.fetch(:collection)
+      @runner = dependencies.fetch(:runner)
+      @archive_handler = dependencies.fetch(:archive_handler)
+    end
+
+    def build(os_image_path)
+      environment.prepare_build
+      runner.configure_and_apply(collection.operating_system_stages)
+      archive_handler.compress(environment.chroot_dir, os_image_path)
+    end
+
+    private
+
+    attr_reader :environment, :collection, :runner, :archive_handler
+  end
+end

data/lib/bosh/stemcell/os_image_uploader.rb

@@ -0,0 +1,23 @@
+module Bosh::Stemcell
+  class OsImageUploader
+    def initialize(dependencies = {})
+      @digester = dependencies.fetch(:digester)
+      @adapter = dependencies.fetch(:adapter)
+    end
+
+    def upload(bucket_name, os_image_path)
+      digest = digester.file(os_image_path).hexdigest
+      adapter.upload(
+        bucket_name: bucket_name,
+        key: digest,
+        body: os_image_path,
+        public: true,
+      )
+      digest
+    end
+
+    private
+
+    attr_reader :digester, :adapter
+  end
+end

data/lib/bosh/stemcell/stage_collection.rb

@@ -9,53 +9,65 @@ module Bosh::Stemcell
       @definition = definition
     end
 
-    def all_stages
-      operating_system_stages + agent_stages + infrastructure_stages
+    def operating_system_stages
+      case operating_system
+      when OperatingSystem::Centos then
+        centos_os_stages + common_os_stages
+      when OperatingSystem::Ubuntu then
+        ubuntu_os_stages + common_os_stages
+      end
     end
 
-    private
-
-    def_delegators :@definition, :infrastructure, :operating_system, :agent
+    def extract_operating_system_stages
+      [
+        :untar_base_os_image,
+      ]
+    end
 
     def agent_stages
       case agent
-        when Agent::Go
-          [
-            :bosh_ruby,
-            :bosh_go_agent,
-            :bosh_micro_go,
-            :aws_cli,
-          ]
-        when Agent::Ruby
-          [
-            :bosh_ruby,
-            :bosh_agent,
-            :bosh_micro,
-          ]
-      end
-    end
-
-    def operating_system_stages
-      case operating_system
-        when OperatingSystem::Centos then
-          centos_os_stages + common_os_stages
-        when OperatingSystem::Ubuntu then
-          ubuntu_os_stages + common_os_stages
+      when Agent::Go
+        [
+          :bosh_ruby,
+          :bosh_go_agent,
+          :bosh_micro_go,
+          :aws_cli,
+        ]
+      when Agent::Ruby
+        [
+          :bosh_ruby,
+          :bosh_agent,
+          :bosh_micro,
+        ]
       end
     end
 
+    # rubocop:disable MethodLength
     def infrastructure_stages
       case infrastructure
-        when Infrastructure::Aws then
-          aws_stages
-        when Infrastructure::OpenStack then
+      when Infrastructure::Aws then
+        aws_stages
+      when Infrastructure::OpenStack then
+        if operating_system.instance_of?(OperatingSystem::Centos)
+          centos_openstack_stages
+        else
           openstack_stages
-        when Infrastructure::Vsphere then
+        end
+      when Infrastructure::Vsphere then
+        if operating_system.instance_of?(OperatingSystem::Centos)
+          centos_vsphere_stages
+        else
           vsphere_stages
-        when Infrastructure::Vcloud then
-          vcloud_stages
+        end
+      when Infrastructure::Vcloud then
+        if operating_system.instance_of?(OperatingSystem::Centos)
+          centos_vcloud_stages
+        else
+          default_vcloud_stages
+        end
       end
     end
+    # rubocop:enable MethodLength
 
     def openstack_stages
       if operating_system.instance_of?(OperatingSystem::Centos)
@@ -81,6 +93,10 @@ module Bosh::Stemcell
       end
     end
 
+    private
+
+    def_delegators :@definition, :infrastructure, :operating_system, :agent
+
     def centos_os_stages
       [:base_centos, :base_yum]
     end

data/lib/bosh/stemcell/stage_runner.rb

@@ -26,17 +26,15 @@ module Bosh::Stemcell
     end
 
     def apply(stages)
-      work_directory = File.join(work_path, 'work')
-
       stages.each do |stage|
-        FileUtils.mkdir_p(work_directory)
+        FileUtils.mkdir_p(work_path)
 
         puts "=== Applying '#{stage}' stage ==="
         puts "== Started #{Time.now.strftime('%a %b %e %H:%M:%S %Z %Y')} =="
 
         stage_apply_script = File.join(build_path, 'stages', stage.to_s, 'apply.sh')
 
-        run_sudo_with_command_env("#{stage_apply_script} #{work_directory}")
+        run_sudo_with_command_env("#{stage_apply_script} #{work_path}")
       end
     end
 

data/lib/bosh/stemcell/stemcell_builder.rb

@@ -0,0 +1,23 @@
+module Bosh::Stemcell
+  class StemcellBuilder
+    def initialize(dependencies = {})
+      @gem_components = dependencies.fetch(:gem_components)
+      @environment = dependencies.fetch(:environment)
+      @collection = dependencies.fetch(:collection)
+      @runner = dependencies.fetch(:runner)
+    end
+
+    def build
+      gem_components.build_release_gems
+      environment.prepare_build
+      stemcell_stages = collection.extract_operating_system_stages +
+        collection.agent_stages +
+        collection.infrastructure_stages
+      runner.configure_and_apply(stemcell_stages)
+    end
+
+    private
+
+    attr_reader :gem_components, :environment, :collection, :runner
+  end
+end

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.2175.0'
+    VERSION = '1.2200.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.2175.0
+  version: 1.2200.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-14 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.2175.0
+        version: 1.2200.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2175.0
+        version: 1.2200.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -149,17 +149,21 @@ files:
 - lib/bosh/stemcell/agent.rb
 - lib/bosh/stemcell/archive.rb
 - lib/bosh/stemcell/archive_filename.rb
+- lib/bosh/stemcell/archive_handler.rb
 - lib/bosh/stemcell/aws/ami.rb
 - lib/bosh/stemcell/aws/light_stemcell.rb
 - lib/bosh/stemcell/aws/region.rb
-- lib/bosh/stemcell/builder_command.rb
+- lib/bosh/stemcell/build_environment.rb
 - lib/bosh/stemcell/builder_options.rb
 - lib/bosh/stemcell/definition.rb
 - lib/bosh/stemcell/disk_image.rb
 - lib/bosh/stemcell/infrastructure.rb
 - lib/bosh/stemcell/operating_system.rb
+- lib/bosh/stemcell/os_image_builder.rb
+- lib/bosh/stemcell/os_image_uploader.rb
 - lib/bosh/stemcell/stage_collection.rb
 - lib/bosh/stemcell/stage_runner.rb
+- lib/bosh/stemcell/stemcell_builder.rb
 - lib/bosh/stemcell/version.rb
 - lib/monkeypatch/serverspec/backend/exec.rb
 - README.md
@@ -184,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1695777046374317705
+      hash: 2870165919734630849
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23