cfoundry 4.0.3 → 4.0.4.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +15 -0
  2. data/lib/cfoundry/v2/client.rb +7 -2
  3. data/lib/cfoundry/v2/model_magic/client_extensions.rb +1 -1
  4. data/lib/cfoundry/version.rb +1 -1
  5. data/spec/cfoundry/client_spec.rb +3 -13
  6. data/spec/cfoundry/v2/service_instance_spec.rb +0 -6
  7. metadata +7 -43
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ OTViOTk3MTEyZDlhOTYwNmY1MjI1MjRmMzVmMTQ1ODk3Nzc3ZDk4Nw==
5
+ data.tar.gz: !binary |-
6
+ ZWUxOWMwNWQ2ZGQyZTk5MWJmNmU2OThjMGQ0YTBjZGExOTBiMWM0Zg==
7
+ !binary "U0hBNTEy":
8
+ metadata.gz: !binary |-
9
+ ZTkxOTMyZjYyYTBiOWY4NTgyMTU4ZTJkNzY3YmNiNzljZTRhY2ZlOWZjZDRj
10
+ ZWIyOGVmN2YwMzhjMDlmMDc3MzMyYjM0MjBhOWFhMDY2OWE2ZWEwZDdlNzlh
11
+ MTkzZTExMWVmNzg1YTUwNTNhZjAyZTUzYTQxZThjZWE5MjhkYWY=
12
+ data.tar.gz: !binary |-
13
+ MDcyMjA5ZDA0MzYzY2NiNGFmN2MxNzNhN2JjNmE4NGQxMjg4Y2MzZDE1NDcy
14
+ M2RmZTE4NGYyNTdiMGNmMjM3Mjc2MmQ4ZTI0YzE0YzE2MmYwMTE0MzkzNmU4
15
+ MzFmZDdmN2RmZDIxNGI5ODFhZjMzZmJmYWJhMzRlYTYwNjdiMjM=
data/lib/cfoundry/v2/client.rb CHANGED
@@ -82,10 +82,15 @@ module CFoundry::V2
82
82
  @base.stream_url(url, &blk)
83
83
  end
84
84
 
85
- # client.service_instances override
86
85
  def service_instances(opts={})
87
- opts[:user_provided] = !!(opts[:user_provided] || opts[:user_provided].nil?)
86
+ opts[:user_provided] = true
88
87
  super(opts)
89
88
  end
89
+
90
+ def service_instances_from(path, *args)
91
+ opts = args.first || {}
92
+ opts[:user_provided] = true
93
+ super(path, opts, *args)
94
+ end
90
95
  end
91
96
  end
data/lib/cfoundry/v2/model_magic/client_extensions.rb CHANGED
@@ -145,4 +145,4 @@ module CFoundry
145
145
  end
146
146
  end
147
147
  end
148
- end
148
+ end
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.3".freeze
3
+ VERSION = "4.0.4.rc1".freeze
4
4
  end
data/spec/cfoundry/client_spec.rb CHANGED
@@ -11,22 +11,12 @@ describe CFoundry::Client do
11
11
  subject.should be_a(CFoundry::V2::Client)
12
12
  end
13
13
 
14
- describe "service_instances" do
14
+ describe "#service_instances" do
15
15
  let(:client) { build(:client) }
16
16
 
17
- it "defaults to true when the :user_provided option is not provided" do
18
- client.base.should_receive(:service_instances).with(user_provided: true).and_return([])
17
+ it "includes user-provided instances" do
18
+ client.base.should_receive(:service_instances).with(hash_including(user_provided: true)).and_return([])
19
19
  client.service_instances
20
20
  end
21
-
22
- it "calls super with true when :user_provded=true" do
23
- client.base.should_receive(:service_instances).with(user_provided: true).and_return([])
24
- client.service_instances(user_provided: true)
25
- end
26
-
27
- it "calls super with false when :user_provided=false" do
28
- client.base.should_receive(:service_instances).with(user_provided: false).and_return([])
29
- client.service_instances(user_provided: false)
30
- end
31
21
  end
32
22
  end
data/spec/cfoundry/v2/service_instance_spec.rb CHANGED
@@ -111,12 +111,6 @@ module CFoundry
111
111
  http_stub.should have_been_requested
112
112
  end
113
113
 
114
- it "gets only cf-managed service instances when user_provided is set to false" do
115
- http_stub = stub_request(:get, "#{client.target}/v2/spaces/#{space.guid}/service_instances?inline-relations-depth=1&return_user_provided_service_instances=false").to_return(:status => 200, :body => example_response)
116
- client.service_instances(user_provided: false)
117
- http_stub.should have_been_requested
118
- end
119
-
120
114
  describe "via service_instance_from" do
121
115
  it "defaults to true when user_provided is set to a bogus value (not true or false)" do
122
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)
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.3
5
- prerelease:
4
+ version: 4.0.4.rc1
6
5
  platform: ruby
7
6
  authors:
8
7
  - Cloud Foundry Team
@@ -10,12 +9,11 @@ authors:
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2013-07-29 00:00:00.000000000 Z
12
+ date: 2013-07-30 00:00:00.000000000 Z
14
13
  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,33 +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: 1737557989823142291
426
394
  required_rubygems_version: !ruby/object:Gem::Requirement
427
- none: false
428
395
  requirements:
429
- - - ! '>='
396
+ - - ! '>'
430
397
  - !ruby/object:Gem::Version
431
- version: '0'
432
- segments:
433
- - 0
434
- hash: 1737557989823142291
398
+ version: 1.3.1
435
399
  requirements: []
436
400
  rubyforge_project: cfoundry
437
- rubygems_version: 1.8.25
401
+ rubygems_version: 2.0.5
438
402
  signing_key:
439
- specification_version: 3
403
+ specification_version: 4
440
404
  summary: High-level library for working with the Cloud Foundry API.
441
405
  test_files:
442
406
  - spec/cc_api_stub/applications_spec.rb