jshint -> eslint + CS update

smirchan · Apr 22, 2015 · 12532e6 · 12532e6
1 parent 48f9b43
commit 12532e6
Show file tree

Hide file tree

Showing 59 changed files with 367 additions and 304 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,7 @@
+demo
+dist
+doc
+node_modules
+tmp
+support
+benchmark/implementations
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,124 @@
+env:
+  node:     true
+  browser:  false
+
+plugins:
+    - nodeca
+
+rules:
+  block-scoped-var:       2
+  brace-style:            [ 2, '1tbs', { "allowSingleLine": true } ]
+  comma-dangle:           2
+  comma-spacing:          2
+  comma-style:            2
+  consistent-return:      2
+  consistent-this:        [ 2, self ]
+  curly:                  [ 2, all ]
+  # default-case:           2
+  # dot-notation:           [ 2, { allowKeywords: true } ]
+  eol-last:               2
+  eqeqeq:                 2
+  func-style:             [ 2, declaration ]
+  handle-callback-err:    2
+  # key-spacing:            [ 2, { "align": "value" } ]
+  max-depth:              [ 1, 6 ]
+  max-nested-callbacks:   [ 1, 5 ]
+  # string can exceed 80 chars, but should not overflow github website :)
+  max-len:                [ 2, 120, 1000 ]
+  new-cap:                2
+  new-parens:             2
+  no-alert:               2
+  no-array-constructor:   2
+  no-bitwise:             2
+  no-caller:              2
+  # no-catch-shadow:        2
+  no-cond-assign:         2
+  no-console:             1
+  no-constant-condition:   2
+  no-control-regex:       2
+  no-div-regex:           2
+  no-dupe-args:           2
+  no-dupe-keys:           2
+  no-duplicate-case:      2
+  no-else-return:         2
+  # no-empty:               1
+  no-empty-class:         2
+  no-empty-label:         2
+  no-eq-null:             2
+  no-eval:                2
+  no-ex-assign:           2
+  no-extend-native:       2
+  no-extra-bind:          2
+  no-extra-boolean-cast:  2
+  no-extra-semi:          2
+  no-fallthrough:         2
+  no-floating-decimal:    2
+  no-func-assign:         2
+  no-implied-eval:        2
+  no-inner-declarations:  2
+  no-invalid-regexp:      2
+  no-irregular-whitespace: 2
+  no-iterator:            2
+  no-label-var:           2
+  no-lone-blocks:         1
+  no-lonely-if:           2
+  no-loop-func:           2
+  no-mixed-spaces-and-tabs: 2
+  no-native-reassign:     2
+  no-negated-in-lhs:      2
+  no-new:                 2
+  no-new-func:            2
+  no-new-object:          2
+  no-new-require:         2
+  no-new-wrappers:        2
+  no-obj-calls:           2
+  no-octal:               2
+  no-octal-escape:        2
+  no-proto:               2
+  no-redeclare:           2
+  # no-regex-spaces:        2
+  no-reserved-keys:       2
+  no-return-assign:       2
+  no-self-compare:        2
+  no-sequences:           2
+  # no-shadow:              2
+  no-shadow-restricted-names: 2
+  no-sparse-arrays:       2
+  no-path-concat:         2
+  no-throw-literal:       2
+  no-trailing-spaces:     2
+  no-undef:               2
+  no-undef-init:          2
+  no-undefined:           2
+  no-unreachable:         2
+  no-unused-expressions:  2
+  no-use-before-define:   2
+  operator-assignment:    1
+  semi:                   2
+  semi-spacing:           2
+  space-after-keywords:   2
+  space-before-blocks:    2
+  space-before-function-paren: [ 2, { "anonymous": "always", "named": "never" } ]
+  space-in-brackets:      [ 2, always, { propertyName: false } ]
+  space-in-parens:        [ 2, never ]
+  space-infix-ops:        2
+  space-return-throw-case: 2
+  space-unary-ops:        2
+  spaced-line-comment:    [ 1, always, { exceptions: [ '/', '=' ] } ]
+  strict:                 [ 2, global ]
+  quotes:                 [ 2, single, avoid-escape ]
+  quote-props:            [ 1, 'as-needed' ]
+  radix:                  2
+  use-isnan:              2
+  valid-typeof:           2
+  # yoda:                   [ 2, never, { "exceptRange": true } ]
+
+
+
+  #
+  # Our custom rules from plugin
+  #
+  nodeca/no-lodash-aliases:   2
+  nodeca/no-async-aliases:    2
+  nodeca/indent:              [2, spaces, 2]
+  nodeca/no-wire-anonymous:   1
diff --git a/.jshintignore b/.jshintignore
diff --git a/.jshintrc b/.jshintrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: false
 language: node_js
 node_js:
- - '0.10'
-before_script: "make dev-deps"
-script: "make test"
+  - '0.10'
+  - '0.12'
+  - iojs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+3.3.0 / 2015-04-22
+------------------
+
+- Significantly improved long strings formatting in dumper, thanks to @isaacs.
+- Strip BOM if exists.
+
+
 3.2.7 / 2015-02-19
 ------------------
 

diff --git a/Makefile b/Makefile
@@ -24,12 +24,7 @@ help:
 
 
 lint:
-	if test ! `which jshint` ; then \
-		echo "You need 'jshint' installed in order to run lint." >&2 ; \
-		echo "  $ make dev-deps" >&2 ; \
-		exit 128 ; \
-		fi
-	jshint . --show-non-errors
+	eslint --reset .
 
 
 test: lint
@@ -41,16 +36,6 @@ test: lint
 	NODE_ENV=test mocha -R spec
 
 
-dev-deps:
-	@if test ! `which npm` ; then \
-		echo "You need 'npm' installed." >&2 ; \
-		echo "  See: http://npmjs.org/" >&2 ; \
-		exit 128 ; \
-		fi
-	npm install -g jshint
-	npm install
-
-
 gh-pages:
 	@if test -z ${REMOTE_REPO} ; then \
 		echo 'Remote repo URL not found' >&2 ; \

diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js
@@ -2,6 +2,7 @@
 
 'use strict';
 
+/*eslint-disable no-console*/
 
 var path      = require('path');
 var fs        = require('fs');

diff --git a/benchmark/profile.js b/benchmark/profile.js
@@ -4,10 +4,11 @@
 'use strict';
 
 var fs   = require('fs');
+var path = require('path');
 var yaml = require('../');
 
-var data = fs.readFileSync(__dirname +'/samples/document_nodeca_application.yaml', 'utf8');
+var data = fs.readFileSync(path.join(__dirname, '/samples/document_nodeca_application.yaml'), 'utf8');
 
-for (var i=0; i<10000; i++) {
+for (var i = 0; i < 10000; i++) {
   yaml.load(data);
 }
diff --git a/bin/js-yaml.js b/bin/js-yaml.js
@@ -3,6 +3,8 @@
 
 'use strict';
 
+/*eslint-disable no-console*/
+
 
 // stdlib
 var fs    = require('fs');
@@ -26,27 +28,27 @@ var cli = new argparse.ArgumentParser({
 });
 
 
-cli.addArgument(['-c', '--compact'], {
+cli.addArgument([ '-c', '--compact' ], {
   help:   'Display errors in compact mode',
   action: 'storeTrue'
 });
 
 
 // deprecated (not needed after we removed output colors)
 // option suppressed, but not completely removed for compatibility
-cli.addArgument(['-j', '--to-json'], {
+cli.addArgument([ '-j', '--to-json' ], {
   help:   argparse.Const.SUPPRESS,
   dest:   'json',
   action: 'storeTrue'
 });
 
 
-cli.addArgument(['-t', '--trace'], {
+cli.addArgument([ '-t', '--trace' ], {
   help:   'Show stack trace on error',
   action: 'storeTrue'
 });
 
-cli.addArgument(['file'], {
+cli.addArgument([ 'file' ], {
   help:   'File to read, utf-8 encoded without BOM',
   nargs:  '?',
   defaultValue: '-'
@@ -67,11 +69,11 @@ function readFile(filename, encoding, callback) {
 
     var chunks = [];
 
-    process.stdin.on('data', function(chunk) {
+    process.stdin.on('data', function (chunk) {
       chunks.push(chunk);
     });
 
-    process.stdin.on('end', function() {
+    process.stdin.on('end', function () {
       return callback(null, Buffer.concat(chunks).toString(encoding));
     });
   } else {
@@ -83,7 +85,7 @@ readFile(options.file, 'utf8', function (error, input) {
   var output, isYaml;
 
   if (error) {
-    if ('ENOENT' === error.code) {
+    if (error.code === 'ENOENT') {
       console.error('File not found: ' + options.file);
       process.exit(2);
     }

diff --git a/examples/custom_types.js b/examples/custom_types.js
@@ -1,5 +1,6 @@
 'use strict';
 
+/*eslint-disable no-console*/
 
 var fs   = require('fs');
 var path = require('path');

diff --git a/examples/dumper.js b/examples/dumper.js
@@ -1,5 +1,6 @@
 'use strict';
 
+/*eslint-disable no-console*/
 
 var yaml = require('../lib/js-yaml');
 var object = require('./dumper.json');

diff --git a/examples/sample_document.js b/examples/sample_document.js
@@ -1,5 +1,6 @@
 'use strict';
 
+/*eslint-disable no-console*/
 
 var fs   = require('fs');
 var path = require('path');