Merge pull request #807 from fintura/master

Add jshint and fix some tests

Author: BridgeAR

.gitignore

@@ -2,3 +2,4 @@ node_modules
 .tern-port
 .nyc_output
 coverage
+npm-debug.log

.jshintignore

@@ -0,0 +1,4 @@
+node_modules/**
+coverage/**
+**.md
+**.log

.jshintrc

@@ -0,0 +1,24 @@
+{
+    "eqeqeq": true, // Prohibits the use of == and != in favor of === and !==
+    "noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`
+    "undef": true, // Require all non-global variables be declared before they are used.
+    "unused": "vars", // Warn unused variables, but not unused params
+    "strict": true, // Require `use strict` pragma in every file.
+    "nonbsp": true, // don't allow non utf-8 pages to break
+    "forin": true, // don't allow not filtert for in loops
+    "freeze": true, // prohibit overwriting prototypes of native objects
+    "nonew": true, // prohibit use of constructors with new when not assigning to a variable
+    "maxdepth": 6,
+    "latedef": true,
+    "maxparams": 5,
+
+    // Environment options
+    "node": true, // Enable globals available when code is running inside of the NodeJS runtime environment.
+    "mocha": true,
+
+    "overrides": {
+        "examples/*.js": {
+            "unused": false
+        }
+    }
+}

.travis.yml

@@ -13,4 +13,4 @@ node_js:
   - "0.12"
   - "4.0"
   - "iojs"
-after_success: npm run coverage
+after_success: npm run coveralls

benches/re_sub_test.js

@@ -1,8 +1,7 @@
 'use strict';
 
-var client = require('../index').createClient()
-  , client2 = require('../index').createClient()
-  , assert = require('assert');
+var client = require('../index').createClient();
+var client2 = require('../index').createClient();
 
 client.once('subscribe', function (channel, count) {
   client.unsubscribe('x');

benches/stress/pubsub/pub.js

@@ -3,8 +3,8 @@
 var freemem = require('os').freemem;
 var profiler = require('v8-profiler');
 var codec = require('../codec');
-
 var sent = 0;
+var exec;
 
 var pub = require('redis').createClient(null, null, {
 	//command_queue_high_water: 5,

benches/stress/pubsub/server.js

@@ -6,12 +6,11 @@ var codec = require('../codec');
 var id = Math.random();
 var recv = 0;
 
-var sub = require('redis').createClient()
+require('redis').createClient()
 	.on('ready', function() {
 		this.subscribe('timeline');
 	})
 	.on('message', function(channel, message) {
-		var self = this;
 		if (message) {
 			message = codec.decode(message);
 			++recv;

benches/stress/rpushblpop/pub.js

@@ -6,6 +6,8 @@ var codec = require('../codec');
 
 var sent = 0;
 
+var exec;
+
 var pub = require('redis').createClient(null, null, {
 	//command_queue_high_water: 5,
 	//command_queue_low_water: 1

benches/stress/rpushblpop/server.js

@@ -7,7 +7,8 @@ var id = Math.random();
 var recv = 0;
 
 var cmd = require('redis').createClient();
-var sub = require('redis').createClient()
+
+require('redis').createClient()
 	.on('ready', function() {
 		this.emit('timeline');
 	})

benches/stress/speed/speed.js

@@ -16,6 +16,40 @@ var codec = {
 
 var obj, l;
 
+function run(obj, codec) {
+	var t1 = Date.now();
+	var n = 10000;
+	for (var i = 0; i < n; ++i) {
+		codec.decode(l = codec.encode(obj));
+	}
+	var t2 = Date.now();
+	//console.log('DONE', n*1000/(t2-t1), 'codecs/sec, length=', l.length);
+	return [n*1000/(t2-t1), l.length];
+}
+
+function series(obj, cname, n) {
+	var rate = 0;
+	var len = 0;
+	for (var i = 0; i < n; ++i) {
+		var r = run(obj, codec[cname]);
+		rate += r[0];
+		len += r[1];
+	}
+	rate /= n;
+	len /= n;
+	console.log(cname + '	' + rate + '	' + len);
+	return [rate, len];
+}
+
+function forObj(obj) {
+	var r = {
+		JSON: series(obj, 'JSON', 20),
+		msgpack: series(obj, 'msgpack', 20),
+		bison: series(obj, 'bison', 20)
+	};
+	return r;
+}
+
 var s = '0';
 for (var i = 0; i < 12; ++i) s += s;
 
@@ -50,37 +84,3 @@ obj = {
 	rand: []
 };
 forObj(obj);
-
-function run(obj, codec) {
-	var t1 = Date.now();
-	var n = 10000;
-	for (var i = 0; i < n; ++i) {
-		codec.decode(l = codec.encode(obj));
-	}
-	var t2 = Date.now();
-	//console.log('DONE', n*1000/(t2-t1), 'codecs/sec, length=', l.length);
-	return [n*1000/(t2-t1), l.length];
-}
-
-function series(obj, cname, n) {
-	var rate = 0;
-	var len = 0;
-	for (var i = 0; i < n; ++i) {
-		var r = run(obj, codec[cname]);
-		rate += r[0];
-		len += r[1];
-	}
-	rate /= n;
-	len /= n;
-	console.log(cname + '	' + rate + '	' + len);
-	return [rate, len];
-}
-
-function forObj(obj) {
-	var r = {
-		JSON: series(obj, 'JSON', 20),
-		msgpack: series(obj, 'msgpack', 20),
-		bison: series(obj, 'bison', 20)
-	};
-	return r;
-}