Skip to content

Commit 2ec134d

Browse files
committed
Closes #9. Stable Version 2.0.2.
1 parent f5aafb2 commit 2ec134d

9 files changed

+254
-224
lines changed

.jshintrc

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"node": false,
33
"browser": true,
44
"esnext": true,
5+
"asi": true,
56
"bitwise": true,
67
"camelcase": false,
78
"curly": true,

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ before_install:
66
- wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
77
- sudo apt-get update -qq
88
- sudo apt-get install rethinkdb -y --force-yes
9+
- npm install -g npm
910
- npm install -g grunt-cli
1011
before_script:
1112
- sudo rethinkdb --io-threads 2048 --daemon

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
##### 2.0.2 - 09 September 2015
2+
3+
###### Backwards compatible bug fixes
4+
- #9 - CI tests failing because of outdated npm
5+
16
##### 2.0.1 - 03 July 2015
27

38
###### Backwards compatible bug fixes

CONTRIBUTING.md

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing Guide
22

3-
First, support is handled via the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
3+
First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
44

55
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
66

@@ -10,13 +10,15 @@ When submitting issues on GitHub, please include as much detail as possible to m
1010

1111
[Github Issues](https://github.com/js-data/js-data-rethinkdb/issues).
1212

13-
#### Pull Requests
13+
#### Submitting Pull Requests
1414

15-
1. Contribute to the issue that is the reason you'll be developing in the first place
15+
1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
1616
1. Fork js-data-rethinkdb
17-
1. `git clone https://github.com/<you>/js-data-rethinkdb.git`
17+
1. `git clone git@github.com:<you>/js-data-rethinkdb.git`
1818
1. `cd js-data-rethinkdb; npm install; bower install;`
19-
1. `grunt go` (builds and starts a watch)
20-
1. (in another terminal) `grunt karma:dev` (runs the tests)
2119
1. Write your code, including relevant documentation and tests
22-
1. Submit a PR and we'll review
20+
1. Run `grunt test` (build and test)
21+
1. Your code will be linted and checked for formatting, the tests will be run
22+
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
23+
1. Submit your PR and we'll review!
24+
1. Thanks!

Gruntfile.js

+17
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,27 @@ module.exports = function (grunt) {
6969
}
7070
});
7171

72+
grunt.registerTask('standard', function () {
73+
var child_process = require('child_process');
74+
var done = this.async();
75+
grunt.log.writeln('Linting for correcting formatting...');
76+
child_process.exec('node node_modules/standard/bin/cmd.js --parser babel-eslint src/index.js', function (err, stdout) {
77+
console.log(stdout);
78+
if (err) {
79+
grunt.log.writeln('Failed due to ' + (stdout.split('\n').length - 2) + ' lint errors!');
80+
done(err);
81+
} else {
82+
grunt.log.writeln('Done linting.');
83+
done();
84+
}
85+
});
86+
});
87+
7288
grunt.registerTask('n', ['mochaTest']);
7389

7490
grunt.registerTask('test', ['build', 'n']);
7591
grunt.registerTask('build', [
92+
'standard',
7693
'webpack'
7794
]);
7895
grunt.registerTask('go', ['build', 'watch:dist']);

README.md

+9-7
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ store.registerAdapter('rethinkdb', adapter, { default: true });
5252

5353
### Contributing
5454

55-
First, support is handled via the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
55+
First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
5656

5757
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
5858

@@ -62,16 +62,18 @@ When submitting issues on GitHub, please include as much detail as possible to m
6262

6363
[Github Issues](https://github.com/js-data/js-data-rethinkdb/issues).
6464

65-
#### Pull Requests
65+
#### Submitting Pull Requests
6666

67-
1. Contribute to the issue that is the reason you'll be developing in the first place
67+
1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
6868
1. Fork js-data-rethinkdb
69-
1. `git clone https://github.com/<you>/js-data-rethinkdb.git`
69+
1. `git clone git@github.com:<you>/js-data-rethinkdb.git`
7070
1. `cd js-data-rethinkdb; npm install; bower install;`
71-
1. `grunt go` (builds and starts a watch)
72-
1. (in another terminal) `grunt karma:dev` (runs the tests)
7371
1. Write your code, including relevant documentation and tests
74-
1. Submit a PR and we'll review
72+
1. Run `grunt test` (build and test)
73+
1. Your code will be linted and checked for formatting, the tests will be run
74+
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
75+
1. Submit your PR and we'll review!
76+
1. Thanks!
7577

7678
### License
7779

dist/js-data-rethinkdb.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -514,19 +514,19 @@ module.exports =
514514

515515
/***/ },
516516
/* 1 */
517-
/***/ function(module, exports, __webpack_require__) {
517+
/***/ function(module, exports) {
518518

519519
module.exports = require("rethinkdbdash");
520520

521521
/***/ },
522522
/* 2 */
523-
/***/ function(module, exports, __webpack_require__) {
523+
/***/ function(module, exports) {
524524

525525
module.exports = require("js-data");
526526

527527
/***/ },
528528
/* 3 */
529-
/***/ function(module, exports, __webpack_require__) {
529+
/***/ function(module, exports) {
530530

531531
module.exports = require("mout/string/underscore");
532532

package.json

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-data-rethinkdb",
33
"description": "RethinkDB adapter for js-data.",
4-
"version": "2.0.1",
4+
"version": "2.0.2",
55
"homepage": "http://www.js-data.io/docs/dsrethinkdbadapter",
66
"repository": {
77
"type": "git",
@@ -28,19 +28,21 @@
2828
"reql"
2929
],
3030
"devDependencies": {
31-
"babel-core": "5.6.15",
32-
"babel-loader": "5.3.0",
33-
"bluebird": "2.9.31",
34-
"chai": "3.0.0",
31+
"babel-core": "5.8.23",
32+
"babel-eslint": "4.1.1",
33+
"babel-loader": "5.3.2",
34+
"bluebird": "2.10.0",
35+
"chai": "3.2.0",
3536
"grunt": "0.4.5",
3637
"grunt-contrib-watch": "0.6.1",
37-
"grunt-karma-coveralls": "2.5.3",
38+
"grunt-karma-coveralls": "2.5.4",
3839
"grunt-mocha-test": "0.12.7",
3940
"grunt-webpack": "1.0.11",
4041
"jit-grunt": "0.9.1",
4142
"jshint": "2.8.0",
4243
"jshint-loader": "0.8.3",
43-
"sinon": "1.15.4",
44+
"sinon": "1.16.1",
45+
"standard": "5.2.2",
4446
"time-grunt": "1.2.1",
4547
"webpack-dev-server": "1.10.1"
4648
},

0 commit comments

Comments
 (0)