bosh-workspace 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 714566deb48e99bec64c59fc879cc8b000ead30b
-  data.tar.gz: 1720922e945f0389deb3cc4f9e5f4ba29193b913
+  metadata.gz: 1bd19a741ce82f38591f6c4e87d8377949f5b625
+  data.tar.gz: b4d837f2f51fe22afa1b4f70cb1c5c42c3170812
 SHA512:
-  metadata.gz: dc1f59f2d91ca1725e5b650aa7be4353edae04632c13c285cd8ada65db6a6e70614a600761811c72f5975e78cbfacd4afedb375f87ffb5c0856a6f83d88855ad
-  data.tar.gz: dede9bcac998279618330764f421d110966105324616d792ea6988f0e0c5d7a665c78c55fb6e0db8915f42b7437ef124249ce57bdedd6fa8bff94b3c79aac9f3
+  metadata.gz: 1f7a58f26ce03271a1a98e133f3f1168b7b8321ba8fdacdb5d37690bb5447b40cf5df7bb45154440ef5e35910694420d00f9dcca9756749eb793ad371c2f5223
+  data.tar.gz: fac5312d74ac733a03669cf9306e82ceb0f232436006be9d1221376ea11c99d5b4f036ed87a2e08ab53c5d0053224fc304bf18eb9304d9666ffe5919e051bea1

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

@@ -19,12 +19,19 @@ module Bosh::Workspace
     end
 
     def require_project_deployment
-      unless project_deployment?
-        err("Deployment is not a project deployment: #{deployment}")
-      end
+      no_deployment_err unless deployment
+      not_a_bosh_workspace_deployment unless project_deployment?
       validate_project_deployment
     end
 
+    def no_deployment_err
+      err "No deployment set"
+    end
+
+    def not_a_bosh_workspace_deployment
+      err "Deployment is not a bosh-workspace deployment: #{deployment}"
+    end
+
     def create_placeholder_deployment
       resolve_director_uuid
 

data/lib/bosh/workspace/release.rb

@@ -1,6 +1,6 @@
 module Bosh::Workspace
   class Release
-    REFSPEC = ['HEAD:refs/remotes/origin/HEAD']
+    REFSPEC = ['HEAD:refs/remotes/origin/HEAD','*:refs/remotes/origin/*']
     attr_reader :name, :git_url, :repo_dir
 
     def initialize(release, releases_dir, credentials_callback, options = {})
@@ -39,7 +39,10 @@ module Bosh::Workspace
     end
 
     def ref
-      @ref && repo.lookup(@ref).oid
+      return nil unless @ref
+      return repo.ref(@ref).target.target.oid if
+        Rugged::Reference.valid_name?(@ref) && repo.ref(@ref)
+      repo.lookup(@ref).oid
     end
 
     def release_dir
@@ -104,6 +107,8 @@ module Bosh::Workspace
     end
 
     def update_repo_with_ref(repository, ref)
+#      require 'pry'
+#     binding.pry
       repository.checkout_tree ref, strategy: :force
       repository.checkout ref, strategy: :force
     end
@@ -181,6 +186,7 @@ module Bosh::Workspace
     end
 
     def symlink_templates
+      return [symlink_target(templates_dir)] if File.symlink?(templates_dir)
       return [] unless File.exist?(templates_dir)
       Find.find(templates_dir)
         .select { |f| File.symlink?(f) }.map { |f| symlink_target(f) }

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.10"
+    VERSION = "0.9.11"
   end
 end

data/spec/helpers/project_deployment_helper_spec.rb

@@ -83,12 +83,23 @@ describe Bosh::Workspace::ProjectDeploymentHelper do
     let(:project_deployment_helper) { ProjectDeploymentHelperTester.new(director, deployment) }
 
     before do
-      expect(subject).to receive(:project_deployment?)
+      allow(subject).to receive(:project_deployment?)
         .and_return(:is_project_deployment)
     end
 
+    context "no deployment is set" do
+      let(:deployment) { nil }
+
+      it "raises an help full error" do
+        expect{ subject.require_project_deployment }
+          .to raise_error /no deployment set/i
+      end
+    end
+
     context "project deployment" do
       let(:is_project_deployment) { true }
+      let(:deployment) { '.deployment/foo.yml' }
+
       it "validates & builds" do
         expect(subject).to receive(:validate_project_deployment)
         subject.require_project_deployment

data/spec/release_spec.rb

@@ -210,6 +210,37 @@ module Bosh::Workspace
       end
     end
 
+    context "given a release that has the whole templates/ dir symlinked from a submodule" do
+      let(:repo) { extracted_asset_dir("supermodule-all-templates-symlinked", "supermodule-all-templates-symlinked-boshrelease-repo.zip") }
+      let(:subrepo) { extracted_asset_dir("submodule-boshrelease", "submodule-boshrelease-repo.zip") }
+      let(:name) { "supermodule-all-templates-symlinked" }
+      let(:version) { "1" }
+
+      before do
+        FileUtils.rm_rf(releases_dir)
+        allow_any_instance_of(Rugged::Submodule).to receive(:url).and_return(subrepo)
+      end
+
+      describe "#update_repo" do
+        subject { Rugged::Repository.new(File.join(releases_dir, name)) }
+
+        context "with templates in submodules" do
+          before do
+            release = load_release("name" => name, "version" => 1, "git" => repo)
+          end
+
+          it "clones + checks out required submodules" do
+            expect(subject.submodules["src/submodule"].workdir_oid)
+                .to eq "95eed8c967af969d659a766b0551a75a729a7b65"
+          end
+
+          it "doesn't clone/checkout extraneous submodules" do
+            expect(subject.submodules["src/other"].workdir_oid).to eq nil
+          end
+        end
+      end
+    end
+
     context "given a release with deprecated structure within 'releases' folder" do
       let(:repo) { extracted_asset_dir("foo", "foo-boshrelease-repo.zip") }
 
@@ -264,6 +295,53 @@ module Bosh::Workspace
           end
         end
 
+        context "specific ref from different branch with specific release" do
+          let(:release_data) do
+            {"name" => name, "version" => "9.1", "ref" => "9c899", "git" => repo}
+          end
+
+          it "checks out repo" do
+            release.update_repo
+            expect(subject).to match(/foo-9.1.yml/)
+          end
+        end
+
+        context "specific ref from different branch with latest release" do
+          let(:release_data) do
+            {"name" => name, "version" => "latest", "ref" => "9c899", "git" => repo}
+          end
+
+          it "checks out repo" do
+            release.update_repo
+            expect(subject).to match(/foo-9.2.yml/)
+            expect(subject).to_not match(/foo-10.yml/)
+          end
+        end
+
+        context "specific tag latest release" do
+          let(:release_data) do
+            {"name" => name, "version" => "latest", "ref" => "refs/tags/v8", "git" => repo}
+          end
+
+          it "checks out repo" do
+
+            release.update_repo
+            expect(subject).to match(/foo-8.yml/)
+          end
+        end
+
+        context "specific tag from different branch with latest release" do
+          let(:release_data) do
+            {"name" => name, "version" => "9.1", "ref" => "refs/tags/v9.1", "git" => repo}
+          end
+
+          it "checks out repo" do
+            release.update_repo
+            expect(subject).to match(/foo-9.1.yml/)
+            expect(subject).to_not match(/foo-9.2.yml/)
+          end
+        end
+
         context "updated version" do
           let(:version) { "11" }
 
@@ -452,10 +530,10 @@ module Bosh::Workspace
 
     context "correct checkout behavior:" do
       let(:release_data) { { "name" => name, "version" => version,
-                             "git" => repo, "ref" => :fooref } }
+                             "git" => repo, "ref" => 'e0b35d6' } }
       let(:repo) { 'foo/bar' }
       let(:repository) do
-        instance_double('Rugged::Repository', lookup: double(oid: :fooref))
+        instance_double('Rugged::Repository', lookup: double(oid: 'e0b35d6'))
       end
 
       describe "#update_repo_with_ref" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -236,6 +236,7 @@ files:
 - spec/assets/manifests-repo/stubs/foobar
 - spec/assets/manifests-repo/templates/foo/bar.yml
 - spec/assets/submodule-boshrelease-repo.zip
+- spec/assets/supermodule-all-templates-symlinked-boshrelease-repo.zip
 - spec/assets/supermodule-boshrelease-repo.zip
 - spec/assets/symlinkreplacement-boshrelease-repo.zip
 - spec/commands/deployment_patch_spec.rb
@@ -315,6 +316,7 @@ test_files:
 - spec/assets/manifests-repo/stubs/foobar
 - spec/assets/manifests-repo/templates/foo/bar.yml
 - spec/assets/submodule-boshrelease-repo.zip
+- spec/assets/supermodule-all-templates-symlinked-boshrelease-repo.zip
 - spec/assets/supermodule-boshrelease-repo.zip
 - spec/assets/symlinkreplacement-boshrelease-repo.zip
 - spec/commands/deployment_patch_spec.rb