bosh-workspace 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7ec012c1379173ecbf91bc2592edf84a13df4e
-  data.tar.gz: f6cd1d81669866d40090afc48dfb3721873fc8da
+  metadata.gz: 6fb508481c57fa872d5d518608450a9c0747307a
+  data.tar.gz: 7fe9a93d76ec7097a551c994d683aa1d8c74811f
 SHA512:
-  metadata.gz: 09373b79183e0bfc9c0b2ba75d9023815290331158c62f540d71a7d51bb7f0cf672138f3a50bf6fb2d9301ad02daa3a61e955c6fa563999596f84aaf57180873
-  data.tar.gz: 936be7053d02d221496fa4133a52ace97fce10d8fbba755a3f3e782e55b18716f98d07a68f069ec6ed59d3b0e320257b7e0c6d66dbf265ee7e3b9711d88c74f8
+  metadata.gz: 7251cdc365208e92f87eeb8a3166a773b6fbf28de55cb1673b42d95100c6e12572859f79a1b6fe5b18afaf2deb07635a88d3a32eacd49b2ebcc293a6e5b5f290
+  data.tar.gz: 20096fa74e4f9c1676999cc5701bd83ae99653a3d7f6b5b26c2dc10d2ec385da0c884c4cda21f15abe66f5a69a358d24e7c61bccd54dccf74cc2fc3a13ec6817

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 group :development do
   gem "guard-rspec"
+  gem "rubocop"
 end
 
 group :test do

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', spec_paths: ["spec"] do
+guard :rspec, cmd: 'rspec' do
   notification :off
   watch(%r{^spec/(.+_spec)\.rb$})
   watch(%r{^lib/bosh/cli/commands/(.+)\.rb$})    { |m| "spec/commands/#{m[1]}_spec.rb" }

data/bosh-workspace.gemspec

@@ -20,15 +20,15 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_runtime_dependency "bosh_cli",  ">= 1.1722.0"
-  spec.add_runtime_dependency "bosh_common",  ">= 1.1722.0"
+  spec.add_runtime_dependency "bosh_cli",  ">= 1.2682.0"
+  spec.add_runtime_dependency "bosh_common",  ">= 1.2682.0"
   spec.add_runtime_dependency "semi_semantic", "~> 1.1.0"
   spec.add_runtime_dependency "membrane", "~>0.0.2"
   spec.add_runtime_dependency "git", "~> 1.2.6"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rspec", "~> 2.13.0"
-  spec.add_development_dependency "rspec-fire"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
+  spec.add_development_dependency "rspec-its", '~> 1.0.1'
   spec.add_development_dependency "rake"
   spec.add_development_dependency "archive-zip", "~> 0.6.0"
 end

data/lib/bosh/workspace/helpers/release_helper.rb

@@ -26,7 +26,7 @@ module Bosh::Workspace
     private
 
     def release_cmd
-      @release_cmd ||= Bosh::Cli::Command::Release.new
+      @release_cmd ||= Bosh::Cli::Command::Release::UploadRelease.new
     end
   end
 end

data/lib/bosh/workspace/project_deployment.rb

@@ -13,10 +13,12 @@ module Bosh::Workspace
       }
     end
 
+    STEMCELL_VERSION = /^\d+\.\d+$/
+
     STEMCELL_SCHEMA = Membrane::SchemaParser.parse do
       {
         "name"    => String,
-        "version" => enum(Integer, "latest"),
+        "version" => enum(Integer, STEMCELL_VERSION, "latest"),
       }
     end
 

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
   end
 end

data/spec/commands/prepare_spec.rb

@@ -15,10 +15,12 @@ describe Bosh::Cli::Command::Prepare do
     end
 
     before do
-      command.stub(:require_project_deployment)
-      command.stub(:auth_required)
-      command.stub(:project_deployment_releases).and_return(releases)
-      command.stub(:project_deployment_stemcells).and_return(stemcells)
+      allow(command).to receive(:require_project_deployment)
+      allow(command).to receive(:auth_required)
+      allow(command).to receive(:project_deployment_releases)
+        .and_return(releases)
+      allow(command).to receive(:project_deployment_stemcells)
+        .and_return(stemcells)
     end
 
     describe "prepare_release(s/_repos)" do
@@ -26,8 +28,8 @@ describe Bosh::Cli::Command::Prepare do
       let(:stemcells) { [] }
 
       before do
-        release.should_receive(:update_repo) 
-        command.should_receive(:release_uploaded?)
+        expect(release).to receive(:update_repo) 
+        expect(command).to receive(:release_uploaded?)
           .with(release.name, release.version).and_return(release_uploaded)
       end
 
@@ -35,7 +37,7 @@ describe Bosh::Cli::Command::Prepare do
         let(:release_uploaded) { true }
 
         it "does not upload the release" do
-          command.should_not_receive(:release_upload)
+          expect(command).to_not receive(:release_upload)
           command.prepare
         end
       end
@@ -44,7 +46,7 @@ describe Bosh::Cli::Command::Prepare do
         let(:release_uploaded) { false }
 
         it "does not upload the release" do
-          command.should_receive(:release_upload).with(release.manifest_file)
+          expect(command).to receive(:release_upload).with(release.manifest_file)
           command.prepare
         end
       end
@@ -55,16 +57,16 @@ describe Bosh::Cli::Command::Prepare do
       let(:stemcells) { [ stemcell ] }
 
       before do
-        command.should_receive(:stemcell_uploaded?)
+        expect(command).to receive(:stemcell_uploaded?)
           .with(stemcell.name, stemcell.version).and_return(stemcell_uploaded)
       end
 
       context "stemcell uploaded" do
         let(:stemcell_uploaded) { true }
-      
+
         it "does not upload the stemcell" do
-          command.should_not_receive(:stemcell_download)
-          command.should_not_receive(:stemcell_upload)
+          expect(command).to_not receive(:stemcell_download)
+          expect(command).to_not receive(:stemcell_upload)
           command.prepare
         end
       end
@@ -72,14 +74,17 @@ describe Bosh::Cli::Command::Prepare do
       context "stemcell not uploaded" do
         let(:stemcell_uploaded) { false }
 
-        before { stemcell.should_receive(:downloaded?).and_return(stemcell_downloaded) }
+        before do 
+          allow(stemcell).to receive(:downloaded?)
+            .and_return(stemcell_downloaded)
+        end
 
         context "stemcell downloaded" do
           let(:stemcell_downloaded) { true }
 
           it "does not upload the stemcell" do
-            command.should_not_receive(:stemcell_download)
-            command.should_receive(:stemcell_upload).with(stemcell.file)
+            expect(command).to_not receive(:stemcell_download)
+            expect(command).to receive(:stemcell_upload).with(stemcell.file)
             command.prepare
           end
         end
@@ -88,8 +93,8 @@ describe Bosh::Cli::Command::Prepare do
           let(:stemcell_downloaded) { false }
 
           it "does not upload the stemcell" do
-            command.should_receive(:stemcell_download).with(stemcell.file_name)
-            command.should_receive(:stemcell_upload).with(stemcell.file)
+            expect(command).to receive(:stemcell_download).with(stemcell.file_name)
+            expect(command).to receive(:stemcell_upload).with(stemcell.file)
             command.prepare
           end
         end

data/spec/commands/project_deployment_spec.rb

@@ -12,7 +12,7 @@ describe Bosh::Cli::Command::ProjectDeployment do
     setup_home_dir
     command.add_option(:config, home_file(".bosh_config"))
     command.add_option(:non_interactive, true)
-    deployment_cmd.stub(:add_option)
+    allow(deployment_cmd).to receive(:add_option)
   end
 
   describe "#deployment" do
@@ -21,7 +21,7 @@ describe Bosh::Cli::Command::ProjectDeployment do
     let(:filename) { "foo" }
 
     before do
-      Bosh::Cli::Command::Deployment.should_receive(:new)
+      expect(Bosh::Cli::Command::Deployment).to receive(:new)
         .and_return(deployment_cmd)
     end
 
@@ -30,18 +30,19 @@ describe Bosh::Cli::Command::ProjectDeployment do
       let(:merged_file) { ".manifests/foo.yml" }
 
       it "sets filename to merged file" do
-        command.should_receive(:find_deployment).with(filename)
+        expect(command).to receive(:find_deployment).with(filename)
           .and_return(deployment)
-        command.should_receive(:project_deployment_file?).with(deployment)
+        expect(command).to receive(:project_deployment_file?).with(deployment)
           .and_return(true)
-        command.should_receive(:project_deployment=).with(deployment)
-        command.should_receive(:validate_project_deployment)
-        File.should_receive(:exists?).with(merged_file).and_return(false)
-        command.should_receive(:create_placeholder_deployment)
-        command.should_receive(:project_deployment)
+        expect(command).to receive(:project_deployment=).with(deployment)
+        expect(command).to receive(:validate_project_deployment)
+        expect(File).to receive(:exists?).with(merged_file).and_return(false)
+        expect(command).to receive(:create_placeholder_deployment)
+        expect(command).to receive(:project_deployment)
           .and_return(project_deployment)
-        project_deployment.should_receive(:merged_file).and_return(merged_file)
-        deployment_cmd.should_receive(:set_current).with(merged_file)
+        expect(project_deployment).to receive(:merged_file)
+          .and_return(merged_file)
+        expect(deployment_cmd).to receive(:set_current).with(merged_file)
         subject
       end
     end
@@ -50,7 +51,7 @@ describe Bosh::Cli::Command::ProjectDeployment do
       let(:filename) { nil }
 
       it "returns current deployment" do
-        deployment_cmd.should_receive(:set_current).with(filename)
+        expect(deployment_cmd).to receive(:set_current).with(filename)
         subject
       end
     end
@@ -60,19 +61,19 @@ describe Bosh::Cli::Command::ProjectDeployment do
     subject { command.deploy }
 
     before do
-      Bosh::Cli::Command::Deployment.should_receive(:new)
+      expect(Bosh::Cli::Command::Deployment).to receive(:new)
         .and_return(deployment_cmd)
-      command.should_receive(:project_deployment?)
+      expect(command).to receive(:project_deployment?)
         .and_return(is_project_deployment)
-      deployment_cmd.should_receive(:perform)
+      expect(deployment_cmd).to receive(:perform)
     end
 
     context "with project deployment" do
       let(:is_project_deployment) { true }
 
       it "requires project deployment" do
-        command.should_receive(:require_project_deployment)
-        command.should_receive(:build_project_deployment)
+        expect(command).to receive(:require_project_deployment)
+        expect(command).to receive(:build_project_deployment)
         subject
       end
     end

data/spec/helpers/project_deployment_helper_spec.rb

@@ -28,17 +28,17 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
     context "deployment" do
       context "without associated project deployment" do
         let(:deployment_path) { "deployments/bar.yml" }
-        it { should be_false }
+        it { should be false }
       end
       context "with associated project deployment" do
         let(:deployment_path) { ".manifests/foo.yml" }
-        it { should be_true }
+        it { should be true }
       end
     end
 
     context "project deployment" do
       let(:deployment_path) { "deployments/foo.yml" }
-      it { should be_true }
+      it { should be true }
     end
   end
 
@@ -48,7 +48,7 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
     let(:deployment_path) { "deployments/foo.yml" }
 
     before do
-      Bosh::Workspace::ProjectDeployment.should_receive(:new)
+      expect(Bosh::Workspace::ProjectDeployment).to receive(:new)
         .with(deployment).and_return(project_deployment)
     end
 
@@ -70,12 +70,12 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
 
     context "project deployment" do
       let(:content) { { "name" => "foo", "templates" => ["bar.yml"] } }
-      it { should be_true }
+      it { should be true }
     end
 
     context "normal deployment" do
       let(:content) { { "name" => "foo" } }
-      it { should be_false }
+      it { should be false }
     end
   end
 
@@ -83,14 +83,14 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
     let(:project_deployment_helper) { ProjectDeploymentHelperTester.new(director, deployment) }
 
     before do
-      subject.should_receive(:project_deployment?)
+      expect(subject).to receive(:project_deployment?)
         .and_return(:is_project_deployment)
     end
 
     context "project deployment" do
       let(:is_project_deployment) { true }
       it "validates & builds" do
-        subject.should_receive(:validate_project_deployment)
+        expect(subject).to receive(:validate_project_deployment)
         subject.require_project_deployment
       end
     end
@@ -113,21 +113,21 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
     let(:content) { "director_uuid #{uuid}" }
 
     it "creates placeholder deployment" do
-      project_deployment_helper.should_receive(:resolve_director_uuid)
-      project_deployment.should_receive(:merged_file).and_return(merged_file)
-      project_deployment.should_receive(:file).and_return(deployment)
-      project_deployment.should_receive(:director_uuid).and_return(uuid)
-      File.should_receive(:open).with(merged_file, "w").and_yield(file)
-      file.should_receive(:write).with(/#{uuid}\s# Don't edit/)
+      expect(project_deployment_helper).to receive(:resolve_director_uuid)
+      expect(project_deployment).to receive(:merged_file).and_return(merged_file)
+      expect(project_deployment).to receive(:file).and_return(deployment)
+      expect(project_deployment).to receive(:director_uuid).and_return(uuid)
+      expect(File).to receive(:open).with(merged_file, "w").and_yield(file)
+      expect(file).to receive(:write).with(/#{uuid}\s# Don't edit/)
       subject
     end
   end
 
   describe "#validate_project_deployment" do
     it "raises an error" do
-      project_deployment.should_receive(:valid?).and_return(false)
-      project_deployment.should_receive(:errors).and_return(["foo"])
-      project_deployment.should_receive(:file).and_return(["foo.yml"])
+      expect(project_deployment).to receive(:valid?).and_return(false)
+      expect(project_deployment).to receive(:errors).and_return(["foo"])
+      expect(project_deployment).to receive(:file).and_return(["foo.yml"])
       expect { subject.validate_project_deployment }.to raise_error(/foo/)
     end
   end
@@ -138,14 +138,17 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
     let(:merged_file) { "foo/bar" }
 
     it "builds project deployment manifest" do
-      project_deployment_helper.should_receive(:resolve_director_uuid)
-      project_deployment_helper.should_receive(:work_dir).and_return(work_dir)
-      project_deployment.should_receive(:domain_name).and_return(domain_name)
-      project_deployment.should_receive(:merged_file).and_return(merged_file)
-
-      Bosh::Workspace::ManifestBuilder.should_receive(:build)
+      expect(project_deployment_helper).to receive(:resolve_director_uuid)
+      expect(project_deployment_helper).to receive(:work_dir)
+        .and_return(work_dir)
+      expect(project_deployment).to receive(:domain_name)
+        .and_return(domain_name)
+      expect(project_deployment).to receive(:merged_file)
+        .and_return(merged_file)
+
+      expect(Bosh::Workspace::ManifestBuilder).to receive(:build)
         .with(project_deployment, work_dir)
-      Bosh::Workspace::DnsHelper.should_receive(:transform)
+      expect(Bosh::Workspace::DnsHelper).to receive(:transform)
         .with(merged_file, domain_name)
 
       subject
@@ -158,8 +161,8 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
     let(:current_uuid) { "current-uuid" }
 
     before do
-      project_deployment.should_receive(:director_uuid).and_return(uuid)
-      director.stub(:get_status).and_return(status)
+      expect(project_deployment).to receive(:director_uuid).and_return(uuid)
+      allow(director).to receive(:get_status).and_return(status)
     end
 
     context "using the warden cpi" do
@@ -168,7 +171,7 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
       context "with director uuid current" do
         let(:uuid) { "current" }
         it "builds manifest" do
-          project_deployment.should_receive(:director_uuid=).with(current_uuid)
+          expect(project_deployment).to receive(:director_uuid=).with(current_uuid)
           subject
         end
       end

data/spec/helpers/release_helper_spec.rb

@@ -16,14 +16,20 @@ describe Bosh::Workspace::ReleaseHelper do
   let(:work_dir) { asset_dir("manifests-repo") }
 
   describe "#release_upload" do
-    let(:release_cmd) { instance_double("Bosh::Cli::Command::Release") }
-    before { Bosh::Cli::Command::Release.stub(:new).and_return(release_cmd) }
-    
+    let(:release_cmd) do
+      instance_double "Bosh::Cli::Command::Release::UploadRelease"
+    end
+
+    before do
+      allow(Bosh::Cli::Command::Release::UploadRelease).to receive(:new)
+        .and_return(release_cmd)
+    end
+
     let(:manifest_file) { "foo-1.yml." }
     subject { release_helper.release_upload(manifest_file) }
-      
+
     it "uploads release" do
-      release_cmd.should_receive(:upload).with(manifest_file)
+      expect(release_cmd).to receive(:upload).with(manifest_file)
       subject
     end
   end
@@ -31,24 +37,30 @@ describe Bosh::Workspace::ReleaseHelper do
   describe "#release_uploaded?" do
     let(:releases) { { "versions" => %w(1 2 3) } }
     subject { release_helper.release_uploaded?("foo", version) }
-    before { director.should_receive(:get_release).with("foo").and_return(releases) }
+    before do 
+      expect(director).to receive(:get_release)
+        .with("foo").and_return(releases)
+    end
 
     context "release exists" do
       let(:version) { 2 }
-      it { should be_true }
+      it { should be true }
     end
 
     context "release not found" do
       let(:version) { "8" }
-      it { should be_false }
+      it { should be false }
     end
   end
-  
+
   describe "#release_dir" do
     let(:releases_dir) { File.join(work_dir, ".releases") }
     subject { release_helper.releases_dir }
-    
-    before { FileUtils.should_receive(:mkdir_p).once.with(releases_dir).and_return([releases_dir]) }
+
+    before do
+      expect(FileUtils).to receive(:mkdir_p).once
+        .with(releases_dir).and_return([releases_dir])
+    end
 
     it { should eq releases_dir }
 
@@ -64,10 +76,14 @@ describe Bosh::Workspace::ReleaseHelper do
     let(:release_data) { { name: "foo" } }
     let(:releases) { [release_data, release_data] }
 
-    before { release_helper.stub_chain("project_deployment.releases").and_return(releases) }
+    before do
+      expect(release_helper)
+        .to receive_message_chain("project_deployment.releases")
+        .and_return(releases)
+    end
 
     it "inits releases once" do
-      Bosh::Workspace::Release.should_receive(:new).twice
+      expect(Bosh::Workspace::Release).to receive(:new).twice
         .with(release_data, /\/.releases/).and_return(release)
       subject
       expect(subject).to eq [release, release]

data/spec/helpers/spiff_helper_spec.rb

@@ -16,7 +16,7 @@ describe Bosh::Workspace::SpiffHelper do
     end
 
     before do
-      subject.should_receive(:sh).and_yield(result)
+      expect(subject).to receive(:sh).and_yield(result)
     end
 
     context "spiff not in path" do
@@ -34,7 +34,7 @@ describe Bosh::Workspace::SpiffHelper do
       let(:result) { Bosh::Exec::Result.new("spiff", "spiff error", 1, false) }
 
       it "raises an error" do
-        subject.should_receive(:say).with(/Command failed/)
+        expect(subject).to receive(:say).with(/Command failed/)
         expect{ subject.spiff_merge templates, target_file }
           .to raise_error /spiff error/
       end
@@ -46,8 +46,8 @@ describe Bosh::Workspace::SpiffHelper do
       let(:result) { Bosh::Exec::Result.new("spiff", output, 0, false) }
 
       it "merges manifests" do
-        File.should_receive(:open).with(target_file, 'w').and_yield(file)
-        file.should_receive(:write).with(output)
+        expect(File).to receive(:open).with(target_file, 'w').and_yield(file)
+        expect(file).to receive(:write).with(output)
         subject.spiff_merge templates, target_file
       end
     end

data/spec/helpers/stemcell_helper_spec.rb

@@ -17,15 +17,18 @@ describe Bosh::Workspace::StemcellHelper do
 
   context "with stemcell command" do
     let(:stemcell_cmd) { instance_double("Bosh::Cli::Command::Stemcell") }
-    before { Bosh::Cli::Command::Stemcell.stub(:new).and_return(stemcell_cmd) }
+    before do
+      allow(Bosh::Cli::Command::Stemcell)
+        .to receive(:new).and_return(stemcell_cmd)
+    end
 
     describe "#stemcell_download" do
       let(:name) { "foo" }
       subject { stemcell_helper.stemcell_download(name) }
-      
+
       it "downloads stemcell" do
-        Dir.should_receive(:chdir).and_yield
-        stemcell_cmd.should_receive(:download_public).with(name)
+        expect(Dir).to receive(:chdir).and_yield
+        expect(stemcell_cmd).to receive(:download_public).with(name)
         subject
       end
     end
@@ -33,9 +36,9 @@ describe Bosh::Workspace::StemcellHelper do
     describe "#stemcell_upload" do
       let(:file) { "foo.tgz" }
       subject { stemcell_helper.stemcell_upload(file) }
-      
+
       it "uploads stemcell" do
-        stemcell_cmd.should_receive(:upload).with(file)
+        expect(stemcell_cmd).to receive(:upload).with(file)
         subject
       end
     end
@@ -44,24 +47,29 @@ describe Bosh::Workspace::StemcellHelper do
   describe "#stemcell_uploaded?" do
     let(:stemcells) { [{ "name" => "foo", "version" => "1" }] }
     subject { stemcell_helper.stemcell_uploaded?(name, 1) }
-    before { director.should_receive(:list_stemcells).and_return(stemcells) }
+    before do
+      expect(director).to receive(:list_stemcells).and_return(stemcells)
+    end
 
     context "stemcell exists" do
       let(:name) { "foo" }
-      it { should be_true }
+      it { should be true }
     end
 
     context "stemcell not found" do
       let(:name) { "bar" }
-      it { should be_false }
+      it { should be false }
     end
   end
-  
+
   describe "#stemcell_dir" do
     let(:stemcells_dir) { File.join(work_dir, ".stemcells") }
     subject { stemcell_helper.stemcells_dir }
-    
-    before { FileUtils.should_receive(:mkdir_p).once.with(stemcells_dir).and_return([stemcells_dir]) }
+
+    before do
+      expect(FileUtils).to receive(:mkdir_p).once.with(stemcells_dir)
+        .and_return([stemcells_dir])
+    end
 
     it { should eq stemcells_dir }
 
@@ -77,10 +85,14 @@ describe Bosh::Workspace::StemcellHelper do
     let(:stemcell_data) { { name: "foo" } }
     let(:stemcells) { [stemcell_data, stemcell_data] }
 
-    before { stemcell_helper.stub_chain("project_deployment.stemcells").and_return(stemcells) }
+    before do
+      allow(stemcell_helper)
+        .to receive_message_chain("project_deployment.stemcells")
+        .and_return(stemcells)
+    end
 
     it "inits stemcells once" do
-      Bosh::Workspace::Stemcell.should_receive(:new).twice
+      expect(Bosh::Workspace::Stemcell).to receive(:new).twice
         .with(stemcell_data, /\/.stemcells/).and_return(stemcell)
       subject
       expect(subject).to eq [stemcell, stemcell]

data/spec/manifest_builder_spec.rb

@@ -12,9 +12,9 @@ describe Bosh::Workspace::ManifestBuilder do
       instance_double("Bosh::Workspace::ManifestBuilder") }
 
     it "creates builder and merges templates" do
-      Bosh::Workspace::ManifestBuilder.should_receive(:new)
+      expect(Bosh::Workspace::ManifestBuilder).to receive(:new)
         .with(project_deployment, work_dir).and_return(manifest_builder)
-      manifest_builder.should_receive(:merge_templates)
+      expect(manifest_builder).to receive(:merge_templates)
       subject
     end
   end
@@ -23,7 +23,8 @@ describe Bosh::Workspace::ManifestBuilder do
     subject { Bosh::Workspace::ManifestBuilder.new project_deployment, work_dir }
 
     before do
-      File.stub(:exists?).with(/templates\//).and_return(template_exists)
+      allow(File).to receive(:exists?).with(/templates\//)
+        .and_return(template_exists)
     end
 
     context "missing template" do
@@ -38,21 +39,22 @@ describe Bosh::Workspace::ManifestBuilder do
       let(:dir_exists) { true }
 
       before do
-        File.stub(:exists?).with(/\.stubs/).and_return(dir_exists)
-        Bosh::Workspace::StubFile.should_receive(:create).with(/\.stubs\/.+yml/, project_deployment)
+        allow(File).to receive(:exists?).with(/\.stubs/).and_return(dir_exists)
+        expect(Bosh::Workspace::StubFile).to receive(:create)
+          .with(/\.stubs\/.+yml/, project_deployment)
       end
 
       context "no hidden dirs" do
         let(:dir_exists) { false }
         it "creates hidden dirs" do
-          subject.stub(:spiff_merge)
-          Dir.should_receive(:mkdir).with(/.stubs/)
+          expect(subject).to receive(:spiff_merge)
+          expect(Dir).to receive(:mkdir).with(/.stubs/)
           subject.merge_templates
         end
       end
 
       it "generates manifest with spiff" do
-        subject.should_receive(:spiff_merge) do |args|
+        expect(subject).to receive(:spiff_merge) do |args|
           if args.is_a?(Array)
             expect(args.first).to match(/\/templates\/.+yml/)
             expect(args.last).to match(/\.stubs\/.+yml/)

data/spec/project_deployment_spec.rb

@@ -123,6 +123,13 @@ describe Bosh::Workspace::ProjectDeployment do
         it { should_not match(/version/i) }
       end
 
+      context "patch version" do
+        let(:missing) { "name" }
+        let(:stemcell_version) { "2719.1" }
+        it { should match(/name.*missing/i) }
+        it { should_not match(/version/i) }
+      end
+
       context "invalid version" do
         let(:missing) { "name" }
         let(:stemcell_version) { "foo" }
@@ -139,7 +146,7 @@ describe Bosh::Workspace::ProjectDeployment do
 
   describe "attr readers" do
     let(:director_uuid) { uuid }
-    %w(name director_uuid templates releases stemcells meta).each do |attr| 
+    %w(name director_uuid templates releases stemcells meta).each do |attr|
       its(attr.to_sym) { should eq eval(attr) }
     end
   end
@@ -147,7 +154,7 @@ describe Bosh::Workspace::ProjectDeployment do
   describe "#merged_file" do
     it "creates parent directory" do
       dir = File.dirname(subject.merged_file)
-      expect(File.directory?(dir)).to be_true
+      expect(File.directory?(dir)).to be true
     end
 
     it "retruns merged file" do

data/spec/release_spec.rb

@@ -88,8 +88,4 @@ describe Bosh::Workspace::Release do
   after do
     FileUtils.rm_r releases_dir
   end
-
-  after(:all) do
-    FileUtils.rm_r repo
-  end
 end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ Bundler.setup(:default, :test)
 $:.unshift(File.expand_path("../../lib", __FILE__))
 
 require "rspec/core"
-require 'rspec/fire'
+require "rspec/its"
 
 require "tmpdir"
 require "archive/zip"
@@ -21,8 +21,7 @@ require "cli"
 require "bosh/workspace"
 
 RSpec.configure do |config|
-  config.include(RSpec::Fire)
-
+  config.raise_errors_for_deprecations!
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end

data/spec/stemcell_spec.rb

@@ -7,22 +7,24 @@ describe Bosh::Workspace::Stemcell do
   let(:version) { 3 }
 
   describe "#name_version" do
-    its(:name_version) { should eq "#{name}/#{version}" }
+    its(:name_version) { is_expected.to eq "#{name}/#{version}" }
   end
 
   describe "#file_name" do
-    its(:file_name) { should eq file_name }
+    its(:file_name) { is_expected.to eq file_name }
   end
 
   describe "#downloaded?" do
-    before { File.should_receive(:exists?).with(/\/#{file_name}/).and_return(true) }
-    its(:downloaded?) { should eq true }
+    before do 
+      expect(File).to receive(:exists?).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) { should eq eval(attr) }
+      its(attr.to_sym) { is_expected.to eq eval(attr) }
     end
   end
 end

data/spec/stub_file_spec.rb

@@ -20,16 +20,16 @@ describe Bosh::Workspace::StubFile do
     subject { Bosh::Workspace::StubFile.create(path, project_deployment) }
 
     it "calls write" do
-      Bosh::Workspace::StubFile.should_receive(:new)
+      expect(Bosh::Workspace::StubFile).to receive(:new)
         .with(project_deployment).and_return(stub_file)
-      stub_file.should_receive(:write).with(path)
+      expect(stub_file).to receive(:write).with(path)
       subject
     end
   end
 
   describe "#write" do
     it "writes yaml content" do
-      IO.should_receive(:write).with(path, /---\n/)
+      expect(IO).to receive(:write).with(path, /---\n/)
       subject.write(path)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1722.0
+        version: 1.2682.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1722.0
+        version: 1.2682.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1722.0
+        version: 1.2682.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1722.0
+        version: 1.2682.0
 - !ruby/object:Gem::Dependency
   name: semi_semantic
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec-fire
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement