closes #28: Contributing - code style.

Author: jsdevel

.gitignore

@@ -4,3 +4,6 @@ coverage
 *.suo
 
 npm-debug.log
+
+# Netbeans
+/nbproject/

.jshintrc

@@ -0,0 +1,18 @@
+{
+  "bitwise":false,
+  "camelcase":true,
+  "curly":false,
+  "eqeqeq":true,
+  "freeze":true,
+  "immed":true,
+  "indent":2,
+  "latedef":"nofunc",
+  "laxbreak":true,
+  "laxcomma":true,
+  "maxlen":80,
+  "newcap":true,
+  "noarg":true,
+  "node":true,
+  "trailing":true,
+  "undef":true
+}

.test-jshintrc

@@ -0,0 +1,26 @@
+{
+  "bitwise":false,
+  "camelcase":true,
+  "curly":false,
+  "eqeqeq":true,
+  "freeze":true,
+  "immed":true,
+  "indent":2,
+  "latedef":"nofunc",
+  "laxbreak":true,
+  "laxcomma":true,
+  "maxlen":80,
+  "newcap":true,
+  "noarg":true,
+  "node":true,
+  "trailing":true,
+  "undef":true,
+  "globals":{
+    "after":false,
+    "afterEach":false,
+    "before":false,
+    "beforeEach":false,
+    "describe":false,
+    "it":false
+  }
+}

bin/cserviced

@@ -1,23 +1,22 @@
 #!/usr/bin/env node
 
-var
-	path = require("path"),
-	spawn = require("child_process").spawn
-;
-
+var path = require("path");
+var spawn = require("child_process").spawn;
 var args = process.argv.slice(2);
 var cservicePath = path.resolve(__dirname, '..', 'bin', 'cservice');
+var cservice;
+
 args.splice(0, 0, cservicePath);
 args.push("--cli");
 args.push("false");
 
-var cservice = spawn(process.execPath, args, {
-	stdio: "ignore",
-	detached: true
+cservice = spawn(process.execPath, args, {
+  stdio: "ignore",
+  detached: true
 });
 
 cservice.on('exit', function (code) {
-	console.error('cluster-service exited: ' + code);
+  console.error('cluster-service exited: ' + code);
 });
 
 cservice.unref(); // unreference so we may exit

cluster-service.js

@@ -1,8 +1,6 @@
-var
-	cluster = require("cluster"),
-	colors = require("colors"),
-	locals = require("./lib/defaults")
-;
+var cluster = require("cluster");
+var colors = require("colors");
+var locals = require("./lib/defaults");
 
 module.exports = exports;
 
@@ -14,52 +12,59 @@ exports.results = require("./lib/util").results;
 exports.workerReady = require("./lib/worker-ready");
 
 Object.defineProperty(exports, "workers", {
-	get: require("./lib/workers").get
+  get: require("./lib/workers").get
 });
 
 Object.defineProperty(exports, "isMaster", {
-	get: function() {
-		return cluster.isMaster;
-	}
+  get: function() {
+    return cluster.isMaster;
+  }
 });
 
 Object.defineProperty(exports, "isWorker", {
-	get: function() {
-		return cluster.isWorker;
-	}
+  get: function() {
+    return cluster.isWorker;
+  }
 });
 
 Object.defineProperty(exports, "options", {
-	get: function() {
-		return locals.options;
-	}
+  get: function() {
+    return locals.options;
+  }
 });
 
 Object.defineProperty(exports, "locals", {
-	get: function() {
-		return locals;
-	}
+  get: function() {
+    return locals;
+  }
 });
 
 if (cluster.isMaster === true) {
-	exports.control = require("./lib/control").addControls;
-	exports.stop = require("./lib/stop");
-	exports.trigger = require("./lib/trigger");
-	exports.newWorker = require("./lib/new-worker");
-	exports.on = require("./lib/on");
+  exports.control = require("./lib/control").addControls;
+  exports.stop = require("./lib/stop");
+  exports.trigger = require("./lib/trigger");
+  exports.newWorker = require("./lib/new-worker");
+  exports.on = require("./lib/on");
 } else {
-	exports.on = function() { };
+  exports.on = function() {
+  };
 }
 
 exports.start = require("./lib/start");
 
-if (cluster.isWorker === true && typeof (cluster.worker.module) === "undefined") {
-	cluster.worker.module = {}; // intermediate state to prevent 2nd call while async in progress
-	// load the worker if not already loaded
-	setTimeout(function() { // async, in case worker loads cluster-service, we need to return before it's avail
-		cluster.worker.module = require(process.env.worker);
-	}, 10);
+if (
+  cluster.isWorker === true
+  && typeof (cluster.worker.module) === "undefined"
+){
+  // intermediate state to prevent 2nd call while async in progress
+  cluster.worker.module = {};
+  // load the worker if not already loaded
+  // async, in case worker loads cluster-service, we need to return before 
+  // it's avail
+  setTimeout(function() {
+    cluster.worker.module = require(process.env.worker);
+  }, 10);
 
-    // start worker monitor to establish two-way relationship with master
-    require("./lib/workers").monitor();
+  // start worker monitor to establish two-way relationship with master
+  require("./lib/workers").monitor();
 }

lib/cli.js

@@ -1,65 +1,64 @@
-var
-	cservice = require("../cluster-service"),
-	util = require("util"),
-	locals = null,
-	options = null
-;
+var cservice = require("../cluster-service"),
+  util = require("util"),
+  locals = null,
+  options = null;
 
 exports.init = function(l, o) {
-	locals = l;
-	options = o;
+  locals = l;
+  options = o;
 
-	util.inspect.styles.name = "grey";
+  util.inspect.styles.name = "grey";
 
-	cservice.log("CLI is now available. Enter 'help [enter]' for instructions.".info);
-	process.stdin.resume();
-	process.stdin.setEncoding('utf8');
-	
-	process.stdin.on("data", onCommand);
+  cservice.log("CLI is now available. Enter 'help [enter]' for instructions.".info);
+  process.stdin.resume();
+  process.stdin.setEncoding('utf8');
 
-	// wait momentarily before attaching CLI. allows workers a little time to output as needed
-	setTimeout(function() {
-	    process.stdout.write("cservice> ".cservice);
-	}, 1000);
+  process.stdin.on("data", onCommand);
+
+  // wait momentarily before attaching CLI. allows workers a little time to output as needed
+  setTimeout(function() {
+    process.stdout.write("cservice> ".cservice);
+  }, 1000);
 };
 
 exports.close = function() {
-	try {
-		process.stdin.pause();
-	} catch (ex) {
-	}
+  try {
+    process.stdin.pause();
+  } catch (ex) {
+  }
 };
 
 function onCommand(question) {
-    question = question.replace(/[\r\n]/g, "");
-	var args = require("./util").getArgsFromQuestion(question, " ");
-	args = [args[0], onCallback].concat(args.slice(1));
-	
-	if (!locals.events[args[0]]) {
-		onCallback("Command " + args[0] + " not found. Try 'help'.");
+  var args;
+  question = question.replace(/[\r\n]/g, "");
+  args = require("./util").getArgsFromQuestion(question, " ");
+  args = [args[0], onCallback].concat(args.slice(1));
+
+  if (!locals.events[args[0]]) {
+    onCallback("Command " + args[0] + " not found. Try 'help'.");
+
+    return;
+  }
 
-		return;
-	}
-	
-	try {
-		cservice.trigger.apply(null, args);
-	} catch(ex) {
-		cservice.error("Command Error " + args[0], util.inspect(ex, { depth:null } ), ex.stack || new Error().stack);
+  try {
+    cservice.trigger.apply(null, args);
+  } catch (ex) {
+    cservice.error("Command Error " + args[0], util.inspect(ex, {depth: null}), ex.stack || new Error().stack);
 
-		onCallback();
-	}
+    onCallback();
+  }
 }
 
 function onCallback(err, result) {
-	delete locals.reason;
-	
-	if (err) {
-		cservice.error("Error: ", err, err.stack ? util.inspect(err.stack, { depth:null, colors: true}) : "");
-	} else if (result) {
-		cservice.log(util.inspect(result, { depth: null, colors: true }));
-	}
+  delete locals.reason;
+
+  if (err) {
+    cservice.error("Error: ", err, err.stack ? util.inspect(err.stack, {depth: null, colors: true}) : "");
+  } else if (result) {
+    cservice.log(util.inspect(result, {depth: null, colors: true}));
+  }
+
+  //cservice.log("");//newline
 
-	//cservice.log("");//newline
-	
-	process.stdout.write("cservice> ".cservice);
+  process.stdout.write("cservice> ".cservice);
 }

lib/commands/exit.js

@@ -1,30 +1,28 @@
-var
-	util = require("util"),
-	cservice = require("../../cluster-service")
-;
+var util = require("util"),
+  cservice = require("../../cluster-service");
 
 module.exports = function(evt, cb, cmd) {
-	if (cmd !== "now") {
-		cb("Invalid request, 'now' required. Try help exit");
-		return;
-	}
+  if (cmd !== "now") {
+    cb("Invalid request, 'now' required. Try help exit");
+    return;
+  }
 
-	cservice.log("*** FORCEFUL TERMINATION REQUESTED ***".warn);
-	cservice.log("Exiting now.".warn);
+  cservice.log("*** FORCEFUL TERMINATION REQUESTED ***".warn);
+  cservice.log("Exiting now.".warn);
 
-	process.exit(0); // exit master
+  process.exit(0); // exit master
 
-	cb(null, "Exiting now.");
+  cb(null, "Exiting now.");
 };
 
 module.exports.more = function(cb) {
-	cb(null, {
-		info: "Forcefully exits the service.",
-		command: "exit now",
-		"now": "Required. 'now' to force exit."
-	});
+  cb(null, {
+    info: "Forcefully exits the service.",
+    command: "exit now",
+    "now": "Required. 'now' to force exit."
+  });
 };
 
-module.exports.control = function(){
-	return "local";
+module.exports.control = function() {
+  return "local";
 };

lib/commands/health.js

@@ -1,14 +1,15 @@
-var
-	cluster = require("cluster")
-;
+var cluster = require("cluster");
 
 module.exports = function(evt, cb) {
-	cb(null, "OK");
+  cb(null, "OK");
 };
 
 module.exports.more = function(cb) {
-	cb(null, {
-		command: "health",
-		info: "Returns health of service. May be overidden by service to expose app-specific data."
-	});
+  cb(null, {
+    command: "health",
+    info: [
+      "Returns health of service.",
+      "May be overidden by service to expose app-specific data."
+    ].join(' ')
+  });
 };