Skip to content

Commit

Permalink
Update to ESLint 2 and use eslint-config-holidaycheck
Browse files Browse the repository at this point in the history
  • Loading branch information
@lo1tuma
lo1tuma committed Mar 5, 2016
1 parent f5838e8 commit 55d4cbe
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 180 deletions.
155 changes: 2 additions & 153 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"extends": "holidaycheck",

"env": {
"node": true
},
Expand All @@ -9,158 +11,5 @@

"ecmaFeatures": {
"globalReturn": false
},

"rules": {
"no-alert": 2,
"no-array-constructor": 2,
"no-bitwise": 2,
"no-caller": 2,
"no-catch-shadow": 2,
"no-cond-assign": 2,
"no-console": 2,
"no-constant-condition": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 2,
"no-dupe-keys": 2,
"no-dupe-args": 2,
"no-else-return": 2,
"no-empty": 2,
"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-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, "functions" ],
"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-requires": 0,
"no-mixed-spaces-and-tabs": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [ 2, { "max": 1 } ],
"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-plusplus": 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": 0,
"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": 0,
"no-trailing-spaces": 2,
"no-throw-literal": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 2,
"no-underscore-dangle": 2,
"no-unreachable": 2,
"no-unused-expressions": 2,
"no-unused-vars": 2,
"no-use-before-define": 2,
"no-void": 2,
"no-warning-comments": [ 2, { "terms": [ "todo", "fixme", "wtf", "falls through" ], "location": "anywhere" } ],
"no-with": 2,
"no-wrap-func": 2,
"block-scoped-var": 0,
"brace-style": [ 2, "1tbs" ],
"camelcase": 2,
"comma-dangle": [ 2, "never" ],
"comma-spacing": [ 2, { "before": false, "after": true } ],
"comma-style": [ 2, "last" ],
"complexity": [ 2, 4 ],
"consistent-return": 2,
"consistent-this": [ 2, "self" ],
"curly": [ 2, "all" ],
"default-case": 2,
"dot-notation": 2,
"eol-last": 2,
"eqeqeq": 2,
"func-names": 0,
"func-style": 0,
"generator-star": 0,
"guard-for-in": 2,
"handle-callback-err": [ 2, "^(e$|(e|(.*(_e|E)))rr)" ],
"indent": 0,
"key-spacing": [ 2, { "beforeColon": false, "afterColon": true } ],
"max-depth": [ 2, 3 ],
"max-len": [ 2, 120, 4 ],
"max-nested-callbacks": [ 2, 3 ],
"max-params": [ 2, 4 ],
"max-statements": [ 2, 10 ],
"new-cap": 2,
"new-parens": 2,
"one-var": 2,
"operator-assignment": [ 2, "always" ],
"padded-blocks": [ 2, "never" ],
"quote-props": [ 2, "as-needed" ],
"quotes": [ 2, "single" ],
"radix": 2,
"semi": 2,
"semi-spacing": [ 2, { "before": false, "after": true } ],
"sort-vars": 0,
"space-after-keywords": [ 2, "always" ],
"space-before-blocks": [ 2, "always" ],
"space-before-function-parentheses": [ 2, { "anonymous": "always", "named": "never" } ],
"space-in-brackets": [ 2, "always", {
"singleValue": true,
"objectsInArrays": true,
"arraysInArrays": true,
"arraysInObjects": true,
"objectsInObjects": true,
"propertyName": false
} ],
"space-in-parens": [ 2, "never" ],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": 2,
"spaced-line-comment": [ 2, "always" ],
"strict": [2, "global"],
"use-isnan": 2,
"valid-jsdoc": 0,
"valid-typeof": 2,
"vars-on-top": 2,
"wrap-iife": [ 2, "outside" ],
"wrap-regex": 2,
"yoda": [ 2, "never" ]
}
}
11 changes: 6 additions & 5 deletions lib/getPullRequestLabel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,19 @@ module.exports = function getPullRequestLabel(githubRepo, pullRequestId) {
return rest.get(url)
.get('data')
.then(function (labels) {
var listOfLabels = validLabelNames.join(', ');
var listOfLabels = validLabelNames.join(', '),
filteredLabels;

labels = labels.filter(function (label) {
filteredLabels = labels.filter(function (label) {
return validLabelNames.indexOf(label.name) !== -1;
});

if (labels.length > 1) {
if (filteredLabels.length > 1) {
throw new Error('Pull Request #' + pullRequestId + ' has multiple labels of ' + listOfLabels);
} else if (labels.length === 0) {
} else if (filteredLabels.length === 0) {
throw new Error('Pull Request #' + pullRequestId + ' has no label of ' + listOfLabels);
}

return labels[0].name;
return filteredLabels[0].name;
});
};
5 changes: 3 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
"chai": "3.0.0",
"chai-as-promised": "5.1.0",
"coveralls": "2.11.2",
"eslint": "0.23.0",
"eslint-plugin-mocha": "0.2.2",
"eslint": "2.3.0",
"eslint-config-holidaycheck": "0.3.0",
"eslint-plugin-mocha": "2.0.0",
"istanbul": "0.3.15",
"mocha": "2.2.5",
"proxyquire": "1.5.0",
Expand Down
6 changes: 3 additions & 3 deletions test/.eslintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"plugins": [ "eslint-plugin-mocha" ],

"rules": {
"no-unused-expressions": 0,
"max-nested-callbacks": [ 2, 5 ],
"no-unused-expressions": "off",
"max-nested-callbacks": [ "error", 5 ],

"mocha/no-exclusive-tests": 2
"mocha/no-exclusive-tests": "error"
}
}
32 changes: 15 additions & 17 deletions test/unit/lib/createChangelogSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,21 @@ describe('createChangelog', function () {
});

it('should create a formatted changelog', function () {
var mergedPullRequests = [
{
id: '1',
title: 'Fixed bug foo',
label: 'bug'
},
{
id: '2',
title: 'Fixed bug bar',
label: 'bug'
},
{
id: '3',
title: 'Fix spelling error',
label: 'documentation'
}
],
var mergedPullRequests = [ {
id: '1',
title: 'Fixed bug foo',
label: 'bug'
},
{
id: '2',
title: 'Fixed bug bar',
label: 'bug'
},
{
id: '3',
title: 'Fix spelling error',
label: 'documentation'
} ],
expectedChangelog = [
'### Bug Fixes',
'',
Expand Down

0 comments on commit 55d4cbe

Please sign in to comment.