From 17916f48c3cdb0c126c5eef7d0ab379a59f92af1 Mon Sep 17 00:00:00 2001 From: Maximilian Antoni Date: Fri, 2 Jun 2017 10:32:39 +0200 Subject: [PATCH] Use eslint and fix linter issues --- .eslintrc | 70 +++ Makefile | 5 +- autolint.js | 13 - bin/blogdown.bin.js | 8 +- lib/blogdown.js | 13 +- lib/file-reader.js | 5 +- lib/file-writer.js | 2 +- lib/folder-reader.js | 10 +- lib/html-renderer.js | 2 +- lib/item-processor.js | 2 +- lib/item-reader.js | 4 +- lib/list.js | 5 +- lib/log.js | 13 +- lib/merger.js | 4 +- lib/meta.js | 4 +- lib/reader.js | 18 +- lib/resolver.js | 2 +- lib/template-reader.js | 10 +- package-lock.json | 845 +++++++++++++++++++++++++++++++++-- package.json | 10 +- test/blogdown-test.js | 39 +- test/file-reader-test.js | 38 +- test/file-writer-test.js | 7 +- test/folder-reader-test.js | 8 +- test/html-renderer-test.js | 6 +- test/item-processor-test.js | 10 +- test/item-reader-test.js | 9 +- test/list-test.js | 9 +- test/merger-test.js | 3 +- test/meta-test.js | 12 +- test/options-test.js | 7 +- test/reader-test.js | 16 +- test/resolver-test.js | 2 +- test/template-reader-test.js | 11 +- 34 files changed, 1025 insertions(+), 197 deletions(-) create mode 100644 .eslintrc delete mode 100644 autolint.js diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..40eef28 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,70 @@ +root: true + +env: + node: true + +extends: "eslint:recommended" + +rules: + array-bracket-spacing: [2, "never"] + block-scoped-var: 2 + block-spacing: 2 + brace-style: [2, "1tbs", { allowSingleLine: true }] + comma-spacing: [2, { before: false, after: true }] + comma-style: [2, "last"] + consistent-return: 2 + curly: 2 + dot-notation: 2 + dot-location: [2, "property"] + eqeqeq: 2 + handle-callback-err: 2 + guard-for-in: 2 + indent: [2, 2] + linebreak-style: [2, "unix"] + max-len: [2, 80, 4] + new-cap: 2 + new-parens: 2 + no-alert: 2 + no-caller: 2 + no-catch-shadow: 2 + no-console: 0 + no-else-return: 2 + no-eq-null: 2 + no-eval: 2 + no-extend-native: [2] + no-extra-bind: 2 + no-implied-eval: 2 + no-lonely-if: 2 + no-loop-func: 2 + no-multiple-empty-lines: [2, { max: 2 }] + no-new-func: 2 + no-new-wrappers: 2 + no-new: 2 + no-return-assign: 2 + no-self-compare: 2 + no-spaced-func: 2 + no-throw-literal: 2 + no-trailing-spaces: 2 + no-undef-init: 2 + no-unneeded-ternary: 2 + no-unused-expressions: 2 + no-use-before-define: 2 + no-useless-call: 2 + no-useless-concat: 2 + no-void: 2 + object-curly-spacing: [2, "always"] + operator-linebreak: [2, "before"] + quotes: [2, "single"] + quote-props: [2, "as-needed"] + radix: 2 + semi: [2, "always"] + semi-spacing: 2 + keyword-spacing: 2 + space-before-blocks: 2 + space-before-function-paren: [2, { anonymous: "always", named: "never" }] + space-in-parens: [2, "never"] + space-infix-ops: 2 + space-unary-ops: 2 + strict: [2, "global"] + wrap-iife: [2, "outside"] + yoda: 2 diff --git a/Makefile b/Makefile index 4665314..21b463d 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,6 @@ SHELL := /bin/bash -default: lint test - -lint: - @node_modules/.bin/autolint --once +default: test .PHONY: test test: diff --git a/autolint.js b/autolint.js deleted file mode 100644 index c8069e2..0000000 --- a/autolint.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - - paths : ["lib/*.js", "test/*.js"], - - linterOptions : { - indent : 2, - maxlen : 78, - node : true, - plusplus : true, - vars : true - } - -}; diff --git a/bin/blogdown.bin.js b/bin/blogdown.bin.js index f9aea08..68b57e4 100755 --- a/bin/blogdown.bin.js +++ b/bin/blogdown.bin.js @@ -6,10 +6,12 @@ * * @license MIT */ -var log = require('../lib/log'); -var options = require('../lib/options'); +'use strict'; + +var log = require('../lib/log'); +var options = require('../lib/options'); var blogdown = require('../lib/blogdown'); -var argv = require('optimist').argv; +var argv = require('optimist').argv; options.read('blogdown', function (err, options) { diff --git a/lib/blogdown.js b/lib/blogdown.js index 8546d6f..82344df 100644 --- a/lib/blogdown.js +++ b/lib/blogdown.js @@ -7,13 +7,12 @@ */ 'use strict'; -var templateReader = require('./template-reader'); -var reader = require('./reader'); -var processor = require('./item-processor'); -var renderer = require('./html-renderer'); -var writer = require('./file-writer'); -var list = require('./list'); -var meta = require('./meta'); +var reader = require('./reader'); +var processor = require('./item-processor'); +var renderer = require('./html-renderer'); +var writer = require('./file-writer'); +var list = require('./list'); +var meta = require('./meta'); module.exports = function (source, target, options, callback) { diff --git a/lib/file-reader.js b/lib/file-reader.js index b58c8e6..76309a7 100644 --- a/lib/file-reader.js +++ b/lib/file-reader.js @@ -7,10 +7,10 @@ */ 'use strict'; -var fs = require('fs'); +var fs = require('fs'); var marked = require('marked'); var listen = require('listen'); -var path = require('path'); +var path = require('path'); function readFile(file, processor, defaultValue, callback) { @@ -126,7 +126,6 @@ exports.read = function (filePath, context, callback) { } else { // listen.js returns results in callback creation order: var json = results.json; - var p = filePath.lastIndexOf('/'); var html = results.html || results.mustache; if (html) { json.html = extractJson(html, json); diff --git a/lib/file-writer.js b/lib/file-writer.js index fa88a4f..8c5aa85 100644 --- a/lib/file-writer.js +++ b/lib/file-writer.js @@ -7,7 +7,7 @@ */ 'use strict'; -var fs = require('fs'); +var fs = require('fs'); var listen = require('listen'); diff --git a/lib/folder-reader.js b/lib/folder-reader.js index ac0e99c..3b11277 100644 --- a/lib/folder-reader.js +++ b/lib/folder-reader.js @@ -7,15 +7,15 @@ */ 'use strict'; -var fs = require('fs'); +var fs = require('fs'); var listen = require('listen'); var types = { - json : true, - html : true, - mustache : true, - md : true + json: true, + html: true, + mustache: true, + md: true }; diff --git a/lib/html-renderer.js b/lib/html-renderer.js index 92a7c8c..d72e579 100644 --- a/lib/html-renderer.js +++ b/lib/html-renderer.js @@ -8,7 +8,7 @@ 'use strict'; var mustache = require('mustache'); -var merger = require('./merger'); +var merger = require('./merger'); exports.render = function (items, lists, partials, context) { diff --git a/lib/item-processor.js b/lib/item-processor.js index 19de937..2d99649 100644 --- a/lib/item-processor.js +++ b/lib/item-processor.js @@ -7,7 +7,7 @@ */ 'use strict'; -var fs = require('fs'); +var fs = require('fs'); var moment = require('moment'); diff --git a/lib/item-reader.js b/lib/item-reader.js index 0d9e53e..f85590e 100644 --- a/lib/item-reader.js +++ b/lib/item-reader.js @@ -7,10 +7,10 @@ */ 'use strict'; -var listen = require('listen'); +var listen = require('listen'); var folderReader = require('./folder-reader'); -var fileReader = require('./file-reader'); +var fileReader = require('./file-reader'); exports.read = function (path, context, callback) { diff --git a/lib/list.js b/lib/list.js index 2a1cebc..0556f76 100644 --- a/lib/list.js +++ b/lib/list.js @@ -100,8 +100,9 @@ exports.create = function (items, config, context, name) { match = matchRegExp(config.filter, /^([\w\-\.]+) ?(=|\!=) ?([^\*]+)(\*)?$/); var value = match[3]; - var comparator = match[4] ? - matches(new RegExp('^' + value)) : equals(value); + var comparator = match[4] + ? matches(new RegExp('^' + value)) + : equals(value); if (match[2] === '!=') { comparator = not(comparator); } diff --git a/lib/log.js b/lib/log.js index b9c811d..a5fea7e 100644 --- a/lib/log.js +++ b/lib/log.js @@ -7,13 +7,13 @@ */ 'use strict'; -var RESET = '\x1B[0m'; +var RESET = '\x1B[0m'; var NORMAL = '\x1B[0;'; -var BOLD = '\x1B[1;'; +var BOLD = '\x1B[1;'; -var WHITE = '37m'; +var WHITE = '37m'; var YELLOW = '33m'; -var RED = '31m'; +var RED = '31m'; function wrap(fn, prefix, color) { return function () { @@ -26,10 +26,7 @@ function wrap(fn, prefix, color) { }; } -var log = console.log; -var info = console.info; -var warn = console.warn; -var error = console.error; +var log = console.log; console.log = function () {}; console.info = wrap(log, '[INFO ] ', BOLD + WHITE); diff --git a/lib/merger.js b/lib/merger.js index b47e537..def4383 100644 --- a/lib/merger.js +++ b/lib/merger.js @@ -19,8 +19,8 @@ exports.apply = function (object, json) { if (json.hasOwnProperty(key)) { if (!object.hasOwnProperty(key)) { object[key] = json[key]; - } else if (typeof object[key] === 'object' && - typeof json[key] === 'object') { + } else if (typeof object[key] === 'object' + && typeof json[key] === 'object') { exports.apply(object[key], json[key]); } } diff --git a/lib/meta.js b/lib/meta.js index 23cbbe4..4474fb0 100644 --- a/lib/meta.js +++ b/lib/meta.js @@ -7,7 +7,7 @@ */ 'use strict'; -var fs = require('fs'); +var fs = require('fs'); var crypto = require('crypto'); var moment = require('moment'); @@ -42,7 +42,7 @@ function update(items, json, options, callback) { var itemMeta = json[path]; if (!itemMeta) { - var timestamp = options.publish ? now : "DRAFT"; + var timestamp = options.publish ? now : 'DRAFT'; itemMeta = { created : timestamp, modified : timestamp, diff --git a/lib/reader.js b/lib/reader.js index f0712b6..537bb69 100644 --- a/lib/reader.js +++ b/lib/reader.js @@ -7,20 +7,20 @@ */ 'use strict'; -var listen = require('listen'); +var listen = require('listen'); -var itemReader = require('./item-reader'); -var folderReader = require('./folder-reader'); -var merger = require('./merger'); -var resolver = require('./resolver'); +var itemReader = require('./item-reader'); +var folderReader = require('./folder-reader'); +var merger = require('./merger'); +var resolver = require('./resolver'); var templateReader = require('./template-reader'); exports.read = function (path, parentTemplate, context, callback) { - var listener = listen(); + var listener = listen(); var templateReaderCallback = listener(); - var itemReaderCallback = listener(); + var itemReaderCallback = listener(); templateReader.read(path, parentTemplate, templateReaderCallback); @@ -31,8 +31,8 @@ exports.read = function (path, parentTemplate, context, callback) { callback(err); } else { var template = results[0]; - var items = results[1]; - var result = {}; + var items = results[1]; + var result = {}; if (template.partials) { result.partials = template.partials; diff --git a/lib/resolver.js b/lib/resolver.js index 3a7b5d4..3264632 100644 --- a/lib/resolver.js +++ b/lib/resolver.js @@ -9,7 +9,7 @@ function resolve(data, path) { - var key = path.shift(); + var key = path.shift(); var value = data[key]; return path.length ? resolve(value, path) : value; } diff --git a/lib/template-reader.js b/lib/template-reader.js index 772e515..ba11883 100644 --- a/lib/template-reader.js +++ b/lib/template-reader.js @@ -7,12 +7,12 @@ */ 'use strict'; -var listen = require('listen'); -var fs = require('fs'); +var listen = require('listen'); +var fs = require('fs'); var fileReader = require('./file-reader'); var itemReader = require('./item-reader'); -var merger = require('./merger'); +var merger = require('./merger'); function extractHtml(result, key, item) { @@ -24,8 +24,8 @@ function extractHtml(result, key, item) { exports.read = function (path, parentTemplate, callback) { - var listener = listen(); - var templatePath = path + '/template'; + var listener = listen(); + var templatePath = path + '/template'; var fileReaderCallback = listener(); var itemReaderCallback = listener(); diff --git a/package-lock.json b/package-lock.json index 4206636..0dbd4cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,10 +3,96 @@ "version": "0.7.0", "lockfileVersion": 1, "dependencies": { - "autolint": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/autolint/-/autolint-1.1.4.tgz", - "integrity": "sha1-95XYGPC7YnB66Hy6WpwKNY/EqS8=", + "acorn": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz", + "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0=", + "dev": true + }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true + }, + "ajv-keywords": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", + "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=", + "dev": true + }, + "ansi-escapes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "babel-code-frame": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", + "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", + "dev": true + }, + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "dev": true + }, + "brace-expansion": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", + "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", "dev": true }, "buster-core": { @@ -21,34 +107,402 @@ "integrity": "sha1-K4bDIuz14bCubm55Bev884fSq5U=", "dev": true }, - "fast-list": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/fast-list/-/fast-list-1.0.3.tgz", - "integrity": "sha1-9dV1Snwcv2gqFZYe+aBjiXVx6qE=", + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true + }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true + }, + "circular-json": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz", + "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=", + "dev": true + }, + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "dev": true + }, + "cli-width": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz", + "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=", + "dev": true + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "concat-stream": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "dev": true + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true + }, + "doctrine": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz", + "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=", + "dev": true + }, + "es5-ext": { + "version": "0.10.22", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz", + "integrity": "sha512-YXTXSlZkJsVwMEVljp1Bh5P9+Raa3524OMl9kywGMp1aazKTCnAqORRL/8dkuqNHk+LRYe0LezuS8PlUt3+mOw==", + "dev": true + }, + "es6-iterator": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", + "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", + "dev": true + }, + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", + "dev": true + }, + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", + "dev": true + }, + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dev": true + }, + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", + "dev": true + }, + "eslint": { + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz", + "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=", + "dev": true + }, + "espree": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz", + "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=", + "dev": true + }, + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "dev": true + }, + "esquery": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz", + "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=", + "dev": true + }, + "esrecurse": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz", + "integrity": "sha1-RxO2U2rffyrE8yfVWed1a/9kgiA=", + "dev": true, + "dependencies": { + "estraverse": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz", + "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=", + "dev": true + } + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "dev": true + }, + "exit-hook": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", + "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true + }, + "file-entry-cache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", + "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "dev": true + }, + "flat-cache": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz", + "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "generate-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", + "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", + "dev": true + }, + "generate-object-property": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", "dev": true }, "glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.0.1.tgz", - "integrity": "sha1-kImbBZc6cLEQazi7Jg9Tfr+sWM4=", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true + }, + "globals": { + "version": "9.17.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz", + "integrity": "sha1-DAymltm5u2lNLlRwvTd3fKrVAoY=", + "dev": true + }, + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true }, "graceful-fs": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.1.14.tgz", - "integrity": "sha1-BweNtfY3f2Mh/Oqu30l94STclGU=", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, - "growl": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz", - "integrity": "sha1-3i1mE20ALhErpw8/EMMc98NQsto=", + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true + }, + "ignore": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz", + "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=", + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true }, "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "inquirer": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", + "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", + "dev": true + }, + "interpret": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", + "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true + }, + "is-my-json-valid": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz", + "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=", + "dev": true + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", + "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "dev": true + }, + "is-path-inside": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", + "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", + "dev": true + }, + "is-property": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", - "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", + "dev": true + }, + "is-resolvable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", + "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "js-tokens": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", + "integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=", + "dev": true + }, + "js-yaml": { + "version": "3.8.4", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz", + "integrity": "sha1-UgtFZPhlc7qWZir4Woyvp7S1pvY=", + "dev": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true + }, + "jsonpointer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", + "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", + "dev": true + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true }, "listen": { @@ -56,10 +510,10 @@ "resolved": "https://registry.npmjs.org/listen/-/listen-0.4.0.tgz", "integrity": "sha1-xS3W86X79NhR4vjfPUoJr67lSQ0=" }, - "lru-cache": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz", - "integrity": "sha1-qlD5cEdCKsclQ72hd6nJ0BjZhFI=", + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", "dev": true }, "marked": { @@ -68,9 +522,21 @@ "integrity": "sha1-1f1oJxyq5hxV0pHQe9UDTP9ec+4=" }, "minimatch": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.1.5.tgz", - "integrity": "sha1-t2LzEgZsu/5QRipoNgv8nKDMsbk=", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true }, "moment": { @@ -78,26 +544,312 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.0.0.tgz", "integrity": "sha1-K7xbRMMhg3aTq278rb1G7ZRiEf4=" }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "mustache": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/mustache/-/mustache-0.7.3.tgz", "integrity": "sha1-JI1o0LEFA5eEj6Y0wkRsGPMEkOk=" }, + "mute-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", + "dev": true + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true + }, + "onetime": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", + "dev": true + }, "optimist": { "version": "0.3.7", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=" }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "dependencies": { + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true + }, + "pluralize": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz", + "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=", + "dev": true + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true + }, + "progress": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", + "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=", + "dev": true + }, + "readable-stream": { + "version": "2.2.10", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz", + "integrity": "sha512-HQEnnoV404e0EtwB9yNiuk2tJ+egeVC8Y9QBAxzDg8DBJt4BzRp+yQuIb/t3FIWkSTmIi+sgx7yVv/ZM0GNoqw==", + "dev": true + }, + "readline2": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", + "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", + "dev": true + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true + }, + "require-uncached": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", + "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", + "dev": true + }, + "resolve": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz", + "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=", + "dev": true + }, + "resolve-from": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", + "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "dev": true + }, + "restore-cursor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "dev": true + }, + "rimraf": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", + "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "dev": true + }, + "run-async": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", + "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", + "dev": true + }, + "rx-lite": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", + "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", + "dev": true + }, + "safe-buffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", + "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", + "dev": true + }, + "shelljs": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz", + "integrity": "sha1-svXHfvlxSPS09uImguELuoZnz/E=", + "dev": true + }, "sinon": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.6.0.tgz", "integrity": "sha1-V3sBfYaUO4xCU31awuhjcw9YzJs=", "dev": true }, - "underscore": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.1.7.tgz", - "integrity": "sha1-QLq4S60Z0jAJbo1u9ii/8FXYPbA=", + "slice-ansi": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", + "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "string_decoder": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", + "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "table": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", + "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=", + "dev": true, + "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz", + "integrity": "sha1-Y1xUNsxypuDDh87KJ41OLuxSaH4=", + "dev": true + } + } + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "tryit": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", + "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=", + "dev": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, "urun": { @@ -106,21 +858,46 @@ "integrity": "sha1-N5mgKTcUwRFdMmpOaeKl+W7nhuI=", "dev": true }, + "user-home": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", + "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", + "dev": true + }, "utest": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/utest/-/utest-0.0.8.tgz", "integrity": "sha1-/AlFH+aXuQCNDEMv4NtDnWzzeRQ=", "dev": true }, - "when": { - "version": "https://github.com/cujojs/when/tarball/1.0.2", - "integrity": "sha1-zz2bMHvkhwvn+l0PjyNp9q2FJ9E=", + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "write": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", + "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true } } } diff --git a/package.json b/package.json index 9afa18d..5805765 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,9 @@ "node": ">=0.8" }, "scripts": { - "test": "make" + "lint": "eslint .", + "test": "make", + "posttest": "npm run lint" }, "repository": { "type": "git", @@ -31,10 +33,10 @@ "optimist": "~0.3.7" }, "devDependencies": { - "utest": "~0.0.6", - "urun": "~0.0.6", + "eslint": "^3.19.0", "sinon": "~1.6.0", - "autolint": "~1.1.3" + "urun": "~0.0.6", + "utest": "~0.0.6" }, "files": [ "bin", diff --git a/test/blogdown-test.js b/test/blogdown-test.js index 600ced0..af03ea3 100644 --- a/test/blogdown-test.js +++ b/test/blogdown-test.js @@ -7,36 +7,25 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var assert = require('assert'); +var sinon = require('sinon'); -var blogdown = require('../lib/blogdown'); -var reader = require('../lib/reader'); +var blogdown = require('../lib/blogdown'); +var reader = require('../lib/reader'); var processor = require('../lib/item-processor'); -var renderer = require('../lib/html-renderer'); -var writer = require('../lib/file-writer'); -var list = require('../lib/list'); -var meta = require('../lib/meta'); +var renderer = require('../lib/html-renderer'); +var writer = require('../lib/file-writer'); +var list = require('../lib/list'); +var meta = require('../lib/meta'); var EMPTY_META_RESULT = { - created : [], - updated : [], - missing : [], - deleted : [], - meta : {} -}; - - -var createMetaWithCreated = function (items) { - return { - created : items, - updated : [], - missing : [], - deleted : [], - meta : {} - }; + created: [], + updated: [], + missing: [], + deleted: [], + meta: {} }; diff --git a/test/file-reader-test.js b/test/file-reader-test.js index 5f13a06..4a9b108 100644 --- a/test/file-reader-test.js +++ b/test/file-reader-test.js @@ -7,11 +7,11 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var assert = require('assert'); +var sinon = require('sinon'); -var fs = require('fs'); +var fs = require('fs'); var fileReader = require('../lib/file-reader'); @@ -213,6 +213,7 @@ test('file-reader', { var item; fileReader.read('some/test', {}, function (err, result) { + assert.ifError(err); item = result; }); @@ -224,6 +225,7 @@ test('file-reader', { var item, context = {}; fileReader.read('some/test', context, function (err, result) { + assert.ifError(err); item = result; }); context.current = item; @@ -236,6 +238,7 @@ test('file-reader', { var item; fileReader.read('a/b/test', { root : 'a' }, function (err, result) { + assert.ifError(err); item = result; }); @@ -244,12 +247,14 @@ test('file-reader', { 'file.path is relative to current item': function () { - var item, context = { + var item; + var context = { root : 'a', current : { file : { path : 'c/file.html' } } }; fileReader.read('a/b/test', context, function (err, result) { + assert.ifError(err); item = result; }); @@ -258,12 +263,14 @@ test('file-reader', { 'file.path is relative to current item in same folder': function () { - var item, context = { + var item; + var context = { root : 'a', current : { file : { path : 'b/file.html' } } }; fileReader.read('a/b/test', context, function (err, result) { + assert.ifError(err); item = result; }); @@ -276,6 +283,7 @@ test('file-reader', { fileReader.read('a/b/index', { root : 'a', rendering : true }, function (err, result) { + assert.ifError(err); item = result; }); @@ -288,6 +296,7 @@ test('file-reader', { fileReader.read('a/b/index', { root : 'a', rendering : false }, function (err, result) { + assert.ifError(err); item = result; }); @@ -296,13 +305,15 @@ test('file-reader', { 'relative file.path from index.html is correct': function () { - var item, context = { + var item; + var context = { root : 'a', current : { file : { path : 'c/' } }, rendering : true }; fileReader.read('a/b/other', context, function (err, result) { + assert.ifError(err); item = result; }); @@ -311,13 +322,15 @@ test('file-reader', { 'relative file.path to index.html is correct': function () { - var item, context = { + var item; + var context = { root : 'a', current : { file : { path : 'c/file.html' } }, rendering : true }; fileReader.read('a/b/index', context, function (err, result) { + assert.ifError(err); item = result; }); @@ -326,13 +339,15 @@ test('file-reader', { 'relative file.path from and to index.html is correct': function () { - var item, context = { + var item; + var context = { root : 'a', current : { file : { path : 'c/' } }, rendering : true }; fileReader.read('a/b/index', context, function (err, result) { + assert.ifError(err); item = result; }); @@ -346,6 +361,7 @@ test('file-reader', { var item; fileReader.read('a/b/c/test', { root : 'a' }, function (err, result) { + assert.ifError(err); item = result; }); @@ -359,6 +375,7 @@ test('file-reader', { var item; fileReader.read('a/test', { root : 'a' }, function (err, result) { + assert.ifError(err); item = result; }); @@ -372,6 +389,7 @@ test('file-reader', { var item; fileReader.read('a/test', null, function (err, result) { + assert.ifError(err); item = result; }); @@ -384,6 +402,7 @@ test('file-reader', { var item; fileReader.read('a/test', {}, function (err, result) { + assert.ifError(err); item = result; }); @@ -397,6 +416,7 @@ test('file-reader', { var item; fileReader.read('a/test', {}, function (err, result) { + assert.ifError(err); item = result; }); diff --git a/test/file-writer-test.js b/test/file-writer-test.js index 05b5192..36d15c9 100644 --- a/test/file-writer-test.js +++ b/test/file-writer-test.js @@ -7,11 +7,10 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var sinon = require('sinon'); -var fs = require('fs'); +var fs = require('fs'); var writer = require('../lib/file-writer'); diff --git a/test/folder-reader-test.js b/test/folder-reader-test.js index 9bc33bf..11b2aec 100644 --- a/test/folder-reader-test.js +++ b/test/folder-reader-test.js @@ -7,11 +7,9 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); - -var fs = require('fs'); +var test = require('utest'); +var sinon = require('sinon'); +var fs = require('fs'); var folderReader = require('../lib/folder-reader'); diff --git a/test/html-renderer-test.js b/test/html-renderer-test.js index 447e097..98f184a 100644 --- a/test/html-renderer-test.js +++ b/test/html-renderer-test.js @@ -7,9 +7,9 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var assert = require('assert'); +var sinon = require('sinon'); var mustache = require('mustache'); var renderer = require('../lib/html-renderer'); diff --git a/test/item-processor-test.js b/test/item-processor-test.js index 0e9d6ec..1bcf151 100644 --- a/test/item-processor-test.js +++ b/test/item-processor-test.js @@ -7,12 +7,12 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var assert = require('assert'); +var sinon = require('sinon'); -var fs = require('fs'); -var processor = require('../lib/item-processor'); +var fs = require('fs'); +var processor = require('../lib/item-processor'); test('processor', { diff --git a/test/item-reader-test.js b/test/item-reader-test.js index 99e6db7..0423efe 100644 --- a/test/item-reader-test.js +++ b/test/item-reader-test.js @@ -7,13 +7,12 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var sinon = require('sinon'); var folderReader = require('../lib/folder-reader'); -var fileReader = require('../lib/file-reader'); -var reader = require('../lib/item-reader'); +var fileReader = require('../lib/file-reader'); +var reader = require('../lib/item-reader'); test('reader', { diff --git a/test/list-test.js b/test/list-test.js index d88aa3a..a796e5b 100644 --- a/test/list-test.js +++ b/test/list-test.js @@ -7,11 +7,11 @@ */ 'use strict'; -var test = require('utest'); +var test = require('utest'); var assert = require('assert'); -var sinon = require('sinon'); +var sinon = require('sinon'); -var list = require('../lib/list'); +var list = require('../lib/list'); test('list', { @@ -25,7 +25,6 @@ test('list', { }); - test('list limit', { 'shortens the array': function () { @@ -166,7 +165,7 @@ test('list nav', { before: function () { var context = this.context = {}; - this.list = list.create([{ n : 1 }, { n : 2}, { n : 3 }], {}, context); + this.list = list.create([{ n : 1 }, { n : 2 }, { n : 3 }], {}, context); }, 'initialized previous and next with null': function () { diff --git a/test/merger-test.js b/test/merger-test.js index 3aa8ab2..a353c95 100644 --- a/test/merger-test.js +++ b/test/merger-test.js @@ -7,9 +7,8 @@ */ 'use strict'; -var test = require('utest'); +var test = require('utest'); var assert = require('assert'); -var sinon = require('sinon'); var merger = require('../lib/merger'); diff --git a/test/meta-test.js b/test/meta-test.js index ed80875..39530aa 100644 --- a/test/meta-test.js +++ b/test/meta-test.js @@ -7,13 +7,13 @@ */ 'use strict'; -var test = require('utest'); +var test = require('utest'); var assert = require('assert'); -var sinon = require('sinon'); +var sinon = require('sinon'); -var fs = require('fs'); +var fs = require('fs'); -var meta = require('../lib/meta'); +var meta = require('../lib/meta'); var timezoneOffSet = -1 * (new Date()).getTimezoneOffset() / 60; var epocCurrentTZString = '1970-01-01T'+timezoneOffSet+':00:00+'+timezoneOffSet+':00'; @@ -22,6 +22,7 @@ function invoke(items, publish) { var json; meta.update(items, { target : 'some/target', publish : publish }, function (err, result) { + assert.ifError(err); json = result; }); return json; @@ -51,8 +52,6 @@ var SHA_EMPTY_HTML = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'; var SHA_EMPTY_CONTENT = '9e26dfeeb6e641a33dae4961196235bdb965b21b'; var SHA_DEFAULT_HTML = '58b78820701d32dac4450754e291bb6cf19c6e46'; var SHA_DEFAULT_CONTENT = '2801f6fa981c15818a1a7654abca07b5d4d731bc'; -var SHA_UPDATED_HTML = ''; -var SHA_UPDATED_CONTENT = ''; test('meta update', { @@ -246,7 +245,6 @@ test('meta update', { }, - 'updates html sha': function () { var json = update({ content : SHA_EMPTY_HTML diff --git a/test/options-test.js b/test/options-test.js index 5a38077..620add2 100644 --- a/test/options-test.js +++ b/test/options-test.js @@ -7,12 +7,11 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var sinon = require('sinon'); var fileReader = require('../lib/file-reader'); -var options = require('../lib/options'); +var options = require('../lib/options'); test('options read', { diff --git a/test/reader-test.js b/test/reader-test.js index b0b2e4a..4c996f9 100644 --- a/test/reader-test.js +++ b/test/reader-test.js @@ -7,17 +7,15 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var sinon = require('sinon'); -var reader = require('../lib/reader'); -var merger = require('../lib/merger'); -var resolver = require('../lib/resolver'); +var reader = require('../lib/reader'); +var merger = require('../lib/merger'); +var resolver = require('../lib/resolver'); var templateReader = require('../lib/template-reader'); -var itemReader = require('../lib/item-reader'); -var folderReader = require('../lib/folder-reader'); -var fileReader = require('../lib/file-reader'); +var itemReader = require('../lib/item-reader'); +var folderReader = require('../lib/folder-reader'); test('reader', { diff --git a/test/resolver-test.js b/test/resolver-test.js index 4c2af09..580d60f 100644 --- a/test/resolver-test.js +++ b/test/resolver-test.js @@ -7,7 +7,7 @@ */ 'use strict'; -var test = require('utest'); +var test = require('utest'); var assert = require('assert'); var resolver = require('../lib/resolver'); diff --git a/test/template-reader-test.js b/test/template-reader-test.js index 3171a5b..c8ce7c9 100644 --- a/test/template-reader-test.js +++ b/test/template-reader-test.js @@ -7,13 +7,12 @@ */ 'use strict'; -var test = require('utest'); -var assert = require('assert'); -var sinon = require('sinon'); +var test = require('utest'); +var sinon = require('sinon'); -var fs = require('fs'); -var fileReader = require('../lib/file-reader'); -var itemReader = require('../lib/item-reader'); +var fs = require('fs'); +var fileReader = require('../lib/file-reader'); +var itemReader = require('../lib/item-reader'); var templateReader = require('../lib/template-reader');