From 4bd032922a35eb0d0620d4ee1e0b245c87d600b3 Mon Sep 17 00:00:00 2001
From: Mike Bland <michael.bland@gsa.gov>
Date: Wed, 23 Sep 2015 05:13:35 -0400
Subject: [PATCH 1/3] Ensure 18F/hookshot is run; pass jsonOptions right

config.payloadLimit wasn't getting passed to the hookshot constructor as it
should have been, and therefore wasn't having any effect.
---
 fabfile.py   | 12 ++++++++----
 package.json |  3 +++
 pages.js     |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index f2c0c8b..b23514b 100755
--- a/fabfile.py
+++ b/fabfile.py
@@ -4,13 +4,17 @@
 
 fabric.api.env.use_ssh_config = True
 fabric.api.env.hosts = ['18f-pages']
-CMD = "pages/pages.js"
+PAGES_DIR = "pages"
+CMD = "pages.js"
 
 def start():
-  fabric.api.run("forever start -l $HOME/pages.log -a %s" % CMD)
+  with fabric.api.cd("pages"):
+    fabric.api.run("forever start -l $HOME/pages.log -a %s" % CMD)
 
 def stop():
-  fabric.api.run("forever stop %s" % CMD)
+  with fabric.api.cd("pages"):
+    fabric.api.run("forever stop %s" % CMD)
 
 def restart():
-  fabric.api.run("forever restart %s" % CMD)
+  with fabric.api.cd("pages"):
+    fabric.api.run("forever restart %s" % CMD)
diff --git a/package.json b/package.json
index 7063480..5aff5ef 100644
--- a/package.json
+++ b/package.json
@@ -30,5 +30,8 @@
     "mocha": "^2.2.5",
     "mock-spawn": "^0.2.6",
     "sinon": "^1.15.4"
+  },
+  "dependencies": {
+    "hookshot": "18f/hookshot#json-options"
   }
 }
diff --git a/pages.js b/pages.js
index 1bcb38a..88a74d7 100644
--- a/pages.js
+++ b/pages.js
@@ -27,13 +27,13 @@ function SiteBuilderOptions(info, repoDir, destDir) {
     config.rsync, config.rsyncOpts);
 }
 
-var webhook = hookshot();
+var webhook = hookshot(null, null, jsonOptions);
 
 function makeBuilderListener(builderConfig) {
   webhook.on('refs/heads/' + builderConfig.branch, function(info) {
     siteBuilder.launchBuilder(info, new SiteBuilderOptions(
       info, builderConfig.repositoryDir, builderConfig.generatedSiteDir));
-  }, jsonOptions);
+  });
 }
 
 var numBuilders = config.builders.length;

From f46a1c566478cb6dfc37b69499c289522a9f7a75 Mon Sep 17 00:00:00 2001
From: Mike Bland <michael.bland@gsa.gov>
Date: Wed, 23 Sep 2015 05:34:05 -0400
Subject: [PATCH 2/3] Use PAGES_DIR variable

---
 fabfile.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index b23514b..6dc0b48 100755
--- a/fabfile.py
+++ b/fabfile.py
@@ -8,13 +8,13 @@
 CMD = "pages.js"
 
 def start():
-  with fabric.api.cd("pages"):
+  with fabric.api.cd(PAGES_DIR):
     fabric.api.run("forever start -l $HOME/pages.log -a %s" % CMD)
 
 def stop():
-  with fabric.api.cd("pages"):
+  with fabric.api.cd(PAGES_DIR):
     fabric.api.run("forever stop %s" % CMD)
 
 def restart():
-  with fabric.api.cd("pages"):
+  with fabric.api.cd(PAGES_DIR):
     fabric.api.run("forever restart %s" % CMD)

From d4bd862a03bc21cf01412535d346481bf1ce8335 Mon Sep 17 00:00:00 2001
From: Mike Bland <michael.bland@gsa.gov>
Date: Wed, 23 Sep 2015 05:43:21 -0400
Subject: [PATCH 3/3] Move file-locked-operation to dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5aff5ef..f8eaaa4 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
   "devDependencies": {
     "chai": "^3.2.0",
     "chai-as-promised": "^5.1.0",
-    "file-locked-operation": "0.0.1",
     "gulp": "^3.9.0",
     "gulp-jshint": "^1.11.2",
     "gulp-mocha": "^2.1.3",
@@ -32,6 +31,7 @@
     "sinon": "^1.15.4"
   },
   "dependencies": {
+    "file-locked-operation": "0.0.1",
     "hookshot": "18f/hookshot#json-options"
   }
 }