version bumps, jshint fixes

BryanDonovan · BryanDonovan · commit ff50048ecd89 · 2013-02-23T21:27:25.000-08:00
diff --git a/.jshintrc b/.jshintrc
@@ -73,8 +73,9 @@
     "nomen"         : false,  // Prohibit use of initial or trailing underbars in names.
     "onevar"        : false,  // Allow only one `var` statement per function.
     "plusplus"      : false,  // Prohibit use of `++` & `--`.
-    "sub"           : true,  // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`.
-    "trailing"      : true,  // Prohibit trailing whitespaces. (only works if white is 'true')
-    "white"         : true,  // Check against strict whitespace and indentation rules.
-    "indent"        : 4       // ignored because "white" is false.
+    "sub"           : true,   // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`.
+    "trailing"      : true,   // Prohibit trailing whitespaces. (only works if white is 'true')
+    "white"         : true,   // Check against strict whitespace and indentation rules.
+    "indent"        : 4,      // ignored because "white" is false.
+    "unused"        : true
 }
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ TEST_COMMAND = NODE_ENV=test ./node_modules/.bin/mocha
 COVERAGE_OPTS = --lines 95 --statements 90 --branches 80 --functions 90
 BUSTER = ./node_modules/.bin/buster test
 
-main: lint test
+main: lint test test-buster
 
 cover:
 	$(ISTANBUL) cover test/run.js
@@ -28,7 +28,9 @@ test-acceptance:
 	test/run.js -T acceptance
 
 lint:
-	./node_modules/jshint/bin/hint ./lib --config $(BASE)/.jshintrc && cd test && ../node_modules/jshint/bin/hint . && cd ..
+	./node_modules/.bin/jshint ./lib --config $(BASE)/.jshintrc && \
+	./node_modules/.bin/jshint ./test --config $(BASE)/.jshintrc
+	./node_modules/.bin/jshint ./test-buster --config $(BASE)/.jshintrc
 
 
 .PHONY: test test-buster
diff --git a/lib/server/app_server.js b/lib/server/app_server.js
@@ -15,7 +15,7 @@ var logger = new Logger({
     ]
 });
 
-function AppServer(config, options) {
+function AppServer(config) {
     var self = this;
     self.config = config;
     self.started = false;
diff --git a/lib/server/responder.js b/lib/server/responder.js
@@ -1,5 +1,4 @@
 var restify = require('restify');
-var util = require('util');
 
 var responder = {
     error: function (res, err, next) {
diff --git a/package.json b/package.json
@@ -17,12 +17,11 @@
     },
     "devDependencies": {
         "buster": "0.6.3",
-        "Faker" : "git://github.com/BryanDonovan/Faker.js.git#master",
-        "jshint": "0.9.0",
-        "jugglingdb": "0.2.0-2",
-        "istanbul": "0.1.25",
-        "mocha": "1.7.4",
-        "sinon": "1.4.2"
+        "Faker" : "0.5.6",
+        "jshint": "1.0.0",
+        "istanbul": "0.1.29",
+        "mocha": "1.8.1",
+        "sinon": "1.5.2"
     },
     "repository": {
         "type": "git",
diff --git a/test-buster/apps/users/controller.unit.js b/test-buster/apps/users/controller.unit.js
@@ -7,7 +7,7 @@ var support = require('../../support');
 var http = support.http;
 var User = main.models.User;
 
-var spec = describe("users/controller.js", function () {
+describe("users/controller.js", function () {
     var app;
     var http_client;
 
@@ -33,7 +33,7 @@ var spec = describe("users/controller.js", function () {
                 cb(null, {});
             });
 
-            http_client.post('/users', params, function (err, result) {
+            http_client.post('/users', params, function (err) {
                 buster.refute(err);
                 assert(User.create.calledWith(params));
                 assert(true);
diff --git a/test-buster/support/http.js b/test-buster/support/http.js
@@ -1,8 +1,6 @@
 var restify = require('restify');
-var util = require('util');
 var host = process.env.HOST || 'localhost';
 var port = process.env.PORT;
-var ENV = process.env.NODE_ENV;
 
 if (!port) {
     if (host === 'localhost') {
diff --git a/test/apps/users/controller.unit.js b/test/apps/users/controller.unit.js
@@ -31,7 +31,7 @@ describe("users/controller.js", function () {
                 cb(null, {});
             });
 
-            http_client.post('/users', params, function (err, result) {
+            http_client.post('/users', params, function (err) {
                 assert.ifError(err);
                 assert.ok(User.create.calledWith(params));
                 User.create.restore();
diff --git a/test/models/user.unit.js b/test/models/user.unit.js
@@ -1,5 +1,4 @@
 var assert = require('assert');
-var support = require('../support');
 var User = main.models.User;
 
 describe("User model", function () {
diff --git a/test/run.js b/test/run.js
@@ -2,7 +2,6 @@
 process.env.NODE_ENV = 'test';
 require('../lib');
 
-var fs = require('fs');
 var Mocha = require('mocha');
 var optimist = require('optimist');
 var walk_dir = require('./support/walk_dir');
@@ -67,6 +66,7 @@ function run(cb) {
 }
 
 run(function (err) {
+    if (err) { throw err; }
     mocha.run(function (failures) {
         process.exit(failures);
     });
diff --git a/test/server/app_registrar.unit.js b/test/server/app_registrar.unit.js
@@ -1,8 +1,6 @@
 var assert = require('assert');
 var restify = require('restify');
-var sinon = require('sinon');
 var support = require('../support');
-var path = require('path');
 var AppRegistrar = main.server.AppRegistrar;
 
 describe("app_registrar.js", function () {
@@ -27,15 +25,15 @@ describe("app_registrar.js", function () {
         context("when server missing", function () {
             it("throws an error", function () {
                 assert.throws(function () {
-                    var registrar = new AppRegistrar(null, 'users');
+                    new AppRegistrar(null, 'users');
                 }, /AppRegistrar.*server/);
             });
         });
 
         context("when app_name not found in apps path", function () {
             it("throws an error", function () {
                 assert.throws(function () {
-                    var registrar = new AppRegistrar(server, 'foo');
+                    new AppRegistrar(server, 'foo');
                 }, /AppRegistrar.*app not found/);
             });
         });
diff --git a/test/server/app_server.unit.js b/test/server/app_server.unit.js
@@ -1,7 +1,4 @@
 var assert = require('assert');
-var sinon = require('sinon');
-var support = require('../support');
-var path = require('path');
 var Settings = require('settings');
 var config = new Settings(require('../../config'));
 var AppServer = main.server.AppServer;
@@ -11,7 +8,7 @@ describe('app_server.js', function () {
         context("when config is not passed in", function () {
             it("throws an error", function () {
                 assert.throws(function () {
-                    var new_server = new AppServer(null);
+                    new AppServer(null);
                 }, /AppServer.*config/);
             });
         });
diff --git a/test/server/responder.functional.js b/test/server/responder.functional.js
@@ -1,6 +1,5 @@
 var assert = require('assert');
 var restify = require('restify');
-var sinon = require('sinon');
 var support = require('../support');
 var http = support.http;
 var responder = main.server.responder;
@@ -38,7 +37,7 @@ describe("functional - server/responder.js", function () {
     describe("error responses", function () {
         describe("restify errors", function () {
             it("returns correct response body", function (done) {
-                http_client.get('/test/errors/restify', function (err, result, raw_res) {
+                http_client.get('/test/errors/restify', function (err, result) {
                     var expected = {
                         code: 'InvalidArgument',
                         message: 'foo arg invalid'
diff --git a/test/server/responder.unit.js b/test/server/responder.unit.js
@@ -1,12 +1,7 @@
 var assert = require('assert');
-var restify = require('restify');
 var sinon = require('sinon');
-var support = require('../support');
 var responder = main.server.responder;
 
-var fake_req = {
-};
-
 var fake_res = {
     header: function () {},
     status: function () {},
@@ -41,15 +36,15 @@ describe("responder.js", function () {
 
         context("when no data passed in", function () {
             it("calls responder.error()", function (done) {
-                sinon.stub(responder, 'error', function (res, err, next, options) {
+                sinon.stub(responder, 'error', function (res, err, next) {
                     next();
                 });
 
                 responder.success(fake_res, null, fake_next);
 
                 assert.ok(responder.error.called);
                 responder.error.restore();
-                
+
                 done();
             });
         });
diff --git a/test/server/router.unit.js b/test/server/router.unit.js
@@ -1,6 +1,6 @@
+/*jshint unused:false*/
 var assert = require('assert');
 var restify = require('restify');
-var sinon = require('sinon');
 var support = require('../support');
 var router = main.server.router;
 var TEST_HOST = support.http.host;
diff --git a/test/support/http.js b/test/support/http.js
@@ -1,8 +1,6 @@
 var restify = require('restify');
-var util = require('util');
 var host = process.env.HOST || 'localhost';
 var port = process.env.PORT;
-var ENV = process.env.NODE_ENV;
 
 if (!port) {
     if (host === 'localhost') {
diff --git a/test/support/index.js b/test/support/index.js
@@ -13,5 +13,5 @@ module.exports = {
             });
         }
         return ret;
-    },
+    }
 };

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ var logger = new Logger({`
`15`	`15`	`]`
`16`	`16`	`});`
`17`	`17`
`18`		`-function AppServer(config, options) {`
	`18`	`+function AppServer(config) {`
`19`	`19`	`var self = this;`
`20`	`20`	`self.config = config;`
`21`	`21`	`self.started = false;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`var restify = require('restify');`
`2`		`-var util = require('util');`
`3`	`2`
`4`	`3`	`var responder = {`
`5`	`4`	`error: function (res, err, next) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`var assert = require('assert');`
`2`		`-var support = require('../support');`
`3`	`2`	`var User = main.models.User;`
`4`	`3`
`5`	`4`	`describe("User model", function () {`