Skip to content

Commit

Permalink
Rewrite the plugin in ES2015, switch to catberry-locator v2
Browse files Browse the repository at this point in the history
  • Loading branch information
reenko committed Mar 7, 2016
1 parent b27e72c commit 22fff99
Show file tree
Hide file tree
Showing 20 changed files with 1,292 additions and 1,492 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
@@ -0,0 +1,2 @@
**/node_modules/**
node_modules/**
155 changes: 155 additions & 0 deletions .eslintrc
@@ -0,0 +1,155 @@
{
"parserOptions": {
"ecmaVersion": 6
},
"env": {
"browser": true,
"node": true,
"mocha": true
},
"rules": {
"arrow-spacing": [2, { "before": true, "after": true }],
"constructor-super":2,
"generator-star-spacing": [2, {"before": false, "after": true}],
"no-class-assign": 2,
"no-const-assign": 2,
"no-dupe-class-members": 2,
"no-this-before-super": 2,
"no-useless-constructor": 2,
"object-shorthand": 2,
"prefer-arrow-callback": 2,
"prefer-const": 2,
"prefer-rest-params": 2,
"prefer-spread": 2,
"prefer-template": 2,
"require-yield": 2,
"template-curly-spacing": [2, "never"],

"array-bracket-spacing": [2, "never"],
"block-spacing": [2, "always"],
"brace-style": [2, "1tbs"],
"camelcase": [2, {"properties": "always"}],
"comma-spacing": [2, {"before": false, "after": true}],
"comma-style": [2, "last"],
"computed-property-spacing": [2, "never"],
"consistent-this": [2, "self"],
"eol-last": 2,
"indent": [2, "tab"],
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
"keyword-spacing": [2, {"before": true, "after": true}],
"linebreak-style": [2, "unix"],
"lines-around-comment": [2, { "beforeBlockComment": true, "beforeLineComment": false }],
"max-depth": [2, 4],
"max-nested-callbacks": [2, 2],
"max-params": [2, 4],
"new-cap": 2,
"new-parens": 2,
"no-array-constructor": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": [2, {"max": 1}],
"no-nested-ternary": 2,
"no-new-object": 2,
"no-whitespace-before-property": 2,
"no-spaced-func": 2,
"no-trailing-spaces": 2,
"no-underscore-dangle": [2, { "allowAfterThis": true }],
"no-unneeded-ternary": 2,
"object-curly-spacing": [2, "never"],
"one-var": [2, {
"uninitialized": "always",
"initialized": "never"
}],
"operator-assignment": [2, "always"],
"operator-linebreak": [2, "after"],
"quote-props": [2, "as-needed"],
"quotes": [2, "single"],
"require-jsdoc": 2,
"semi-spacing": [2, {"before": false, "after": true}],
"semi": 2,
"space-before-blocks": 2,
"space-before-function-paren": [2, "never"],
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": [2, "always"],

"handle-callback-err": 2,
"no-mixed-requires": [1, true],
"no-new-require": 2,
"no-path-concat": 2,
"no-sync": 2,

"strict": [2, "global"],

"complexity": [2, 10],
"consistent-return": 2,
"curly": [2, "all"],
"dot-location": [2, "property"],
"dot-notation": [2, {"allowKeywords": true}],
"eqeqeq": 2,
"guard-for-in": 2,
"no-alert": 2,
"no-caller": 2,
"no-else-return": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-implicit-coercion": 2,
"no-implicit-globals": 2,
"no-implied-eval": 2,
"no-invalid-this": 2,
"no-iterator": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-new": 2,
"no-process-env": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-return-assign": 2,
"no-self-assign": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-throw-literal": 2,
"no-unmodified-loop-condition": 2,
"no-unused-expressions": 2,
"no-useless-call": 2,
"no-useless-concat": 2,
"no-void": 2,
"no-with": 2,
"radix": [2, "always"],
"wrap-iife": [2, "outside"],
"yoda": [2, "never"],

"comma-dangle": [2, "never"],
"no-cond-assign": 2,
"no-console": 2,
"no-constant-condition": 2,
"no-debugger": 2,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-empty-character-class": 2,
"no-empty": 2,
"no-ex-assign": 2,
"no-extra-boolean-cast": 2,
"no-extra-semi": 2,
"no-func-assign": 2,
"no-inner-declarations": 2,
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-negated-in-lhs": 2,
"no-obj-calls": 2,
"no-sparse-arrays": 2,
"no-unexpected-multiline": 2,
"no-unreachable": 2,
"use-isnan": 2,
"valid-typeof": 2
}
}
127 changes: 0 additions & 127 deletions .jscsrc

This file was deleted.

2 changes: 0 additions & 2 deletions .jshintignore

This file was deleted.

22 changes: 0 additions & 22 deletions .jshintrc

This file was deleted.

4 changes: 0 additions & 4 deletions .travis.yml
@@ -1,9 +1,5 @@
language: node_js
sudo: false
node_js:
- "0.12"
- "1"
- "2"
- "3"
- "4"
- "5"
43 changes: 12 additions & 31 deletions Makefile 100644 → 100755
@@ -1,50 +1,31 @@

SRC = lib/*.js \
browser/*.js

TESTS = test/lib/* \
test/browser/*
SOURCES = ./lib ./browser ./test
TESTS = ./test/lib/* ./test/browser/*

all: lint test

lint:
./node_modules/.bin/jshint ./ && ./node_modules/.bin/jscs ./
./node_modules/.bin/eslint $(SOURCES) $(TESTS)

lint-fix:
./node_modules/.bin/eslint $(SOURCES) $(TESTS) --fix

test:
ifeq ($(TRAVIS),true)
@echo "Running tests for Travis..."
$(MAKE) travis
$(MAKE) travis-cov
else
@echo "Running tests..."
@NODE_ENV=test ./node_modules/.bin/mocha \
$(TESTS) \
--bail
./node_modules/.bin/mocha $(TESTS) --recursive
endif

test-cov:
ifeq ($(TRAVIS),true)
@echo "Getting coverage for Travis..."
@NODE_ENV=test node ./node_modules/.bin/istanbul cover \
./node_modules/.bin/_mocha \
--harmony-generators \
--report lcovonly \
-- -u exports \
$(TESTS) \
--bail
else
@echo "Getting coverage report..."
@NODE_ENV=test node ./node_modules/.bin/istanbul cover \
./node_modules/.bin/_mocha \
--harmony-generators \
-- -u exports \
$(TESTS) \
--bail
endif
./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- $(TESTS) --recursive

send-cov: test-cov
cat ./coverage/lcov.info | ./node_modules/.bin/codecov
travis-cov:
@echo "Getting coverage for Travis..."
./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- $(TESTS) --recursive -R spec && ./node_modules/.bin/codecov

travis: send-cov
clean:
rm -rf coverage

Expand Down

0 comments on commit 22fff99

Please sign in to comment.