cf 4.2.1.rc2 → 4.2.1.rc3

data/lib/cf/cli/app/start.rb

@@ -39,7 +39,7 @@ module CF::App
 
     def start_app(app)
       log = nil
-      with_progress("Starting #{c(app.name, :name)}") do
+      with_progress("Preparing to start #{c(app.name, :name)}") do
         app.start!(true) do |url|
           log = url
         end
@@ -110,7 +110,7 @@ module CF::App
             indented { print_instances_summary(instances) }
 
             if all_instances_running?(instances)
-              line "#{c("Push successful! App '#{app.name}' available at http://#{app.subdomain}.#{app.domain}", :good)}"
+              line "#{c("Push successful! App '#{app.name}' available at http://#{app.host}.#{app.domain}", :good)}"
               return
             end
           rescue CFoundry::NotStaged

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

@@ -72,21 +72,18 @@ module CF::Service
       table(
         ["name", "service", "provider", "version", "plan", "bound apps"],
         @services.collect { |i|
+          apps     = name_list(i.service_bindings.collect(&:app))
           plan = i.service_plan
-          service = plan.service
 
-          label    = service.label
-          version  = service.version
-          apps     = name_list(i.service_bindings.collect(&:app))
-          provider = service.provider
-
-          [ c(i.name, :name),
-            label,
-            provider,
-            version,
-            plan.name,
-            apps
-          ]
+          unless plan
+            [ c(i.name, :name), "none", "none", "none", "none", apps]
+          else
+            service = plan.service
+            label    = service.label
+            version  = service.version
+            provider = service.provider
+            [ c(i.name, :name), label, provider, version, plan.name, apps]
+          end
         })
 
     end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.2.1.rc2".freeze
+  VERSION = "4.2.1.rc3".freeze
 end

data/spec/cf/cli/app/start_spec.rb

@@ -37,7 +37,7 @@ module CF
         def self.it_says_application_is_starting
           it "says that it's starting the application" do
             execute_start_app
-            expect(output).to say("Starting #{app.name}... OK")
+            expect(output).to say("Preparing to start #{app.name}... OK")
           end
         end
 

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

@@ -74,6 +74,37 @@ module CF
 
         end
 
+        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
+            output = stdout.read
+
+            expect(output).to match /Getting services in the space.*OK/
+
+            expect(output).to match /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+
+            expect(output).to match /service-instance-.+?\s+  # name
+        service-.*?\s+                                  # service
+        provider.*?\s+                                  # provider
+        service_version\s+                              # version
+        service-plan-.*?\s+                             # plan
+        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
+        /x
+          end
+        end
+
+
         context 'when given --marketplace argument' do
           it 'lists services on the target' do
             client.stub(:services => Array.new(3) { build(:service) })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.2.1.rc2
+  version: 4.2.1.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -619,7 +619,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4538612442505593071
+      hash: 786991883399052394
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: