bosh-workspace 0.9.0.rc2 → 0.9.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ccd94bede78be067bb0b528afc2342f80668f00
-  data.tar.gz: 460d07d013206e4e0bece716e190107118644f89
+  metadata.gz: 51bf8a5f27e3c24ee4ef726151e656ddd79a15e6
+  data.tar.gz: 1b12be1ab651f544abe8ed1ec01346425ecd8c8d
 SHA512:
-  metadata.gz: e2360dacd6ec5f34e5a7d94aa464611acd4cf24eddf684fd6ca86c399f5c4fa0dbcc0e77bfb5ea2c0b6381a3e6bb7c1a31c10b3e6a744d577096772eb097a15b
-  data.tar.gz: bdbd537d2ec1c8577ea211aeb005fc26d6fc09fc8fbd8181e056b47411450ea75190808eea72a3c8215ce685337685f5ef53dd771a5c4de9ed962a3156912e55
+  metadata.gz: f6a551fbb230b60f22a2fe19bbe304faca18751e7934591de500d0f1c092e2d83f05f300c456d3107acff5e2a69096c52cca95d778fc9f0bc2d1393a12b31015
+  data.tar.gz: f7a83e2266fcbbac54d2794ad391ddc66fa478a20cba79b0e047086cd52cb8c582896d1e36e2e4fa1789bf9fd6aca1c6f3286ad72317c31d1781f48476ac48cf

data/lib/bosh/workspace/release.rb

@@ -5,13 +5,13 @@ module Bosh::Workspace
     def initialize(release, releases_dir)
       @name = release["name"]
       @ref = release["ref"]
-      @spec_version = release["version"]
+      @spec_version = release["version"].to_s
       @git_url = release["git"]
       @repo_dir = File.join(releases_dir, @name)
     end
 
     def update_repo
-      repo.checkout ref || version_ref, strategy: :force
+      repo.checkout ref || release[:commit], strategy: :force
     end
 
     def manifest_file
@@ -19,7 +19,7 @@ module Bosh::Workspace
     end
 
     def manifest
-      final_releases[version]
+      release[:manifest]
     end
 
     def name_version
@@ -27,11 +27,7 @@ module Bosh::Workspace
     end
 
     def version
-      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
-      @spec_version.to_i
+      release[:version]
     end
 
     def ref
@@ -49,25 +45,43 @@ module Bosh::Workspace
       File.directory?(dir) && !File.symlink?(dir)
     end
 
+    def releases_dir
+      new_style_repo ? "releases/#{@name}" : "releases"
+    end
+
+    def releases_tree
+      repo.lookup(repo.head.target.tree.path(releases_dir)[:oid])
+    end
+
     # transforms releases/foo-1.yml, releases/bar-2.yml to:
-    # { "1" => foo-1.yml, "2" => bar-2.yml }
+    # [ { version: "1", commit: ee8d52f5d, manifest: releases/foo-1.yml } ]
     def final_releases
       @final_releases ||= begin
-        releases_dir = new_style_repo ? "releases/#{@name}" : "releases"
+        final_releases = {}
+        releases_tree.walk_blobs(:preorder) do |_, entry|
+          path = File.join(releases_dir, entry[:name])
+          blame = Rugged::Blame.new(repo, path)[0]
+          time = blame[:final_signature][:time]
+          commit_id = blame[:final_commit_id]
+          manifest = blame[:orig_path]
+          version = entry[:name][/#{@name}-(.+)\.yml/, 1]
+          final_releases[time] = {
+            version: version, manifest: manifest, commit: commit_id
+          }
+        end
 
-        Hash[Dir[File.join(repo_dir, releases_dir, "*.yml")]
-          .reject { |f| f[/index.yml/] }
-          .map { |dir| File.join(releases_dir, File.basename(dir)) }
-          .map { |version| [version[/(\d+)/].to_i, version] }]
+        final_releases.sort_by { |k, _| k }
+          .map { |a| a[1] }.reject { |f| f[:manifest][/index.yml/] }
       end
     end
 
-    def version_ref
-      # figure out the last commit which changed the release manifest file
-      # in other words the commit sha of the final release
-      repo.walk(repo.head.target) do |commit|
-        return commit.oid if commit.tree.path(manifest)
+    def release
+      return final_releases.last if @spec_version == "latest"
+      release = final_releases.find { |v| v[:version] == @spec_version }
+      unless release
+        err("Could not find version: #{@spec_version} for release: #{@name}")
       end
+      release
     end
   end
 end

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.0.rc2"
+    VERSION = "0.9.0.rc3"
   end
 end

data/spec/release_spec.rb

@@ -2,7 +2,7 @@ describe Bosh::Workspace::Release do
   include Bosh::Workspace::GitCredenialsHelper
   let(:name) { "foo" }
   let(:release) { load_release(release_data) }
-  let(:version) { 3 }
+  let(:version) { "3" }
   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 }
@@ -18,7 +18,8 @@ describe Bosh::Workspace::Release do
 
     describe "#update_repo" do
       subject do
-        Dir[File.join(releases_dir, name, "releases/#{name}/foo*.yml")].to_s
+        # puts `cd #{File.join(releases_dir, name)} && git checkout origin/HEAD && git log`
+        Dir[File.join(releases_dir, name, "releases/**/foo*.yml")].to_s
       end
 
       context "latest version" do
@@ -27,24 +28,33 @@ describe Bosh::Workspace::Release do
         let(:version) { "latest" }
 
         it "checks out repo" do
-          expect(subject).to match(/foo-11.yml/)
+          expect(subject).to match(/releases\/foo\/foo-12.yml/)
         end
+      end
 
-        it "does not include templates from master" do
-          expect(templates).to_not match(/deployment.yml/)
+      context "version from before new structure" do
+        before { release.update_repo }
+
+        let(:version) { "11" }
+
+        it "checks out repo" do
+          expect(subject).to match(/releases\/foo-11.yml/)
         end
       end
     end
 
     describe "attributes" do
+      let(:version) { "12" }
       subject { release }
       its(:name) { should eq name }
       its(:git_url) { should eq repo }
       its(:repo_dir) { should match(/\/#{name}$/) }
-      its(:manifest_file) { should match(/\/#{name}-#{version}.yml$/) }
       its(:manifest) { should match "releases/#{name}/#{name}-#{version}.yml$" }
       its(:name_version) { should eq "#{name}/#{version}" }
       its(:version) { should eq version }
+      its(:manifest_file) do
+        should match(/\/releases\/#{name}\/#{name}-#{version}.yml$/)
+      end
     end
   end
 
@@ -102,7 +112,7 @@ describe Bosh::Workspace::Release do
         end
       end
 
-      context "updated version " do
+      context "updated version" do
         let(:version) { "11" }
 
         it "checks out file with multiple commits" do
@@ -135,7 +145,7 @@ describe Bosh::Workspace::Release do
         let(:version) { "11" }
 
         before do
-          load_release("name" => "bar", "version" => 2, "git" => repo).update_repo
+          load_release("name" => "foo", "version" => 2, "git" => repo).update_repo
         end
 
         it "version 11" do
@@ -212,7 +222,7 @@ describe Bosh::Workspace::Release do
         let(:version) { "11" }
 
         before do
-          load_release("name" => "bar", "version" => 2, "git" => repo).update_repo
+          load_release("name" => "foo", "version" => 2, "git" => repo).update_repo
         end
 
         it "version 11" do
@@ -245,7 +255,7 @@ describe Bosh::Workspace::Release do
       its(:manifest_file) { should match(/\/#{name}-#{version}.yml$/) }
       its(:manifest) { should match "releases/#{name}-#{version}.yml$" }
       its(:name_version) { should eq "#{name}/#{version}" }
-      its(:version) { should eq version }
+      its(:version) { should eq version.to_s }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc2
+  version: 0.9.0.rc3
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli