Skip to content

Commit b34aa5a

Browse files
pdehaanphated
authored andcommitted
Build: Add eslint and jscs presets & update code
1 parent 5879741 commit b34aa5a

File tree

9 files changed

+35
-48
lines changed

9 files changed

+35
-48
lines changed

.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "gulp"
3+
}

.jscsrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"preset": "gulp"
3+
}

.jshintrc

Lines changed: 0 additions & 25 deletions
This file was deleted.

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
sudo: false
2+
13
language: node_js
4+
25
node_js:
36
- '0.10'
47
- '0.12'
8+
- 'stable'
9+
510
script:
611
- npm test
712
- npm run lint

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
async-settle
22
============
33

4-
[![build status](https://secure.travis-ci.org/phated/async-settle.png)](http://travis-ci.org/phated/async-settle)
4+
[![build status](https://secure.travis-ci.org/gulpjs/async-settle.png)](http://travis-ci.org/gulpjs/async-settle)
55

66
Settle your async functions - when you need to know all your parallel functions are complete (success or failure)
77

@@ -49,9 +49,9 @@ Takes a function to execute (`fn`) and a function to call on completion (`callba
4949

5050
Optionally takes a callback to call when async tasks are complete.
5151

52-
Executed in the context of [`async-done`](https://github.com/phated/async-done), with all errors and results being settled.
52+
Executed in the context of [`async-done`](https://github.com/gulpjs/async-done), with all errors and results being settled.
5353

54-
Completion is handled by [`async-done` completion and error resolution](https://github.com/phated/async-done#completion-and-error-resolution).
54+
Completion is handled by [`async-done` completion and error resolution](https://github.com/gulpjs/async-done#completion-and-error-resolution).
5555

5656
#### `callback(error, result)`
5757

index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
var asyncDone = require('async-done');
44

5-
function settle(fn, done){
6-
asyncDone(fn, function(error, result){
5+
function settle(fn, done) {
6+
asyncDone(fn, function(error, result) {
77
var settled = {};
88

9-
if(error != null){
9+
if (error != null) {
1010
settled.state = 'error';
1111
settled.value = error;
1212
} else {

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@
66
"contributors": [
77
"Blaine Bublitz <blaine@iceddev.com> (http://iceddev.com/)"
88
],
9-
"repository": "phated/async-settle",
9+
"repository": "gulpjs/async-settle",
1010
"license": "MIT",
1111
"engines": {
1212
"node": ">= 0.10"
1313
},
1414
"main": "index.js",
1515
"scripts": {
1616
"test": "lab -cv",
17-
"lint": "jshint test index.js --reporter node_modules/jshint-stylish/index.js --exclude node_modules"
17+
"lint": "eslint . && jscs *.js test/"
1818
},
1919
"dependencies": {
2020
"async-done": "^1.1.1"
2121
},
2222
"devDependencies": {
2323
"code": "^1.5.0",
24-
"jshint": "^2.8.0",
25-
"jshint-stylish": "^2.0.1",
24+
"eslint": "^1.7.3",
25+
"eslint-config-gulp": "^2.0.0",
26+
"jscs": "^2.3.5",
27+
"jscs-preset-gulp": "^1.0.0",
2628
"lab": "^6.2.0"
2729
},
2830
"keywords": [

test/.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "gulp/test"
3+
}

test/index.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,33 @@
33
var lab = exports.lab = require('lab').script();
44
var describe = lab.describe;
55
var it = lab.it;
6-
var before = lab.before;
7-
var beforeEach = lab.beforeEach;
8-
var after = lab.after;
9-
var afterEach = lab.afterEach;
106
var expect = require('code').expect;
117

128
var settle = require('../');
139

14-
describe('asyncSettle', function(){
10+
describe('asyncSettle', function() {
1511

16-
it('should transform success into settled success values', function(done){
12+
it('should transform success into settled success values', function(done) {
1713
var val = 'value to be settled';
18-
settle(function(done){
14+
settle(function(done) {
1915
done(null, val);
20-
}, function(err, result){
16+
}, function(err, result) {
2117
expect(result).to.include({
2218
state: 'success',
23-
value: val
19+
value: val,
2420
});
2521
done(err);
2622
});
2723
});
2824

29-
it('should transform errors into settled success values', function(done){
25+
it('should transform errors into settled success values', function(done) {
3026
var error = new Error('Error to be settled');
31-
settle(function(done){
27+
settle(function(done) {
3228
done(error);
33-
}, function(err, result){
29+
}, function(err, result) {
3430
expect(result).to.include({
3531
state: 'error',
36-
value: error
32+
value: error,
3733
});
3834
done(err);
3935
});

0 commit comments

Comments
 (0)