From 3149464c7afdfdbb6fd4a10e9213381383ea34a2 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <juanchiviotti@gmail.com>
Date: Wed, 7 Oct 2015 11:38:59 -0400
Subject: [PATCH] Shorten the length of await device message

If the spinner message doesn't fit in your terminal, each spinner
position will be printed in different lines.

We mitigate this by dramatically shortenning the message.
---
 build/utils/patterns.js   | 26 +++++++++++++-------------
 lib/utils/patterns.coffee | 32 ++++++++++++++++----------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/build/utils/patterns.js b/build/utils/patterns.js
index 73736b83..21606386 100644
--- a/build/utils/patterns.js
+++ b/build/utils/patterns.js
@@ -96,20 +96,20 @@
   };
 
   exports.awaitDevice = function(uuid) {
-    var poll, spinner;
-    spinner = new visuals.Spinner("Waiting for your device to come online: " + uuid);
-    poll = function() {
-      return resin.models.device.isOnline(uuid).then(function(isOnline) {
-        if (isOnline) {
-          spinner.stop();
-          console.info("Device became online: " + uuid);
-        } else {
-          spinner.start();
-          return Promise.delay(3000).then(poll);
-        }
-      });
-    };
     return resin.models.device.getName(uuid).then(function(deviceName) {
+      var poll, spinner;
+      spinner = new visuals.Spinner("Waiting for " + deviceName + " to come online");
+      poll = function() {
+        return resin.models.device.isOnline(uuid).then(function(isOnline) {
+          if (isOnline) {
+            spinner.stop();
+            console.info("Device became online: " + deviceName);
+          } else {
+            spinner.start();
+            return Promise.delay(3000).then(poll);
+          }
+        });
+      };
       console.info("Waiting for " + deviceName + " to connect to resin...");
       return poll()["return"](uuid);
     });
diff --git a/lib/utils/patterns.coffee b/lib/utils/patterns.coffee
index b4b22bca..bfe1d7cf 100644
--- a/lib/utils/patterns.coffee
+++ b/lib/utils/patterns.coffee
@@ -62,23 +62,23 @@ exports.selectProjectDirectory = ->
 			default: projectsDirectory
 
 exports.awaitDevice = (uuid) ->
-	spinner = new visuals.Spinner("Waiting for your device to come online: #{uuid}")
-
-	poll = ->
-		resin.models.device.isOnline(uuid).then (isOnline) ->
-			if isOnline
-				spinner.stop()
-				console.info("Device became online: #{uuid}")
-				return
-			else
-
-				# Spinner implementation is smart enough to
-				# not start again if it was already started
-				spinner.start()
-
-				return Promise.delay(3000).then(poll)
-
 	resin.models.device.getName(uuid).then (deviceName) ->
+		spinner = new visuals.Spinner("Waiting for #{deviceName} to come online")
+
+		poll = ->
+			resin.models.device.isOnline(uuid).then (isOnline) ->
+				if isOnline
+					spinner.stop()
+					console.info("Device became online: #{deviceName}")
+					return
+				else
+
+					# Spinner implementation is smart enough to
+					# not start again if it was already started
+					spinner.start()
+
+					return Promise.delay(3000).then(poll)
+
 		console.info("Waiting for #{deviceName} to connect to resin...")
 		poll().return(uuid)