bosh-gen 0.16.2 → 0.17.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. checksums.yaml +13 -5
  2. data/.rspec +3 -0
  3. data/.travis.yml +16 -0
  4. data/ChangeLog.md +110 -89
  5. data/Gemfile +7 -1
  6. data/Guardfile +4 -8
  7. data/README.md +52 -22
  8. data/Rakefile +10 -0
  9. data/bosh-gen.gemspec +7 -5
  10. data/lib/bosh/gen/cli.rb +20 -28
  11. data/lib/bosh/gen/generators/job_generator.rb +9 -10
  12. data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_simple/templates/bin/%job_name%_ctl.tt +5 -5
  13. data/lib/bosh/gen/generators/new_release_generator.rb +63 -68
  14. data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/bin/%job_name%_ctl.tt +5 -5
  15. data/lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name_hyphenated%/templates/data/properties.sh.erb +6 -0
  16. data/lib/bosh/gen/generators/new_release_generator/templates/templates/infrastructure-aws-ec2.yml.tt +7 -5
  17. data/lib/bosh/gen/generators/new_release_generator/templates/templates/infrastructure-warden.yml.tt +3 -4
  18. data/lib/bosh/gen/generators/new_release_generator/templates/templates/jobs.yml.tt +3 -0
  19. data/lib/bosh/gen/generators/new_release_generator/templates/templates/make_manifest.tt +18 -2
  20. data/lib/bosh/gen/generators/new_release_generator/templates/templates/stub.yml.tt +2 -1
  21. data/lib/bosh/gen/settings.rb +61 -0
  22. data/lib/bosh/gen/version.rb +1 -1
  23. data/spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk_with_numeric.yml +64 -0
  24. data/spec/fixtures/releases/s3test-boshrelease/.gitignore +18 -0
  25. data/spec/fixtures/releases/s3test-boshrelease/README.md +51 -0
  26. data/spec/fixtures/releases/s3test-boshrelease/Rakefile +15 -0
  27. data/spec/fixtures/releases/s3test-boshrelease/config/blobs.yml +1 -0
  28. data/spec/fixtures/releases/s3test-boshrelease/config/final.yml +5 -0
  29. data/spec/fixtures/releases/s3test-boshrelease/jobs/.gitkeep +0 -0
  30. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/monit +5 -0
  31. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/spec +13 -0
  32. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/bin/monit_debugger +13 -0
  33. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/bin/s3test_ctl +36 -0
  34. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/config/.gitkeep +0 -0
  35. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/config/s3test.conf.erb +5 -0
  36. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/data/properties.sh.erb +10 -0
  37. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/helpers/ctl_setup.sh +81 -0
  38. data/spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/helpers/ctl_utils.sh +156 -0
  39. data/spec/fixtures/releases/s3test-boshrelease/packages/.gitkeep +0 -0
  40. data/spec/fixtures/releases/s3test-boshrelease/src/.gitkeep +0 -0
  41. data/spec/fixtures/releases/s3test-boshrelease/templates/deployment.yml +35 -0
  42. data/spec/fixtures/releases/s3test-boshrelease/templates/infrastructure-aws-ec2.yml +40 -0
  43. data/spec/fixtures/releases/s3test-boshrelease/templates/infrastructure-warden.yml +107 -0
  44. data/spec/fixtures/releases/s3test-boshrelease/templates/jobs.yml +30 -0
  45. data/spec/fixtures/releases/s3test-boshrelease/templates/make_manifest +54 -0
  46. data/spec/fixtures/releases/s3test-boshrelease/templates/stub.yml +13 -0
  47. data/spec/generators/deployment_manifest_generator_spec.rb +19 -14
  48. data/spec/generators/{jobs/webapp_job_generator_spec.rb → job_generator_spec.rb} +8 -13
  49. data/spec/generators/new_release_generator_spec.rb +70 -0
  50. data/spec/models/bosh_config_spec.rb +3 -3
  51. data/spec/models/deployment_manifest_spec.rb +16 -6
  52. data/spec/models/release_detection_spec.rb +6 -6
  53. data/spec/spec_helper.rb +27 -7
  54. data/spec/support/fog.rb +3 -0
  55. data/spec/{generators → support}/generator_spec_helper.rb +47 -6
  56. metadata +105 -36
  57. data/spec/models/extract_spec.rb +0 -10
metadata CHANGED
@@ -1,111 +1,125 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-gen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.2
4
+ version: 0.17.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dr Nic Williams
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-12 00:00:00.000000000 Z
11
+ date: 2014-06-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - ! '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - ! '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh_cli
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - ! '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - ! '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh_common
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
- name: rake
56
+ name: cyoi
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: '0'
62
- type: :development
61
+ version: 0.10.0
62
+ type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - ~>
67
67
  - !ruby/object:Gem::Version
68
- version: '0'
68
+ version: 0.10.0
69
69
  - !ruby/object:Gem::Dependency
70
- name: minitest
70
+ name: fog
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
- version: '2.12'
76
- type: :development
75
+ version: '1.11'
76
+ type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ~>
81
81
  - !ruby/object:Gem::Version
82
- version: '2.12'
82
+ version: '1.11'
83
83
  - !ruby/object:Gem::Dependency
84
- name: minitest-colorize
84
+ name: readwritesettings
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ~>
88
+ - !ruby/object:Gem::Version
89
+ version: '3.0'
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ~>
95
+ - !ruby/object:Gem::Version
96
+ version: '3.0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: rake
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
- - - ">="
101
+ - - ! '>='
88
102
  - !ruby/object:Gem::Version
89
103
  version: '0'
90
104
  type: :development
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
- - - ">="
108
+ - - ! '>='
95
109
  - !ruby/object:Gem::Version
96
110
  version: '0'
97
111
  - !ruby/object:Gem::Dependency
98
- name: guard-minitest
112
+ name: rspec-fire
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
- - - ">="
115
+ - - ! '>='
102
116
  - !ruby/object:Gem::Version
103
117
  version: '0'
104
118
  type: :development
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
- - - ">="
122
+ - - ! '>='
109
123
  - !ruby/object:Gem::Version
110
124
  version: '0'
111
125
  description: Generators for creating BOSH releases
@@ -116,7 +130,9 @@ executables:
116
130
  extensions: []
117
131
  extra_rdoc_files: []
118
132
  files:
119
- - ".gitignore"
133
+ - .gitignore
134
+ - .rspec
135
+ - .travis.yml
120
136
  - ChangeLog.md
121
137
  - Gemfile
122
138
  - Guardfile
@@ -193,9 +209,11 @@ files:
193
209
  - lib/bosh/gen/models/bosh_config.rb
194
210
  - lib/bosh/gen/models/deployment_manifest.rb
195
211
  - lib/bosh/gen/models/release_detection.rb
212
+ - lib/bosh/gen/settings.rb
196
213
  - lib/bosh/gen/version.rb
197
214
  - spec/fixtures/bosh_config/multiple_boshes.yml
198
215
  - spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk.yml
216
+ - spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk_with_numeric.yml
199
217
  - spec/fixtures/deployment_manifests/2_jobs_2_ips_no_disk.yml
200
218
  - spec/fixtures/releases/bosh-sample-release/.gitignore
201
219
  - spec/fixtures/releases/bosh-sample-release/LICENSE
@@ -231,19 +249,44 @@ files:
231
249
  - spec/fixtures/releases/bosh-sample-release/packages/php5/spec
232
250
  - spec/fixtures/releases/bosh-sample-release/packages/wordpress/packaging
233
251
  - spec/fixtures/releases/bosh-sample-release/packages/wordpress/spec
252
+ - spec/fixtures/releases/s3test-boshrelease/.gitignore
253
+ - spec/fixtures/releases/s3test-boshrelease/README.md
254
+ - spec/fixtures/releases/s3test-boshrelease/Rakefile
255
+ - spec/fixtures/releases/s3test-boshrelease/config/blobs.yml
256
+ - spec/fixtures/releases/s3test-boshrelease/config/dev.yml
257
+ - spec/fixtures/releases/s3test-boshrelease/config/final.yml
258
+ - spec/fixtures/releases/s3test-boshrelease/jobs/.gitkeep
259
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/monit
260
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/spec
261
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/bin/monit_debugger
262
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/bin/s3test_ctl
263
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/config/.gitkeep
264
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/config/s3test.conf.erb
265
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/data/properties.sh.erb
266
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/helpers/ctl_setup.sh
267
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/helpers/ctl_utils.sh
268
+ - spec/fixtures/releases/s3test-boshrelease/packages/.gitkeep
269
+ - spec/fixtures/releases/s3test-boshrelease/src/.gitkeep
270
+ - spec/fixtures/releases/s3test-boshrelease/templates/deployment.yml
271
+ - spec/fixtures/releases/s3test-boshrelease/templates/infrastructure-aws-ec2.yml
272
+ - spec/fixtures/releases/s3test-boshrelease/templates/infrastructure-warden.yml
273
+ - spec/fixtures/releases/s3test-boshrelease/templates/jobs.yml
274
+ - spec/fixtures/releases/s3test-boshrelease/templates/make_manifest
275
+ - spec/fixtures/releases/s3test-boshrelease/templates/stub.yml
234
276
  - spec/fixtures/releases/some_dev_releases/config/dev.yml
235
277
  - spec/fixtures/releases/some_dev_releases/dev_releases/index.yml
236
278
  - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-1.yml
237
279
  - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-10.yml
238
280
  - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-2.yml
239
281
  - spec/generators/deployment_manifest_generator_spec.rb
240
- - spec/generators/generator_spec_helper.rb
241
- - spec/generators/jobs/webapp_job_generator_spec.rb
282
+ - spec/generators/job_generator_spec.rb
283
+ - spec/generators/new_release_generator_spec.rb
242
284
  - spec/models/bosh_config_spec.rb
243
285
  - spec/models/deployment_manifest_spec.rb
244
- - spec/models/extract_spec.rb
245
286
  - spec/models/release_detection_spec.rb
246
287
  - spec/spec_helper.rb
288
+ - spec/support/fog.rb
289
+ - spec/support/generator_spec_helper.rb
247
290
  homepage: https://github.com/drnic/bosh-gen
248
291
  licenses: []
249
292
  metadata: {}
@@ -253,23 +296,24 @@ require_paths:
253
296
  - lib
254
297
  required_ruby_version: !ruby/object:Gem::Requirement
255
298
  requirements:
256
- - - ">="
299
+ - - ! '>='
257
300
  - !ruby/object:Gem::Version
258
301
  version: '0'
259
302
  required_rubygems_version: !ruby/object:Gem::Requirement
260
303
  requirements:
261
- - - ">="
304
+ - - ! '>='
262
305
  - !ruby/object:Gem::Version
263
306
  version: '0'
264
307
  requirements: []
265
308
  rubyforge_project:
266
- rubygems_version: 2.2.1
309
+ rubygems_version: 2.2.2
267
310
  signing_key:
268
311
  specification_version: 4
269
312
  summary: ''
270
313
  test_files:
271
314
  - spec/fixtures/bosh_config/multiple_boshes.yml
272
315
  - spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk.yml
316
+ - spec/fixtures/deployment_manifests/2_jobs_1_ip_8196_disk_with_numeric.yml
273
317
  - spec/fixtures/deployment_manifests/2_jobs_2_ips_no_disk.yml
274
318
  - spec/fixtures/releases/bosh-sample-release/.gitignore
275
319
  - spec/fixtures/releases/bosh-sample-release/LICENSE
@@ -305,16 +349,41 @@ test_files:
305
349
  - spec/fixtures/releases/bosh-sample-release/packages/php5/spec
306
350
  - spec/fixtures/releases/bosh-sample-release/packages/wordpress/packaging
307
351
  - spec/fixtures/releases/bosh-sample-release/packages/wordpress/spec
352
+ - spec/fixtures/releases/s3test-boshrelease/.gitignore
353
+ - spec/fixtures/releases/s3test-boshrelease/README.md
354
+ - spec/fixtures/releases/s3test-boshrelease/Rakefile
355
+ - spec/fixtures/releases/s3test-boshrelease/config/blobs.yml
356
+ - spec/fixtures/releases/s3test-boshrelease/config/dev.yml
357
+ - spec/fixtures/releases/s3test-boshrelease/config/final.yml
358
+ - spec/fixtures/releases/s3test-boshrelease/jobs/.gitkeep
359
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/monit
360
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/spec
361
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/bin/monit_debugger
362
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/bin/s3test_ctl
363
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/config/.gitkeep
364
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/config/s3test.conf.erb
365
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/data/properties.sh.erb
366
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/helpers/ctl_setup.sh
367
+ - spec/fixtures/releases/s3test-boshrelease/jobs/s3test/templates/helpers/ctl_utils.sh
368
+ - spec/fixtures/releases/s3test-boshrelease/packages/.gitkeep
369
+ - spec/fixtures/releases/s3test-boshrelease/src/.gitkeep
370
+ - spec/fixtures/releases/s3test-boshrelease/templates/deployment.yml
371
+ - spec/fixtures/releases/s3test-boshrelease/templates/infrastructure-aws-ec2.yml
372
+ - spec/fixtures/releases/s3test-boshrelease/templates/infrastructure-warden.yml
373
+ - spec/fixtures/releases/s3test-boshrelease/templates/jobs.yml
374
+ - spec/fixtures/releases/s3test-boshrelease/templates/make_manifest
375
+ - spec/fixtures/releases/s3test-boshrelease/templates/stub.yml
308
376
  - spec/fixtures/releases/some_dev_releases/config/dev.yml
309
377
  - spec/fixtures/releases/some_dev_releases/dev_releases/index.yml
310
378
  - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-1.yml
311
379
  - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-10.yml
312
380
  - spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-2.yml
313
381
  - spec/generators/deployment_manifest_generator_spec.rb
314
- - spec/generators/generator_spec_helper.rb
315
- - spec/generators/jobs/webapp_job_generator_spec.rb
382
+ - spec/generators/job_generator_spec.rb
383
+ - spec/generators/new_release_generator_spec.rb
316
384
  - spec/models/bosh_config_spec.rb
317
385
  - spec/models/deployment_manifest_spec.rb
318
- - spec/models/extract_spec.rb
319
386
  - spec/models/release_detection_spec.rb
320
387
  - spec/spec_helper.rb
388
+ - spec/support/fog.rb
389
+ - spec/support/generator_spec_helper.rb
data/spec/models/extract_spec.rb DELETED
@@ -1,10 +0,0 @@
1
- require "spec_helper"
2
- require "bosh/gen/models"
3
-
4
- class ExtractSpec < MiniTest::Spec
5
- it "finds the files to copy from a job with nested dependencies" do
6
- end
7
-
8
- it "finds to files to copy from a package with nested dependencies" do
9
- end
10
- end