Skip to content

Commit

Permalink
Modernized the tooling.
Browse files Browse the repository at this point in the history
- updated all deps
- switched from jshint to eslint
- switched from blanket to nyc
- linted everything for bugs
  • Loading branch information
ceejbot committed Apr 23, 2016
1 parent a68bc2d commit 30c0fbb
Show file tree
Hide file tree
Showing 13 changed files with 246 additions and 193 deletions.
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true

[*.js]
indent_style = tab
indent_size = 4
trim_trailing_whitespace = true
curly_bracket_next_line = true
indent_brace_style = Allman
quote_type = single
170 changes: 170 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"env": {
"browser": false,
"node": true
},

"globals": {
"crypto": true,
"escape": false,
"unescape": false
},

"ecmaFeatures": {
"arrowFunctions": true,
"binaryLiterals": true,
"blockBindings": true,
"defaultParams": true,
"forOf": true,
"generators": true,
"objectLiteralComputedProperties": true,
"objectLiteralDuplicateProperties": false,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"octalLiterals": false,
"regexUFlag": true,
"regexYFlag": true,
"superInFunctions": true,
"templateStrings": true,
"unicodeCodePointEscapes": true,
"globalReturn": true
},

"rules": {
"block-scoped-var": 0,
"brace-style": [2, "allman", { "allowSingleLine": true }],
"camelcase": 0,
"comma-spacing": [2, {"before": false, "after": true}],
"comma-style": [2, "last"],
"complexity": 0,
"consistent-return": 0,
"consistent-this": 0,
"curly": 0,
"default-case": 0,
"dot-notation": 0,
"eol-last": 2,
"eqeqeq": [2, "allow-null"],
"func-names": 0,
"func-style": [0, "declaration"],
"generator-star": 0,
"global-strict": 0,
"guard-for-in": 0,
"handle-callback-err": [2, "^(err|error|anySpecificError)$" ],
"indent": [2, "tab"],
"max-depth": 0,
"max-len": 0,
"max-nested-callbacks": 0,
"max-params": 0,
"max-statements": 0,
"new-cap": 0,
"new-parens": 2,
"no-alert": 2,
"no-array-constructor": 2,
"no-bitwise": 0,
"no-caller": 2,
"no-catch-shadow": 0,
"no-cond-assign": 2,
"no-console": 0,
"no-constant-condition": 0,
"no-control-regex": 2,
"no-debugger": 2,
"no-delete-var": 2,
"no-div-regex": 0,
"no-dupe-keys": 2,
"no-else-return": 0,
"no-empty": 0,
"no-empty-character-class": 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-fallthrough": 2,
"no-floating-decimal": 2,
"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": 2,
"no-label-var": 2,
"no-labels": 0,
"no-lone-blocks": 2,
"no-lonely-if": 0,
"no-loop-func": 0,
"no-mixed-requires": [0, false],
"no-mixed-spaces-and-tabs": [2, false],
"no-multi-str": 2,
"no-multiple-empty-lines": [2, {"max": 1}],
"no-native-reassign": 2,
"no-negated-in-lhs": 2,
"no-nested-ternary": 0,
"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": 0,
"no-octal-escape": 2,
"no-path-concat": 0,
"no-plusplus": 0,
"no-process-env": 0,
"no-process-exit": 0,
"no-proto": 2,
"no-redeclare": 2,
"no-regex-spaces": 2,
"no-reserved-keys": 0,
"no-restricted-modules": 0,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 2,
"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-undef": 2,
"no-undef-init": 2,
"no-undefined": 0,
"no-underscore-dangle": 0,
"no-unreachable": 2,
"no-unused-expressions": 0,
"no-unused-vars": [2, {"vars": "local", "args": "none", "varsIgnorePattern": "demand"}],
"no-use-before-define": 0,
"no-var": 0,
"no-void": 0,
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
"no-with": 2,
"one-var": 0,
"operator-assignment": [0, "always"],
"padded-blocks": 0,
"quote-props": 0,
"quotes": [2, "single", "avoid-escape"],
"radix": 2,
"semi": [2, "always"],
"sort-vars": 0,
"space-before-function-paren": [2, "never"],
"space-before-blocks": [2, "always"],
"space-in-brackets": 0,
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"strict": 0,
"use-isnan": 2,
"valid-jsdoc": 0,
"valid-typeof": 2,
"vars-on-top": 0,
"wrap-iife": [2, "any"],
"wrap-regex": 0,
"yoda": 0
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ node_modules
**log
.DS_Store
test/coverage.html
.nyc_output
58 changes: 0 additions & 58 deletions .jscsrc

This file was deleted.

54 changes: 0 additions & 54 deletions .jshintrc

This file was deleted.

8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
sudo: false
language: node_js
node_js:
- "0.10"
- "0.12"
- iojs
- '4.*'
- '5.*'
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq beanstalkd
- sudo beanstalkd -d -l 127.0.0.1 -p 11300
script:
- npm run test-travis
script: npm run travis
after_success: npm run coverage
16 changes: 11 additions & 5 deletions lib/client.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
var
_ = require('lodash'),
events = require('events'),
net = require('net'),
util = require('util'),
yaml = require('js-yaml')
;
;

var DEFAULT_HOST = '127.0.0.1';
var DEFAULT_PORT = 11300;
Expand Down Expand Up @@ -169,7 +168,10 @@ var CRLF = new Buffer([0x0d, 0x0a]);
ResponseHandler.prototype.process = function(data)
{
var eol = findInBuffer(data, CRLF);
if (eol > -1)

// afaict this is an eslint 2.8.0 bug: it complains about this brace
/*eslint brace-style:0*/
if(eol > -1)
{
var sliceStart;

Expand Down Expand Up @@ -207,7 +209,8 @@ ResponseHandler.prototype.process = function(data)
}
else {
// no response expected (quit)
if ('' === this.expectedResponse) {
if ('' === this.expectedResponse)
{
this.success = true;
this.complete = true;
}
Expand All @@ -229,12 +232,15 @@ ResponseHandler.prototype.parseBody = function(how)
{
if ((this.body === undefined) || (this.body === null))
return;

var expectedLength = parseInt(this.args[this.args.length - 1], 10);
if (this.body.length > (expectedLength + 2)) {
if (this.body.length > (expectedLength + 2))
{
// Body contains multiple responses. Split off the remaining bytes.
this.remainder = this.body.slice(expectedLength + 2);
this.body = this.body.slice(0, expectedLength + 2);
}

if (this.body.length === (expectedLength + 2))
{
this.args.pop();
Expand Down
Loading

0 comments on commit 30c0fbb

Please sign in to comment.