bosh-workspace 0.9.7 → 0.9.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/lib/bosh/workspace/project_deployment.rb +3 -1
- data/lib/bosh/workspace/rspec/shared_workspace_examples.rb +3 -3
- data/lib/bosh/workspace/version.rb +1 -1
- data/spec/assets/manifests-repo/stubs/{foobar.sh → foobar} +0 -0
- data/spec/integration/shared_workspace_examples_spec.rb +36 -14
- data/spec/release_spec.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2a436bec65906d24adb7c0bafc96e21e6df833b4
|
4
|
+
data.tar.gz: 11818e982632c6757381382c450ecccb75e48602
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 822956b6fb582d1de0f8e5ce43a1e80d3e1a5e77e48aae1eac8fc186aec5ef33495e9b96cc3f7a0295b5977cfacb933a4d171d237caf046f86bec2d05ab608ac
|
7
|
+
data.tar.gz: 152ea4addf1d2f4f040f2ac3ba56cfccb89393a6f2e92713cbe7b84a576c9ee28f2e9aa0da5704c8cb7c5a68a371b1f9468b2b9b48b5f201cf5944d02244686d
|
data/README.md
CHANGED
@@ -128,14 +128,14 @@ Example `.credentials.yml` file:
|
|
128
128
|
### OSX
|
129
129
|
cmake isneeded and libssh2 is optionally (only needed when using cloning over ssh)
|
130
130
|
```
|
131
|
-
brew install cmake libssh2
|
131
|
+
brew install cmake libssh2 pkg-config
|
132
132
|
```
|
133
133
|
|
134
134
|
### Ubuntu
|
135
135
|
cmake and libcurl4-openssl-dev is needed for rugged install
|
136
136
|
|
137
137
|
```
|
138
|
-
sudo apt-get install cmake libcurl4-openssl-dev
|
138
|
+
sudo apt-get install cmake libcurl4-openssl-dev libssh2-1-dev
|
139
139
|
```
|
140
140
|
|
141
141
|
## Experimental
|
@@ -60,7 +60,9 @@ module Bosh::Workspace
|
|
60
60
|
end
|
61
61
|
|
62
62
|
def stub_file
|
63
|
-
|
63
|
+
[file_basename, file_basename('.*')].map do |file|
|
64
|
+
Dir[File.join(stubs_dir, file)]
|
65
|
+
end.flatten.compact.first
|
64
66
|
end
|
65
67
|
|
66
68
|
def executable_stub?
|
@@ -8,14 +8,14 @@ desc = "behaves as bosh-workspace deployment"
|
|
8
8
|
RSpec.shared_examples desc do |deployment_file, result_file, stub_file|
|
9
9
|
let(:workdir) { File.expand_path(File.join(deployment_file, '../..')) }
|
10
10
|
let(:stub) do
|
11
|
-
|
12
|
-
result
|
11
|
+
return nil unless File.exist?(stub_file)
|
12
|
+
result = YAML.load_file(stub_file) || {}
|
13
13
|
result.merge({'director_uuid' => '00000000-0000-0000-0000-000000000000'})
|
14
14
|
end
|
15
15
|
|
16
16
|
subject do
|
17
17
|
Bosh::Workspace::ProjectDeployment.new(deployment_file).tap do |d|
|
18
|
-
d.stub = stub
|
18
|
+
d.stub = stub if stub
|
19
19
|
d.validate
|
20
20
|
end
|
21
21
|
end
|
File without changes
|
@@ -2,6 +2,7 @@ require 'bosh/workspace/rspec'
|
|
2
2
|
|
3
3
|
describe "rspec shared bosh-workspace example" do
|
4
4
|
deployment = {
|
5
|
+
'director_uuid' => 'e4802655-2dfe-459f-8344-1e3ea56b3feb',
|
5
6
|
'name' => 'foo',
|
6
7
|
'releases' => [],
|
7
8
|
'stemcells' => [],
|
@@ -18,14 +19,6 @@ describe "rspec shared bosh-workspace example" do
|
|
18
19
|
'releases' => '(( merge ))',
|
19
20
|
'jobs' => []
|
20
21
|
}
|
21
|
-
stub = { 'name' => 'bar' }
|
22
|
-
|
23
|
-
result = {
|
24
|
-
'director_uuid' => '00000000-0000-0000-0000-000000000000',
|
25
|
-
'name' => 'bar',
|
26
|
-
'releases' => [],
|
27
|
-
'jobs' => []
|
28
|
-
}
|
29
22
|
|
30
23
|
deployment_file = get_tmp_yml_file_path(deployment).tap do |d|
|
31
24
|
templates_path = File.expand_path('../../templates', d)
|
@@ -36,10 +29,39 @@ describe "rspec shared bosh-workspace example" do
|
|
36
29
|
)
|
37
30
|
end
|
38
31
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
32
|
+
context "given a stub file" do
|
33
|
+
stub = { 'name' => 'bar' }
|
34
|
+
|
35
|
+
result = {
|
36
|
+
'director_uuid' => '00000000-0000-0000-0000-000000000000',
|
37
|
+
'name' => 'bar',
|
38
|
+
'releases' => [],
|
39
|
+
'jobs' => []
|
40
|
+
}
|
41
|
+
|
42
|
+
include_examples(
|
43
|
+
"behaves as bosh-workspace deployment",
|
44
|
+
deployment_file,
|
45
|
+
get_tmp_yml_file_path(result),
|
46
|
+
get_tmp_yml_file_path(stub)
|
47
|
+
)
|
48
|
+
end
|
49
|
+
|
50
|
+
context "when stub file is absent" do
|
51
|
+
non_existent_stub = File.join(Dir.mktmpdir, 'foobar')
|
52
|
+
|
53
|
+
result = {
|
54
|
+
'director_uuid' => 'e4802655-2dfe-459f-8344-1e3ea56b3feb',
|
55
|
+
'name' => 'foo',
|
56
|
+
'releases' => [],
|
57
|
+
'jobs' => []
|
58
|
+
}
|
59
|
+
|
60
|
+
include_examples(
|
61
|
+
"behaves as bosh-workspace deployment",
|
62
|
+
deployment_file,
|
63
|
+
get_tmp_yml_file_path(result),
|
64
|
+
non_existent_stub
|
65
|
+
)
|
66
|
+
end
|
45
67
|
end
|
data/spec/release_spec.rb
CHANGED
@@ -451,7 +451,6 @@ module Bosh::Workspace
|
|
451
451
|
end
|
452
452
|
|
453
453
|
context "correct checkout behavior:" do
|
454
|
-
let(:repo) { extracted_asset_dir("foo", "foo-boshrelease-repo.zip") }
|
455
454
|
let(:release_data) { { "name" => name, "version" => version,
|
456
455
|
"git" => repo, "ref" => :fooref } }
|
457
456
|
let(:repo) { 'foo/bar' }
|
@@ -472,6 +471,7 @@ module Bosh::Workspace
|
|
472
471
|
{ 'refs/remotes/origin/HEAD' =>
|
473
472
|
double(resolve: double(target_id: :oid)) }
|
474
473
|
end
|
474
|
+
allow(subject).to receive(:repo_exists?).and_return(true)
|
475
475
|
end
|
476
476
|
|
477
477
|
it "calls checkout_tree and checkout" do
|
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.
|
4
|
+
version: 0.9.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ruben Koster
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-01-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bosh_cli
|
@@ -233,7 +233,7 @@ files:
|
|
233
233
|
- spec/assets/manifests-repo/deployments/foo.yml
|
234
234
|
- spec/assets/manifests-repo/deployments/foobar.yml
|
235
235
|
- spec/assets/manifests-repo/stubs/foo.yml
|
236
|
-
- spec/assets/manifests-repo/stubs/foobar
|
236
|
+
- spec/assets/manifests-repo/stubs/foobar
|
237
237
|
- spec/assets/manifests-repo/templates/foo/bar.yml
|
238
238
|
- spec/assets/submodule-boshrelease-repo.zip
|
239
239
|
- spec/assets/supermodule-boshrelease-repo.zip
|
@@ -312,7 +312,7 @@ test_files:
|
|
312
312
|
- spec/assets/manifests-repo/deployments/foo.yml
|
313
313
|
- spec/assets/manifests-repo/deployments/foobar.yml
|
314
314
|
- spec/assets/manifests-repo/stubs/foo.yml
|
315
|
-
- spec/assets/manifests-repo/stubs/foobar
|
315
|
+
- spec/assets/manifests-repo/stubs/foobar
|
316
316
|
- spec/assets/manifests-repo/templates/foo/bar.yml
|
317
317
|
- spec/assets/submodule-boshrelease-repo.zip
|
318
318
|
- spec/assets/supermodule-boshrelease-repo.zip
|