bosh-workspace 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f29b754b572e4d5ed8dec967631ad55ad4c1aaf
-  data.tar.gz: ef6635245f5b889dce32d237cbc729d757b0e488
+  metadata.gz: ddb023e47693f436c7daee1d66f7748200efd6e1
+  data.tar.gz: ab7a404ecb45a646ce8a35effb7b40efffdeea3a
 SHA512:
-  metadata.gz: f6d369889fcadf43fd158cdbeef13bceca9352acd375b6f7471f7530e9febaab0368a1689a6866ec2db504bfde8c922fe7e091503ad473c2c79a9e34293727ae
-  data.tar.gz: d76958a05172e80c8ee96ee84010827cfaab34d94f0b8fe36cfb6917f36f98c9cd959a9af21a0508b4a7552b8993d49948534182392bc82bc4b0c8bfc91ffcd2
+  metadata.gz: 80a13e5532ca630551be4289cfa37ca51b13fcfa51bd1b151b56c6e1f517c3dc5369399c82e0cb4e003562c34b0005387a9b8194c10d63f16e02ac676608fdd2
+  data.tar.gz: b26a3a7727d476bca4b7956d3ed4637da3243c40f97c465de9a4fd3451380370131b93d136e623e455bc9c77ab87bc75818069f0818977cd608b718aa02422d2

data/lib/bosh/workspace/release.rb

@@ -124,19 +124,14 @@ module Bosh::Workspace
     end
 
     # transforms releases/foo-1.yml, releases/bar-2.yml to:
-    # [ { version: "1", commit: ee8d52f5d, manifest: releases/foo-1.yml } ]
+    # [ { version: "1", manifest: releases/foo-1.yml } ]
     def final_releases
       @final_releases ||= begin
         final_releases = []
         releases_tree.walk_blobs(:preorder) do |_, entry|
           next if entry[:filemode] == 40960 # Skip symlinks
           next unless version = entry[:name][/#{@name}-(.+)\.yml/, 1]
-          blame = repo_blame(File.join(releases_dir, entry[:name]))
-          final_releases << {
-            version: version,
-            manifest: blame[:orig_path],
-            commit: blame[:final_commit_id]
-          }
+          final_releases << { version: version, manifest: entry[:name] }
         end
         final_releases.sort! { |a, b| a[:version].to_i <=> b[:version].to_i }
       end
@@ -151,11 +146,17 @@ module Bosh::Workspace
     end
 
     def release
+      return @release if @release
       latest_offline_warning if latest? && offline?
-      return final_releases.last if latest?
-      final_releases.find { |v| v[:version] == @spec_version }.tap do |release|
-        missing_release_err(@spec_version, @name) unless release
-      end
+      release = final_releases.last if latest?
+      release ||= final_releases.find { |v| v[:version] == @spec_version }
+      missing_release_err(@spec_version, @name) unless release
+      @release = lookup_release_ref(release)
+    end
+
+    def lookup_release_ref(release)
+      b = repo_blame(File.join(releases_dir, release[:manifest]))
+      release.merge(manifest: b[:orig_path], commit: b[:final_commit_id])
     end
 
     def missing_release_err(version, name)

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
   end
 end

metadata

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