From e8c28c8274ebbc0cc6dc60120f1b97810008dec9 Mon Sep 17 00:00:00 2001
From: Dmitry unknownexception <unknownliveid@hotmail.com>
Date: Sat, 16 Aug 2014 13:09:51 +0700
Subject: [PATCH 1/2] change run(app) signature to run(app, options)

---
 lib/run.js   | 18 ++++++++++++++----
 package.json |  5 ++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/run.js b/lib/run.js
index d41102d..ecf0946 100644
--- a/lib/run.js
+++ b/lib/run.js
@@ -13,8 +13,8 @@ var remap = {
  *
  * @param main the module to run
  */
-var run = module.exports = function(main) {
-  var options = {}, argv = [];
+var run = module.exports = function(main, options) {
+  var options = options || {}, argv = [];
   process.argv.forEach(function(arg) {
     if (!arg.indexOf('-')) {
       options[arg.substr(1)] = true;
@@ -73,7 +73,9 @@ var run = module.exports = function(main) {
         if (module.app) {
           var httpserver = require('./httpserver');
           if (!httpserver.started) {
-            httpserver.main(module.app, argv[2], {cluster:argv[3]});
+            var port = options.port || argv[2];
+            var cluster = options.cluster || argv[3];
+            httpserver.main(module.app, port, {cluster:cluster});
           }
         }
       }
@@ -104,7 +106,15 @@ var run = module.exports = function(main) {
   }
 };
 
+function extend(){
+  for(var i=1; i<arguments.length; i++)
+    for(var key in arguments[i])
+      if(arguments[i].hasOwnProperty(key))
+          arguments[0][key] = arguments[i][key];
+  return arguments[0];
+}
+
 if (require.main === module) {
   process.argv.shift(); // remove node, which is first arg
   run();
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 31ab3fc..1d012b2 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,9 @@
   },
   "homepage":"http://github.com/olegp/common-node/",
   "main":"./lib/all.js",
+  "scripts": {
+    "test": "node test/all.js"
+  },
   "bin":{
     "common-node":"./bin/common-node"
   },
@@ -44,4 +47,4 @@
       "type":"MIT"
     }
   ]
-}
\ No newline at end of file
+}

From 8eb7790c5b2a39183aaf32ec4b06a8254d9f233e Mon Sep 17 00:00:00 2001
From: Dmitry <unknownliveid@hotmail.com>
Date: Thu, 25 Sep 2014 20:08:34 +0700
Subject: [PATCH 2/2] Update run.js

---
 lib/run.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/run.js b/lib/run.js
index ecf0946..4d97bfc 100644
--- a/lib/run.js
+++ b/lib/run.js
@@ -14,7 +14,7 @@ var remap = {
  * @param main the module to run
  */
 var run = module.exports = function(main, options) {
-  var options = options || {}, argv = [];
+  options = options || {}, argv = [];
   process.argv.forEach(function(arg) {
     if (!arg.indexOf('-')) {
       options[arg.substr(1)] = true;
@@ -73,9 +73,11 @@ var run = module.exports = function(main, options) {
         if (module.app) {
           var httpserver = require('./httpserver');
           if (!httpserver.started) {
-            var port = options.port || argv[2];
-            var cluster = options.cluster || argv[3];
-            httpserver.main(module.app, port, {cluster:cluster});
+            httpserver.main(module.app, 
+              (options.port || argv[2]),
+              {
+                cluster: (options.cluster || argv[3])
+              });
           }
         }
       }
@@ -106,13 +108,6 @@ var run = module.exports = function(main, options) {
   }
 };
 
-function extend(){
-  for(var i=1; i<arguments.length; i++)
-    for(var key in arguments[i])
-      if(arguments[i].hasOwnProperty(key))
-          arguments[0][key] = arguments[i][key];
-  return arguments[0];
-}
 
 if (require.main === module) {
   process.argv.shift(); // remove node, which is first arg