CLI wrapper and entry point restructure to allow for programmatic usage

Author: James Wright

lib/index.js

@@ -1,32 +1,18 @@
-#! /usr/bin/env node
-
 'use strict';
 
-const config = require('./config');
 const intro = require('./intro');
 const runner = require('./runner');
 const localAppServer = require('./localAppServer');
 const resultsPrinter = require('./resultsPrinter');
 
-intro();
-
-const prerun = config.localAppServer
-? localAppServer.start(config.localAppServer)
-: Promise.resolve();
-
-prerun.then(runner)
-.then(results => resultsPrinter.printResults(results))
-.then(onValidated).catch(onError);
-
 function onValidated(results) {
-const failed = hasErrors(results);
+const hasFailed = hasErrors(results);
 
-if (!failed) {
+if (!hasFailed) {
 console.info('Congratulations! Your HTML is valid!');
-exit(0);
-} 
+}
 
-exit(config.failHard ? 1 : 0);
+return hasFailed;
 }
 
 function hasErrors(results) {
@@ -35,14 +21,30 @@ function hasErrors(results) {
 
 function onError(error) {
 console.error(error);
-exit(1);
+exit(true);
 }
 
-function exit(exitCode) {
+function exit(hasFailed, config) {
+const exitCode = hasFailed && config.failHard ? 1 : 0;
+
 if (config.localAppServer) {
 localAppServer.stop();
 }
 
 resultsPrinter.resetStdout();
 process.exit(exitCode);
-}
+}
+
+module.exports = function valimate(config) {
+intro();
+
+const prerun = config.localAppServer
+? localAppServer.start(config.localAppServer)
+: Promise.resolve();
+
+return prerun.then(runner)
+.then(results => resultsPrinter.printResults(results))
+.then(onValidated)
+.then(hasFailed => exit(hasFailed, config))
+.catch(() => onError(true, config));
+};

package.json

@@ -3,28 +3,37 @@
  "version": "2.1.2",
  "description": "Automated HTML validation for Node.js applications",
  "repository": "https://github.com/jamesseanwright/valimate",
+
  "bin": {
  "valimate": "lib/index.js"
  },
+
+ "main": "lib/index.js",
+
  "scripts": {
- "test": "eslint {lib,tests} && mocha && node lib"
+ "test": "eslint {lib,tests} && mocha && node valimate"
  },
+
  "keywords": [
  "html",
+ "html5",
  "validate",
  "validation",
  "w3",
  "w3c"
  ],
+
  "author": "James Wright <james@jamesswright.co.uk>",
  "license": "ISC",
+
  "devDependencies": {
  "chai": "3.4.1",
  "eslint": "3.10.2",
  "mocha": "2.3.4",
  "sinon": "1.17.2",
  "valimate-notifier": "1.0.2"
  },
+
  "dependencies": {
  "request": "2.74.0"
  }

valimate.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+
+const config = require('./lib/config');
+const valimate = require('./lib');
+
+valimate(config);