cf 4.1.5.rc3 → 4.1.5.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 254907a2729b959a99b14ede16060567f9e97cfb
-  data.tar.gz: b08033676ccba00d1eab75e8c9981c1d002133d2
+  metadata.gz: eeeab88cd5d4fe615841147f7951e324a24cba11
+  data.tar.gz: 9974b6699cd3dc29a66774fd7cc782741d41bc25
 SHA512:
-  metadata.gz: 356b0451113f2e1dfe185fe97411272302ce0e9f8d061d37bd65b2e4e1af0608edb665fb0daf3f1f1976062144fc5009465681433947719eae088477440f66e9
-  data.tar.gz: 6865a4f6f0256bc4bbf6f3f1e7980ec8d936e44a328bbf5e4407f9edd8e1c82b34bcff52679b06f1004b9436ad5cd517d3cba6d3b6d2f1eb9489840a89ff5acf
+  metadata.gz: 66e8bb42bfdf140307ad90600b6b58ffa91ff3bee947ed34ea7c7bb6d1d1287580e0239288a9f698ba702957a09d2d49f6cd7928f923c03d41e91e8abd1eeaa8
+  data.tar.gz: a91890e75b606f9826e3848b6c49f50d94d8c0232c3cad7f256e7fdc3a9bfd93981325d7462a8341d27ab38be36900a19e8540bb1c3497f36eb0692838458e6b

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

@@ -91,15 +91,16 @@ module CF::App
         return
       end
 
-      line "Checking #{c(app.name, :name)}..."
+      print("Checking status of app '#{c(app.name, :name)}'...")
 
       seconds = 0
+      @first_time_after_staging_succeeded = true
 
       begin
         instances = []
         while true
           if any_instance_flapping?(instances) || seconds == APP_CHECK_LIMIT
-            err "Application failed to start."
+            err "Push unsuccessful."
             return
           end
 
@@ -109,11 +110,11 @@ module CF::App
             indented { print_instances_summary(instances) }
 
             if all_instances_running?(instances)
-              line "#{c("OK", :good)}"
+              line "#{c("Push successful! App '#{app.name}' available at #{app.name}.#{app.domain}", :good)}"
               return
             end
           rescue CFoundry::NotStaged
-            line "Staging in progress..."
+            print (".")
           end
 
           sleep 1
@@ -133,6 +134,12 @@ module CF::App
     end
 
     def print_instances_summary(instances)
+
+      if @first_time_after_staging_succeeded
+        line
+        @first_time_after_staging_succeeded = false
+      end
+
       counts = Hash.new { 0 }
       instances.each do |i|
         counts[i.state] += 1
@@ -148,8 +155,8 @@ module CF::App
       total = instances.count
       running = counts["RUNNING"].to_s.rjust(total.to_s.size)
 
-      ratio = "#{running}#{d("/")}#{total} instances:"
-      line "#{ratio} #{states.join(", ")}"
+      ratio = "#{running}#{d(" of ")}#{total} instances running"
+      line "#{ratio} (#{states.join(", ")})"
     end
   end
 end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.1.5.rc3".freeze
+  VERSION = "4.1.5.rc4".freeze
 end

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

@@ -9,6 +9,9 @@ module CF
       before do
         stub_client_and_precondition
         client.stub(:apps).and_return([app])
+
+        app.stub(:host).and_return("some_host")
+        app.stub(:domain).and_return("some_domain")
       end
 
       def execute_start_app
@@ -80,7 +83,7 @@ module CF
 
               it "says app is started" do
                 execute_start_app
-                expect(output).to say("Checking #{app.name}...")
+                expect(output).to say("Checking status of app '#{app.name}'...")
                 expect(output).to say("1 running, 1 down")
                 expect(output).to say("2 running")
               end
@@ -93,7 +96,7 @@ module CF
 
               it "says the app failed to stage" do
                 execute_start_app
-                expect(output).to say("Checking #{app.name}...")
+                expect(output).to say("Checking status of app '#{app.name}'...")
                 expect(error_output).to say("Application failed to stage")
                 expect(output).to_not say(/\d (running|down|flapping)/)
               end
@@ -112,8 +115,7 @@ module CF
 
               it "keeps polling" do
                 execute_start_app
-                expect(output).to say("Checking #{app.name}...")
-                expect(output).to say("Staging in progress...")
+                expect(output).to say("Checking status of app '#{app.name}'...")
                 expect(output).to say("2 running")
               end
             end
@@ -127,10 +129,10 @@ module CF
 
               it "says app failed to start" do
                 execute_start_app
-                expect(output).to say("Checking #{app.name}...")
+                expect(output).to say("Checking status of app '#{app.name}'...")
                 expect(output).to say("1 running, 1 down")
                 expect(output).to say("1 starting, 1 flapping")
-                expect(error_output).to say("Application failed to start")
+                expect(error_output).to say("Push unsuccessful.")
               end
             end
           end

data/spec/integration/push_flow_spec.rb

@@ -95,9 +95,10 @@ if ENV["CF_V2_RUN_INTEGRATION"]
 
           expect(runner).to say "Uploading #{app}... OK", 180
           expect(runner).to say "Starting #{app}... OK", 180
-          expect(runner).to say "Checking #{app}...", 180
-          expect(runner).to say "1/1 instances"
-          expect(runner).to say "OK", 30
+          expect(runner).to say "Checking status of app '#{app}'...", 180
+          expect(runner).to say "0 of 1 instances running (1 starting)"
+          expect(runner).to say "1 of 1 instances running"
+          expect(runner).to say "Push successful! App '#{app}' available at #{app}.a1-app.cf-app.com", 30
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.1.5.rc3
+  version: 4.1.5.rc4
 platform: ruby
 authors:
 - Cloud Foundry Team