fit prompts into verbose/indentation scheme

diff --git a/client.coffee b/client.coffee
index a7dbca5..9765703 100755 (executable)
--- a/client.coffee
+++ b/client.coffee
@@ -85,7 +85,7 @@ class Session
                                        when 0
                                                get_token callback
                                        when -1
-                                               login callback
+                                               login.call this, callback
                                        else
                                                callback null, @token
                        (token, callback) =>
@@ -103,17 +103,18 @@ class Session
                        else
                                callback err, result
 
-ask = (opts, callback) ->
-       process.stdout.write opts.prompt
-       process.stdin.setEncoding 'utf8'
-       process.stdin.resume()
-       process.stdin.once 'data', (line) ->
-               if opts.silent
-                       # send ^[[A^[[2K to move the cursor up one line, then clear that line
-                       process.stdout.write new Buffer [27, 91, 65, 27, 91, 50, 75]
-                       process.stdout.write opts.prompt + "***\n"
-               process.stdin.pause()
-               callback null, (line.substr 0, line.length - 1)
+       ask: (opts, callback) ->
+               process.stdout.write @log_whitespace() + opts.prompt
+               process.stdin.setEncoding 'utf8'
+               process.stdin.resume()
+               process.stdin.once 'data', (line) =>
+                       if opts.silent
+                               # send ^[[A^[[2K to move the cursor up one line, then clear that line
+                               process.stdout.write new Buffer [27, 91, 65, 27, 91, 50, 75]
+                               process.stdout.write @log_whitespace() + opts.prompt + "***\n"
+                       process.stdin.pause()
+                       @log_mid = false
+                       callback null, (line.substr 0, line.length - 1)
 
 get_token = (callback) ->
        fs.readFile token_file, 'utf8', (err, token) ->
@@ -124,9 +125,9 @@ get_token = (callback) ->
 
 login = (callback) ->
        async.waterfall [
-               (callback) -> async.series [
-                       (callback) -> ask prompt: 'username: ', callback
-                       (callback) -> ask prompt: 'password: ', silent: true, callback
+               (callback) => async.series [
+                       (callback) => @ask prompt: 'username: ', callback
+                       (callback) => @ask prompt: 'password: ', silent: true, callback
                ], callback
                ([username, password], callback) ->
                        af.login username, password, callback