Merge pull request felixge#82 from janpieper/jshint

Use jshint to check code for problems and errors
abeck70 · Oct 24, 2013 · a9f56a9 · a9f56a9
2 parents e9857de + b8e1996
commit a9f56a9
Show file tree

Hide file tree

Showing 19 changed files with 437 additions and 423 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,7 @@
+{
+  "node": true,
+  "laxbreak": true,
+  "indent": 2,
+  "curly": true,
+  "trailing": true
+}
diff --git a/examples/save-video-stream.js b/examples/save-video-stream.js
@@ -3,7 +3,7 @@
 // or streaming to a ffserver
 
 var arDrone = require('..');
-var PaVEParser = require('../lib/video/PaVEParser'); 
+var PaVEParser = require('../lib/video/PaVEParser');
 var output = require('fs').createWriteStream('./vid.h264');
 
 var video = arDrone.createClient().getVideoStream();

diff --git a/lib/Client.js b/lib/Client.js
@@ -19,7 +19,7 @@ function Client(options) {
   this._udpControl        = options.udpControl || new Client.UdpControl(options);
   this._udpNavdatasStream = options.udpNavdataStream || new Client.UdpNavdataStream(options);
   this._pngStream         = null;
-  this._tcpStream         = null;
+  this._tcpVideoStream    = null;
   this._interval          = null;
   this._ref               = {};
   this._pcmd              = {};
@@ -49,46 +49,46 @@ Client.prototype.createPngStream = function() {
 };
 
 Client.prototype.getPngStream = function() {
-  if (this._pngStream == null) {
-      this._pngStream = this._newPngStream();
+  if (this._pngStream === null) {
+    this._pngStream = this._newPngStream();
   }
   return this._pngStream;
-}
+};
 
 Client.prototype.getVideoStream = function() {
-  if (this._tcpVideoStream == null) {
+  if (this._tcpVideoStream === null) {
     this._tcpVideoStream = this._newTcpVideoStream();
   }
   return this._tcpVideoStream;
-}
+};
 
 Client.prototype._newTcpVideoStream = function() {
   var stream = new Client.TcpVideoStream(this._options);
   var callback = function(err) {
     if (err !== null) {
       console.log('TcpVideoStream error: %s', err.message);
       setTimeout(function () {
-          console.log('Attempting to reconnect to TcpVideoStream...');
-          stream.connect(callback);
+        console.log('Attempting to reconnect to TcpVideoStream...');
+        stream.connect(callback);
       }, 1000);
     }
-  }
+  };
 
   stream.connect(callback);
   stream.on('error', callback);
   return stream;
-}
+};
 
 Client.prototype._newPngStream = function() {
   var videoStream = this.getVideoStream();
   var pngEncoder = new Client.PngEncoder(this._options);
 
   videoStream.on('data', function(data) {
-      pngEncoder.write(data);
+    pngEncoder.write(data);
   });
 
   return pngEncoder;
-}
+};
 
 Client.prototype.resume = function() {
   // Reset config ACK.
@@ -231,7 +231,7 @@ Client.prototype.config = function(key, value, callback) {
 };
 
 Client.prototype.ctrl = function(controlMode, otherMode) {
-    this._udpControl.ctrl(controlMode, otherMode);
+  this._udpControl.ctrl(controlMode, otherMode);
 };
 
 Client.prototype.animate = function(animation, duration) {
@@ -265,7 +265,7 @@ var pcmdOptions = [
   ['left', 'right'],
   ['front', 'back'],
   ['clockwise', 'counterClockwise'],
-]
+];
 
 pcmdOptions.forEach(function(pair) {
   Client.prototype[pair[0]] = function(speed) {

diff --git a/lib/Repl.js b/lib/Repl.js
@@ -12,6 +12,7 @@ Repl.prototype.resume = function() {
     prompt : 'drone> ',
   });
 
+  /* jshint evil:true */
   this._nodeEval = this._repl.eval;
 
   // @TODO This does not seem to work for animate('yawShake', 2000), need

diff --git a/lib/control/AtCommandCreator.js b/lib/control/AtCommandCreator.js
@@ -14,8 +14,8 @@ AtCommandCreator.prototype.raw = function(type, args, blocks, options, callback)
 };
 
 AtCommandCreator.prototype.ctrl = function(controlMode, otherMode) {
-    var args = [controlMode, otherMode];
-    return this.raw('CTRL', args);
+  var args = [controlMode, otherMode];
+  return this.raw('CTRL', args);
 };
 
 // Used for fly/land as well as emergency trigger/recover
@@ -87,7 +87,7 @@ AtCommandCreator.prototype.ctrl = function(a, b) {
 // TMP: Used to send FTRIM
 AtCommandCreator.prototype.ftrim = function() {
   return this.raw('FTRIM');
-}
+};
 
 AtCommandCreator.prototype.animateLeds = function(name, hz, duration) {
   // Default animation

diff --git a/lib/control/UdpControl.js b/lib/control/UdpControl.js
@@ -123,7 +123,7 @@ UdpControl.prototype._sendCommands = function(commands) {
   debug(serialized.replace('\r', '|'));
   var buffer = new Buffer(serialized);
   this._socket.send(buffer, 0, buffer.length, this._port, this._ip);
-}
+};
 
 UdpControl.prototype._concat = function(commands) {
   var self = this;

diff --git a/lib/navdata/UdpNavdataStream.js b/lib/navdata/UdpNavdataStream.js
@@ -55,8 +55,10 @@ UdpNavdataStream.prototype._setTimeout = function() {
 };
 
 UdpNavdataStream.prototype._handleMessage = function(buffer) {
+  var navdata = {};
+
   try {
-    var navdata = this._parseNavdata(buffer);
+    navdata = this._parseNavdata(buffer);
   } catch (err) {
     // avoid 'error' causing an exception when nobody is listening
     if (this.listeners('error').length > 0) {

diff --git a/lib/navdata/maskingFunctions.js b/lib/navdata/maskingFunctions.js
@@ -4,7 +4,7 @@ exports.NAVDATA_NUM_TAGS         = Object.keys(constants.options).length;
 exports.NAVDATA_OPTION_FULL_MASK = (1<<exports.NAVDATA_NUM_TAGS) - 1;
 
 exports.TAG_TYPE_MASK = function (tagtype) {
-  return (tagtype == 0) ? 0 : 1 << (tagtype - 1);
+  return (tagtype === 0) ? 0 : 1 << (tagtype - 1);
 };
 
 exports.NAVDATA_OPTION_MASK = function (option) {

diff --git a/lib/navdata/parseNavdata.js b/lib/navdata/parseNavdata.js
@@ -3,7 +3,9 @@ var NavdataReader = require('./NavdataReader');
 // call `iterator` `n` times, returning an array of the results
 var timesMap = function(n, iterator, context) {
   var results = [];
-  for (var i = 0; i < n; i++) results[i] = iterator.call(context, i);
+  for (var i = 0; i < n; i++) {
+    results[i] = iterator.call(context, i);
+  }
   return results;
 };
 

diff --git a/lib/video/PngSplitter.js b/lib/video/PngSplitter.js
@@ -41,7 +41,7 @@ PngSplitter.prototype.write = function(buffer) {
 
         this._state = 'chunk.data';
         break;
-     case 'chunk.data':
+      case 'chunk.data':
         var chunkSize = this._chunk.length + 4; // 4 bytes = CRC
         if (this.remainingBytes() < chunkSize) {
           return;
@@ -60,7 +60,7 @@ PngSplitter.prototype.write = function(buffer) {
           break;
         }
 
-        this._state = 'chunk.header'
+        this._state = 'chunk.header';
         break;
     }
   }

diff --git a/lib/video/TcpVideoStream.js b/lib/video/TcpVideoStream.js
@@ -11,7 +11,7 @@ function TcpVideoStream(options) {
   options = options || {};
 
   this.readable   = true;
-  this._socket    = options.socket || new net.Socket;
+  this._socket    = options.socket || new net.Socket();
   this._port      = options.port || constants.ports.VIDEO;
   this._ip        = options.ip || constants.DEFAULT_DRONE_IP;
   this._timeout   = options.timeout || 1 * 1000;

diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
   },
   "main": "./index",
   "scripts": {
+    "pretest": "node_modules/jshint/bin/jshint -c .jshintrc examples/ lib/ test/ index.js",
     "test": "node test/run.js"
   },
   "dependencies": {
@@ -19,7 +20,8 @@
   "devDependencies": {
     "utest": "0.0.6",
     "urun": "0.0.6",
-    "sinon": "1.4.2"
+    "sinon": "1.4.2",
+    "jshint": "2.3.0"
   },
   "optionalDependencies": {},
   "engines": {

diff --git a/test/integration/video/TcpVideoStream/test-connection-timeout.js b/test/integration/video/TcpVideoStream/test-connection-timeout.js
@@ -11,7 +11,7 @@ server.listen(common.TCP_PORT, function() {
   var video = new TcpVideoStream({ip: 'localhost', port: common.TCP_PORT, timeout: 100});
 
   video.connect(function(err) {
-    if (err) throw err;
+    if (err) { throw err; }
 
     events.push('connectCb');
   });

diff --git a/test/integration/video/TcpVideoStream/test-normal-connection.js b/test/integration/video/TcpVideoStream/test-normal-connection.js
@@ -13,7 +13,7 @@ server.listen(common.TCP_PORT, function() {
   var video = new TcpVideoStream({ip: 'localhost', port: common.TCP_PORT});
 
   video.connect(function(err) {
-    if (err) throw err;
+    if (err) { throw err; }
 
     events.push('connectCb');
   });

diff --git a/test/unit/control/test-AtCommandCreator.js b/test/unit/control/test-AtCommandCreator.js
@@ -18,16 +18,16 @@ test('AtCommandCreator', {
     assert(!cmd.callback);
 
     var options = { timeout: 10 };
-    var cmd = this.creator.raw('FOO', [1, 2], true, options);
+    cmd = this.creator.raw('FOO', [1, 2], true, options);
     assert.equal(cmd.type, 'FOO');
     assert.deepEqual(cmd.args, [1, 2]);
     assert.equal(cmd.blocks, true);
     assert.deepEqual(cmd.options, options);
     assert(!cmd.callback);
 
-    var options = { timeout: 10 };
+    options = { timeout: 10 };
     var callback = function() {};
-    var cmd = this.creator.raw('FOO', [1, 2], true, options, callback);
+    cmd = this.creator.raw('FOO', [1, 2], true, options, callback);
     assert.equal(cmd.type, 'FOO');
     assert.deepEqual(cmd.args, [1, 2]);
     assert.equal(cmd.blocks, true);
@@ -54,12 +54,12 @@ test('AtCommandCreator', {
     assert.equal(cmd.blocks, false);
     assert.deepEqual(cmd.options, {});
 
-    var cmd = this.creator.ref({fly: true});
+    cmd = this.creator.ref({fly: true});
     assert.ok(cmd.args[0] & AtCommandCreator.REF_FLAGS.takeoff);
     assert.equal(cmd.blocks, false);
     assert.deepEqual(cmd.options, {});
 
-    var cmd = this.creator.ref({emergency: true});
+    cmd = this.creator.ref({emergency: true});
     assert.ok(cmd.args[0] & AtCommandCreator.REF_FLAGS.emergency);
     assert.equal(cmd.blocks, false);
     assert.deepEqual(cmd.options, {});
@@ -85,16 +85,16 @@ test('AtCommandCreator', {
     assert.equal(this.creator.pcmd({counterClockwise: val}).args[4], at.floatString(-val));
 
     // test multiple aliases togeter
-    var cmd = this.creator.pcmd({left: 0.1, clockwise: 0.3});
+    cmd = this.creator.pcmd({left: 0.1, clockwise: 0.3});
     assert.equal(cmd.args[1], at.floatString(-0.1));
     assert.equal(cmd.args[4], at.floatString(0.3));
 
     // test progressive bit being unset when no aliases are provided
-    var cmd = this.creator.pcmd();
+    cmd = this.creator.pcmd();
     assert.equal(cmd.args[0] & AtCommandCreator.PCMD_FLAGS.progressive, false);
 
     // test progressive bit being set automatically
-    var cmd = this.creator.pcmd({left: 0.1});
+    cmd = this.creator.pcmd({left: 0.1});
     assert.ok(cmd.args[0] & (1 << 0));
   },
 
@@ -122,7 +122,7 @@ test('AtCommandCreator', {
     assert.deepEqual(cmd.options, {});
 
     var callback = function() {};
-    var cmd = this.creator.config('foo', 'bar', callback);
+    cmd = this.creator.config('foo', 'bar', callback);
     assert.equal(cmd.type, 'CONFIG');
     assert.equal(cmd.args.length, 2);
     assert.equal(cmd.args[0], '"foo"');
@@ -131,14 +131,14 @@ test('AtCommandCreator', {
     assert.deepEqual(cmd.options, {});
     assert.equal(cmd.callback, callback);
 
-    var cmd = this.creator.config({key: 'foo', value: 'bar'});
+    cmd = this.creator.config({key: 'foo', value: 'bar'});
     assert.equal(cmd.type, 'CONFIG');
     assert.equal(cmd.args.length, 2);
     assert.equal(cmd.args[0], '"foo"');
     assert.equal(cmd.args[1], '"bar"');
     assert.equal(cmd.blocks, true);
 
-    var cmd = this.creator.config({key: 'foo', value: 'bar', timeout: 1}, callback);
+    cmd = this.creator.config({key: 'foo', value: 'bar', timeout: 1}, callback);
     assert.equal(cmd.type, 'CONFIG');
     assert.equal(cmd.args.length, 2);
     assert.equal(cmd.args[0], '"foo"');

diff --git a/test/unit/control/test-UdpControl.js b/test/unit/control/test-UdpControl.js
@@ -134,12 +134,12 @@ test('UdpControl', {
 
 
     // Should have sent a single non-blocking command second.
-    var sendArgs = fakeSocket.send.getCall(1).args;
-    var buffer   = sendArgs.shift();
-    var offset   = sendArgs.shift();
-    var length   = sendArgs.shift();
-    var port     = sendArgs.shift();
-    var ip       = sendArgs.shift();
+    sendArgs = fakeSocket.send.getCall(1).args;
+    buffer   = sendArgs.shift();
+    offset   = sendArgs.shift();
+    length   = sendArgs.shift();
+    port     = sendArgs.shift();
+    ip       = sendArgs.shift();
 
     assert.equal(Buffer.isBuffer(buffer), true);
     assert.deepEqual(buffer.toString(), config1.serialize(2));
@@ -158,13 +158,13 @@ test('UdpControl', {
     control.ack();
     control.flush();
 
-    var ctrl     = new AtCommand('CTRL', [5, 0]);
-    var sendArgs = fakeSocket.send.getCall(2).args;
-    var buffer   = sendArgs.shift();
-    var offset   = sendArgs.shift();
-    var length   = sendArgs.shift();
-    var port     = sendArgs.shift();
-    var ip       = sendArgs.shift();
+    ctrl     = new AtCommand('CTRL', [5, 0]);
+    sendArgs = fakeSocket.send.getCall(2).args;
+    buffer   = sendArgs.shift();
+    offset   = sendArgs.shift();
+    length   = sendArgs.shift();
+    port     = sendArgs.shift();
+    ip       = sendArgs.shift();
 
     assert.equal(Buffer.isBuffer(buffer), true);
     assert.deepEqual(buffer.toString(), ctrl.serialize(3));
@@ -178,12 +178,12 @@ test('UdpControl', {
     control.ackReset();
     control.flush();
 
-    var sendArgs = fakeSocket.send.getCall(3).args;
-    var buffer   = sendArgs.shift();
-    var offset   = sendArgs.shift();
-    var length   = sendArgs.shift();
-    var port     = sendArgs.shift();
-    var ip       = sendArgs.shift();
+    sendArgs = fakeSocket.send.getCall(3).args;
+    buffer   = sendArgs.shift();
+    offset   = sendArgs.shift();
+    length   = sendArgs.shift();
+    port     = sendArgs.shift();
+    ip       = sendArgs.shift();
 
     assert.equal(Buffer.isBuffer(buffer), true);
     assert.deepEqual(buffer.toString(), config2.serialize(4));
@@ -208,5 +208,5 @@ test('UdpControl', {
 
     control.close();
     assert.equal(fakeSocket.close.callCount, 1);
-  },
+  }
 });