gina 0.1.1-alpha.8 → 0.1.1-alpha.82

package/AUTHORS

@@ -2,5 +2,6 @@
 # project in one way or another.
 #
 
-Martin Luther ETOUMAN <m.etouman@rhinostone.com>
+Martin Luther ETOUMAN <martin-luther.etouman@gina.io>
+Fabrice Delaneau <fabrice.delaneau@gina.io>
 Stephane HEAV <stephane.heav@gmail.com>

package/README.md

@@ -23,11 +23,23 @@ Note that Gina does not rely on Connect or ExpressJS, still, you can use all plu
 ### Installing Gina
 Gina aims to be at the same time a framework, a deployment and monitoring environment for your projects. So, to fully enjoy Gina, we recommend that you install it with the `-g` option.
 > For Microsoft Windows, you might have to run the command line with Administrator privileges.
+> For Linux & Mac OS X, __the use of `sudo` is discouraged__
 
+__For developpment__
 ```  tty
 npm install -g gina@latest
 ```
 
+Or if you have an Error like `EACCESS: permission denied, mkdir '/usr/local/lib/node_modules/gina'`
+
+__For production__
+```tty
+npm install -g gina@latest --prefix=~/.npm-global --reset
+```
+This will install gina in the user's home directory avoiding at the same time the need to use `sudo`.
+the `reset` argument is there to ensure a factory reset for the `~/.gina` folder.
+
+
 You can check if Gina is properly installed
 ```  tty
 gina version
@@ -35,6 +47,10 @@ gina version
 __NB.:__ This is a shortcut for `gina framework:version`
 
 
+
+
+
+
 ### Starting the framework
 Gina is at the same time a framework and a server.
 By starting the framework, you will also start the server.
@@ -346,9 +362,33 @@ gina bundle:restart @myproject
 ```
 
 
+### Uninstalling Gina
+
+> For Microsoft Windows, you might have to run the command line with Administrator privileges.
+
+__Wihtout prefix__
+```  tty
+npm uninstall -g gina
+```
+
+Or if you have an Error like `EACCESS: permission denied, mkdir '/usr/local/lib/node_modules/gina'`
+
+__With prefix - If Gina was installed with a prefix__
+```tty
+npm uninstall -g gina --prefix=~/.npm-global
+```
+
+
+
 
 ## Troubleshooting
 
+### My settings are broken, I need a fresh install with the default settings
+```tty
+npm install -g gina@latest --reset
+```
+
+
 ### I can't start my bundle
 
 __Are you starting for the first time ?__

package/bin/cli

@@ -4,10 +4,11 @@
 var fs          = require('fs');
 var net         = require('net');
 var util        = require('util');
+var os          = require("os");
 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;
@@ -18,9 +19,9 @@ async function onExec() {
     // loading pack
     var pack            = ginaPath + '/package.json';
     pack = (isWin32) ? pack.replace(/\//g, '\\') : pack;
-    var home            = getUserHome();// jshint ignore:line
+    var home            = null;
     var frameworkPath   = null;
-    
+
     var debugPort           = null
         , debugBrkEnabled   = false
         , isUpdateRequired  = false
@@ -33,53 +34,60 @@ 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
-        
-        
+
+        home = getUserHome();// 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 = { 'log_level': 'info'}; // First time launch or reset
+        if ( new _( home +'/'+ shortVersion +'/settings.json', true ).existsSync() ) {
+            var settingsPath =  _( home +'/'+ shortVersion +'/settings.json', true );// jshint ignore:line
+            settings = requireJSON(settingsPath);// jshint ignore:line
+        }
+
+
         setEnvVar('GINA_LOG_LEVEL', settings['log_level']);// jshint ignore:line
         setEnvVar('GINA_VERSION', version);// jshint ignore:line
+        setEnvVar('GINA_RUNDIR', settings['rundir']);// jshint ignore:line
+        setEnvVar('GINA_LOGDIR', settings['logdir']);// jshint ignore:line
+        setEnvVar('GINA_TMPDIR', settings['tmpdir']);// jshint ignore:line
 
         // Loading logger.
         console = lib.logger;// jshint ignore:line
@@ -88,16 +96,16 @@ 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
-            var mqPortFile = './tmp/mq-listener-v'+ version +'.port';
+            var mqPortFile = getTmpDir() + '/mq-listener-v'+ version +'.port';
             console.debug('Writting: '+ mqPortFile);
             fs.writeFileSync( mqPortFile, ''+mqPort );
             process.on('exit', function() {
@@ -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)
@@ -127,7 +135,8 @@ async function onExec() {
     filterArgs();// jshint ignore:line
     //check for $HOME path, alert if empty.
     if (!home) {
-        console.error('No ' + ((isWin32) ? 'USERPROFILE' : 'HOME') + ' path found.')
+        console.error('No ' + ((isWin32) ? 'USERPROFILE' : 'HOME') + ' path found.');
+        process.exit(1);
     } else {
         setEnvVar('GINA_HOMEDIR', home);// jshint ignore:line
         setEnvVar('GINA_DIR', ginaPath);// jshint ignore:line
@@ -136,7 +145,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 +207,7 @@ async function onExec() {
             debugBrkEnabled : debugBrkEnabled,
             pack            : pack
         });
-        
+
 
     } else if (
         typeof(process.argv[2]) != 'undefined'
@@ -207,7 +216,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 +243,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 +271,7 @@ async function onExec() {
                 client.end();
                 return
             }
-            
+
         });
 
         //client end event.
@@ -276,11 +285,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/bin/cli-debug

@@ -3,7 +3,7 @@
 /**
  * Mainly used to debug framework CMD lib - default port should be #5858 by default
  * To modify the debug port :
- * 
+ *
  * $ gina framework:set --debug-port=<your new debug port>
  */
 const fs    = require('fs');
@@ -34,16 +34,16 @@ var params = argv.split(/\s+/g);
 if ( params.length > 0 ) {
     for (var p = 0, len = params.length; p < len; ++p) {
         if ( /^\-\-port/.test(params[p]) ) {
-            setEnvVar('GINA_PORT', ~~params[p].split(/\=/)[1]);
+            setEnvVar('GINA_PORT', ~~params[p].split(/\=/)[1]);// jshint ignore:line
             continue;
         }
         if ( /^\-\-debug(\_|\-)port/.test(params[p]) ) {
-            setEnvVar('GINA_DEBUG_PORT', ~~params[p].split(/\=/)[1]);
+            setEnvVar('GINA_DEBUG_PORT', ~~params[p].split(/\=/)[1]);// jshint ignore:line
             continue;
         }
         if ( /^\-\-(inspect|debug)/.test(params[p]) ) {
             debugPort = ~~params[p].split(/\=/)[1];
-            process.argv.splice(p,1);   
+            process.argv.splice(p,1);
         }
     }
 }

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

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