bosh-workspace 0.9.11 → 0.9.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1bd19a741ce82f38591f6c4e87d8377949f5b625
4
- data.tar.gz: b4d837f2f51fe22afa1b4f70cb1c5c42c3170812
3
+ metadata.gz: b031dc50d4d16966afac82ac5dce3528c2761e02
4
+ data.tar.gz: b8abd2c3b8e4829a16ad6ac32df1a2759d6b07c3
5
5
  SHA512:
6
- metadata.gz: 1f7a58f26ce03271a1a98e133f3f1168b7b8321ba8fdacdb5d37690bb5447b40cf5df7bb45154440ef5e35910694420d00f9dcca9756749eb793ad371c2f5223
7
- data.tar.gz: fac5312d74ac733a03669cf9306e82ceb0f232436006be9d1221376ea11c99d5b4f036ed87a2e08ab53c5d0053224fc304bf18eb9304d9666ffe5919e051bea1
6
+ metadata.gz: 7746e682b951894c1ccab0692c0183d714e09b24f6109c1e3476f231d4a1ca50924c4a7e7a23726bff7fd2884379e4b94ef34b31248494094a74675ac6da0fe0
7
+ data.tar.gz: 84736cf6bd0bc30d47f352f2a7f9cc7c1aec9da519cd0fb06cc9027a10c34aa8caf38a20be9ec5fbaf5e2b25679cefab78d1bd7f1b096bb3da7e709f99359a53
@@ -32,6 +32,7 @@ module Bosh::Cli::Command
32
32
  usage "deploy"
33
33
  desc "Deploy according to the currently selected deployment manifest"
34
34
  option "--recreate", "recreate all VMs in deployment"
35
+ option "--no-redact", "redact manifest value chanes in deployment"
35
36
  def deploy
36
37
  if project_deployment?
37
38
  require_project_deployment
@@ -40,7 +40,7 @@ module Bosh::Workspace
40
40
 
41
41
  def ref
42
42
  return nil unless @ref
43
- return repo.ref(@ref).target.target.oid if
43
+ return find_commit_sha(repo.ref(@ref)) if
44
44
  Rugged::Reference.valid_name?(@ref) && repo.ref(@ref)
45
45
  repo.lookup(@ref).oid
46
46
  end
@@ -55,6 +55,10 @@ module Bosh::Workspace
55
55
 
56
56
  private
57
57
 
58
+ def find_commit_sha(obj)
59
+ defined?(obj.target) ? find_commit_sha(obj.target) : obj.oid
60
+ end
61
+
58
62
  def update_submodules
59
63
  required_submodules.each do |submodule|
60
64
  fetch_repo(submodule_repo(submodule.path, submodule.url))
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Manifests
3
- VERSION = "0.9.11"
3
+ VERSION = "0.9.12"
4
4
  end
5
5
  end
Binary file
data/spec/release_spec.rb CHANGED
@@ -241,7 +241,7 @@ module Bosh::Workspace
241
241
  end
242
242
  end
243
243
 
244
- context "given a release with deprecated structure within 'releases' folder" do
244
+ context "given a release with deprecated structure within 'releases' folder:" do
245
245
  let(:repo) { extracted_asset_dir("foo", "foo-boshrelease-repo.zip") }
246
246
 
247
247
  describe "#update_repo" do
@@ -318,10 +318,11 @@ module Bosh::Workspace
318
318
  end
319
319
  end
320
320
 
321
- context "specific tag latest release" do
321
+ context "specific tag latest release" do
322
322
  let(:release_data) do
323
323
  {"name" => name, "version" => "latest", "ref" => "refs/tags/v8", "git" => repo}
324
324
  end
325
+ let(:release) { load_release(release_data, {}, true) }
325
326
 
326
327
  it "checks out repo" do
327
328
 
@@ -334,6 +335,7 @@ module Bosh::Workspace
334
335
  let(:release_data) do
335
336
  {"name" => name, "version" => "9.1", "ref" => "refs/tags/v9.1", "git" => repo}
336
337
  end
338
+ let(:release) { load_release(release_data, {}, true) }
337
339
 
338
340
  it "checks out repo" do
339
341
  release.update_repo
@@ -342,6 +344,18 @@ module Bosh::Workspace
342
344
  end
343
345
  end
344
346
 
347
+ context "specific lightweight tag with latest release" do
348
+ let(:release_data) do
349
+ {"name" => name, "version" => "latest", "ref" => "refs/tags/lightweight-tag", "git" => repo}
350
+ end
351
+ let(:release) { load_release(release_data, {}, true) }
352
+
353
+ it "checks out repo" do
354
+ release.update_repo
355
+ expect(subject).to match(/foo-9.yml/)
356
+ end
357
+ end
358
+
345
359
  context "updated version" do
346
360
  let(:version) { "11" }
347
361
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-workspace
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.11
4
+ version: 0.9.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ruben Koster
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-10 00:00:00.000000000 Z
11
+ date: 2016-04-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_cli