bosh-workspace 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb023e47693f436c7daee1d66f7748200efd6e1
-  data.tar.gz: ab7a404ecb45a646ce8a35effb7b40efffdeea3a
+  metadata.gz: 9da3815bae98d1612dc8108666ca2a2843d301dd
+  data.tar.gz: e8592ea8c80c6dcab8c86fa502ed18b8ea390a7f
 SHA512:
-  metadata.gz: 80a13e5532ca630551be4289cfa37ca51b13fcfa51bd1b151b56c6e1f517c3dc5369399c82e0cb4e003562c34b0005387a9b8194c10d63f16e02ac676608fdd2
-  data.tar.gz: b26a3a7727d476bca4b7956d3ed4637da3243c40f97c465de9a4fd3451380370131b93d136e623e455bc9c77ab87bc75818069f0818977cd608b718aa02422d2
+  metadata.gz: 0262e9881e357eab8e143a268a8115236b4ae9da9bd3d46d9ca409b0aa75f843dbc1bf7285451e227cd8056f51eea5035c31e3c4a40c52c36cb8f31804393d2a
+  data.tar.gz: a8b244be56f42052be702bb5f23d9bcc6c6963376517b0d488a1e29e14c41017b504a08c74ac412bd8fee4eedf61c8ae75802b09d38c560d3794f794b59c9d6e

data/lib/bosh/workspace/schemas/stemcells.rb

@@ -5,7 +5,8 @@ module Bosh::Workspace
         Membrane::SchemaParser.parse do
           [{
             "name"    => String,
-            "version" => StemcellVersion.new
+            "version" => StemcellVersion.new,
+            optional("light") => bool
           }]
         end.validate object
       end

data/lib/bosh/workspace/stemcell.rb

@@ -5,6 +5,7 @@ module Bosh::Workspace
     def initialize(stemcell, stemcells_dir)
       @name = stemcell["name"]
       @version = stemcell["version"]
+      @light = stemcell["light"]
       @file = File.join(stemcells_dir, file_name)
     end
 
@@ -13,11 +14,12 @@ module Bosh::Workspace
     end
 
     def file_name
-      name.gsub(/^bosh-/, "bosh-stemcell-#{version}-") + ".tgz"
+      prefix = @light ? 'light-' : ''
+      name.gsub(/^bosh-/, "#{prefix}bosh-stemcell-#{version}-") + '.tgz'
     end
 
     def downloaded?
-      File.exists? file
+      File.exist? file
     end
   end
 end

data/lib/bosh/workspace/stub_file.rb

@@ -28,17 +28,29 @@ module Bosh::Workspace
     end
 
     def releases
-      @releases.map { |r| r.select { |key| %w[name version].include?(key) } }
+      filter_keys(@releases, %w(name version))
     end
 
     def meta
-      out = case @stemcells.size
-      when 1
-        { "stemcell" => @stemcells.first }
-      else
-        { "stemcells" => @stemcells }
-      end
-      out.merge(@meta)
+      stemcells_meta.merge(@meta)
+    end
+
+    private
+
+    def filter_keys(array, keys)
+      array.map { |s| s.select { |key| keys.include?(key) } }
+    end
+
+    def stemcells
+      filter_keys(@stemcells, %w(name version))
+    end
+
+    def stemcell
+      stemcells[1] ? nil : stemcells[0]
+    end
+
+    def stemcells_meta
+      stemcell.nil? ? { 'stemcells' => stemcells } : { 'stemcell' => stemcell }
     end
   end
 end

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

data/spec/schemas/stemcells_spec.rb

@@ -1,7 +1,7 @@
 module Bosh::Workspace::Schemas
   describe Stemcells do
     let(:stemcell) do
-      {"name" => "foo", "version" => 1}
+      { "name" => "foo", "version" => 1, "light" => true }
     end
 
     subject { Stemcells.new.validate(stemcells) }
@@ -42,6 +42,15 @@ module Bosh::Workspace::Schemas
       let(:stemcells) { stemcell["version"] = "foo"; [stemcell] }
       it { expect { subject }.to raise_error(/version.*should match/i) }
     end
+
+    context "without optional light key" do
+      let(:stemcells) { [stemcell.delete_if { |k| k == "light" }] }
+      it { expect { subject }.to_not raise_error }
+    end
+
+    context "light non boolean" do
+      let(:stemcells) { stemcell["light"] = "foo"; [stemcell] }
+      it { expect { subject }.to raise_error /true or false/ }
+    end
   end
 end
-

data/spec/stemcell_spec.rb

@@ -1,30 +1,63 @@
 describe Bosh::Workspace::Stemcell do
   subject { Bosh::Workspace::Stemcell.new(stemcell, stemcells_dir) }
   let(:stemcells_dir) { ".stemcells" }
-  let(:stemcell) { { "name" => name, "version" => version } }
-  let(:name) { "bosh-warden-boshlite-ubuntu-trusty-go_agent" }
-  let(:file_name) { "bosh-stemcell-3-warden-boshlite-ubuntu-trusty-go_agent.tgz" }
-  let(:version) { 3 }
+  let(:stemcell) { { "name" => name, "version" => version, "light" => light } }
 
-  describe "#name_version" do
-    its(:name_version) { is_expected.to eq "#{name}/#{version}" }
-  end
+  context "given a normal stemcell" do
+    let(:light) { nil }
+    let(:name) { "bosh-warden-boshlite-ubuntu-trusty-go_agent" }
+    let(:file_name) { "bosh-stemcell-3-warden-boshlite-ubuntu-trusty-go_agent.tgz" }
+    let(:version) { 3 }
 
-  describe "#file_name" do
-    its(:file_name) { is_expected.to eq file_name }
-  end
+    describe "#name_version" do
+      its(:name_version) { is_expected.to eq "#{name}/#{version}" }
+    end
+
+    describe "#file_name" do
+      its(:file_name) { is_expected.to eq file_name }
+    end
+
+    describe "#downloaded?" do
+      before do
+        expect(File).to receive(:exist?).with(/\/#{file_name}/).and_return(true)
+      end
+      its(:downloaded?) { is_expected.to eq true }
+    end
 
-  describe "#downloaded?" do
-    before do 
-      expect(File).to receive(:exists?).with(/\/#{file_name}/).and_return(true)
+    describe "attr readers" do
+      let(:file) { "#{stemcells_dir}/#{file_name}" }
+      %w(name version file).each do |attr|
+        its(attr.to_sym) { is_expected.to eq eval(attr) }
+      end
     end
-    its(:downloaded?) { is_expected.to eq true }
   end
 
-  describe "attr readers" do
-    let(:file) { "#{stemcells_dir}/#{file_name}" }
-    %w(name version file).each do |attr| 
-      its(attr.to_sym) { is_expected.to eq eval(attr) }
+  context "given a light stemcell" do
+    let(:light) { true }
+    let(:name) { "bosh-aws-xen-hvm-ubuntu-trusty-go_agent" }
+    let(:file_name) { "light-bosh-stemcell-3143-aws-xen-hvm-ubuntu-trusty-go_agent.tgz" }
+    let(:version) { 3143 }
+
+    describe "#name_version" do
+      its(:name_version) { is_expected.to eq "#{name}/#{version}" }
+    end
+
+    describe "#file_name" do
+      its(:file_name) { is_expected.to eq file_name }
+    end
+
+    describe "#downloaded?" do
+      before do
+        expect(File).to receive(:exist?).with(/\/#{file_name}/).and_return(true)
+      end
+      its(:downloaded?) { is_expected.to eq true }
+    end
+
+    describe "attr readers" do
+      let(:file) { "#{stemcells_dir}/#{file_name}" }
+      %w(name version file).each do |attr|
+        its(attr.to_sym) { is_expected.to eq eval(attr) }
+      end
     end
   end
 end

data/spec/stub_file_spec.rb

@@ -8,8 +8,8 @@ describe Bosh::Workspace::StubFile do
     meta: meta,
     merged_file: ".deployments/foo.yml")
   }
-  let(:meta) {{ "foo" => "bar" }}
-  let(:stemcells) { [ { "name" => "foo", "version" => "2"} ] }
+  let(:meta) { { "foo" => "bar" } }
+  let(:stemcells) { [{ "name" => "foo", "version" => "2" }] }
   let(:path) { "foo/.stubs/bar.yml"}
 
   let(:stub_file) { Bosh::Workspace::StubFile.new(project_deployment) }
@@ -55,7 +55,7 @@ describe Bosh::Workspace::StubFile do
 
     context "1 stemcell" do
       let(:stemcells) { [ stemcell_foo ] }
-      its(:meta) { should include "stemcell" => stemcell_foo }
+      its(:meta) { is_expected.to include("stemcell" => stemcell_foo) }
       its(:meta) { should include meta }
     end
 
@@ -70,5 +70,13 @@ describe Bosh::Workspace::StubFile do
       let(:stemcells) { [ stemcell_foo ] }
       its(:meta) { should include "stemcell" => stemcell_bar }
     end
+
+    context "when using a light stemcell" do
+      let(:stemcells) { stemcell_foo['light'] = true; [stemcell_foo] }
+
+      it "does not contain a light stemcell key in meta" do
+        expect(subject.meta['stemcell'].keys).to_not include 'light'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli