add linting, remove 0.12 and iojs add v4 and other fixes

.travis.yml

@@ -2,6 +2,6 @@ language: node_js
 
 node_js:
   - 0.10
-  - 0.12
-  - iojs
+  - 4
 
+sudo: false

lib/index.js

@@ -42,9 +42,9 @@ internals.hawk = function (server, options) {
                         var payloadHash = Hawk.crypto.initializePayloadHash(request.auth.credentials.algorithm, request.headers['content-type']);
                         payloadHash.update(chunk);
 
-                        request.on('peek', function (chunk) {
+                        request.on('peek', function (chunk2) {
 
-                            payloadHash.update(chunk);
+                            payloadHash.update(chunk2);
                         });
 
                         request.once('finish', function () {
@@ -58,7 +58,7 @@ internals.hawk = function (server, options) {
                 if (err) {
                     return reply(err, null, result);
                 }
-                
+
                 return reply.continue(result);
             });
         },
@@ -121,7 +121,7 @@ internals.bewit = function (server, options) {
                 if (err) {
                     return reply(err, null, result);
                 }
-                
+
                 return reply.continue(result);
             });
         }

package.json

@@ -3,7 +3,7 @@
   "description": "Hawk authentication plugin",
   "version": "3.0.0",
   "repository": "git://github.com/hapijs/hapi-auth-hawk",
-  "main": "index",
+  "main": "lib/index.js",
   "keywords": [
     "hapi",
     "plugin",
@@ -28,7 +28,8 @@
     "lab": "5.x.x"
   },
   "scripts": {
-    "test": "make test-cov"
+    "test": "lab -r console -t 100 -a code -L",
+    "test-cov-html": "lab -r html -o coverage.html -a code -L"
   },
   "licenses": [
     {

test/bewit.js

@@ -41,19 +41,15 @@ describe('bewit scheme', function () {
         if (credentials[id]) {
             return callback(credentials[id].err, credentials[id].cred);
         }
-        else {
-            return callback(null, null);
-        }
+        return callback(null, null);
     };
 
     var getBewit = function (id, path) {
 
         if (credentials[id] && credentials[id].cred) {
             return Hawk.uri.getBewit('http://example.com:8080' + path, { credentials: credentials[id].cred, ttlSec: 60 });
         }
-        else {
-            return '';
-        }
+        return '';
     };
 
     var bewitHandler = function (request, reply) {
@@ -74,7 +70,7 @@ describe('bewit scheme', function () {
             server.route([
                 { method: 'GET', path: '/bewit', handler: bewitHandler, config: { auth: 'default' } },
                 { method: 'GET', path: '/bewitOptional', handler: bewitHandler, config: { auth: { mode: 'optional', strategy: 'default' } } },
-                { method: 'GET', path: '/bewitScope', handler: bewitHandler, config: { auth: { scope: 'x', strategy: 'default' } } },
+                { method: 'GET', path: '/bewitScope', handler: bewitHandler, config: { auth: { scope: 'x', strategy: 'default' } } }
             ]);
 
             done();
@@ -135,7 +131,7 @@ describe('bewit scheme', function () {
         var bewit = getBewit('john', '/bewit');
         var request = { method: 'GET', url: '/bewit?bewit=' + bewit, headers: { custom: 'example.com:8080' } };
 
-        var server = new Hapi.Server();
+        server = new Hapi.Server();
         server.connection();
         server.register(require('../'), function (err) {