gina 0.1.1-alpha.3 → 0.1.1-alpha.30

package/bin/cli

@@ -7,7 +7,7 @@ var util        = require('util');
 var promisify   = util.promisify;
 
 async function onExec() {
-    
+
     // process.stdout.write('GINA CLI LOADED !! ' + JSON.stringify(process.argv, null, 2) + '\n');
 
     var isWin32         = (process.platform === 'win32') ? true : false;
@@ -20,7 +20,7 @@ async function onExec() {
     pack = (isWin32) ? pack.replace(/\//g, '\\') : pack;
     var home            = getUserHome();// jshint ignore:line
     var frameworkPath   = null;
-    
+
     var debugPort           = null
         , debugBrkEnabled   = false
         , isUpdateRequired  = false
@@ -33,51 +33,59 @@ async function onExec() {
         var generator   = require(frameworkPath + '/lib/generator');
 
         require(frameworkPath + '/lib');
-        var aliases     = require(frameworkPath + '/lib/cmd/aliases.json');
-        
+        // var aliases     = require(frameworkPath + '/lib/cmd/aliases.json');
+
         // catching debug|inspect arg
-        //process.stdout.write('params '+ params.join(', ') + '\n');    
+        //process.stdout.write('params '+ params.join(', ') + '\n');
         if ( params.length > 0 ) {
             for (var p = 0, len = params.length; p < len; ++p) {
-                
+
                 if ( /^\-\-port/.test(params[p]) ) {
                     let port = params[p].split(/\=/)[1];
                     setEnvVar('GINA_PORT', ~~port);// jshint ignore:line
-                    isUpdateRequired = true;            
+                    isUpdateRequired = true;
                     continue;
                 }
-                
+
                 if ( /^\-\-debug(\_|\-)port/.test(params[p]) ) {
                     let port = params[p].split(/\=/)[1];
                     setEnvVar('GINA_DEBUG_PORT', ~~port);// jshint ignore:line
-                    isUpdateRequired = true;            
+                    isUpdateRequired = true;
                     continue;
                 }
-                
+
                 if ( /^\-\-(inspect|debug)/.test(params[p]) ) {
                     debugBrkEnabled = ( /\-brk/.test(params[p]) ) ? true : false;
                     debugPort       = params[p].split(/\=/)[1];
-                    params.splice(p,1);            
+                    params.splice(p,1);
                     break;
                 }
             }
         }
-        
+
 
         var shortVersion = version.split('.');
         shortVersion.splice(2);
         shortVersion = shortVersion.join('.');
         setEnvVar('GINA_SHORT_VERSION', shortVersion);// jshint ignore:line
-        
-        
+
+
         if ( typeof(getEnvVar('GINA_HOMEDIR')) == 'undefined') {// jshint ignore:line
             setEnvVar('GINA_HOMEDIR', home + '/.gina')// jshint ignore:line
         }
         home = getEnvVar('GINA_HOMEDIR');// jshint ignore:line
-        
-        var settingsPath =  _( home +'/'+ shortVersion +'/settings.json', true );// jshint ignore:line
-        var settings = requireJSON(settingsPath);// jshint ignore:line
-        
+
+        var settings = {};
+        try {
+            var settingsPath =  _( home +'/'+ shortVersion +'/settings.json', true );// jshint ignore:line
+            settings = requireJSON(settingsPath);// jshint ignore:line
+        } catch(settingsErr) {
+            // First time launch or reset
+            settings['log_level'] = 'info';
+
+        }
+
+
         setEnvVar('GINA_LOG_LEVEL', settings['log_level']);// jshint ignore:line
         setEnvVar('GINA_VERSION', version);// jshint ignore:line
 
@@ -88,12 +96,12 @@ async function onExec() {
             console.pauseReporting();
         }
         console.setLevel(settings['log_level'], 'gina');
-                
+
         // Loading logger listner vs ~/.gina/user/extensions/logger/mq/config.json & ~/.gina/{shortVersion}/settings.json
         if ( /(gina\/bin\/cli|gina\/\/bin\/gina)$/.test(process.argv[1]) ) {
-            
+
             var MQListener = require(frameworkPath + '/lib/logger/src/containers/mq/listener.js');
-            
+
             var mqPort = 8125;
             var mqListener = await new MQListener({ port: 8125 });
             // required for tail command
@@ -106,7 +114,7 @@ async function onExec() {
                 mqListener.unref();
             })
         }
-        
+
         if ( !fs.existsSync(frameworkPath) ) {
             console.alert('Could not find version ' + version + '.\nFirst try:\n$ gina framework:install ' + version);
             process.exit(1)
@@ -136,7 +144,7 @@ async function onExec() {
     }
     setEnvVar('GINA_IS_WIN32', isWin32, true);// jshint ignore:line
 
-    if (isUpdateRequired) {    
+    if (isUpdateRequired) {
         settings['port'] = getEnvVar('GINA_PORT') || null;// jshint ignore:line
         settings['debug_port'] = getEnvVar('GINA_DEBUG_PORT') || null;// jshint ignore:line
         console.debug('Updating debug settings: #'+  getEnvVar('GINA_DEBUG_PORT'));// jshint ignore:line
@@ -198,7 +206,7 @@ async function onExec() {
             debugBrkEnabled : debugBrkEnabled,
             pack            : pack
         });
-        
+
 
     } else if (
         typeof(process.argv[2]) != 'undefined'
@@ -207,7 +215,7 @@ async function onExec() {
         || process.argv[2].substr(0, 2) === '--'
         || process.argv[2].substr(0, 1) === '-'
     ) {
-            
+
         require(binPath + '/cmd')({
             binPath         : binPath,
             ginaPath        : ginaPath,
@@ -234,21 +242,21 @@ async function onExec() {
                 // retieving debug infos
                 var debugOption = null;
                 if ( debugPort ) {
-                    debugOption = '--inspect=' + debugPort;     
-                        
+                    debugOption = '--inspect=' + debugPort;
+
                     if (debugBrkEnabled) {
                         debugOption = debugOption.replace(/\-\-inspect/, '--inspect-brk')
                     }
-                    
+
                     process.argv.push(debugOption)
                 }
-                
+
                 client.write( JSON.stringify(process.argv) );
             }
         );
 
-        client.on('data', function(data) {       
-            
+        client.on('data', function(data) {
+
             //Acknowledging ready state.
             if ( /\[ quit \]/.test(data) ) {
                 client.end();
@@ -262,7 +270,7 @@ async function onExec() {
                 client.end();
                 return
             }
-            
+
         });
 
         //client end event.
@@ -276,11 +284,11 @@ async function onExec() {
             } else {
                 console.log('[ gina ] not started, try to start framework with :\n$ sudo gina start')
             }
-            
+
             console.debug(err.stack||err);
-            
+
             process.exit(1)
-        });    
+        });
     }
 }
 

package/framework/v0.1.1-alpha.30/VERSION

@@ -0,0 +1 @@
+0.1.1-alpha.30