cf 4.2.8.rc1 → 4.2.8.rc2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2E2N2JhODkyOTg2YzFiNGI3YzFkOTZhMTUwYTcwYTViZGFlMDYzYw==
+    ZGFmMTYzNDMzMzMwYTdiODgyNDI3OGNmOThjZjliMmI1MjdiZGU2OQ==
   data.tar.gz: !binary |-
-    OWExNzFiZGNlYmFhODE4MjZlOTIzMDIwNGNkNTcyN2JhZWM3MGUwNg==
+    NGU3YjQ1NTQxMDc3MzMzMzE3NzljODdiZTQ0MTgzZDg4NmM2YTE3Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDAzYWU4ODRmODA0YTU3NjMwYmE3NzYzMjUxZDI1NmI4MmY2OGNlNzIxZmE0
-    MzNiNmM1OTUzNTUyOGYzZjExZDVjYTFhNDE1MGNjNWM4YzAxODhhMDM2NjE4
-    NGIyOGQ0ZTI1M2NjMDg4MmYyNTBhYTc3ODUzMzM5OTY4YmY0M2Y=
+    ZmFmNWIzZGU1MmRmNmNjZTFiODVmYjViNjg5YjVmM2EyNGQwNjc3MTFmNjg5
+    MTU0YjFiOTEzZTlkNDU1MmE3YTk4Njg5ZWNlYzU0YjNmZjM1MDAxY2U5YzYx
+    NzI4ZjQzNzYyNWRhYmJkYzJiYmMzYjU0NzdjODZkNGE2YmEyMGY=
   data.tar.gz: !binary |-
-    OTkxYTMwYjg5MTQ1MGJlMjcxMTk4MGQzNDZjOTdmZjI0OTU1MjdlMGU3MGEw
-    ZTQ0ZDhkNTI2Nzc4ZmRjYmE0NzgwNzU3YzI4NjczZDdkMGM3OTM1YjgwOTY4
-    ZDVkMDJjMjNmMDc2ZTI2NWZjN2VmZjc5MTdjNzQwMGFhNmQ0MTI=
+    OTQzYmExMGQ0MjY0Zjk3ZGY5ZmU2NmUyYzhhMzU2ZjAyNTQzMjE0NDlmMjFk
+    MjAyZTA0YjkzYTQ2YzEzMTMwZjg2MzcyOTY2NDkzZTlhNWFhZTc0MzM1YWJj
+    Mzc3YzdhOTU2MWQ1MzYwZDlmNWNlMmZiZWVjMWJiNjBiMjlmYTA=

data/lib/cf/cli/service/services.rb

@@ -76,7 +76,7 @@ module CF::Service
           plan = i.service_plan
 
           unless plan
-            [ c(i.name, :name), "none", "none", "none", "none", apps]
+            [ c(i.name, :name), "user-provided", "none", "none", "none", apps]
           else
             service = plan.service
             label    = service.label

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.2.8.rc1".freeze
+  VERSION = "4.2.8.rc2".freeze
 end

data/spec/cf/cli/service/services_spec.rb

@@ -82,6 +82,7 @@ module CF
           context "when one of the services does not have a service plan" do
             let(:service_instances) { [service1, service2]}
             let(:service2) { build(:service_instance, :service_plan => nil, :service_bindings => [service_binding]) }
+
             it 'still produces a table of service' do
               subject
               stdout.rewind
@@ -96,15 +97,15 @@ module CF
         provider.*?\s+                                  # provider
         service_version\s+                              # version
         service-plan-.*?\s+                             # plan
-        app-name-\d+\s+                                         # bound apps
+        app-name-\d+\s+                                 # bound apps
         /x
 
               expect(output).to match /service-instance-.+?\s+  # name
-        none\s+                                  # service
-        none\s+                                  # provider
-        none\s+                              # version
-        none\s+                             # plan
-        app-name-\d+\s+                                         # bound apps
+        user-provided\s+                                # service
+        none\s+                                         # provider
+        none\s+                                         # version
+        none\s+                                         # plan
+        app-name-\d+\s+                                 # bound apps
         /x
             end
           end

data/spec/features/services_spec.rb

@@ -8,11 +8,10 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     describe "listing services" do
       it "shows all service instances in the space" do
-        pending "Need a test environment to run this against. A1 should soon contain the necessary changes - DS & RT"
         service1 = "some-provided-instance-#{Time.now.to_i}"
         service2 = "cf-managed-instance-#{Time.now.to_i}"
         create_service_instance("user-provided", service1, credentials: { hostname: "myservice.com"} )
-        create_service_instance("1", service2, plan: "1")
+        create_service_instance("dummy-dev", service2, plan: "small")
 
         BlueShell::Runner.run("#{cf_bin} services") do |runner|
           expect(runner).to say /#{service1}\s+none\s+none\s+none\s+none\s+.*/
@@ -40,7 +39,6 @@ if ENV['CF_V2_RUN_INTEGRATION']
         let(:service_name) { "my-private-db-#{Random.rand(1000) + 1000}"}
 
         it "can create a service instance" do
-          pending "Need a test environment to run this against. A1 should soon contain the necessary changes - DS & RT"
           BlueShell::Runner.run("#{cf_bin} create-service") do |runner|
             expect(runner).to say "What kind?"
             runner.send_keys "user-provided"
@@ -64,12 +62,11 @@ Key"
 
     describe "binding to a service" do
       let(:app_folder) { "env" }
-      let(:app_name) { "services_env_test_app" }
+      let(:app_name) { "services_env_test_app-#{Time.now.to_i}" }
 
       let(:service_name) { "some-provided-instance-#{Time.now.to_i}" }
 
-      xit "can bind and unbind user-provided services to apps" do
-        pending "Unbind needs to work -- RT + WR"
+      it "can bind and unbind user-provided services to apps" do
         push_app(app_folder, app_name, start_command: "'bundle exec ruby env_test.rb -p $PORT'", timeout: 90)
         create_service_instance("user-provided", service_name, credentials: { hostname: "myservice.com"} )
 
@@ -87,7 +84,10 @@ Key"
           expect(runner).to say "Which application?"
           runner.send_keys app_name
 
+          expect(runner).to say "Which service?>"
+          runner.send_keys service_name
 
+          expect(runner).to say "Unbinding #{service_name} from #{app_name}... OK"
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.2.8.rc1
+  version: 4.2.8.rc2
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable