cfoundry 4.0.2.rc4 → 4.0.2.rc5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +15 -0
  2. data/lib/cfoundry/version.rb +1 -1
  3. data/spec/cfoundry/v2/service_instance_spec.rb +9 -22
  4. data/spec/integration/client_spec.rb +4 -3
  5. metadata +4 -37
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MDg3NzA0YjdjMmNjNDIyMmI5YTg3ZGQwOTIxZThiOTI1YmZjZTVjZA==
5
+ data.tar.gz: !binary |-
6
+ MzEwMGFkM2U4ZDhiNzRmMGZiMDA4Mjc5NWJkMDBkZTIxNDAzOGQ5YQ==
7
+ !binary "U0hBNTEy":
8
+ metadata.gz: !binary |-
9
+ OTI0MTBmZmI4YzkyNGZkMzk4OTI1ODU1YzVlYzc2ZjZlNjY0MDU0YjVkYmQw
10
+ ZTQwYWRhYWQyNTA0NmY5ZWU2MTc4NTU4OThjMTM3MGE0ODE5OTM2NDQ2ZmY2
11
+ M2I0YWRhNGM5MTBjMGYxMDZhNDNlOGRiYzhmODBmYmNhZmNmMTE=
12
+ data.tar.gz: !binary |-
13
+ NWYyNjg5MzFjYmEyMzRiYTg0ZWFiNDJjN2ZlOTBhYTRiNjFkNzcxNzRmOThi
14
+ MmI5MGE5NjdiZmRjMmU3YzFhYWU0ZGQ5YTRiZTcyZTBmODlkNzE3MmU2ZDJm
15
+ MzI2MTg5NzI5MWM4MjY1NmRjZTc5NGE3MzZkMzBjN2E2YjBlYzA=
data/lib/cfoundry/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module CFoundry # :nodoc:
2
2
  # CFoundry library version number.
3
- VERSION = "4.0.2.rc4".freeze
3
+ VERSION = "4.0.2.rc5".freeze
4
4
  end
data/spec/cfoundry/v2/service_instance_spec.rb CHANGED
@@ -100,38 +100,25 @@ module CFoundry
100
100
  }'
101
101
  end
102
102
 
103
- context "when there is no current org or current space" do
104
- it "gets both user-provided and cf-managed service instances" do
105
- http_stub = stub_request(:get, "#{client.target}/v2/service_instances?inline-relations-depth=1&return_user_provided_service_instances=true").to_return(:status => 200, :body => example_response)
106
- client.service_instances
107
- http_stub.should have_been_requested
108
- end
109
-
110
- it "gets only cf-managed service instances if the user explicitly sets :user_provided to false" do
111
- http_stub = stub_request(:get, "#{client.target}/v2/service_instances?inline-relations-depth=1&return_user_provided_service_instances=false").to_return(:status => 200, :body => example_response)
112
- client.service_instances(user_provided: false)
113
- http_stub.should have_been_requested
114
- end
115
- end
116
-
117
- it "defaults to true when user_provided is set to a bogus value (not true or false)" do
118
- http_stub = stub_request(:get, "#{client.target}/v2/service_instances?inline-relations-depth=1&return_user_provided_service_instances=true").to_return(:status => 200, :body => example_response)
119
- client.service_instances(user_provided: 'some_non-boolean_value')
120
- http_stub.should have_been_requested
121
- end
122
-
123
-
124
103
  context "when there is a current org and a current space" do
125
104
  let(:org) { build(:organization) }
126
105
  let(:space) { build(:space, organization: org) }
127
106
  let(:client) { build(:client, current_organization: org, current_space: space) }
107
+
128
108
  it "gets both user-provided and cf-managed service instances" do
129
109
  http_stub = stub_request(:get, "#{client.target}/v2/spaces/#{space.guid}/service_instances?inline-relations-depth=1&return_user_provided_service_instances=true").to_return(:status => 200, :body => example_response)
130
110
  client.service_instances
131
111
  http_stub.should have_been_requested
132
112
  end
133
- end
134
113
 
114
+ describe "via service_instance_from" do
115
+ it "defaults to true when user_provided is set to a bogus value (not true or false)" do
116
+ http_stub = stub_request(:get, "#{client.target}/v2/spaces/#{space.guid}/service_instances?inline-relations-depth=1&return_user_provided_service_instances=true").to_return(:status => 200, :body => example_response)
117
+ client.service_instances(user_provided: 'some_non-boolean_value')
118
+ http_stub.should have_been_requested
119
+ end
120
+ end
121
+ end
135
122
  end
136
123
 
137
124
  describe 'query params' do
data/spec/integration/client_spec.rb CHANGED
@@ -5,6 +5,7 @@ describe CFoundry::V2::Client do
5
5
  WebMock.allow_net_connect!
6
6
  end
7
7
 
8
+ let(:environment_api) { ENV["CF_V2_TEST_TARGET"] || "api.#{a1_domain}"}
8
9
  let(:a1_domain) { "a1.cf-app.com" }
9
10
  let(:prod_domain) { "run.pivotal.io" }
10
11
 
@@ -21,12 +22,12 @@ describe CFoundry::V2::Client do
21
22
 
22
23
  if ENV["CF_V2_RUN_INTEGRATION"]
23
24
  it "requires a re-login" do
24
- client = CFoundry::V2::Client.new("http://api." + a1_domain)
25
+ client = CFoundry::V2::Client.new("http://#{environment_api}")
25
26
  client.login({username: ENV["CF_V2_TEST_USER"], password: ENV["CF_V2_TEST_PASSWORD"]})
26
27
  client.quota_definitions # Getting quota definitions will always be the shortest request that requires auth
27
28
 
28
29
  client.target = nil
29
- client.target = "http://api." + a1_domain
30
+ client.target = "http://#{environment_api}"
30
31
  expect { client.quota_definitions }.to raise_error(CFoundry::InvalidAuthToken)
31
32
 
32
33
  client.login({username: ENV["CF_V2_TEST_USER"], password: ENV["CF_V2_TEST_PASSWORD"]})
@@ -34,4 +35,4 @@ describe CFoundry::V2::Client do
34
35
  end
35
36
  end
36
37
  end
37
- end
38
+ end
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cfoundry
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.2.rc4
5
- prerelease: 6
4
+ version: 4.0.2.rc5
6
5
  platform: ruby
7
6
  authors:
8
7
  - Cloud Foundry Team
@@ -15,7 +14,6 @@ dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: activemodel
17
16
  requirement: !ruby/object:Gem::Requirement
18
- none: false
19
17
  requirements:
20
18
  - - ~>
21
19
  - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
23
21
  type: :runtime
24
22
  prerelease: false
25
23
  version_requirements: !ruby/object:Gem::Requirement
26
- none: false
27
24
  requirements:
28
25
  - - ~>
29
26
  - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
31
28
  - !ruby/object:Gem::Dependency
32
29
  name: cf-uaa-lib
33
30
  requirement: !ruby/object:Gem::Requirement
34
- none: false
35
31
  requirements:
36
32
  - - ~>
37
33
  - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
39
35
  type: :runtime
40
36
  prerelease: false
41
37
  version_requirements: !ruby/object:Gem::Requirement
42
- none: false
43
38
  requirements:
44
39
  - - ~>
45
40
  - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
47
42
  - !ruby/object:Gem::Dependency
48
43
  name: multi_json
49
44
  requirement: !ruby/object:Gem::Requirement
50
- none: false
51
45
  requirements:
52
46
  - - ~>
53
47
  - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
55
49
  type: :runtime
56
50
  prerelease: false
57
51
  version_requirements: !ruby/object:Gem::Requirement
58
- none: false
59
52
  requirements:
60
53
  - - ~>
61
54
  - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
63
56
  - !ruby/object:Gem::Dependency
64
57
  name: multipart-post
65
58
  requirement: !ruby/object:Gem::Requirement
66
- none: false
67
59
  requirements:
68
60
  - - ~>
69
61
  - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
71
63
  type: :runtime
72
64
  prerelease: false
73
65
  version_requirements: !ruby/object:Gem::Requirement
74
- none: false
75
66
  requirements:
76
67
  - - ~>
77
68
  - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
79
70
  - !ruby/object:Gem::Dependency
80
71
  name: rubyzip
81
72
  requirement: !ruby/object:Gem::Requirement
82
- none: false
83
73
  requirements:
84
74
  - - ~>
85
75
  - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
87
77
  type: :runtime
88
78
  prerelease: false
89
79
  version_requirements: !ruby/object:Gem::Requirement
90
- none: false
91
80
  requirements:
92
81
  - - ~>
93
82
  - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
95
84
  - !ruby/object:Gem::Dependency
96
85
  name: anchorman
97
86
  requirement: !ruby/object:Gem::Requirement
98
- none: false
99
87
  requirements:
100
88
  - - ! '>='
101
89
  - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
103
91
  type: :development
104
92
  prerelease: false
105
93
  version_requirements: !ruby/object:Gem::Requirement
106
- none: false
107
94
  requirements:
108
95
  - - ! '>='
109
96
  - !ruby/object:Gem::Version
@@ -111,7 +98,6 @@ dependencies:
111
98
  - !ruby/object:Gem::Dependency
112
99
  name: factory_girl
113
100
  requirement: !ruby/object:Gem::Requirement
114
- none: false
115
101
  requirements:
116
102
  - - ! '>='
117
103
  - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
119
105
  type: :development
120
106
  prerelease: false
121
107
  version_requirements: !ruby/object:Gem::Requirement
122
- none: false
123
108
  requirements:
124
109
  - - ! '>='
125
110
  - !ruby/object:Gem::Version
@@ -127,7 +112,6 @@ dependencies:
127
112
  - !ruby/object:Gem::Dependency
128
113
  name: gem-release
129
114
  requirement: !ruby/object:Gem::Requirement
130
- none: false
131
115
  requirements:
132
116
  - - ! '>='
133
117
  - !ruby/object:Gem::Version
@@ -135,7 +119,6 @@ dependencies:
135
119
  type: :development
136
120
  prerelease: false
137
121
  version_requirements: !ruby/object:Gem::Requirement
138
- none: false
139
122
  requirements:
140
123
  - - ! '>='
141
124
  - !ruby/object:Gem::Version
@@ -143,7 +126,6 @@ dependencies:
143
126
  - !ruby/object:Gem::Dependency
144
127
  name: json_pure
145
128
  requirement: !ruby/object:Gem::Requirement
146
- none: false
147
129
  requirements:
148
130
  - - ~>
149
131
  - !ruby/object:Gem::Version
@@ -151,7 +133,6 @@ dependencies:
151
133
  type: :development
152
134
  prerelease: false
153
135
  version_requirements: !ruby/object:Gem::Requirement
154
- none: false
155
136
  requirements:
156
137
  - - ~>
157
138
  - !ruby/object:Gem::Version
@@ -159,7 +140,6 @@ dependencies:
159
140
  - !ruby/object:Gem::Dependency
160
141
  name: rake
161
142
  requirement: !ruby/object:Gem::Requirement
162
- none: false
163
143
  requirements:
164
144
  - - ! '>='
165
145
  - !ruby/object:Gem::Version
@@ -167,7 +147,6 @@ dependencies:
167
147
  type: :development
168
148
  prerelease: false
169
149
  version_requirements: !ruby/object:Gem::Requirement
170
- none: false
171
150
  requirements:
172
151
  - - ! '>='
173
152
  - !ruby/object:Gem::Version
@@ -175,7 +154,6 @@ dependencies:
175
154
  - !ruby/object:Gem::Dependency
176
155
  name: rspec
177
156
  requirement: !ruby/object:Gem::Requirement
178
- none: false
179
157
  requirements:
180
158
  - - ~>
181
159
  - !ruby/object:Gem::Version
@@ -183,7 +161,6 @@ dependencies:
183
161
  type: :development
184
162
  prerelease: false
185
163
  version_requirements: !ruby/object:Gem::Requirement
186
- none: false
187
164
  requirements:
188
165
  - - ~>
189
166
  - !ruby/object:Gem::Version
@@ -191,7 +168,6 @@ dependencies:
191
168
  - !ruby/object:Gem::Dependency
192
169
  name: shoulda-matchers
193
170
  requirement: !ruby/object:Gem::Requirement
194
- none: false
195
171
  requirements:
196
172
  - - ~>
197
173
  - !ruby/object:Gem::Version
@@ -199,7 +175,6 @@ dependencies:
199
175
  type: :development
200
176
  prerelease: false
201
177
  version_requirements: !ruby/object:Gem::Requirement
202
- none: false
203
178
  requirements:
204
179
  - - ~>
205
180
  - !ruby/object:Gem::Version
@@ -207,7 +182,6 @@ dependencies:
207
182
  - !ruby/object:Gem::Dependency
208
183
  name: timecop
209
184
  requirement: !ruby/object:Gem::Requirement
210
- none: false
211
185
  requirements:
212
186
  - - ~>
213
187
  - !ruby/object:Gem::Version
@@ -215,7 +189,6 @@ dependencies:
215
189
  type: :development
216
190
  prerelease: false
217
191
  version_requirements: !ruby/object:Gem::Requirement
218
- none: false
219
192
  requirements:
220
193
  - - ~>
221
194
  - !ruby/object:Gem::Version
@@ -223,7 +196,6 @@ dependencies:
223
196
  - !ruby/object:Gem::Dependency
224
197
  name: webmock
225
198
  requirement: !ruby/object:Gem::Requirement
226
- none: false
227
199
  requirements:
228
200
  - - ~>
229
201
  - !ruby/object:Gem::Version
@@ -231,7 +203,6 @@ dependencies:
231
203
  type: :development
232
204
  prerelease: false
233
205
  version_requirements: !ruby/object:Gem::Requirement
234
- none: false
235
206
  requirements:
236
207
  - - ~>
237
208
  - !ruby/object:Gem::Version
@@ -410,30 +381,26 @@ files:
410
381
  - spec/support/test_model_builder.rb
411
382
  homepage: http://github.com/cloudfoundry/cfoundry
412
383
  licenses: []
384
+ metadata: {}
413
385
  post_install_message:
414
386
  rdoc_options: []
415
387
  require_paths:
416
388
  - lib
417
389
  required_ruby_version: !ruby/object:Gem::Requirement
418
- none: false
419
390
  requirements:
420
391
  - - ! '>='
421
392
  - !ruby/object:Gem::Version
422
393
  version: '0'
423
- segments:
424
- - 0
425
- hash: 1435326454035257909
426
394
  required_rubygems_version: !ruby/object:Gem::Requirement
427
- none: false
428
395
  requirements:
429
396
  - - ! '>'
430
397
  - !ruby/object:Gem::Version
431
398
  version: 1.3.1
432
399
  requirements: []
433
400
  rubyforge_project: cfoundry
434
- rubygems_version: 1.8.25
401
+ rubygems_version: 2.0.5
435
402
  signing_key:
436
- specification_version: 3
403
+ specification_version: 4
437
404
  summary: High-level library for working with the Cloud Foundry API.
438
405
  test_files:
439
406
  - spec/cc_api_stub/applications_spec.rb