Merge pull request #8 from michaelbpaulson/master

added a style issue.

.jscsrc

@@ -2,6 +2,10 @@
     // setup
     "fileExtensions":   [ ".js" ],
     "excludeFiles":     [ "./node_modules/**",
+                          "./bin",
+                          "./deps",
+                          "./docs",
+                          "./examples",
                           "./coverage"
                         ],
 
@@ -32,6 +36,7 @@
         "binary",
         "string"
     ],
+    "disallowAnonymousFunctions": true,
     "disallowMixedSpacesAndTabs": true,
     "disallowMultipleVarDecl": "exceptUndefined",
     "disallowNewlineBeforeBlockStatements": true,
@@ -42,10 +47,6 @@
     "disallowTrailingComma": true,
     "disallowTrailingWhitespace": true,
     "disallowYodaConditions": true,
-    "disallowAnonymousFunctions": true,
-    "disallowSpacesInAnonymousFunctionExpression": {
-        "beforeOpeningRoundBrace": true
-    },
 
     // require rules
     "requireBlocksOnNewline": true,
@@ -65,23 +66,16 @@
     "requireLineBreakAfterVariableAssignment": true,
     "requirePaddingNewLinesAfterUseStrict": true,
     "requirePaddingNewLinesBeforeExport": true,
-    "requireSemicolons": true,
-    "requireSpaceAfterBinaryOperators": true,
-    "requireSpaceAfterKeywords": [
+    "requirePaddingNewlinesBeforeKeywords": [
         "do",
         "for",
-        "if",
-        "else",
         "switch",
-        "case",
         "try",
-        "catch",
-        "void",
-        "while",
-        "with",
-        "return",
-        "typeof"
+        "while"
     ],
+    "requireSemicolons": true,
+    "requireSpaceAfterBinaryOperators": true,
+    "requireSpaceAfterKeywords": true,
     "requireSpaceBeforeBinaryOperators": true,
     "requireSpaceBeforeBlockStatements": true,
     "requireSpaceBeforeKeywords": [
@@ -90,6 +84,9 @@
         "catch"
     ],
     "requireSpaceBetweenArguments": true,
+    "requireSpacesInAnonymousFunctionExpression": {
+        "beforeOpeningRoundBrace": true
+    },
     "requireSpacesInConditionalExpression": true,
     "requireSpacesInForStatement": true,
     "requireSpacesInFunction": {

build/build.style.js

@@ -1,26 +1,36 @@
 var gulp = require('gulp');
 var jscs = require('gulp-jscs');
 var eslint = require('gulp-eslint');
+var src = [
+    './src/**/*.js'
+];
+var build = [
+    './build/**/*.js',
+    './gulpfile.js'
+];
+var test = [
+    './test/**/*.js'
+];
 
 gulp.task('jscs', function _jscs() {
-    return gulp.src([
-            './src/**/*.js',
-            './build/**/*.js',
-            './gulpfile.js'
-        ]).
+    // style does not apply to test files, but lint does.
+    return gulp.src(
+            src.
+                concat(build)).
         pipe(jscs()).
-        pipe(jscs.reporter());
+        pipe(jscs.reporter()).
+        pipe(jscs.reporter('fail'));
 });
 
 gulp.task('lint', function _lint() {
-    return gulp.src(['src/**/*.js']).
+    return gulp.src(src).
         pipe(eslint()).
         pipe(eslint.format()).
         pipe(eslint.failAfterError());
 });
 
 gulp.task('lint-test', function _lint() {
-    return gulp.src(['test/**/*.js']).
+    return gulp.src(test).
         pipe(eslint({
             globals: {
                 describe: false,

build/build.test.js

@@ -2,7 +2,10 @@ var gulp = require('gulp');
 var istanbul = require('gulp-istanbul');
 var mocha = require('gulp-mocha');
 
-gulp.task('test-coverage', function testCoverage(cb) {
+require('./build.style');
+
+// Before running coverage, fix the linting issues.
+gulp.task('test-coverage', ['jscs', 'lint'], function testCoverage(cb) {
     gulp.src(['./src/**/*.js']).
         pipe(istanbul()).
         pipe(istanbul.hookRequire()).

src/Subscribable.js

@@ -20,6 +20,7 @@ Subscribable.prototype.subscribe = function subscribe(a, b, c) {
         };
     }
     var subscription = this._subscribe(observer);
+
     switch (typeof subscription) {
         case 'function':
             return { dispose: subscription };