Merge pull request rstudio#2 from rstudio/feature/task-description

Display task description instead of task status

R/deployApp.R

@@ -91,7 +91,7 @@ deployApp <- function(appDir = getwd(),
   })
 
   # wait for the deployment to complete (will raise an error if it can't)
-  displayStatus("Initializing application...\n")
+  displayStatus("Deploying application...\n")
   lucid$waitForTaskCompletion(task$task_id, quiet)
   displayStatus(paste("Application successfully deployed to", application$url))
 

R/lucid.R

@@ -57,12 +57,23 @@ lucidClient <- function(authInfo) {
     waitForTaskCompletion = function(taskId, quiet = FALSE) {    
 
       path <- paste("/tasks/", taskId, sep="")
-
+
+      if (!quiet) {
+        cat("Waiting for task: ", taskId, "\n", sep="")
+      }
+
       lastStatus <- NULL
       while(TRUE) {
         # check status
         status <- handleResponse(GET(authInfo, path))
 
+        # display status to the user if it changed
+        if (!identical(lastStatus, status$description)) {
+          if (!quiet)
+            cat("  ", status$status, ": ", status$description, "\n", sep="")
+          lastStatus <- status$description
+        }
+
         # are we finished? (note: this codepath is the only way to exit 
         # this function)
         if (status$finished) {
@@ -72,13 +83,6 @@ lucidClient <- function(authInfo) {
             stop(status$error, call. = FALSE)  
         }
 
-        # display status to the user if it changed
-        else if (!identical(lastStatus, status$status)) {
-          if (!quiet)
-            cat("  ", status$status, "\n", sep="")
-          lastStatus <- status$status
-        }
-
         # wait for 1 second before polling again
         Sys.sleep(1)
       }