Some style hints

[perso/Immae/Projets/Nodejs/Surfer.git] / cli / actions.js

diff --git a/cli/actions.js b/cli/actions.js
index 25643da705a0070153af8ec6bff6f3f44f88a432..b49ce5900e63196147e1dbff4dd0db28645aaa05 100644 (file)
--- a/cli/actions.js
+++ b/cli/actions.js
@@ -55,18 +55,18 @@ function collectFiles(filesOrFolders, options) {
 
 function login(uri) {
     var tmp = url.parse(uri);
-    if (!tmp.host) tmp = url.parse('https://' + uri);
+    if (!tmp.slashes) tmp = url.parse('https://' + uri);
 
     var server = tmp.protocol + '//' + tmp.host;
 
-    console.log('Using server', server.bold);
+    console.log('Using server', server.cyan);
 
-    var username = readlineSync.question('Username: ', { hideEchoBack: false });
-    var password = readlineSync.question('Password: ', { hideEchoBack: true });
+    var username = readlineSync.question('Username: ');
+    var password = readlineSync.question('Password: ', { noEchoBack: true });
 
     superagent.get(server + API + '/').query({ username: username, password: password }).end(function (error, result) {
         if (error && error.code === 'ENOTFOUND') {
-            console.log('No such server %s'.red, server.bold);
+            console.log('Server %s not found.'.red, server.bold);
             process.exit(1);
         }
         if (error && error.code) {
@@ -86,7 +86,7 @@ function login(uri) {
 
         gQuery = { username: username, password: password };
 
-        console.log('Ok'.green);
+        console.log('Login successful'.green);
     });
 }
 
@@ -97,9 +97,10 @@ function put(filePath, otherFilePaths, options) {
 
     async.eachSeries(files, function (file, callback) {
         var relativeFilePath;
+
         if (path.isAbsolute(file)) {
             relativeFilePath = path.basename(file);
-        } else if (path.resolve(file).indexOf(process.cwd().length) === 0) { // relative to current dir
+        } else if (path.resolve(file).indexOf(process.cwd()) === 0) { // relative to current dir
             relativeFilePath = path.resolve(file).slice(process.cwd().length + 1);
         } else { // relative but somewhere else
             relativeFilePath = path.basename(file);
@@ -113,6 +114,8 @@ function put(filePath, otherFilePaths, options) {
             if (result.statusCode !== 201) return callback(new Error('Error uploading file: ' + result.statusCode));
 
             console.log('Uploaded to ' + config.server() + destinationPath);
+
+            callback(null);
         });
     }, function (error) {
         if (error) {