From e2a720425c6d056e23f27b01a28259357178e1cb Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 10 Jul 2014 10:41:04 -0400
Subject: [PATCH] refactor(cloudcmd) mv argv parsing to bin

---
 .travis.yml     |  2 +-
 bin/cloudcmd.js | 17 +++++++++++++++--
 cloudcmd.js     | 16 +++++++---------
 lib/server.js   |  5 +----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 11b511f6..65ea04cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ before_install:
 
 script:
   - gulp default
-  - node cloudcmd test
+  - node bin/cloudcmd test
 
 notifications:
     #webhooks:
diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js
index 88f21a26..9db7b09c 100755
--- a/bin/cloudcmd.js
+++ b/bin/cloudcmd.js
@@ -3,9 +3,22 @@
 (function(){
     'use strict';
     
-    var CloudCmd = require('../cloudcmd');
+    var CloudCmd    = require('../cloudcmd'),
+        DIR         = '../lib/',
+        Util        = require(DIR + 'util'),
+        argv        = process.argv,
+        length      = argv.length - 1,
+        argvFirst   = argv[length],
+        isTest      = Util.isContainStr(argvFirst, 'test');
     
-    CloudCmd.start();
+    if (isTest) {
+        Util.log('Cloud Commander testing mode');
+        Util.log('argv: ', argv);
+    }
+    
+    CloudCmd.start({
+        isTest: isTest
+    });
     
 })();
 
diff --git a/cloudcmd.js b/cloudcmd.js
index c635c62d..bf6b8855 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -42,13 +42,17 @@
             'link',
         ],
         
+        IsTest,
+        
         Template    = {},
         
         FS          = CloudFunc.FS;
         /* reinit main dir os if we on Win32 should be backslashes */
         DIR         = main.DIR;
         
-    exports.start = function() {
+    exports.start = function(params) {
+        IsTest = params.isTest;
+        
         readConfig(init);
         win.prepareCodePage();
     };
@@ -115,21 +119,15 @@
     
     
     function init() {
-        var params,
-            argv        = process.argv,
-            length      = argv.length - 1,
-            argvFirst   = argv[length],
-            isTest      = Util.isContainStr(argvFirst, 'test');
+        var params;
         
         if (update)
             update.get();
         
         Util.log('server dir: ' + DIR);
         
-        if (isTest) {
-            Util.log('argv: ', argv);
+        if (IsTest)
             Config.server  = false;
-        }
         
         if (Config.logs) {
             Util.log('log param setted up in config.json\n' +
diff --git a/lib/server.js b/lib/server.js
index 67bed8ef..fc960a22 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -75,10 +75,7 @@
         ssl     = options.ssl,
         sslPort = config.sslPort;
         
-        /* server mode or testing mode */
-        if (!config.server)
-            Util.log('Cloud Commander testing mode');
-        else
+        if (config.server)
             if (!ssl) 
                 createServer(port, ip, HTTP);
             else {