diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..e7b1998 --- /dev/null +++ b/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["es2015-node4"] +} diff --git a/.eslintrc b/.eslintrc index 1e754f8..7fe9686 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,163 +1 @@ -{ - "ecmaFeatures": { - "modules": true - }, - "env": { - "es6": true, - "node": true - }, - "parser": "babel-eslint", - "plugins": [ - "babel" - ], - "rules": { - "accessor-pairs": [2, true], - "array-bracket-spacing": 2, - "babel/block-scoped-var": 2, - "babel/generator-star-spacing": 2, - "babel/new-cap": 2, - "babel/object-shorthand": [2, "always"], - "brace-style": 2, - "camelcase": 2, - "comma-dangle": [2, "never"], - "comma-spacing": 2, - "comma-style": 2, - "computed-property-spacing": 2, - "consistent-return": 2, - "consistent-this": 2, - "constructor-super": 2, - "curly": [2, "all"], - "default-case": 2, - "dot-location": [2, "property"], - "dot-notation": [2, {"allowKeywords": true, "allowPattern": ""}], - "eol-last": 2, - "eqeqeq": [2, "smart"], - "func-names": 2, - "func-style": 2, - "guard-for-in": 2, - "indent": [2, 2], - "key-spacing": 2, - "linebreak-style": [2, "unix"], - "lines-around-comment": 2, - "max-nested-callbacks": 2, - "new-parens": 2, - "newline-after-var": 2, - "no-alert": 2, - "no-caller": 2, - "no-catch-shadow": 2, - "no-cond-assign": [2, "always"], - "no-console": 2, - "no-constant-condition": 2, - "no-control-regex": 2, - "no-debugger": 2, - "no-delete-var": 2, - "no-div-regex": 2, - "no-dupe-args": 2, - "no-dupe-keys": 2, - "no-duplicate-case": 2, - "no-else-return": 2, - "no-empty": 2, - "no-empty-character-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-parens": 2, - "no-extra-semi": 2, - "no-fallthrough": 2, - "no-floating-decimal": 2, - "no-func-assign": 2, - "no-implied-eval": 2, - "no-inline-comments": 2, - "no-inner-declarations": 2, - "no-invalid-regexp": 2, - "no-irregular-whitespace": 2, - "no-iterator": 2, - "no-label-var": 2, - "no-labels": 2, - "no-lone-blocks": 2, - "no-lonely-if": 2, - "no-loop-func": 2, - "no-mixed-spaces-and-tabs": 2, - "no-multi-spaces": 2, - "no-multi-str": 2, - "no-multiple-empty-lines": 2, - "no-native-reassign": 2, - "no-negated-in-lhs": 2, - "no-nested-ternary": 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-path-concat": 2, - "no-process-env": 2, - "no-process-exit": 2, - "no-proto": 2, - "no-redeclare": 2, - "no-regex-spaces": 2, - "no-reserved-keys": 2, - "no-restricted-modules": 2, - "no-return-assign": 2, - "no-script-url": 2, - "no-self-compare": 2, - "no-sequences": 2, - "no-shadow": 2, - "no-shadow-restricted-names": 2, - "no-spaced-func": 2, - "no-sparse-arrays": 2, - "no-sync": 2, - "no-ternary": 2, - "no-this-before-super": 2, - "no-throw-literal": 2, - "no-trailing-spaces": 2, - "no-undef": 2, - "no-undef-init": 2, - "no-undefined": 2, - "no-underscore-dangle": 2, - "no-unexpected-multiline": 2, - "no-unneeded-ternary": 2, - "no-unreachable": 2, - "no-unused-expressions": 2, - "no-unused-vars": 2, - "no-use-before-define": 2, - "no-var": 2, - "no-void": 2, - "no-warning-comments": 2, - "no-with": 2, - "object-curly-spacing": [2, "always"], - "one-var": 2, - "operator-assignment": 2, - "operator-linebreak": 2, - "padded-blocks": [2, "never"], - "prefer-const": 2, - "quote-props": [2, "as-needed"], - "quotes": [2, "single"], - "radix": 2, - "semi": [2, "always"], - "semi-spacing": 2, - "sort-vars": 2, - "space-after-keywords": 2, - "space-before-blocks": 2, - "space-before-function-paren": [2, "never"], - "space-in-parens": 2, - "space-infix-ops": 2, - "space-return-throw-case": 2, - "space-unary-ops": 2, - "spaced-comment": [2, "always"], - "strict": [2, "global"], - "use-isnan": 2, - "valid-jsdoc": 2, - "valid-typeof": 2, - "vars-on-top": 2, - "wrap-iife": 2, - "wrap-regex": 2, - "yoda": [2, "never"] - } -} +extends: seegno diff --git a/.jscsrc b/.jscsrc index a5aaaed..872495e 100644 --- a/.jscsrc +++ b/.jscsrc @@ -1,3 +1,4 @@ -{ - "esnext": true -} +plugins: + - jscs-config-seegno + +preset: seegno diff --git a/.travis.yml b/.travis.yml index c8cdc47..4475e98 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: node_js node_js: - - iojs - - "0.12" - - "0.10" + - 4 + - 5 after_success: - npm run coveralls diff --git a/package.json b/package.json index 45e25e8..ef5f808 100644 --- a/package.json +++ b/package.json @@ -25,33 +25,37 @@ "logging" ], "options": { - "mocha": "--compilers js:babel/register --require should test" + "mocha": "--compilers js:babel-register --require should test" }, "scripts": { - "build": "rm -rf dist/* && ./node_modules/.bin/babel src/ --loose --plugins object-assign --out-dir dist/", - "changelog": "github_changelog_generator", - "cover": "./node_modules/.bin/babel-node node_modules/.bin/isparta cover --report html node_modules/.bin/_mocha -- $npm_package_options_mocha", - "coveralls": "./node_modules/.bin/babel-node node_modules/.bin/isparta cover --report html node_modules/.bin/_mocha --report lcovonly -- $npm_package_options_mocha && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", - "lint": "eslint src", + "build": "rm -rf dist/* && babel src/ --out-dir dist/", + "changelog": "github_changelog_generator --no-issues --header-label '# Changelog'", + "cover": "babel-node isparta cover --report html _mocha -- $npm_package_options_mocha", + "coveralls": "babel-node isparta cover --report html _mocha --report lcovonly -- $npm_package_options_mocha && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js", + "lint": "eslint src && jscs src", "prepublish": "npm test && npm run build", - "test": "./node_modules/.bin/mocha $npm_package_options_mocha" + "test": "mocha $npm_package_options_mocha" }, "dependencies": { "bunyan": "^1.4.0", "debug": "^2.2.0" }, "devDependencies": { - "babel": "^5.6.14", - "babel-eslint": "^3.1.23", - "babel-plugin-object-assign": "^1.2.0", + "babel-cli": "^6.3.17", + "babel-eslint": "^4.1.6", + "babel-preset-es2015-node4": "^2.0.2", + "babel-register": "^6.3.13", "coveralls": "^2.11.2", - "eslint": "^0.24.1", - "eslint-plugin-babel": "^1.1.0", - "isparta": "^3.0.3", + "eslint": "^1.10.3", + "eslint-config-seegno": "^1.2.0", + "eslint-plugin-babel": "^3.0.0", + "isparta": "^4.0.0", + "jscs": "^2.7.0", + "jscs-config-seegno": "^1.1.0", "mocha": "^2.0.1", - "should": "^7.0.1" + "should": "^8.0.2" }, "engines": { - "node": ">= 0.10" + "node": ">= 4" } } diff --git a/src/index.js b/src/index.js index d75887a..f5d536a 100755 --- a/src/index.js +++ b/src/index.js @@ -32,7 +32,7 @@ export default function debugnyan(name, options, config) { }, config); if (!loggers[root]) { - loggers[root] = bunyan.createLogger(Object.assign({}, options, { name: root, level })); + loggers[root] = bunyan.createLogger(Object.assign({}, options, { level, name: root })); } let child = loggers[root]; @@ -49,8 +49,8 @@ export default function debugnyan(name, options, config) { } options = Object.assign({}, options, { - [`${config.prefix.repeat(i - 1)}${config.suffix}`]: current, - level + level, + [`${config.prefix.repeat(i - 1)}${config.suffix}`]: current }); child = next.child(options, true);