bosh-director 1.5.0.pre.1211 → 1.5.0.pre.1215

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/bosh/director/compiled_package_downloader.rb +10 -15
  2. data/lib/bosh/director/compiled_package_group.rb +1 -1
  3. data/lib/bosh/director/compiled_package_yaml_writer.rb +24 -0
  4. data/lib/bosh/director/version.rb +1 -1
  5. metadata +17 -16
data/lib/bosh/director/compiled_package_downloader.rb CHANGED
@@ -1,5 +1,9 @@
1
+ require 'bosh/director'
2
+ require 'bosh/director/compiled_package_yaml_writer'
3
+
1
4
  require 'fileutils'
2
5
  require 'tmpdir'
6
+ require 'pathname'
3
7
 
4
8
  module Bosh::Director
5
9
  class CompiledPackageDownloader
@@ -9,34 +13,25 @@ module Bosh::Director
9
13
  end
10
14
 
11
15
  def download
12
- @download_dir = Dir.mktmpdir
16
+ @download_dir = Pathname.new(Dir.mktmpdir)
13
17
 
14
- compiled_packages = {'compiled_packages' => []}
15
- FileUtils.mkdir_p(File.join(@download_dir, 'compiled_packages', 'blobs'))
18
+ blobs_path = @download_dir.join('compiled_packages', 'blobs')
19
+ blobs_path.mkpath
16
20
 
17
21
  @compiled_package_group.compiled_packages.each do |compiled_package|
18
22
  blobstore_id = compiled_package.blobstore_id
19
23
 
20
- compiled_packages['compiled_packages'] << {
21
- 'package_name' => compiled_package.package.name,
22
- 'package_fingerprint' => compiled_package.package.fingerprint,
23
- 'stemcell_sha1' => @compiled_package_group.stemcell_sha1,
24
- 'blobstore_id' => blobstore_id,
25
- }
26
- compiled_package_blob = File.open(File.join(@download_dir, 'compiled_packages', 'blobs', blobstore_id), 'w')
24
+ compiled_package_blob = blobs_path.join(blobstore_id).open('w')
27
25
  @blobstore_client.get(blobstore_id, compiled_package_blob)
28
26
  compiled_package_blob.close
29
27
  end
30
28
 
31
- File.open(File.join(@download_dir, 'compiled_packages', 'compiled_packages.yml'), 'w') do |f|
32
- f.write(YAML.dump(compiled_packages))
33
- end
34
-
29
+ CompiledPackageYamlWriter.new(@compiled_package_group, @download_dir.join('compiled_packages')).write
35
30
  @download_dir
36
31
  end
37
32
 
38
33
  def cleanup
39
- FileUtils.rm_rf(@download_dir)
34
+ @download_dir.rmtree
40
35
  end
41
36
  end
42
37
  end
data/lib/bosh/director/compiled_package_group.rb CHANGED
@@ -6,7 +6,7 @@ module Bosh::Director
6
6
  end
7
7
 
8
8
  def compiled_packages
9
- @release_version.packages.map do |package|
9
+ @compiled_packages ||= @release_version.packages.map do |package|
10
10
  Models::CompiledPackage[
11
11
  :package_id => package.id,
12
12
  :stemcell_id => @stemcell.id,
data/lib/bosh/director/compiled_package_yaml_writer.rb ADDED
@@ -0,0 +1,24 @@
1
+ require 'bosh/director'
2
+
3
+ module Bosh::Director
4
+ class CompiledPackageYamlWriter
5
+ def initialize(group, dir)
6
+ @compiled_package_group = group
7
+ @dir = dir
8
+ end
9
+
10
+ def write
11
+ hashes = @compiled_package_group.compiled_packages.map do |compiled_package|
12
+ {
13
+ 'package_name' => compiled_package.package.name,
14
+ 'package_fingerprint' => compiled_package.package.fingerprint,
15
+ 'stemcell_sha1' => @compiled_package_group.stemcell_sha1,
16
+ 'blobstore_id' => compiled_package.blobstore_id,
17
+ }
18
+ end
19
+ File.open(File.join(@dir, 'compiled_packages.yml'), 'w') do |f|
20
+ f.write(YAML.dump('compiled_packages' => hashes))
21
+ end
22
+ end
23
+ end
24
+ end
data/lib/bosh/director/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Bosh
4
4
  module Director
5
- VERSION = '1.5.0.pre.1211'
5
+ VERSION = '1.5.0.pre.1215'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0.pre.1211
4
+ version: 1.5.0.pre.1215
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.5.0.pre.1211
37
+ version: 1.5.0.pre.1215
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- version: 1.5.0.pre.1211
45
+ version: 1.5.0.pre.1215
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh-core
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ~>
52
52
  - !ruby/object:Gem::Version
53
- version: 1.5.0.pre.1211
53
+ version: 1.5.0.pre.1215
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 1.5.0.pre.1211
61
+ version: 1.5.0.pre.1215
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh_common
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: 1.5.0.pre.1211
69
+ version: 1.5.0.pre.1215
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 1.5.0.pre.1211
77
+ version: 1.5.0.pre.1215
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: bosh_cpi
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
82
82
  requirements:
83
83
  - - ~>
84
84
  - !ruby/object:Gem::Version
85
- version: 1.5.0.pre.1211
85
+ version: 1.5.0.pre.1215
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - ~>
92
92
  - !ruby/object:Gem::Version
93
- version: 1.5.0.pre.1211
93
+ version: 1.5.0.pre.1215
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: bosh_openstack_cpi
96
96
  requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
98
98
  requirements:
99
99
  - - ~>
100
100
  - !ruby/object:Gem::Version
101
- version: 1.5.0.pre.1211
101
+ version: 1.5.0.pre.1215
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
106
106
  requirements:
107
107
  - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: 1.5.0.pre.1211
109
+ version: 1.5.0.pre.1215
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: bosh_aws_cpi
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
114
114
  requirements:
115
115
  - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 1.5.0.pre.1211
117
+ version: 1.5.0.pre.1215
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
122
122
  requirements:
123
123
  - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 1.5.0.pre.1211
125
+ version: 1.5.0.pre.1215
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: bosh_vsphere_cpi
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - ~>
132
132
  - !ruby/object:Gem::Version
133
- version: 1.5.0.pre.1211
133
+ version: 1.5.0.pre.1215
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
138
138
  requirements:
139
139
  - - ~>
140
140
  - !ruby/object:Gem::Version
141
- version: 1.5.0.pre.1211
141
+ version: 1.5.0.pre.1215
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: eventmachine
144
144
  requirement: !ruby/object:Gem::Requirement
@@ -445,7 +445,7 @@ dependencies:
445
445
  version: '1.0'
446
446
  description: ! 'BOSH Director
447
447
 
448
- d1557f'
448
+ 732bcf'
449
449
  email: support@cloudfoundry.com
450
450
  executables:
451
451
  - bosh-director
@@ -527,6 +527,7 @@ files:
527
527
  - lib/bosh/director/compile_task.rb
528
528
  - lib/bosh/director/compiled_package_downloader.rb
529
529
  - lib/bosh/director/compiled_package_group.rb
530
+ - lib/bosh/director/compiled_package_yaml_writer.rb
530
531
  - lib/bosh/director/compiled_packages_exporter.rb
531
532
  - lib/bosh/director/config.rb
532
533
  - lib/bosh/director/configuration_hasher.rb