Merge pull request #270 from Financial-Times/minor-fixes

CLI won't break if task does not return promise or stream, and docume…

README.md

@@ -50,7 +50,7 @@ All the tasks are built using [gulp](http://gulpjs.com/), and almost all of them
 
 	Mostly used options include:
 	   [--watch]                    Re-run every time a file changes
-	   [--local]                    Build demos locally
+	   [--runServer]                Build demos locally and runs a server
 	   [--updateorigami]            Update origami.json with the latest demo files created
 	   [--js=<path>]                Main JavaScript file (default: ./src/main.js)
 	   [--sass=<path>]              Main Sass file (default: ./src/main.scss)

lib/origami-build-tools-cli.js

@@ -39,7 +39,7 @@ function printUsage(commands) {
 	console.log('');
 	console.log('Mostly used options include:');
 	console.log('   [--watch]                    Re-run every time a file changes');
-	console.log('   [--local]                    Build demos locally');
+	console.log('   [--runServer]                Build demos locally and runs a server');
 	console.log('   [--updateorigami]            Update origami.json with the latest demo files created');
 	console.log('   [--js=<path>]                Main JavaScript file (default: ./src/main.js)');
 	console.log('   [--sass=<path>]              Main Sass file (default: ./src/main.scss)');
@@ -78,12 +78,15 @@ if (tasks.isValid(argument)) {
 		watcher.run(task, gulp, argv);
 	} else {
 		var taskResult = task(gulp, argv);
-		// Check if the function returns a Promise
-		if (taskResult instanceof Promise) {
-			taskResult.catch(reportTaskError);
-		// Check if it's a stream
-		} else if (taskResult.on) {
-			taskResult.on('error', reportTaskError);
+
+		if (typeof taskResult !== 'undefined' && taskResult !== null) {
+			// Check if the function returns a Promise
+			if (taskResult instanceof Promise) {
+				taskResult.catch(reportTaskError);
+			// Check if it's a stream
+			} else if (taskResult.on) {
+				taskResult.on('error', reportTaskError);
+			}
 		}
 	}
 } else {