separated cli stuff from generator, renamed package

Author: lgraubner

.eslintrc.json

@@ -6,6 +6,7 @@
     "func-names": 0,
     "object-shorthand": 0,
     "camelcase": 0,
-    "new-cap": 0
+    "new-cap": 0,
+    "strict": 0
   }
 }

index.js cli.jsindex.js renamed to cli.js

@@ -23,7 +23,13 @@ if (!program.args[0]) {
 require('find-java-home')(function (err, java_home) {
   var validator;
   if (!err) {
-    validator = new W3CValidator(program.args[0], java_home);
+    validator = new W3CValidator({
+      url: program.args[0],
+      query: program.query,
+      verbose: program.verbose,
+      log: program.log,
+      max: program.max,
+    }, java_home);
     validator.start();
   } else {
     console.error(chalk.red.bold('Error: Java is required to use w3c-validator!'));

lib/W3CValidator.js

@@ -2,7 +2,6 @@
 
 var path = require('path');
 var Crawler = require('simplecrawler');
-var program = require('commander');
 var chalk = require('chalk');
 var exec = require('child_process').exec;
 var _ = {
@@ -13,7 +12,7 @@ var Spinner = require('cli-spinner').Spinner;
 var URL = require('url-parse');
 var fs = require('fs');
 
-function W3CValidator(url, java_home) {
+function W3CValidator(options, java_home) {
   var port = 80;
   var exclude = ['swf', 'pdf', 'ps', 'dwf', 'kml', 'kmz', 'gpx', 'hwp',
     'ppt', 'pptx', 'doc', 'docx', 'odp', 'ods', 'odt', 'rtf', 'wri', 'svg',
@@ -23,6 +22,7 @@ function W3CValidator(url, java_home) {
   var exts = exclude.join('|');
   var regex = new RegExp('\.(' + exts + ')', 'i');
 
+  this.options = options;
   this.chunk = [];
   this.count = 0;
   this.valid = 0;
@@ -31,7 +31,7 @@ function W3CValidator(url, java_home) {
   this.logData = '';
   this.httpProxy = false;
 
-  this.uri = new URL(url);
+  this.uri = new URL(this.options.url);
   this.crawler = new Crawler(this.uri.host);
 
   this.logFileName = 'w3c-check-' + +new Date() + '-' + this.uri.host;
@@ -66,7 +66,7 @@ function W3CValidator(url, java_home) {
   this.crawler.initialProtocol = this.uri.protocol.replace(':', '');
   this.crawler.userAgent = 'Node/W3CValidator';
 
-  if (!program.query) {
+  if (!this.options.query) {
     this.crawler.stripQuerystring = true;
   }
 
@@ -103,13 +103,13 @@ W3CValidator.prototype.checkURL = function () {
         this.invalid++;
         console.log(chalk.red.bold('×', url));
 
-        if (program.verbose) {
+        if (this.options.verbose) {
           _.forEach(errors.messages, function (m) {
             console.log('  Line ' + m.lastLine + ':  ' + m.message);
           });
         }
 
-        if (program.log && errors.messages) {
+        if (this.options.log && errors.messages) {
           this.logData += '\n' + url + '\n';
           _.forEach(errors.messages, function (m) {
             this.logData += '  Line ' + m.lastLine + ':  ' + m.message;
@@ -126,7 +126,7 @@ W3CValidator.prototype.checkURL = function () {
           process.exit();
         };
 
-        if (program.log) {
+        if (this.options.log) {
           fs.writeFile(path.join('./', this.logFileName + '.txt'),
           this.logData, function () {
             console.log('Wrote logged error data to \'%s.txt\'.', this.logFileName);
@@ -148,7 +148,7 @@ W3CValidator.prototype.start = function () {
 
   this.crawler.on('fetchcomplete', function (item) {
     this.chunk.push(item.url);
-    if (program.max && this.chunk.length >= program.max) {
+    if (this.options.max && this.chunk.length >= this.options.max) {
       this.crawler.emit('complete');
       this.crawler.stop();
     }
@@ -161,7 +161,7 @@ W3CValidator.prototype.start = function () {
     if (!_.isEmpty(this.chunk)) {
       this.checkURL();
     } else {
-      console.error(chalk.red.bold('Error: Site "%s" could not be found.'), program.args[0]);
+      console.error(chalk.red.bold('Error: Site "%s" could not be found.'), this.options.url);
       process.exit(1);
     }
   }.bind(this));

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "w3c-validator",
-  "version": "3.2.0",
+  "name": "w3c-validator-cli",
+  "version": "3.3.0",
   "description": "Crawls a given site and checks for W3C validity.",
-  "homepage": "https://github.com/lgraubner/node-w3c-validator",
+  "homepage": "https://github.com/lgraubner/node-w3c-validator-cli",
   "author": {
     "name": "Lars Graubner",
     "email": "[email protected]",
@@ -15,15 +15,16 @@
     "w3c",
     "validator",
     "crawler",
-    "check"
+    "check",
+    "ecosystem:node"
   ],
-  "main": "index.js",
+  "main": "cli.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/lgraubner/node-w3c-validator.git"
+    "url": "https://github.com/lgraubner/node-w3c-validator-cli.git"
   },
   "bugs": {
-    "url": "https://github.com/lgraubner/node-w3c-validator/issues"
+    "url": "https://github.com/lgraubner/node-w3c-validator-cli/issues"
   },
   "dependencies": {
     "simplecrawler": "^0.5.4",
@@ -39,11 +40,11 @@
     "node": ">=0.12"
   },
   "bin": {
-    "w3c-validator": "index.js"
+    "w3c-validator": "cli.js"
   },
   "license": "MIT",
   "scripts": {
-    "test": "eslint index.js lib/** && NODE_ENV=development mocha test"
+    "test": "eslint cli.js lib/** && NODE_ENV=development mocha test"
   },
   "devDependencies": {
     "chai": "^3.4.1",

test/cli.js

@@ -13,7 +13,7 @@ describe('$ w3c-validator invalid', function () {
   var _stderr;
 
   before(function (done) {
-    exec('node ./index.js illegal', function cmd(error, stdout, stderr) {
+    exec('node ./cli.js illegal', function cmd(error, stdout, stderr) {
       _error = error;
       _stderr = stderr;
       done();
@@ -37,7 +37,7 @@ describe('$ w3c-validator 127.0.0.1', function () {
   this.timeout(10000);
 
   before(function (done) {
-    exec('node ./index.js 127.0.0.1', function cmd(error, stdout, stderr) {
+    exec('node ./cli.js 127.0.0.1', function cmd(error, stdout, stderr) {
       _error = error;
       _stdout = stdout;
       _stderr = stderr;
@@ -61,7 +61,7 @@ describe('$ w3c-validator --log 127.0.0.1', function () {
   });
 
   before(function (done) {
-    exec('node ./index.js --log', function cmd() {
+    exec('node ./cli.js --log', function cmd() {
       done();
     });
   });