Skip to content

Commit

Permalink
Closes #9. Stable Version 2.0.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmdobry committed Sep 10, 2015
1 parent f5aafb2 commit 2ec134d
Show file tree
Hide file tree
Showing 9 changed files with 254 additions and 224 deletions.
1 change: 1 addition & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"node": false,
"browser": true,
"esnext": true,
"asi": true,
"bitwise": true,
"camelcase": false,
"curly": true,
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ before_install:
- wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
- sudo apt-get update -qq
- sudo apt-get install rethinkdb -y --force-yes
- npm install -g npm
- npm install -g grunt-cli
before_script:
- sudo rethinkdb --io-threads 2048 --daemon
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
##### 2.0.2 - 09 September 2015

###### Backwards compatible bug fixes
- #9 - CI tests failing because of outdated npm

##### 2.0.1 - 03 July 2015

###### Backwards compatible bug fixes
Expand Down
16 changes: 9 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing Guide

First, support is handled via the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
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.

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

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

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

#### Pull Requests
#### Submitting Pull Requests

1. Contribute to the issue that is the reason you'll be developing in the first place
1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
1. Fork js-data-rethinkdb
1. `git clone https://github.com/<you>/js-data-rethinkdb.git`
1. `git clone git@github.com:<you>/js-data-rethinkdb.git`
1. `cd js-data-rethinkdb; npm install; bower install;`
1. `grunt go` (builds and starts a watch)
1. (in another terminal) `grunt karma:dev` (runs the tests)
1. Write your code, including relevant documentation and tests
1. Submit a PR and we'll review
1. Run `grunt test` (build and test)
1. Your code will be linted and checked for formatting, the tests will be run
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
1. Submit your PR and we'll review!
1. Thanks!
17 changes: 17 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,27 @@ module.exports = function (grunt) {
}
});

grunt.registerTask('standard', function () {
var child_process = require('child_process');
var done = this.async();
grunt.log.writeln('Linting for correcting formatting...');
child_process.exec('node node_modules/standard/bin/cmd.js --parser babel-eslint src/index.js', function (err, stdout) {
console.log(stdout);
if (err) {
grunt.log.writeln('Failed due to ' + (stdout.split('\n').length - 2) + ' lint errors!');
done(err);
} else {
grunt.log.writeln('Done linting.');
done();
}
});
});

grunt.registerTask('n', ['mochaTest']);

grunt.registerTask('test', ['build', 'n']);
grunt.registerTask('build', [
'standard',
'webpack'
]);
grunt.registerTask('go', ['build', 'watch:dist']);
Expand Down
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ store.registerAdapter('rethinkdb', adapter, { default: true });

### Contributing

First, support is handled via the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
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.

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

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

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

#### Pull Requests
#### Submitting Pull Requests

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

### License

Expand Down
6 changes: 3 additions & 3 deletions dist/js-data-rethinkdb.js
Original file line number Diff line number Diff line change
Expand Up @@ -514,19 +514,19 @@ module.exports =

/***/ },
/* 1 */
/***/ function(module, exports, __webpack_require__) {
/***/ function(module, exports) {

module.exports = require("rethinkdbdash");

/***/ },
/* 2 */
/***/ function(module, exports, __webpack_require__) {
/***/ function(module, exports) {

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

/***/ },
/* 3 */
/***/ function(module, exports, __webpack_require__) {
/***/ function(module, exports) {

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

Expand Down
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "js-data-rethinkdb",
"description": "RethinkDB adapter for js-data.",
"version": "2.0.1",
"version": "2.0.2",
"homepage": "http://www.js-data.io/docs/dsrethinkdbadapter",
"repository": {
"type": "git",
Expand All @@ -28,19 +28,21 @@
"reql"
],
"devDependencies": {
"babel-core": "5.6.15",
"babel-loader": "5.3.0",
"bluebird": "2.9.31",
"chai": "3.0.0",
"babel-core": "5.8.23",
"babel-eslint": "4.1.1",
"babel-loader": "5.3.2",
"bluebird": "2.10.0",
"chai": "3.2.0",
"grunt": "0.4.5",
"grunt-contrib-watch": "0.6.1",
"grunt-karma-coveralls": "2.5.3",
"grunt-karma-coveralls": "2.5.4",
"grunt-mocha-test": "0.12.7",
"grunt-webpack": "1.0.11",
"jit-grunt": "0.9.1",
"jshint": "2.8.0",
"jshint-loader": "0.8.3",
"sinon": "1.15.4",
"sinon": "1.16.1",
"standard": "5.2.2",
"time-grunt": "1.2.1",
"webpack-dev-server": "1.10.1"
},
Expand Down
Loading

0 comments on commit 2ec134d

Please sign in to comment.