Merge pull request #785 from fintura/master

Add "use strict", semicolons, whitespace & code cleanup, remove util.print.

benches/buffer_bench.js

@@ -1,6 +1,8 @@
+'use strict';
+
 var source = new Buffer(100),
     dest = new Buffer(100), i, j, k, tmp, count = 1000000, bytes = 100;
-    
+
 for (i = 99 ; i >= 0 ; i--) {
     source[i] = 120;
 }

benches/hiredis_parser.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var Parser = require('../lib/parser/hiredis').Parser;
 var assert = require('assert');
 

benches/re_sub_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var client = require('../index').createClient()
   , client2 = require('../index').createClient()
   , assert = require('assert');

benches/reconnect_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis = require("../index").createClient(null, null, {
 //    max_attempts: 4
 });

benches/stress/codec.js

@@ -1,16 +1,8 @@
+'use strict';
+
 var json = {
 	encode: JSON.stringify,
 	decode: JSON.parse
 };
 
-var MsgPack = require('node-msgpack');
-msgpack = {
-	encode: MsgPack.pack,
-	decode: function(str) { return MsgPack.unpack(new Buffer(str)); }
-};
-
-bison = require('bison');
-
 module.exports = json;
-//module.exports = msgpack;
-//module.exports = bison;

benches/stress/speed/speed.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var msgpack = require('node-msgpack');
 var bison = require('bison');
 var codec = {

benches/sub_quit_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var client = require("redis").createClient(),
     client2 = require("redis").createClient();
 

connection_breaker.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var net = require('net');
 
 var proxyPort = 6379;

diff_multi_bench_output.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 var colors = require('colors'),
     fs = require('fs'),
     _ = require('underscore'),
@@ -35,8 +37,8 @@ before_lines.forEach(function(b, i) {
         return;
     }
 
-    b_words = b.split(' ').filter(is_whitespace);
-    a_words = a.split(' ').filter(is_whitespace);
+    var b_words = b.split(' ').filter(is_whitespace);
+    var a_words = a.split(' ').filter(is_whitespace);
 
     var ops =
         [b_words, a_words]
@@ -47,7 +49,7 @@ before_lines.forEach(function(b, i) {
             var isNaN = !num && num !== 0;
             return !isNaN;
         });
-    if (ops.length != 2) return
+    if (ops.length !== 2) return;
 
     var delta = ops[1] - ops[0];
     var pct = ((delta / ops[0]) * 100).toPrecision(3);
@@ -58,7 +60,7 @@ before_lines.forEach(function(b, i) {
     pct = humanize_diff(pct, '%');
     console.log(
         // name of test
-        command_name(a_words) == command_name(b_words)
+        command_name(a_words) === command_name(b_words)
             ? command_name(a_words) + ':'
             : '404:',
         // results of test

examples/auth.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis  = require("redis"),
     client = redis.createClient();
 

examples/backpressure_drain.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis = require("../index"),
     client = redis.createClient(null, null, {
         command_queue_high_water: 5,

examples/eval.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis = require("../index"),
     client = redis.createClient();
 

examples/extend.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis = require("redis"),
     client = redis.createClient();
 
@@ -14,7 +16,7 @@ redis.RedisClient.prototype.parse_info = function (callback) {
                 obj[parts[0]] = parts[1];
             }
         });
-        callback(obj)
+        callback(obj);
     });
 };
 

examples/file.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Read a file from disk, store it in Redis, then read it back from Redis.
 
 var redis = require("redis"),
@@ -11,17 +13,17 @@ var redis = require("redis"),
 
 // Read a file from fs, store it in Redis, get it back from Redis, write it back to fs.
 fs.readFile(filename, function (err, data) {
-    if (err) throw err
+    if (err) throw err;
     console.log("Read " + data.length + " bytes from filesystem.");
-    
+
     client.set(filename, data, redis.print); // set entire file
     client.get(filename, function (err, reply) { // get entire file
         if (err) {
             console.log("Get error: " + err);
         } else {
             fs.writeFile("duplicate_" + filename, reply, function (err) {
                 if (err) {
-                    console.log("Error on write: " + err)
+                    console.log("Error on write: " + err);
                 } else {
                     console.log("File written.");
                 }

examples/mget.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var client = require("redis").createClient();
 
 client.mget(["sessions started", "sessions started", "foo"], function (err, res) {

examples/monitor.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var client  = require("../index").createClient(),
     util = require("util");
 

examples/multi.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis  = require("redis"),
     client = redis.createClient(), set_size = 20;
 

examples/multi2.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis  = require("redis"),
     client = redis.createClient(), multi;
 

examples/psubscribe.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis = require("redis"),
     client1 = redis.createClient(),
     client2 = redis.createClient(),

examples/pub_sub.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis = require("redis"),
     client1 = redis.createClient(), msg_count = 0,
     client2 = redis.createClient();

examples/scan.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis  = require("redis"),
     client = redis.createClient();
 

examples/simple.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis = require("redis"),
     client = redis.createClient();
 

examples/sort.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var redis = require("redis"),
     client = redis.createClient();
 

examples/subqueries.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Sending commands in response to other commands.
 // This example runs "type" against every key in the database
 //

examples/subquery.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var client = require("redis").createClient();
 
 function print_results(obj) {
@@ -7,7 +9,7 @@ function print_results(obj) {
 // build a map of all keys and their types
 client.keys("*", function (err, all_keys) {
     var key_types = {};
-    
+
     all_keys.forEach(function (key, pos) { // use second arg of forEach to get pos
         client.type(key, function (err, type) {
             key_types[key] = type;

examples/unix_socket.js

@@ -1,9 +1,11 @@
+'use strict';
+
 var redis = require("redis"),
     client = redis.createClient("/tmp/redis.sock"),
     profiler = require("v8-profiler");
 
 client.on("connect", function () {
-    console.log("Got Unix socket connection.")
+    console.log("Got Unix socket connection.");
 });
 
 client.on("error", function (err) {

examples/web_server.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // A simple web server that generates dyanmic content based on responses from Redis
 
 var http = require("http"), server,
@@ -7,9 +9,9 @@ server = http.createServer(function (request, response) {
     response.writeHead(200, {
         "Content-Type": "text/plain"
     });
-    
+
     var redis_info, total_requests;
-    
+
     redis_client.info(function (err, reply) {
         redis_info = reply; // stash response in outer scope
     });

generate_commands.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var http = require("http"),
     fs = require("fs");
 

index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /*global Buffer require exports console setTimeout */
 
 var net = require("net"),
@@ -15,10 +17,10 @@ var net = require("net"),
 // can set this to true to enable for all connections
 exports.debug_mode = false;
 
-var arraySlice = Array.prototype.slice
+var arraySlice = Array.prototype.slice;
 function trace() {
     if (!exports.debug_mode) return;
-    console.log.apply(null, arraySlice.call(arguments))
+    console.log.apply(null, arraySlice.call(arguments));
 }
 
 // hiredis might not be installed
@@ -139,7 +141,7 @@ RedisClient.prototype.unref = function () {
         trace("Not connected yet, will unref later");
         this.once("connect", function () {
             this.unref();
-        })
+        });
     }
 };
 
@@ -217,7 +219,7 @@ RedisClient.prototype.do_auth = function () {
                 }, 2000); // TODO - magic number alert
                 return;
             } else if (err.toString().match("no password is set")) {
-                console.log("Warning: Redis server does not require a password, but a password was supplied.")
+                console.log("Warning: Redis server does not require a password, but a password was supplied.");
                 err = null;
                 res = "OK";
             } else {
@@ -1263,7 +1265,7 @@ var createClient_unix = function(path, options){
     redis_client.address = path;
 
     return redis_client;
-}
+};
 
 var createClient_tcp = function (port_arg, host_arg, options) {
     var cnxOptions = {

lib/commands.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // This file was generated by ./generate_commands.js on Wed Apr 23 2014 14:51:21 GMT-0700 (PDT)
 module.exports = [
     "append",

lib/parser/hiredis.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var events = require("events"),
     util = require("../util"),
     hiredis = require("hiredis");

lib/parser/javascript.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var events = require("events"),
     util   = require("../util");
 

lib/queue.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Queue class adapted from Tim Caswell's pattern library
 // http://github.com/creationix/pattern/blob/master/lib/pattern/queue.js
 

lib/to_array.js

@@ -1,3 +1,5 @@
+'use strict';
+
 function to_array(args) {
     var len = args.length,
         arr = new Array(len), i;

lib/util.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Support for very old versions of node where the module was called "sys".  At some point, we should abandon this.
 
 var util;