bosh-stemcell 1.5.0.pre.1117 → 1.5.0.pre.1134

data/lib/bosh/stemcell/archive.rb

@@ -1,5 +1,5 @@
-require 'rake/file_utils_ext'
 require 'yaml'
+require 'rake/file_utils_ext'
 require 'bosh/stemcell/aws/region'
 
 module Bosh::Stemcell
@@ -27,6 +27,12 @@ module Bosh::Stemcell
       cloud_properties.fetch('version')
     end
 
+    def sha1
+      sha1 = manifest.fetch('sha1')
+      raise 'sha1 must not be nil' unless sha1
+      sha1.to_s
+    end
+
     def light?
       infrastructure == 'aws' && ami_id
     end

data/lib/bosh/stemcell/infrastructure.rb

@@ -36,7 +36,7 @@ module Bosh::Stemcell
 
     class Vsphere < Base
       def initialize
-        super(name: 'vsphere', hypervisor: 'esxi', default_disk_size: 2048)
+        super(name: 'vsphere', hypervisor: 'esxi', default_disk_size: 3072)
       end
     end
 

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.5.0.pre.1117'
+    VERSION = '1.5.0.pre.1134'
   end
 end

data/spec/bosh/stemcell/archive_spec.rb

@@ -3,31 +3,32 @@ require 'bosh/stemcell/archive'
 
 module Bosh::Stemcell
   describe Archive do
+    subject { described_class.new(stemcell_path) }
     let(:stemcell_path) { spec_asset('fake-stemcell-aws.tgz') }
 
-    subject { Archive.new(stemcell_path) }
-
     describe '#initialize' do
       it 'errors if path does not exist' do
-        expect { Archive.new('/not/found/stemcell.tgz') }.to raise_error "Cannot find file `/not/found/stemcell.tgz'"
+        expect {
+          described_class.new('/not/found/stemcell.tgz')
+        }.to raise_error("Cannot find file `/not/found/stemcell.tgz'")
       end
     end
 
     describe '#manifest' do
       it 'has a manifest' do
-        expect(subject.manifest).to be_a Hash
+        expect(subject.manifest).to be_a(Hash)
       end
     end
 
     describe '#name' do
       it 'has a name' do
-        expect(subject.name).to eq 'fake-stemcell'
+        expect(subject.name).to eq('fake-stemcell')
       end
     end
 
     describe '#infrastructure' do
       it 'has an infrastructure' do
-        expect(subject.infrastructure).to eq 'aws'
+        expect(subject.infrastructure).to eq('aws')
       end
     end
 
@@ -43,6 +44,32 @@ module Bosh::Stemcell
       end
     end
 
+    describe '#sha1' do
+      context 'when sha1 is just a string (from fake-stemcell-aws.tgz)' do
+        it 'returns a sha1 as a string' do
+          expect(subject.sha1).to eq('fake-stemcell-sha1')
+        end
+      end
+
+      context 'when sha1 happens to be a number' do
+        before { subject.manifest['sha1'] = 123 }
+
+        it 'returns a sha1 as a string' do
+          expect(subject.sha1).to eq('123')
+        end
+      end
+
+      context 'when the sha1 is nil' do
+        before { subject.manifest['sha1'] = nil }
+
+        it 'raises an error' do
+          expect {
+            subject.sha1
+          }.to raise_error(RuntimeError, 'sha1 must not be nil')
+        end
+      end
+    end
+
     describe '#light?' do
       context 'when infrastructure is "aws"' do
         context 'when there is not an "ami" key in the "cloud_properties" section of the manifest' do
@@ -51,14 +78,12 @@ module Bosh::Stemcell
 
         context 'when there is an "ami" key in the "cloud_properties" section of the manifest' do
           let(:stemcell_path) { spec_asset('light-fake-stemcell-aws.tgz') }
-
           it { should be_light }
         end
       end
 
       context 'when infrastructure is anything but "aws"' do
         let(:stemcell_path) { spec_asset('fake-stemcell-vsphere.tgz') }
-
         it { should_not be_light }
       end
     end
@@ -71,26 +96,26 @@ module Bosh::Stemcell
 
         context 'when there is an "ami" key in the "cloud_properties" section of the manifest' do
           let(:stemcell_path) { spec_asset('light-fake-stemcell-aws.tgz') }
-
           its(:ami_id) { should eq('ami-FAKE_AMI_KEY') }
         end
       end
 
       context 'when infrastructure is anything but "aws"' do
         let(:stemcell_path) { spec_asset('fake-stemcell-vsphere.tgz') }
-
         its(:ami_id) { should be_nil }
       end
     end
 
     describe '#extract' do
       it 'extracts stemcell' do
-        Rake::FileUtilsExt.should_receive(:sh).with(/tar xzf .*#{stemcell_path} --directory/)
+        Rake::FileUtilsExt.should_receive(:sh).with(
+          /tar xzf .*#{stemcell_path} --directory/)
         subject.extract {}
       end
 
       it 'extracts stemcell and excludes files' do
-        Rake::FileUtilsExt.should_receive(:sh).with(/tar xzf .*#{stemcell_path} --directory .* --exclude=image/)
+        Rake::FileUtilsExt.should_receive(:sh).with(
+          /tar xzf .*#{stemcell_path} --directory .* --exclude=image/)
         subject.extract(exclude: 'image') {}
       end
     end

data/spec/bosh/stemcell/builder_options_spec.rb

@@ -165,6 +165,7 @@ module Bosh::Stemcell
 
         context 'when infrastruture is vsphere' do
           let(:infrastructure) { Infrastructure.for('vsphere') }
+          let(:default_disk_size) { 3072 }
 
           it_sets_correct_environment_variables
 

data/spec/bosh/stemcell/infrastructure_spec.rb

@@ -60,7 +60,7 @@ module Bosh::Stemcell
   describe Infrastructure::Vsphere do
     its(:name)              { should eq('vsphere') }
     its(:hypervisor)        { should eq('esxi') }
-    its(:default_disk_size) { should eq(2048) }
+    its(:default_disk_size) { should eq(3072) }
     it { should_not be_light }
   end
 end

data/spec/stemcells/centos_spec.rb

@@ -92,8 +92,8 @@ describe 'CentOs Stemcell' do
 
   context 'installed by system_kernel' do
     {
-      'kernel'         => '2.6.32-358.18.1.el6.x86_64',
-      'kernel-headers' => '2.6.32-358.18.1.el6.x86_64',
+      'kernel'         => '2.6.32-358.23.2.el6.x86_64',
+      'kernel-headers' => '2.6.32-358.23.2.el6.x86_64',
     }.each do |pkg, version|
       describe package(pkg) do
         it { should be_installed.with_version(version) }
@@ -112,10 +112,11 @@ describe 'CentOs Stemcell' do
       it { should be_file }
       it { should contain 'default=0' }
       it { should contain 'timeout=1' }
-      it { should contain 'title CentOS release 6.4 (Final) (2.6.32-358.18.1.el6.x86_64)' }
+      it { should contain 'title CentOS release 6.4 (Final) (2.6.32-358.23.2.el6.x86_64)' }
       it { should contain '  root (hd0,0)' }
-      it { should contain '  kernel /boot/vmlinuz-2.6.32-358.18.1.el6.x86_64 ro root=UUID=' }
-      it { should contain '  initrd /boot/initramfs-2.6.32-358.18.1.el6.x86_64.img' }
+      it { should contain '  kernel /boot/vmlinuz-2.6.32-358.23.2.el6.x86_64 ro root=UUID=' }
+      it { should contain ' selinux=0' }
+      it { should contain '  initrd /boot/initramfs-2.6.32-358.23.2.el6.x86_64.img' }
     end
 
     describe file('/boot/grub/menu.lst') do

data/spec/stemcells/ubuntu_spec.rb

@@ -126,6 +126,7 @@ describe 'Ubuntu Stemcell' do
       it { should contain 'title Ubuntu 10.04.4 LTS (3.0.0-32-virtual)' }
       it { should contain '  root (hd0,0)' }
       it { should contain '  kernel /boot/vmlinuz-3.0.0-32-virtual ro root=UUID=' }
+      it { should contain ' selinux=0' }
       it { should contain '  initrd /boot/initrd.img-3.0.0-32-virtual' }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1117
+  version: 1.5.0.pre.1134
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-21 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.5.0.pre.1117
+        version: 1.5.0.pre.1134
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement