Merge pull request #14 from Financial-Times/issue-13

Should have a non-zero exit status if command invalid — fixes #13

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 script: npm test
 node_js:
-- '0.10'
+- '0.12'
 before_deploy:
 - npm-prepublish --verbose
 deploy:

bin/next-build-tools.js

@@ -12,7 +12,7 @@ var provision = require('../tasks/provision');
 var downloadConfiguration = require('../tasks/download-configuration');
 
 function list(val) {
-  return val.split(',');
+	return val.split(',');
 }
 
 function exit(err) {
@@ -66,4 +66,15 @@ program
 			}
 		});
 
+	program
+		.command('*')
+		.description('')
+		.action(function(app) {
+			exit("The command ‘" + app + "’ is not known");
+		});
+
 program.parse(process.argv);
+
+if (!process.argv.slice(2).length) {
+	program.outputHelp();
+}

lib/heroku-auth-token.js

@@ -1,3 +1,4 @@
+/*jshint node:true*/
 'use strict';
 
 var denodeify = require('denodeify');

package.json

@@ -5,21 +5,20 @@
     "next-build-tools": "./bin/next-build-tools.js"
   },
   "scripts": {
-    "test": "jshint `find . -name '*.js' ! -path './node_modules/*'`"
+    "test": "origami-build-tools verify"
   },
   "dependencies": {
     "commander": "^2.6.0",
     "debug": "^2.1.1",
     "denodeify": "^1.2.0",
     "es6-promise": "^2.0.1",
-    "haikro": "^1.12.0",
+    "haikro": "^1.9.0",
     "heroku-client": "^1.9.1",
     "fetchres": "^1.0.4",
-    "haikro": "^1.9.0",
     "isomorphic-fetch": "^1.1.0"
   },
   "devDependencies": {
-    "jshint": "^2.6.0",
-    "npm-prepublish": "^1.2.0"
+    "npm-prepublish": "^1.2.0",
+    "origami-build-tools": "^2.10.0"
   }
 }

tasks/clean.js

@@ -1,3 +1,4 @@
+/*jshint node:true*/
 'use strict';
 
 var denodeify = require('denodeify');

tasks/configure.js

@@ -1,3 +1,5 @@
+/*jshint node:true*/
+/*global fetch*/
 'use strict';
 
 var packageJson = require(process.cwd() + '/package.json');
@@ -6,12 +8,12 @@ var normalizeName = require('../lib/normalize-name');
 var fetchres = require('fetchres');
 
 module.exports = function(opts) {
-	
+
 	var source = opts.source || 'ft-next-' + normalizeName(packageJson.name);
 	var target = opts.target || source;
 	var overrides = {};
 
-	if (opts.overrides) { 
+	if (opts.overrides) {
 		opts.overrides.map(function (o) {
 			var t = o.split('=');
 			overrides[t[0]] = t[1];
@@ -58,7 +60,7 @@ module.exports = function(opts) {
 			Object.keys(desired).forEach(function(key) {
 				patch[key] = desired[key];
 			});
-			
+
 			Object.keys(overrides).forEach(function(key) {
 				patch[key] = overrides[key];
 			});
@@ -70,9 +72,9 @@ module.exports = function(opts) {
 					console.log("Setting config var: " + key);
 				}
 			});
-			
+
 			console.log("Setting environment to", patch);
-			
+
 			return fetch('https://api.heroku.com/apps/' + target + '/config-vars', {
 				headers: authorizedPostHeaders,
 				method: 'patch',

tasks/deploy.js

@@ -1,3 +1,4 @@
+/*jshint node:true*/
 "use strict";
 
 var packageJson = require(process.cwd() + '/package.json');

tasks/download-configuration.js

@@ -1,3 +1,5 @@
+/*jshint node:true*/
+/*global fetch*/
 'use strict';
 
 var herokuAuthToken = require('../lib/heroku-auth-token');

tasks/provision.js

@@ -1,34 +1,32 @@
+/*jshint node:true*/
+'use strict';
 
-var debug  = require('debug')('next-build-tools');
-var packageJson = require(process.cwd() + '/package.json');
 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 logger = require('haikro/lib/logger');
-var normalizeName = require('../lib/normalize-name');
 
 // create a Heroku application server
 module.exports = function (name) {
+	var heroku_auth = process.env.HEROKU_AUTH_TOKEN;
 
-    var heroku_auth = process.env.HEROKU_AUTH_TOKEN;
-
-    if (!heroku_auth) {
-        throw "You need to set a HEROKU_AUTH_TOKEN environment variables";
-    }
+	if (!heroku_auth) {
+		throw "You need to set a HEROKU_AUTH_TOKEN environment variables";
+	}
 
 	var token;
 	return Promise.all([
 		process.env.HEROKU_AUTH_TOKEN ? Promise.resolve(process.env.HEROKU_AUTH_TOKEN) : exec('heroku auth:token'),
 	])
 		.then(function(results) {
-	        logger.setLevel('debug');
+			logger.setLevel('debug');
 			token = results[0].trim();
-            var server = {
-                app: name, 
-                region: 'eu',
+			var server = {
+				app: name,
+				region: 'eu',
 				token: token,
-                organization: 'financial-times'
-            };
-            return create(server);
+				organization: 'financial-times'
+			};
+			return create(server);
 		});
 };