bosh-workspace 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc164ab39f93979ea18104b4eec2af8b2685474
-  data.tar.gz: 0f363f7c17c3094578da216df5b289bac36cece0
+  metadata.gz: 509af72a3d60e92cdfc60b4e3f27d7ca4590b569
+  data.tar.gz: a67937d21657958dcad54f43617df73e97cb2def
 SHA512:
-  metadata.gz: cde52c0f73412df1285ea4da74f1e6e77a9bc9fd59050d0f6c2f3de83a3e53c6018c49b8271229e1b60e93a3cf92111af4e4b8db75aef676b10228d18b3753ff
-  data.tar.gz: 5a798f29796e8744ba0fda7fede8d5e8e1ff09661411b3c7c0969a634fcb17ba8c1e0a6e6bfb6c82609c842c9e925f092734de49944aa827e3b202046c8d8527
+  metadata.gz: 4261f81472671a031ebd91cfb7948730b0f9690ce8de410ea9f0b5f679d2c2fe6e83ce473580bd1b60d44dbfafe92fb470d500ce60eea709251b70aeb2a9ad98
+  data.tar.gz: ea63269675c3184df76c34c08ca7d6e6777a231687674749c309431a972d6888b6b1074d36d6811e1798d73ff4e86ce909cc7f81ce0d24ff164b3a1cc3a0ab09

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

@@ -27,7 +27,10 @@ module Bosh::Cli::Command
       project_deployment_releases.each do |release|
         say "Cloning release '#{release.name.make_green}' to satisfy template references"
         release.update_repo
-        say "Version '#{release.version.to_s.make_green}' has been checkout into: #{release.repo_dir}"
+        msg = "Version '#{release.version.to_s.make_green}'"
+        msg = "Ref '#{release.ref.make_green}'" if release.ref
+        say "#{msg} has been checkout into:"
+        say "- #{release.repo_dir}"
       end
     end
 

data/lib/bosh/workspace/project_deployment.rb

@@ -9,6 +9,7 @@ module Bosh::Workspace
       {
         "name"    => String,
         "version" => enum(Integer, "latest"),
+        optional("ref") => enum(String),
         "git"     => String,
       }
     end

data/lib/bosh/workspace/release.rb

@@ -1,19 +1,21 @@
 require "git"
 module Bosh::Workspace
   class Release
-    attr_reader :name, :git_uri, :repo_dir
+    attr_reader :name, :git_uri, :repo_dir, :ref
 
     def initialize(release, releases_dir)
       @name = release["name"]
-      @version_ref = release["version"]
+      @ref = release["ref"]
+      @spec_version = release["version"]
       @git_uri = release["git"]
       @repo_dir = File.join(releases_dir, @name)
       init_repo
     end
 
     def update_repo
-      @repo.pull
-      @repo.checkout(ref)
+      @repo.fetch "origin", tags: true
+      @repo.checkout last_commit
+      @repo.checkout ref || version_ref
     end
 
     def manifest_file
@@ -29,11 +31,11 @@ module Bosh::Workspace
     end
 
     def version
-      return final_releases.keys.sort.last if @version_ref == "latest"
-      unless final_releases[@version_ref.to_i]
-        err("Could not find version: #{@version_ref} for release: #{@name}")
+      return final_releases.keys.sort.last if @spec_version == "latest"
+      unless final_releases[@spec_version.to_i]
+        err("Could not find version: #{@spec_version} for release: #{@name}")
       end
-      @version_ref.to_i
+      @spec_version.to_i
     end
 
     private
@@ -49,7 +51,11 @@ module Bosh::Workspace
       end
     end
 
-    def ref
+    def last_commit
+      @repo.log.object("origin").first
+    end
+
+    def version_ref
       @repo.log.object(manifest).first
     end
 

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.8.3"
+    VERSION = "0.8.4"
   end
 end

data/spec/commands/prepare_spec.rb

@@ -26,9 +26,11 @@ describe Bosh::Cli::Command::Prepare do
     describe "prepare_release(s/_repos)" do
       let(:releases) { [ release ] }
       let(:stemcells) { [] }
+      let(:ref) { nil }
 
       before do
-        expect(release).to receive(:update_repo) 
+        expect(release).to receive(:update_repo)
+        expect(release).to receive(:ref).and_return(ref)
         expect(command).to receive(:release_uploaded?)
           .with(release.name, release.version).and_return(release_uploaded)
       end
@@ -42,12 +44,16 @@ describe Bosh::Cli::Command::Prepare do
         end
       end
 
-      context "release not uploaded" do
+      context "release not uploaded with ref" do
         let(:release_uploaded) { false }
+        let(:ref) { "0f910f" }
 
-        it "does not upload the release" do
-          expect(command).to receive(:release_upload).with(release.manifest_file)
-          command.prepare
+        context "without release ref" do
+          it "does upload the release" do
+            expect(release).to receive(:ref).and_return(ref)
+            expect(command).to receive(:release_upload).with(release.manifest_file)
+            command.prepare
+          end
         end
       end
     end

data/spec/project_deployment_spec.rb

@@ -6,10 +6,16 @@ describe Bosh::Workspace::ProjectDeployment do
   let(:uuid) { "e55134c3-0a63-47be-8409-c9e53e965d5c" }
   let(:domain_name) { "bosh" }
   let(:templates) { ["path_to_bar", "path_to_baz"] }
-  let(:releases) { [
-    { "name" => "foo", "version" => release_version, "git" => "example.com/foo.git" }
-  ] }
+  let(:releases) do 
+    [{
+       "name" => "foo",
+       "version" => release_version,
+       "ref" => release_ref,
+       "git" => "example.com/foo.git"
+    }]
+  end
   let(:release_version) { 1 }
+  let(:release_ref) { "eb8ccf" }
   let(:stemcells) { [
     { "name" => "bar", "version" => stemcell_version }
   ] }
@@ -101,6 +107,11 @@ describe Bosh::Workspace::ProjectDeployment do
         it { should match(/git.*missing/i) }
         it { should match(/version.*doesn't validate/i) }
       end
+
+      context "optional ref" do
+        let(:missing) { ["git", "ref"] }
+        it { should match(/git.*missing/i) }
+      end
     end
 
     context "stemcells" do

data/spec/release_spec.rb

@@ -27,6 +27,18 @@ describe Bosh::Workspace::Release do
       end
     end
 
+    context "specific ref with latest release" do
+      let(:release_data) do 
+        { "name" => name, "version" => "latest", "ref" => "66658", "git" => repo }
+      end
+
+      it "checks out repo" do
+        release.update_repo
+        expect(subject).to match(/foo-2.yml/)
+        expect(subject).to_not match(/foo-3.yml/)
+      end
+    end
+
     context "updated version " do
       let(:version) { "11" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli