Merge pull request #19 from Financial-Times/destroy-before-provision

Destroy before provision in case a branch build runs within 10 mins of the last branch build

tasks/provision.js

@@ -1,25 +1,29 @@
 'use strict';
 
-var denodeify = require('denodeify');
-var exec = denodeify(require('child_process').exec, function(err, stdout, stderr) { return [err, stdout]; });
 var create = require('haikro/lib/create');
+var destroy = require('haikro/lib/destroy');
 var logger = require('haikro/lib/logger');
+var herokuAuthToken = require('../lib/heroku-auth-token');
 
 // create a Heroku application server
-module.exports = function (name) {
-	var heroku_auth = process.env.HEROKU_AUTH_TOKEN;
-
-	if (!heroku_auth) {
-		throw "You need to set a HEROKU_AUTH_TOKEN environment variables";
-	}
-
+module.exports = function(name) {
 	var token;
-	return Promise.all([
-		process.env.HEROKU_AUTH_TOKEN ? Promise.resolve(process.env.HEROKU_AUTH_TOKEN) : exec('heroku auth:token'),
-	])
-		.then(function(results) {
+
+	return herokuAuthToken()
+		.then(function(result) {
 			logger.setLevel('debug');
-			token = results[0].trim();
+			token = result;
+			logger.verbose("Hack: Attempt to destroy app if already exists");
+			return destroy({
+				token: token,
+				app: name
+
+			// Suppress any errors
+			}).catch(function() {
+
+			});
+		})
+		.then(function() {
 			var server = {
 				app: name,
 				region: 'eu',