Ensure 18F/hookshot is run; pass jsonOptions right

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_DIR):
+    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_DIR):
+    fabric.api.run("forever stop %s" % CMD)
 
 def restart():
-  fabric.api.run("forever restart %s" % CMD)
+  with fabric.api.cd(PAGES_DIR):
+    fabric.api.run("forever restart %s" % CMD)

package.json

@@ -22,13 +22,16 @@
   "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",
     "jshint": "^2.8.0",
     "mocha": "^2.2.5",
     "mock-spawn": "^0.2.6",
     "sinon": "^1.15.4"
+  },
+  "dependencies": {
+    "file-locked-operation": "0.0.1",
+    "hookshot": "18f/hookshot#json-options"
   }
 }

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;