cf 5.4.4 → 5.4.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/lib/cf/version.rb +1 -1
  2. data/lib/manifests/manifests.rb +1 -1
  3. data/lib/tasks/gem_release.rake +6 -6
  4. data/spec/manifests/manifests_spec.rb +56 -0
  5. metadata +77 -31
  6. checksums.yaml +0 -7
data/lib/cf/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CF
2
- VERSION = "5.4.4".freeze
2
+ VERSION = "5.4.5".freeze
3
3
  end
data/lib/manifests/manifests.rb CHANGED
@@ -309,7 +309,7 @@ module CFManifests
309
309
  offering = offerings.find { |o|
310
310
  o.label == (svc[:label] || svc[:type] || svc[:vendor]) &&
311
311
  (!svc[:version] || o.version == svc[:version]) &&
312
- (o.provider == (svc[:provider] || "core"))
312
+ (o.provider == svc[:provider] || (svc[:provider].nil? && o.provider == "core"))
313
313
  }
314
314
 
315
315
  fail "Unknown service offering: #{svc.inspect}." unless offering
data/lib/tasks/gem_release.rake CHANGED
@@ -9,20 +9,20 @@ namespace :gem do
9
9
 
10
10
  sh! "gem bump --version #{version} --no-commit"
11
11
 
12
- print "About to bump version to #{gem_version}, continue? (Y): "
12
+ print "About to bump version to #{version}, continue? (Y): "
13
13
  answer = STDIN.gets.strip
14
14
  exit unless answer.length == 0 || answer.upcase.start_with?("Y")
15
15
 
16
16
  sh! "git add lib/cf/version.rb"
17
17
 
18
- print_with_purpose "Bumping to version #{gem_version}"
18
+ print_with_purpose "Bumping to version #{version}"
19
19
 
20
20
  sh!("bundle")
21
21
  sh!("git add Gemfile.lock")
22
22
 
23
- generate_release_notes(old_version)
23
+ generate_release_notes(old_version, version)
24
24
 
25
- sh!("git commit -m 'Bumping to version #{gem_version}.'")
25
+ sh!("git commit -m 'Bumping to version #{version}.'")
26
26
  sh!("git push")
27
27
  sh!("gem release --tag")
28
28
  sh!("git tag -a -f latest-release -m 'Latest Release'")
@@ -31,9 +31,9 @@ namespace :gem do
31
31
 
32
32
  private
33
33
 
34
- def generate_release_notes(old_version)
34
+ def generate_release_notes(old_version, new_version)
35
35
  print_with_purpose "Generating release notes..."
36
- file_name = "release_#{gem_version}"
36
+ file_name = "release_#{new_version}"
37
37
  sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
38
38
  sh!("git add release_notes")
39
39
  end
data/spec/manifests/manifests_spec.rb CHANGED
@@ -178,6 +178,62 @@ describe CFManifests do
178
178
  build(:client).tap { |client| client.stub(:services => [mysql], :service_instances => service_instances) }
179
179
  end
180
180
 
181
+ context "when the service providers do not match" do
182
+ let(:info) do
183
+ {:services => {"service-1" => {:label => "mysql", :plan => "100", :provider => "not core"}}}
184
+ end
185
+
186
+ it 'fails' do
187
+ cmd.should_not_receive(:invoke).with(:create_service, anything)
188
+ cmd.should_not_receive(:invoke).with(:bind_service, anything)
189
+ expect {cmd.send(:setup_services, app, info)}.to raise_error(CF::UserError, /Unknown service offering/)
190
+ end
191
+ end
192
+
193
+ context "when the service versions do not match" do
194
+ let(:info) do
195
+ {:services => {"service-1" => {:label => "mysql", :plan => "100", :version => "something"}}}
196
+ end
197
+
198
+ it 'fails' do
199
+ cmd.should_not_receive(:invoke).with(:create_service, anything)
200
+ cmd.should_not_receive(:invoke).with(:bind_service, anything)
201
+ expect {cmd.send(:setup_services, app, info)}.to raise_error(CF::UserError, /Unknown service offering/)
202
+ end
203
+ end
204
+
205
+ context "when the service providers and versions are nil" do
206
+ let(:info) do
207
+ {:services => {"service-1" => {:label => "mysql", :plan => "100"}}}
208
+ end
209
+
210
+ it 'provisions a service instance' do
211
+ cmd.should_receive(:invoke).with(:create_service, :app => app,
212
+ :name => service_1.name, :offering => mysql, :plan => plan_100)
213
+ cmd.send(:setup_services, app, info)
214
+ end
215
+ end
216
+
217
+ context "when the service provider is nil in the manifest but the CC's service provider is defined" do
218
+ let(:mysql) do
219
+ build(
220
+ :service,
221
+ :label => "mysql",
222
+ :provider => "MySQLmaker",
223
+ :service_plans => [plan_100])
224
+ end
225
+
226
+ let(:info) do
227
+ {:services => {"service-1" => {:label => "mysql", :plan => "100"}}}
228
+ end
229
+
230
+ it 'fails' do
231
+ cmd.should_not_receive(:invoke).with(:create_service, anything)
232
+ cmd.should_not_receive(:invoke).with(:bind_service, anything)
233
+ expect {cmd.send(:setup_services, app, info)}.to raise_error(CF::UserError, /Unknown service offering/)
234
+ end
235
+ end
236
+
181
237
  context "and the services exist" do
182
238
  let(:service_instances) { [service_1] }
183
239
 
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cf
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.4.4
4
+ version: 5.4.5
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Cloud Foundry Team
@@ -9,25 +10,28 @@ authors:
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2013-12-04 00:00:00.000000000 Z
13
+ date: 2013-12-13 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: addressable
16
17
  requirement: !ruby/object:Gem::Requirement
18
+ none: false
17
19
  requirements:
18
- - - '>='
20
+ - - ! '>='
19
21
  - !ruby/object:Gem::Version
20
22
  version: '0'
21
23
  type: :runtime
22
24
  prerelease: false
23
25
  version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
24
27
  requirements:
25
- - - '>='
28
+ - - ! '>='
26
29
  - !ruby/object:Gem::Version
27
30
  version: '0'
28
31
  - !ruby/object:Gem::Dependency
29
32
  name: caldecott-client
30
33
  requirement: !ruby/object:Gem::Requirement
34
+ none: false
31
35
  requirements:
32
36
  - - ~>
33
37
  - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
35
39
  type: :runtime
36
40
  prerelease: false
37
41
  version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
38
43
  requirements:
39
44
  - - ~>
40
45
  - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
42
47
  - !ruby/object:Gem::Dependency
43
48
  name: cfoundry
44
49
  requirement: !ruby/object:Gem::Requirement
50
+ none: false
45
51
  requirements:
46
52
  - - ~>
47
53
  - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
49
55
  type: :runtime
50
56
  prerelease: false
51
57
  version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
52
59
  requirements:
53
60
  - - ~>
54
61
  - !ruby/object:Gem::Version
@@ -56,48 +63,55 @@ dependencies:
56
63
  - !ruby/object:Gem::Dependency
57
64
  name: interact
58
65
  requirement: !ruby/object:Gem::Requirement
66
+ none: false
59
67
  requirements:
60
- - - '>='
68
+ - - ! '>='
61
69
  - !ruby/object:Gem::Version
62
70
  version: '0.5'
63
71
  type: :runtime
64
72
  prerelease: false
65
73
  version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
66
75
  requirements:
67
- - - '>='
76
+ - - ! '>='
68
77
  - !ruby/object:Gem::Version
69
78
  version: '0.5'
70
79
  - !ruby/object:Gem::Dependency
71
80
  name: json_pure
72
81
  requirement: !ruby/object:Gem::Requirement
82
+ none: false
73
83
  requirements:
74
- - - '>='
84
+ - - ! '>='
75
85
  - !ruby/object:Gem::Version
76
86
  version: '0'
77
87
  type: :runtime
78
88
  prerelease: false
79
89
  version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
80
91
  requirements:
81
- - - '>='
92
+ - - ! '>='
82
93
  - !ruby/object:Gem::Version
83
94
  version: '0'
84
95
  - !ruby/object:Gem::Dependency
85
96
  name: mothership
86
97
  requirement: !ruby/object:Gem::Requirement
98
+ none: false
87
99
  requirements:
88
- - - '>='
100
+ - - ! '>='
89
101
  - !ruby/object:Gem::Version
90
102
  version: 0.5.1
91
103
  type: :runtime
92
104
  prerelease: false
93
105
  version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
94
107
  requirements:
95
- - - '>='
108
+ - - ! '>='
96
109
  - !ruby/object:Gem::Version
97
110
  version: 0.5.1
98
111
  - !ruby/object:Gem::Dependency
99
112
  name: multi_json
100
113
  requirement: !ruby/object:Gem::Requirement
114
+ none: false
101
115
  requirements:
102
116
  - - ~>
103
117
  - !ruby/object:Gem::Version
@@ -105,6 +119,7 @@ dependencies:
105
119
  type: :runtime
106
120
  prerelease: false
107
121
  version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
108
123
  requirements:
109
124
  - - ~>
110
125
  - !ruby/object:Gem::Version
@@ -112,6 +127,7 @@ dependencies:
112
127
  - !ruby/object:Gem::Dependency
113
128
  name: rest-client
114
129
  requirement: !ruby/object:Gem::Requirement
130
+ none: false
115
131
  requirements:
116
132
  - - ~>
117
133
  - !ruby/object:Gem::Version
@@ -119,6 +135,7 @@ dependencies:
119
135
  type: :runtime
120
136
  prerelease: false
121
137
  version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
122
139
  requirements:
123
140
  - - ~>
124
141
  - !ruby/object:Gem::Version
@@ -126,6 +143,7 @@ dependencies:
126
143
  - !ruby/object:Gem::Dependency
127
144
  name: uuidtools
128
145
  requirement: !ruby/object:Gem::Requirement
146
+ none: false
129
147
  requirements:
130
148
  - - ~>
131
149
  - !ruby/object:Gem::Version
@@ -133,6 +151,7 @@ dependencies:
133
151
  type: :runtime
134
152
  prerelease: false
135
153
  version_requirements: !ruby/object:Gem::Requirement
154
+ none: false
136
155
  requirements:
137
156
  - - ~>
138
157
  - !ruby/object:Gem::Version
@@ -140,48 +159,55 @@ dependencies:
140
159
  - !ruby/object:Gem::Dependency
141
160
  name: anchorman
142
161
  requirement: !ruby/object:Gem::Requirement
162
+ none: false
143
163
  requirements:
144
- - - '>='
164
+ - - ! '>='
145
165
  - !ruby/object:Gem::Version
146
166
  version: '0'
147
167
  type: :development
148
168
  prerelease: false
149
169
  version_requirements: !ruby/object:Gem::Requirement
170
+ none: false
150
171
  requirements:
151
- - - '>='
172
+ - - ! '>='
152
173
  - !ruby/object:Gem::Version
153
174
  version: '0'
154
175
  - !ruby/object:Gem::Dependency
155
176
  name: blue-shell
156
177
  requirement: !ruby/object:Gem::Requirement
178
+ none: false
157
179
  requirements:
158
- - - '>='
180
+ - - ! '>='
159
181
  - !ruby/object:Gem::Version
160
182
  version: 0.2.2
161
183
  type: :development
162
184
  prerelease: false
163
185
  version_requirements: !ruby/object:Gem::Requirement
186
+ none: false
164
187
  requirements:
165
- - - '>='
188
+ - - ! '>='
166
189
  - !ruby/object:Gem::Version
167
190
  version: 0.2.2
168
191
  - !ruby/object:Gem::Dependency
169
192
  name: factory_girl
170
193
  requirement: !ruby/object:Gem::Requirement
194
+ none: false
171
195
  requirements:
172
- - - '>='
196
+ - - ! '>='
173
197
  - !ruby/object:Gem::Version
174
198
  version: '0'
175
199
  type: :development
176
200
  prerelease: false
177
201
  version_requirements: !ruby/object:Gem::Requirement
202
+ none: false
178
203
  requirements:
179
- - - '>='
204
+ - - ! '>='
180
205
  - !ruby/object:Gem::Version
181
206
  version: '0'
182
207
  - !ruby/object:Gem::Dependency
183
208
  name: fakefs
184
209
  requirement: !ruby/object:Gem::Requirement
210
+ none: false
185
211
  requirements:
186
212
  - - ~>
187
213
  - !ruby/object:Gem::Version
@@ -189,6 +215,7 @@ dependencies:
189
215
  type: :development
190
216
  prerelease: false
191
217
  version_requirements: !ruby/object:Gem::Requirement
218
+ none: false
192
219
  requirements:
193
220
  - - ~>
194
221
  - !ruby/object:Gem::Version
@@ -196,6 +223,7 @@ dependencies:
196
223
  - !ruby/object:Gem::Dependency
197
224
  name: ffaker
198
225
  requirement: !ruby/object:Gem::Requirement
226
+ none: false
199
227
  requirements:
200
228
  - - '='
201
229
  - !ruby/object:Gem::Version
@@ -203,6 +231,7 @@ dependencies:
203
231
  type: :development
204
232
  prerelease: false
205
233
  version_requirements: !ruby/object:Gem::Requirement
234
+ none: false
206
235
  requirements:
207
236
  - - '='
208
237
  - !ruby/object:Gem::Version
@@ -210,48 +239,55 @@ dependencies:
210
239
  - !ruby/object:Gem::Dependency
211
240
  name: gem-release
212
241
  requirement: !ruby/object:Gem::Requirement
242
+ none: false
213
243
  requirements:
214
- - - '>='
244
+ - - ! '>='
215
245
  - !ruby/object:Gem::Version
216
246
  version: '0'
217
247
  type: :development
218
248
  prerelease: false
219
249
  version_requirements: !ruby/object:Gem::Requirement
250
+ none: false
220
251
  requirements:
221
- - - '>='
252
+ - - ! '>='
222
253
  - !ruby/object:Gem::Version
223
254
  version: '0'
224
255
  - !ruby/object:Gem::Dependency
225
256
  name: ocra
226
257
  requirement: !ruby/object:Gem::Requirement
258
+ none: false
227
259
  requirements:
228
- - - '>='
260
+ - - ! '>='
229
261
  - !ruby/object:Gem::Version
230
262
  version: '0'
231
263
  type: :development
232
264
  prerelease: false
233
265
  version_requirements: !ruby/object:Gem::Requirement
266
+ none: false
234
267
  requirements:
235
- - - '>='
268
+ - - ! '>='
236
269
  - !ruby/object:Gem::Version
237
270
  version: '0'
238
271
  - !ruby/object:Gem::Dependency
239
272
  name: license_finder
240
273
  requirement: !ruby/object:Gem::Requirement
274
+ none: false
241
275
  requirements:
242
- - - '>='
276
+ - - ! '>='
243
277
  - !ruby/object:Gem::Version
244
278
  version: '0'
245
279
  type: :development
246
280
  prerelease: false
247
281
  version_requirements: !ruby/object:Gem::Requirement
282
+ none: false
248
283
  requirements:
249
- - - '>='
284
+ - - ! '>='
250
285
  - !ruby/object:Gem::Version
251
286
  version: '0'
252
287
  - !ruby/object:Gem::Dependency
253
288
  name: rake
254
289
  requirement: !ruby/object:Gem::Requirement
290
+ none: false
255
291
  requirements:
256
292
  - - ~>
257
293
  - !ruby/object:Gem::Version
@@ -259,6 +295,7 @@ dependencies:
259
295
  type: :development
260
296
  prerelease: false
261
297
  version_requirements: !ruby/object:Gem::Requirement
298
+ none: false
262
299
  requirements:
263
300
  - - ~>
264
301
  - !ruby/object:Gem::Version
@@ -266,6 +303,7 @@ dependencies:
266
303
  - !ruby/object:Gem::Dependency
267
304
  name: rspec
268
305
  requirement: !ruby/object:Gem::Requirement
306
+ none: false
269
307
  requirements:
270
308
  - - ~>
271
309
  - !ruby/object:Gem::Version
@@ -273,6 +311,7 @@ dependencies:
273
311
  type: :development
274
312
  prerelease: false
275
313
  version_requirements: !ruby/object:Gem::Requirement
314
+ none: false
276
315
  requirements:
277
316
  - - ~>
278
317
  - !ruby/object:Gem::Version
@@ -280,6 +319,7 @@ dependencies:
280
319
  - !ruby/object:Gem::Dependency
281
320
  name: rspec-instafail
282
321
  requirement: !ruby/object:Gem::Requirement
322
+ none: false
283
323
  requirements:
284
324
  - - ~>
285
325
  - !ruby/object:Gem::Version
@@ -287,6 +327,7 @@ dependencies:
287
327
  type: :development
288
328
  prerelease: false
289
329
  version_requirements: !ruby/object:Gem::Requirement
330
+ none: false
290
331
  requirements:
291
332
  - - ~>
292
333
  - !ruby/object:Gem::Version
@@ -294,29 +335,33 @@ dependencies:
294
335
  - !ruby/object:Gem::Dependency
295
336
  name: sinatra
296
337
  requirement: !ruby/object:Gem::Requirement
338
+ none: false
297
339
  requirements:
298
- - - '>='
340
+ - - ! '>='
299
341
  - !ruby/object:Gem::Version
300
342
  version: '0'
301
343
  type: :development
302
344
  prerelease: false
303
345
  version_requirements: !ruby/object:Gem::Requirement
346
+ none: false
304
347
  requirements:
305
- - - '>='
348
+ - - ! '>='
306
349
  - !ruby/object:Gem::Version
307
350
  version: '0'
308
351
  - !ruby/object:Gem::Dependency
309
352
  name: webmock
310
353
  requirement: !ruby/object:Gem::Requirement
354
+ none: false
311
355
  requirements:
312
- - - '>='
356
+ - - ! '>='
313
357
  - !ruby/object:Gem::Version
314
358
  version: '0'
315
359
  type: :development
316
360
  prerelease: false
317
361
  version_requirements: !ruby/object:Gem::Requirement
362
+ none: false
318
363
  requirements:
319
- - - '>='
364
+ - - ! '>='
320
365
  - !ruby/object:Gem::Version
321
366
  version: '0'
322
367
  description:
@@ -622,26 +667,27 @@ files:
622
667
  homepage: http://github.com/cloudfoundry/cf
623
668
  licenses:
624
669
  - Apache 2.0
625
- metadata: {}
626
670
  post_install_message:
627
671
  rdoc_options: []
628
672
  require_paths:
629
673
  - lib
630
674
  required_ruby_version: !ruby/object:Gem::Requirement
675
+ none: false
631
676
  requirements:
632
- - - '>='
677
+ - - ! '>='
633
678
  - !ruby/object:Gem::Version
634
679
  version: '0'
635
680
  required_rubygems_version: !ruby/object:Gem::Requirement
681
+ none: false
636
682
  requirements:
637
- - - '>='
683
+ - - ! '>='
638
684
  - !ruby/object:Gem::Version
639
685
  version: '0'
640
686
  requirements: []
641
687
  rubyforge_project: cf
642
- rubygems_version: 2.1.11
688
+ rubygems_version: 1.8.23
643
689
  signing_key:
644
- specification_version: 4
690
+ specification_version: 3
645
691
  summary: Friendly command-line interface for Cloud Foundry.
646
692
  test_files:
647
693
  - spec/admin/curl_spec.rb
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 891c232dd1827bdd843fde5bba696cf34ff3a3e3
4
- data.tar.gz: 12686fe3dfbb634873a660f705e4b830c140bd6d
5
- SHA512:
6
- metadata.gz: ec3c2885cd1750aee10cf0f7b63e13830c406ef9f80787b81bd271cfe0c5a4346209746a770e398619041c675e8f656904b9370acb1197d8b8f899bad640931f
7
- data.tar.gz: 13847b5607cf439730f5ff6263b45ac961e09db9e83b8876327409e3ed5c8632d5a706d067bf3bf424eba6caaa6a4769cd3b10912e4049a1397314ddf147fcd4