bosh-workspace 0.9.0.rc5 → 0.9.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7b969ed0420ed359c4b818cc406ba9da51da12
-  data.tar.gz: e18975e40f8822effa0e4a38116779dd38831d3a
+  metadata.gz: 3fbe620ebe35229e628a0723a0f2f920a1a73a98
+  data.tar.gz: 3cb1479d27acd91b94ca5c06677de889c70d03ef
 SHA512:
-  metadata.gz: 3a962465f8afd6ec0d9165db2e6b2907208709b014ddd21051e82f62c3084ec0e963b5696ca56d343578521c82aa41873abf08daaf8af621174111178ae7faca
-  data.tar.gz: d0564bb1504d5492a362a1cf548aa746afa80db5d4ee2080edef5d8db47bb84b5299a3749e3520e8868f3334b58120c8c21b0858e8d638b61ce131cbde505cad
+  metadata.gz: edbf6bae79436cf92a0c82569d5dc04d86370d1269d539e349f37d869fdc21814c3d25f707da2049f7816dcce2340c8536bb8691f4a8b6d40f14caaf1ba55c93
+  data.tar.gz: c20a99dff6248d798a6b0c0dbbe98cd53909f7354dc859ec40add67d02bf7a00579efcfea5191e168a1750e617e11a9a943abdcfc209ffda00dc8b978c690b2b

data/README.md

@@ -1,7 +1,6 @@
 # Bosh workspace
 [![Build Status](https://img.shields.io/travis/cloudfoundry-incubator/bosh-workspace/master.svg?style=flat-square)](https://travis-ci.org/cloudfoundry-incubator/bosh-workspace) [![Test Coverage](https://img.shields.io/codeclimate/coverage/github/rkoster/bosh-workspace.svg?style=flat-square)](https://codeclimate.com/github/rkoster/bosh-workspace) [![Code Climate](https://img.shields.io/codeclimate/github/rkoster/bosh-workspace.svg?style=flat-square)](https://codeclimate.com/github/rkoster/bosh-workspace) [![Dependency Status](https://img.shields.io/gemnasium/cloudfoundry-incubator/bosh-workspace.svg?style=flat-square)](https://gemnasium.com/cloudfoundry-incubator/bosh-workspace) [![Stories in Ready](https://img.shields.io/badge/tracker-waffle.io-blue.svg?style=flat-square)](https://waffle.io/cloudfoundry-incubator/bosh-workspace)
 
-
 This is a `bosh` cli plugin for creating reproducible and upgradable deployments.
 
 ## Getting started

data/lib/bosh/cli/commands/prepare.rb

@@ -56,6 +56,9 @@ module Bosh::Cli::Command
       if release_uploaded?(release.name, release.version)
         say "Release '#{release.name_version.make_green}' exists"
         say "Skipping upload"
+      elsif release.url
+        say "Uploading '#{release.url}'"
+        release_remote(release.url, release.release_dir)
       else
         say "Uploading '#{release.name_version.make_green}'"
         release_upload(release.manifest_file, release.release_dir)

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

@@ -17,6 +17,7 @@ module Bosh::Workspace
       url = repo.remotes['origin'].url
       repo.fetch('origin', REFSPEC, connection_options_for(repo, url))
       commit = repo.references['refs/remotes/origin/HEAD'].resolve.target_id
+      repo.checkout_tree commit, strategy: :force
       repo.checkout commit, strategy: :force
     end
 

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

@@ -7,9 +7,9 @@ module Bosh::Workspace
       remote_release && remote_release["versions"].include?(version.to_s)
     end
 
-    def release_upload(manifest_file, release_dir)
+    def release_upload(manifest_file_or_release_url, release_dir)
       Dir.chdir(release_dir) do
-        release_cmd.upload(manifest_file)
+        release_cmd.upload(manifest_file_or_release_url)
       end
     end
 

data/lib/bosh/workspace/release.rb

@@ -3,20 +3,22 @@ module Bosh::Workspace
     attr_reader :name, :git_url, :repo_dir
 
     def initialize(release, releases_dir)
-      @name = release["name"]
-      @ref = release["ref"]
-      @path = release["path"]
+      @name         = release["name"]
+      @ref          = release["ref"]
+      @path         = release["path"]
       @spec_version = release["version"].to_s
-      @git_url = release["git"]
-      @repo_dir = File.join(releases_dir, @name)
+      @git_url      = release["git"]
+      @repo_dir     = File.join(releases_dir, @name)
+      @url          = release["url"]
     end
 
     def update_repo
-      repo.checkout ref || release[:commit], strategy: :force
+      hash = ref || release[:commit]
+      update_repo_with_ref(repo, hash)
     end
 
     def update_submodule(submodule)
-      submodule.repository.checkout submodule.head_oid, strategy: :force
+      update_repo_with_ref(submodule.repository, submodule.head_oid)
     end
 
     def required_submodules
@@ -54,12 +56,21 @@ module Bosh::Workspace
       @path ? File.join(@repo_dir, @path) : @repo_dir
     end
 
+    def url
+      @url && @url.gsub("^VERSION^", version)
+    end
+
     private
 
     def repo
       @repo ||= Rugged::Repository.new(repo_dir)
     end
 
+    def update_repo_with_ref(repository, ref)
+      repository.checkout_tree ref, strategy: :force
+      repository.checkout ref, strategy: :force
+    end
+
     def new_style_repo
       base = @path ? File.join(@path, 'releases') : 'releases'
       dir = File.join(repo_dir, base, @name)

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

@@ -6,6 +6,7 @@ module Bosh::Workspace
           [{
             "name"           => String,
             "version"        => ReleaseVersion.new,
+            optional("url")  => String,
             optional("path") => enum(String),
             optional("ref")  => enum(String),
             optional("git")  => String,

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.0.rc5"
+    VERSION = "0.9.0.rc6"
   end
 end

data/spec/commands/prepare_spec.rb

@@ -6,7 +6,7 @@ describe Bosh::Cli::Command::Prepare do
     let(:release) do
       instance_double("Bosh::Workspace::Release",
         name: "foo", version: "1", repo_dir: ".releases/foo", git_url: "/.git",
-        release_dir: '.releases/foo/sub', name_version: "foo/1",
+        release_dir: '.releases/foo/sub', name_version: "foo/1", url: nil,
         manifest_file: "releases/foo-1.yml")
     end
     let(:stemcell) do

data/spec/helpers/git_credentials_helper_spec.rb

@@ -28,6 +28,7 @@ module Bosh::Workspace
         .and_return(:commit_id)
       allow(remote).to receive(:check_connection).with(:fetch, Hash)
         .and_return(!auth_required, credentials_auth_valid)
+      allow(repo).to receive(:checkout_tree).with(:commit_id, strategy: :force)
       allow(repo).to receive(:checkout).with(:commit_id, strategy: :force)
       allow(GitRemoteUrl).to receive(:new).and_return(git_url)
     end
@@ -48,6 +49,8 @@ module Bosh::Workspace
       context "with existing repo" do
         it do
           expect_no_credentials
+          expect(repo).to receive("checkout_tree")
+          expect(repo).to receive("checkout")
           subject
         end
       end
@@ -61,6 +64,8 @@ module Bosh::Workspace
       context "with existing repo" do
         it do
           expect_no_credentials
+          expect(repo).to receive("checkout_tree")
+          expect(repo).to receive("checkout")
           subject
         end
       end

data/spec/release_spec.rb

@@ -1,8 +1,11 @@
+require "fileutils"
+
 describe Bosh::Workspace::Release do
   include Bosh::Workspace::GitCredentialsHelper
   let(:name) { "foo" }
   let(:release) { load_release(release_data) }
   let(:version) { "3" }
+  let(:url) { "http://local.url/release" }
   let(:release_data) { { "name" => name, "version" => version, "git" => repo } }
   let(:releases_dir) { File.join(asset_dir("manifests-repo"), ".releases") }
   let(:templates) { Dir[File.join(releases_dir, name, "templates/*.yml")].to_s }
@@ -13,7 +16,7 @@ describe Bosh::Workspace::Release do
     end
   end
 
-  context "given a release with new structure within 'releases' folder" do
+  context "with new structure within 'releases' folder" do
     let(:repo) { extracted_asset_dir("foo", "foo-boshrelease-repo-new-structure.zip") }
 
     describe "#update_repo" do
@@ -43,8 +46,11 @@ describe Bosh::Workspace::Release do
     end
 
     describe "attributes" do
+      let(:release_data) { { "name" => name, "version" => version, "git" => repo } }
       let(:version) { "12" }
+
       subject { release }
+
       its(:name) { should eq name }
       its(:git_url) { should eq repo }
       its(:repo_dir) { should match(/\/#{name}$/) }
@@ -55,6 +61,28 @@ describe Bosh::Workspace::Release do
       its(:manifest_file) do
         should match(/\/releases\/#{name}\/#{name}-#{version}.yml$/)
       end
+
+      context ", using a local url" do
+        context "with a version placeholder" do
+          let(:url) { "http://local.url/release?^VERSION^" }
+          let(:version) { "12" }
+          let(:release_data) { { "name" => name, "version" => version, "url" => url } }
+
+          it 'replaces the version placeholder with the version number' do
+            expect(release.url).to eq "http://local.url/release?12"
+          end
+        end
+
+        context 'with no version placeholder' do
+          let(:url) { "http://local.url/release" }
+          let(:version) { "12" }
+          let(:release_data) {{ "name" => name, "version" => version, "url" => url }}
+
+          it 'returns the same url' do
+            expect(release.url).to eq "http://local.url/release"
+          end
+        end
+      end
     end
   end
 
@@ -67,10 +95,10 @@ describe Bosh::Workspace::Release do
       subject { Rugged::Repository.new(File.join(releases_dir, name)) }
       context "with templates in submodules" do
         before do
-          system("rm -rf #{releases_dir}")
+          FileUtils.rm_rf(releases_dir)
           allow_any_instance_of(Rugged::Submodule).to receive(:url).and_return(subrepo)
 
-          release = load_release("name" => name, "version" => 1, "git" => repo)
+          release = load_release( "name" => name, "version" => 1, "git" => repo)
           release.update_repo
           release.required_submodules.each do |submodule|
             fetch_or_clone_repo(File.join(release.repo_dir, submodule.path), submodule.url)
@@ -88,10 +116,10 @@ describe Bosh::Workspace::Release do
       end
       context "with templates in submodules" do
         before do
-          system("rm -rf #{releases_dir}")
+          FileUtils.rm_rf(releases_dir)
           allow_any_instance_of(Rugged::Submodule).to receive(:url).and_return(subrepo)
 
-          release = load_release("name" => name, "version" => 2, "git" => repo)
+          release = load_release( "name" => name, "version" => 2, "git" => repo)
           release.update_repo
           release.required_submodules.each do |submodule|
             fetch_or_clone_repo(File.join(release.repo_dir, submodule.path), submodule.url)
@@ -110,7 +138,7 @@ describe Bosh::Workspace::Release do
 
       context "from v1 to v2" do
         before do
-          system("rm -rf #{releases_dir}")
+          FileUtils.rm_rf(releases_dir)
           allow_any_instance_of(Rugged::Submodule).to receive(:url).and_return(subrepo)
         end
 
@@ -379,4 +407,49 @@ describe Bosh::Workspace::Release do
       end
     end
   end
+
+  context "correct checkout behavior:" do
+    let(:repo) { extracted_asset_dir("foo", "foo-boshrelease-repo.zip") }
+    let(:release_data) { { "name" => name, "version" => version,
+                           "git" => repo, "ref" => :fooref } }
+    let(:repo) { 'foo/bar' }
+    let(:repository) do
+      instance_double('Rugged::Repository', lookup: double(oid: :fooref))
+    end
+
+    describe "#update_repo_with_ref" do
+      subject { Bosh::Workspace::Release.new(release_data, releases_dir) }
+
+      before do
+        expect(Rugged::Repository).to receive(:new).and_return(repository)
+      end
+
+      it "calls checkout_tree and checkout" do
+        expect(repository).to receive("checkout_tree").at_least(:once)
+        expect(repository).to receive("checkout").at_least(:once)
+        subject.update_repo
+      end
+    end
+  end
+
+  context "given a release which moved a directory to a symlink across versions" do
+    let(:repo) { extracted_asset_dir("symlinkreplacement", "symlinkreplacement-boshrelease-repo.zip") }
+    let(:name) { "symlinkreplacement" }
+
+    describe "#update_repo" do
+      subject { Rugged::Repository.new(File.join(releases_dir, name)) }
+      context "using a previous version should work" do
+        before do
+          FileUtils.rm_rf(releases_dir)
+
+          release = load_release("name" => name, "version" => "1", "git" => repo)
+          release.update_repo
+        end
+        it "git state is happy" do
+          expect(subject.head.target.oid).to eq "d96521d1940934b1941e0f4a462d3a5e9f31c75d"
+          expect(subject.diff_workdir(subject.head.target.oid).size).to eq 0
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc5
+  version: 0.9.0.rc6
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -229,6 +229,7 @@ files:
 - spec/assets/manifests-repo/templates/foo/bar.yml
 - spec/assets/submodule-boshrelease-repo.zip
 - spec/assets/supermodule-boshrelease-repo.zip
+- spec/assets/symlinkreplacement-boshrelease-repo.zip
 - spec/commands/deployment_patch_spec.rb
 - spec/commands/prepare_spec.rb
 - spec/commands/project_deployment_spec.rb
@@ -300,6 +301,7 @@ test_files:
 - spec/assets/manifests-repo/templates/foo/bar.yml
 - spec/assets/submodule-boshrelease-repo.zip
 - spec/assets/supermodule-boshrelease-repo.zip
+- spec/assets/symlinkreplacement-boshrelease-repo.zip
 - spec/commands/deployment_patch_spec.rb
 - spec/commands/prepare_spec.rb
 - spec/commands/project_deployment_spec.rb