From 0a8ebca67a5860c62c4af783d823ea2c3078c245 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 14 Aug 2013 12:11:09 -0700
Subject: [PATCH] Use an async waterfall to chain deploy commands

---
 tasks/docs-task.coffee | 50 +++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/tasks/docs-task.coffee b/tasks/docs-task.coffee
index fb027522d..6206e7fe5 100644
--- a/tasks/docs-task.coffee
+++ b/tasks/docs-task.coffee
@@ -24,29 +24,35 @@ module.exports = (grunt) ->
   grunt.registerTask 'deploy-docs', 'Publishes latest API docs to atom-docs.githubapp.com', ->
     done = @async()
 
-    pushHeroku = (error, result, code) ->
-      sha = String(result).trim()
-      cmd = 'git'
-      args = ['--work-tree=../atom-docs/', '--git-dir=../atom-docs/.git/', 'push', 'heroku', 'master']
-      grunt.util.spawn({cmd, args, opts}, done)
+    copyDocs = (args..., callback) ->
+      cmd = 'cp'
+      args = ['-r', 'docs/api', '../atom-docs/public/']
+      grunt.util.spawn({cmd, args, opts}, callback)
 
-    pushOrigin = (error, result, code) ->
-      sha = String(result).trim()
-      cmd = 'git'
-      args = ['--work-tree=../atom-docs/', '--git-dir=../atom-docs/.git/', 'push', 'origin', 'master']
-      grunt.util.spawn({cmd, args, opts}, pushHeroku)
-
-    commitChanges = (error, result, code) ->
-      sha = String(result).trim()
-      cmd = 'git'
-      args = ['--work-tree=../atom-docs/', '--git-dir=../atom-docs/.git/', 'commit', '-a', "-m Update API docs to #{sha}"]
-      grunt.util.spawn({cmd, args, opts}, pushOrigin)
-
-    fetchSha = (error, result, code) ->
+    fetchSha = (args..., callback) ->
       cmd = 'git'
       args = ['rev-parse', 'HEAD']
-      grunt.util.spawn({cmd, args}, commitChanges)
+      grunt.util.spawn {cmd, args}, (error, result) ->
+        if error?
+          callback(error)
+        else
+          callback(null, String(result).trim())
 
-    cmd = 'cp'
-    args = ['-r', 'docs/api', '../atom-docs/public/']
-    grunt.util.spawn {cmd, args, opts}, fetchSha
+    docsRepoArgs = ['--work-tree=../atom-docs/', '--git-dir=../atom-docs/.git/']
+
+    commitChanges = (sha, callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'commit', '-a', "-m Update API docs to #{sha}"]
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    pushOrigin = (args..., callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'push', 'origin', 'master']
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    pushHeroku = (args..., callback) ->
+      cmd = 'git'
+      args = [docsRepoArgs..., 'push', 'heroku', 'master']
+      grunt.util.spawn({cmd, args, opts}, callback)
+
+    grunt.util.async.waterfall [copyDocs, fetchSha, commitChanges, pushOrigin, pushHeroku], done