Merge 74998a4 into ff0c6db

.eslintrc

@@ -0,0 +1,201 @@
+{
+  "ecmaFeatures": {
+    "jsx": true
+  },
+  "parser": "espree",
+  "env": {
+    "amd": false,
+    "jasmine": false,
+    "node": true,
+    "mocha": true,
+    "browser": true,
+    "builtin": true,
+    "es6": true
+  },
+  "rules": {
+    "no-alert": 2,
+    "no-array-constructor": 2,
+    "no-bitwise": 2,
+    "no-caller": 2,
+    "no-catch-shadow": 2,
+    "no-comma-dangle": 0,
+    "no-cond-assign": [2, "except-parens"],
+    "no-constant-condition": 2,
+    "no-continue": 0,
+    "no-control-regex": 2,
+    "no-debugger": 2,
+    "no-delete-var": 2,
+    "no-div-regex": 0,
+    "no-dupe-keys": 2,
+    "no-dupe-args": 2,
+    "no-duplicate-case": 2,
+    "no-else-return": 0,
+    "no-empty": 2,
+    "no-empty-class": 0,
+    "no-empty-character-class": 2,
+    "no-empty-label": 2,
+    "no-eq-null": 0,
+    "no-eval": 2,
+    "no-ex-assign": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-extra-boolean-cast": 2,
+    "no-extra-parens": 0,
+    "no-extra-semi": 2,
+    "no-extra-strict": 2,
+    "no-fallthrough": 2,
+    "no-floating-decimal": 0,
+    "no-func-assign": 2,
+    "no-implied-eval": 2,
+    "no-inline-comments": 0,
+    "no-inner-declarations": [2, "functions"],
+    "no-invalid-regexp": 2,
+    "no-irregular-whitespace": 2,
+    "no-iterator": 0,
+    "no-label-var": 2,
+    "no-labels": 2,
+    "no-lone-blocks": 2,
+    "no-lonely-if": 0,
+    "no-loop-func": 2,
+    "no-mixed-requires": [0, false],
+    "no-mixed-spaces-and-tabs": [2, false],
+    "linebreak-style": [0, "unix"],
+    "no-multi-spaces": 2,
+    "no-multi-str": 2,
+    "no-multiple-empty-lines": [0, {
+      "max": 2
+    }],
+    "no-native-reassign": 2,
+    "no-negated-in-lhs": 2,
+    "no-nested-ternary": 0,
+    "no-new": 0,
+    "no-new-func": 2,
+    "no-new-object": 2,
+    "no-new-require": 0,
+    "no-new-wrappers": 2,
+    "no-obj-calls": 2,
+    "no-octal": 2,
+    "no-octal-escape": 2,
+    "no-param-reassign": 0,
+    "no-path-concat": 0,
+    "no-plusplus": 0,
+    "no-process-env": 0,
+    "no-process-exit": 0,
+    "no-proto": 2,
+    "no-redeclare": 0,
+    "no-regex-spaces": 2,
+    "no-reserved-keys": 0,
+    "no-restricted-modules": 0,
+    "no-return-assign": 0,
+    "no-script-url": 2,
+    "no-self-compare": 0,
+    "no-sequences": 2,
+    "no-shadow": 0,
+    "no-shadow-restricted-names": 2,
+    "no-space-before-semi": 0,
+    "no-spaced-func": 2,
+    "no-sparse-arrays": 2,
+    "no-sync": 0,
+    "no-ternary": 0,
+    "no-trailing-spaces": 2,
+    "no-this-before-super": 0,
+    "no-throw-literal": 0,
+    "no-undef": 2,
+    "no-undef-init": 2,
+    "no-undefined": 0,
+    "no-unexpected-multiline": 0,
+    "no-underscore-dangle": 0,
+    "no-unneeded-ternary": 0,
+    "no-unreachable": 2,
+    "no-unused-expressions": 0,
+    "no-unused-vars": 2,
+    "no-use-before-define": [2, "nofunc"],
+    "no-void": 0,
+    "no-var": 0,
+    "prefer-const": 0,
+    "no-warning-comments": [0, {
+      "terms": ["todo", "fixme", "xxx"],
+      "location": "start"
+    }],
+    "no-with": 2,
+    "no-wrap-func": 2,
+    "array-bracket-spacing": [0, "never"],
+    "accessor-pairs": 0,
+    "block-scoped-var": 0,
+    "brace-style": [0, "1tbs"],
+    "camelcase": 0,
+    "comma-dangle": 0,
+    "comma-spacing": 2,
+    "comma-style": 0,
+    "complexity": [0, 11],
+    "computed-property-spacing": [0, "never"],
+    "consistent-return": 0,
+    "consistent-this": [0, "that"],
+    "constructor-super": 0,
+    "curly": [2, "all"],
+    "default-case": 0,
+    "dot-location": 0,
+    "dot-notation": 0,
+    "eol-last": 2,
+    "eqeqeq": 2,
+    "func-names": 0,
+    "func-style": [0, "declaration"],
+    "generator-star": 0,
+    "generator-star-spacing": 0,
+    "global-strict": [0, "never"],
+    "guard-for-in": 0,
+    "handle-callback-err": 0,
+    "indent": 0,
+    "key-spacing": [2, {
+      "beforeColon": false,
+      "afterColon": true
+    }],
+    "lines-around-comment": 0,
+    "max-depth": [0, 4],
+    "max-len": [0, 80, 4],
+    "max-nested-callbacks": [0, 2],
+    "max-params": [0, 3],
+    "max-statements": [0, 10],
+    "new-cap": 0,
+    "new-parens": 2,
+    "newline-after-var": 0,
+    "object-curly-spacing": [0, "never"],
+    "object-shorthand": 0,
+    "one-var": 0,
+    "operator-assignment": [0, "always"],
+    "operator-linebreak": 0,
+    "padded-blocks": 0,
+    "quote-props": 0,
+    "quotes": [2, "double"],
+    "radix": 0,
+    "semi": 2,
+    "semi-spacing": [2, {
+      "before": false,
+      "after": true
+    }],
+    "sort-vars": 0,
+    "space-after-function-name": [0, "never"],
+    "space-after-keywords": [0, "always"],
+    "space-before-blocks": [0, "always"],
+    "space-before-function-paren": [0, "always"],
+    "space-before-function-parentheses": [0, "always"],
+    "space-in-brackets": [0, "never"],
+    "space-in-parens": [0, "never"],
+    "space-infix-ops": 2,
+    "space-return-throw-case": 2,
+    "space-unary-ops": [2, {
+      "words": true,
+      "nonwords": false
+    }],
+    "spaced-comment": 0,
+    "spaced-line-comment": [0, "always"],
+    "strict": 0,
+    "use-isnan": 2,
+    "valid-jsdoc": 0,
+    "valid-typeof": 0,
+    "vars-on-top": 0,
+    "wrap-iife": 0,
+    "wrap-regex": 0,
+    "yoda": [2, "never"]
+  }
+}

.travis.yml

@@ -4,7 +4,6 @@ os:
 language: node_js
 
 node_js:
-  - "0.11.13"
   - "0.12"
   - "iojs-1"
   - "iojs-2"

Makefile

@@ -48,9 +48,12 @@ test-npm:
 
 
 test-spm:
-	@spm test --coveralls
+	@spm test
 
-test: test-spm test-npm test-cli benchmark
+lint:
+	@./node_modules/eslint/bin/eslint.js ./src/pinyin.js
+
+test: lint test-spm test-npm test-cli benchmark
 
 output = _site/coverage.html
 coverage: build-doc
@@ -82,4 +85,4 @@ dict-node:
 infrequent:
 	@node ./tools/infrequent.js > ./tools/zi/infrequent.js
 
-.PHONY: build-doc publish-doc server clean test coverage
+.PHONY: build-doc publish-doc server clean test coverage test-spm test-npm test-cli lint

package.json

@@ -30,11 +30,14 @@
     "test": "make test"
   },
   "dependencies": {
-    "commander": "~1.1.1",
+    "commander": "~1.1.1"
+  },
+  "optionalDependencies": {
     "nodejieba": "~1.2.2"
   },
   "devDependencies": {
     "benchmark": "~1.0.0",
+    "eslint": "~0.24.0",
     "expect.js": "0.3.1",
     "istanbul": "~0.3.17",
     "mocha": "1.17.1",