make multi-api call funcs session-aware

[af-coffee.git] / client.coffee

diff --git a/client.coffee b/client.coffee
index 8ae4715..84fff91 100755 (executable)
--- a/client.coffee
+++ b/client.coffee
@@ -12,6 +12,43 @@ timeout = (ms, f) -> setTimeout f, ms
 # password if it goes stale. It re-tries API calls that fail due to
 # invalid/expired token
 
+commands = {}
+for k, v of af
+       commands[k] = v unless k is 'login'
+
+# this is the friendly one that updates the files then restarts the app
+commands.app_publish = (token, app_name, zip_file, callback) ->
+       async.waterfall [
+               (callback) =>      @api 'app_update_files', app_name, zip_file, callback
+               (res, callback) => @api 'app_restart',      app_name, callback
+       ], callback
+
+commands.app_set_state = (token, app_name, state, callback) ->
+       async.waterfall [
+               (callback) =>
+                       @api 'app_info', app_name, callback
+               (info, callback) =>
+                       info.state = state
+                       @api 'app_set_info', app_name, info, callback
+       ], callback
+
+commands.app_start = (token, app_name, callback) ->
+       @api 'app_set_state', app_name, 'STARTED', callback
+
+commands.app_stop = (token, app_name, callback) ->
+       @api 'app_set_state', app_name, 'STOPPED', callback
+
+
+commands.app_restart = (token, app_name, callback) ->
+       # Server requires you to fetch the app state before each call to change
+       # it, so there's no quicker way than just calling app_stop then app_start
+       async.waterfall [
+               (callback) =>      @api 'app_stop',  app_name, callback
+               (res, callback) => @api 'app_start', app_name, callback
+       ], callback
+
+
+
 class Session
        constructor: ->
                @token = 0
@@ -28,7 +65,8 @@ class Session
                                                callback null, @token
                        (token, callback) =>
                                @token = token
-                               af[call] @token, args..., callback
+                               # commands implemented in client.coffee need "this" pointing to the session
+                               commands[call].call this, @token, args..., callback
                ], (err, result) =>
                        # eg /app/xxx/stats sometimes returns 404 with wrong auth token
                        if err?.code is 403 or err?.code is 404
@@ -36,7 +74,7 @@ class Session
                                @api(call, args..., callback)
                        else
                                callback err, result
-                               
+
 ask = (opts, callback) ->
        process.stdout.write opts.prompt
        process.stdin.setEncoding 'utf8'
@@ -68,7 +106,7 @@ login = (callback) ->
                        # wait for file write so there's no race condition if get_token gets called soon
                        fs.writeFile token_file, token, (err) ->
                                if err
-                                       console.log "Warning: couldn't cache auth token in #{token_file}: ", err
+                                       process.stderr.write "Warning: couldn't cache auth token in #{token_file}: #{err}\n"
                                # don't pass on error, it's ok if we can't cache it
                                callback null, token
        ], callback
@@ -78,23 +116,24 @@ exports.new_session = ->
        return new Session()
 
 usage = ->
-       console.log "usage: #{process.argv[0]} #{process.argv[1]} command [args...]"
-       console.log "valid commands are:"
-       for k, v of af
-               console.log "\t#{k}" unless k is 'login'
+       process.stderr.write "usage: #{process.argv[0]} #{process.argv[1]} command [args...]\n"
+       process.stderr.write "valid commands are:\n\t#{(k for k, v of commands).join '\n\t'}\n"
 
 # parse and act on commandline arguments unless we were require()d as a module
 if require.main is module
        args = process.argv[2..]
        if args.length is 0
                usage()
-       else if not af[args[0]]
-               console.log "unknown command \"#{args[0]}\""
+       else if not commands[args[0]]
+               process.stderr.write "unknown command \"#{args[0]}\"\n"
                usage()
        else
                session = new Session()
-               session.api args[0], args[1..], (err, result) ->
+               session.api args[0], args[1..]..., (err, result) ->
                        if err?
-                               console.log "error: ", err
+                               process.stderr.write "Error: #{JSON.stringify err}\n"
                        if result?
-                               console.log "result: ", result
+                               if typeof result is 'string'
+                                       process.stdout.write result
+                               else
+                                       process.stdout.write JSON.stringify result