Merge branch 'master' into bump-dependencies

* master:
  fix testHelpers imports
  also lint gulp and test files
  lock history version for react-router
  change travis node version
  Revert "bump engine versions"
  bump version
  add npm scripts
  set up linting task
  add dev dependencies and build status to readme
  fix eslintrc
  add travis.yml
  bump engine versions
  update dependencies

Conflicts:
	package.json

.eslintrc

@@ -9,9 +9,7 @@
   },
   "env": {
     "browser": true,
-    "node": true,
-    "jasmine": true,
-    "mocha": true
+    "node": true
   },
   "rules": {
     "quotes": [2, "single"],

.travis.yml

@@ -0,0 +1,14 @@
+language: node_js
+node_js:
+- '0.12.7'
+branches:
+  only:
+    - master
+cache:
+  directories:
+    - node_modules
+install:
+- npm install
+before_script:
+- npm run lint
+- npm run test

README.md

@@ -1,5 +1,7 @@
 react-rocket
 ============
+[![Build Status](https://travis-ci.org/jakemmarsh/react-rocket-boilerplate.svg)](https://travis-ci.org/jakemmarsh/react-rocket-boilerplate) [![devDependency Status](https://david-dm.org/jakemmarsh/react-rocket-boilerplate/dev-status.svg)](https://david-dm.org/jakemmarsh/react-rocket-boilerplate#info=devDependencies)
+
 
 A boilerplate using ReactJS (along with React Router and RefluxJS), SASS, Gulp, and Browserify that also utilizes Gulp best practices from [this resource](https://github.com/greypants/gulp-starter).
 

__tests__/.eslintrc

@@ -1,4 +1,8 @@
 {
+  "env": {
+    "jasmine": true,
+    "mocha": true
+  },
   "globals": {
     "sinon": true,
     "sandbox": true,

__tests__/App.test.js

@@ -7,7 +7,7 @@ import App                from '../app/js/App';
 import CurrentUserStore   from '../app/js/stores/CurrentUserStore';
 import CurrentUserActions from '../app/js/actions/CurrentUserActions';
 import {ListenerMixin}    from 'reflux';
-import TestHelpers        from '../utils/TestHelpers';
+import TestHelpers        from '../utils/testHelpers';
 
 describe('App', function() {
 

__tests__/pages/HomePage.test.js

@@ -3,7 +3,7 @@
 import ReactDOM    from 'react-dom';
 import TestUtils   from 'react-addons-test-utils';
 
-import TestHelpers from '../../utils/TestHelpers';
+import TestHelpers from '../../utils/testHelpers';
 import HomePage    from '../../app/js/pages/HomePage';
 
 describe('Page: Home', function() {

__tests__/pages/NotFoundPage.test.js

@@ -3,7 +3,7 @@
 import ReactDOM     from 'react-dom';
 import TestUtils    from 'react-addons-test-utils';
 
-import TestHelpers  from '../../utils/TestHelpers';
+import TestHelpers  from '../../utils/testHelpers';
 import NotFoundPage from '../../app/js/pages/NotFoundPage';
 
 describe('Page: Not Found', function() {

__tests__/pages/SearchPage.test.js

@@ -3,7 +3,7 @@
 import ReactDOM    from 'react-dom';
 import TestUtils   from 'react-addons-test-utils';
 
-import TestHelpers from '../../utils/TestHelpers';
+import TestHelpers from '../../utils/testHelpers';
 import SearchPage  from '../../app/js/pages/SearchPage';
 
 describe('Page: Search', function() {

__tests__/stores/CurrentUserStore.test.js

@@ -2,7 +2,7 @@
 
 import when               from 'when';
 
-import TestHelpers        from '../../utils/TestHelpers';
+import TestHelpers        from '../../utils/testHelpers';
 import CurrentUserStore   from '../../app/js/stores/CurrentUserStore';
 import CurrentUserActions from '../../app/js/actions/CurrentUserActions';
 import AuthAPI            from '../../app/js/utils/AuthAPI';

__tests__/utils/APIUtils.test.js

@@ -10,7 +10,7 @@ describe('Util: APIUtils', function() {
     let testResponse = {
       status: 200,
       body: {
-        camel_case: 'test',
+        camel_case: 'test', //eslint-disable-line camelcase
         PascalCase: 'test',
         camelCase: 'test'
       }

__tests__/utils/AuthAPI.test.js

@@ -2,7 +2,7 @@
 
 import APIUtils    from '../../app/js/utils/APIUtils';
 import AuthAPI     from '../../app/js/utils/AuthAPI';
-import TestHelpers from '../../utils/TestHelpers';
+import TestHelpers from '../../utils/testHelpers';
 
 describe('Util: AuthAPI', function() {
 

gulp/tasks/lint.js

@@ -0,0 +1,14 @@
+'use strict';
+
+import gulp   from 'gulp';
+import eslint from 'gulp-eslint';
+import config from '../config';
+
+gulp.task('lint', function() {
+
+  return gulp.src([config.scripts.src, config.testFiles, './*.js'])
+    .pipe(eslint())
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError());
+
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-rocket-boilerplate",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "author": "Jake Marsh <[email protected]>",
   "description": "Boilerplate using React, Browserify, SASS, and Gulp.",
   "repository": {
@@ -31,6 +31,7 @@
     "eslint-plugin-react": "^3.6.3",
     "gulp": "^3.9.0",
     "gulp-autoprefixer": "^3.1.0",
+    "gulp-eslint": "^1.1.1",
     "gulp-if": "^2.0.0",
     "gulp-imagemin": "^2.3.0",
     "gulp-jsx-coverage": "^0.3.5",
@@ -42,7 +43,7 @@
     "gulp-streamify": "0.0.5",
     "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.6",
-    "history": "^1.12.5",
+    "history": "1.13.0",
     "humps": "^1.0.0",
     "istanbul": "^0.4.0",
     "jsdom": "3.1.2",
@@ -62,5 +63,9 @@
     "watchify": "^3.2.x",
     "when": "^3.7.4",
     "yargs": "^3.27.0"
+  },
+  "scripts": {
+    "lint": "./node_modules/.bin/gulp lint",
+    "test": "./node_modules/.bin/gulp test"
   }
 }