gina 0.1.1-alpha.99 → 0.1.2-alpha.1

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.1}/lib/cmd/framework/set.js

@@ -19,6 +19,7 @@ function Set(opt){
             console.debug('Preprocessing `framework:set '+ process.argv[i] +'`');
             set(k,v);
         }
+        end()
     };
 
 
@@ -56,25 +57,67 @@ function Set(opt){
             break;
 
             case '--port':
-                setPort(v);
+                setKeyVal('port', ~~v);
             break;
 
             case '--debug_port':
             case '--debug-port':
-                setDebugPort(v);
+                setKeyVal('debug_port', ~~v);
+            break;
+
+            case '--mq_port':
+            case '--mq-port':
+                setKeyVal('mq_port', ~~v);
+            break;
+
+            case '--host_v4':
+            case '--host-v4':
+                setKeyVal('host_v4', v);
+            break;
+
+            case '--iso_short':
+            case '--iso-short':
+                setKeyVal('iso_short', v);
+            break;
+
+            case '--hostname':
+                setKeyVal('hostname', v);
             break;
 
             case '--timezone':
                 setTimezone(v);
             break;
 
+            case '--date':
+                setKeyVal('date', v);
+            break;
+
             default:
-                err = new Error('Setting environment variable `'+ k +'` is not supported');
-                console.error(err.message);
+                return end(new Error('Setting environment variable `'+ k +'` is not supported'), 'error', true);
+                // err = new Error('Setting environment variable `'+ k +'` is not supported');
+                // console.error(err.message);
 
         }
     }
 
+    /**
+     * setKeyVal
+     * Generic method
+     * @param {string} key
+     * @param {string|number|boolean} value
+     */
+     var setKeyVal = function(key, value) {
+        console.debug('Setting `'+key+'` to '+ value);
+        // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
+        if ( /^(true|false)$/i.test(value) ) {
+            value = ( /^true$/i.test(value) ) ? true : false;
+        }
+
+        process['gina'][key] = value;
+        mainSettingsConf[key] = value;
+        lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
+    }
+
     var setPrefix = function(prefix) {
         var err = null;
         if ( !prefix || typeof(prefix) == 'undefined' || prefix == '' ) {
@@ -94,30 +137,48 @@ function Set(opt){
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
         // update package.json
         pack.config.prefix = prefix;
-        lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
+        var ginaPackagePathObj = new _(GINA_DIR +'/package.json', true);
+        // skip for post install step
+        if ( ginaPackagePathObj.existsSync() ) {
+            lib.generator.createFileFromDataSync(pack, ginaPackagePathObj.toString());
+        }
     }
 
+
     var setGlobalMode = function(globalMode) {
         var err = null;
-        if ( !globalMode || typeof(globalMode) == 'undefined' || globalMode == '' ) {
-            err = new Error('Global Mode cannot be left empty or undefined');
-            console.error(err.message);
-            return
-        }
-        globalMode = /^true$/i.test(globalMode) ? true : false;
-        // save to ~/.gina/main.json
-        if ( typeof(mainConf['def_global_mode']) == 'undefined' ) {
-            mainConf['def_global_mode'] = {}
+        try {
+            if ( typeof(globalMode) == 'undefined' || globalMode == '' ) {
+                err = new Error('Global Mode cannot be left empty or undefined');
+                console.error(err.message);
+                return
+            }
+            var ginaPackagePathObj = new _(GINA_DIR +'/package.json', true);
+            globalMode = /^true$/i.test(globalMode) ? true : false;
+            // save to ~/.gina/main.json
+            if ( typeof(mainConf['def_global_mode']) == 'undefined' ) {
+                mainConf['def_global_mode'] = {}
+            }
+            mainConf['def_global_mode'][GINA_SHORT_VERSION] = globalMode;
+            // skip for post install step
+            if ( ginaPackagePathObj.existsSync() ) {
+                lib.generator.createFileFromDataSync(mainConf, mainConfPath);
+            }
+            // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
+            process['gina']['global_mode'] = globalMode;
+            mainSettingsConf['global_mode'] = globalMode;
+            lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
+            // update package.json
+            pack.config.globalMode = globalMode;
+            console.info('GINA_DIR => ', GINA_DIR);
+
+            // skip for post install step
+            if ( ginaPackagePathObj.existsSync() ) {
+                lib.generator.createFileFromDataSync(pack, ginaPackagePathObj.toString());
+            }
+        } catch (setGlobalModeErr) {
+            throw setGlobalModeErr
         }
-        mainConf['def_global_mode'][GINA_SHORT_VERSION] = globalMode;
-        lib.generator.createFileFromDataSync(mainConf, mainConfPath);
-        // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
-        process['gina']['global_mode'] = globalMode;
-        mainSettingsConf['global_mode'] = globalMode;
-        lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
-        // update package.json
-        pack.config.globalMode = globalMode;
-        lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
     }
 
     var setLogLevel = function(level) {
@@ -184,21 +245,22 @@ function Set(opt){
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
 
-    var setPort = function(port) {
-        console.debug('Setting `port` to #'+ port);
-        // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
-        process['gina']['port'] = ~~port;
-        mainSettingsConf['port'] = ~~port;
-        lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
-    }
+    // var setPort = function(key, port) {
+    //     console.debug('Setting `'+ key +'` to #'+ port);
+    //     // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
+    //     process['gina'][key] = ~~port;
+    //     mainSettingsConf[key] = ~~port;
+    //     lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
+    // }
 
-    var setDebugPort = function(port) {
-        console.debug('Setting `debug port` to #'+ port);
-        // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
-        process['gina']['debug_port'] = ~~port;
-        mainSettingsConf['debug_port'] = ~~port;
-        lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
-    }
+
+    // var setDebugPort = function(port) {
+    //     console.debug('Setting `debug port` to #'+ port);
+    //     // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
+    //     process['gina']['debug_port'] = ~~port;
+    //     mainSettingsConf['debug_port'] = ~~port;
+    //     lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
+    // }
 
     var setTimezone = function(timezone) {
         // save to ~/.gina/main.json
@@ -210,7 +272,25 @@ function Set(opt){
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
 
-    init(opt)
-};
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
 
-module.exports = Set
+        process.exit( err ? 1:0 )
+    }
+
+    init(opt)
+}
+module.exports = Set;

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.1}/lib/cmd/framework/start.js

@@ -1,8 +1,9 @@
 'use strict';
 var fs      = require('fs');
-var help    = require( getPath('gina').root + '/utils/helper');
+const {execSync}    = require('child_process');
+var help    = require( getPath('gina').root + '/utils/helper');// jshint ignore:line
 // var child   = require('child_process');
-var lib     = require( getPath('gina').lib );
+var lib     = require( getPath('gina').lib );// jshint ignore:line
 //var helpers     = require( getPath('gina').helpers );
 var console = lib.logger;
 /**
@@ -29,22 +30,37 @@ function Start(opt){
     //};
 
     var init = function(opt){
-        
-        
+
+
         self.pid        = opt.pid;
-        setEnvVar('GINA_PID', opt.pid);
-        self.projects   = require(GINA_HOMEDIR + '/projects.json');
+        setEnvVar('GINA_PID', opt.pid);// jshint ignore:line
+        self.projects   = require(GINA_HOMEDIR + '/projects.json');// jshint ignore:line
         self.services   = [];
         self.bundles    = [];
 
         cleanPIDs();
+        // restartRunningBunldes();
+
         console.notice('Framework ready for connections\n');
 
     };
 
+    // TODO  - not working with execSync ... should try with spawn, like or restart
+    var restartRunningBunldes = function() {
+        var list = fs.readdirSync(_(GINA_RUNDIR, true));// jshint ignore:line
+        for (let i=0, len=list.length; i<len; i++ ) {
+            let file = list[i];
+            if (/^\./.test(file) || !/\.pid$/.test(file) || /^gina\-/.test(file) || /(minion)/.test(file) ) {
+                continue;
+            }
+            // process.stdout.write('\ngina bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @') + '\n');
+            execSync('gina bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @'));
+        }
+    }
+
     var cleanPIDs = function() {
         var f = 0
-            , path = _(GINA_RUNDIR)
+            , path = _(GINA_RUNDIR)// jshint ignore:line
             , files = null
         ;
 
@@ -54,42 +70,55 @@ function Start(opt){
                 files = fs.readdirSync( path );
 
             } catch (err) {
-
-                //if (err.stack)
-                //    err.stack = 'Possible write privilege exception: grant access to your user or run the command as sudo/admin\n'+ err.stack;
-
-                console.crit(err.stack||err.message);
-                process.exit(1);
+                return end(err, 'crit')
             }
 
 
             for (;f < files.length; ++f) {
-                
+
                 // skip all but framework pid files
                 if ( files[f] != process.title +'.pid' ) {
                     continue;
                 }
-                
+
                 let filePid = null;
                 try {
-                    filePid = fs.readFileSync(_(path +'/'+ files[f], true)).toString().trim();
+                    filePid = fs.readFileSync(_(path +'/'+ files[f], true)).toString().trim();// jshint ignore:line
                 } catch(fileErr) {
-                    fs.unlinkSync(_(path +'/'+ files[f], true));
+                    fs.unlinkSync(_(path +'/'+ files[f], true));// jshint ignore:line
                     continue;
                 }
                 // remove old framework pid files
                 if (filePid && filePid != self.pid) {
                     try {
-                        new _(path +'/'+ files[f]).rmSync()
+                        new _(path +'/'+ files[f]).rmSync()// jshint ignore:line
                     } catch(err) {
-                        console.error(err.stack||err.message);
-                        process.exit(1);
+                        return end(err)
                     }
                 }
             }
         }
     }
 
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
     init(opt)
 }
 

package/framework/v0.1.2-alpha.1/lib/cmd/framework/status.js

@@ -0,0 +1,144 @@
+var fs          = require('fs');
+const {spawn}       = require('child_process');
+const {execSync}    = require('child_process');
+//const { debug } = require('console');
+
+var CmdHelper   = require('./../helper');
+var console     = lib.logger;
+/**
+ * Framework status
+ *
+ * e.g.
+ *  gina framework:status
+ *  or
+ *  gina status
+ *
+ * */
+function Status(opt, cmd) {
+    var self    = {};
+
+
+    var init = function(opt, cmd) {
+
+        console.debug('Getting framework status');
+
+        // import CMD helpers
+        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
+
+        status(opt, cmd);
+    }
+
+    var checkUnregistered = function(pidFiles) {
+        // Those not in file
+        var list = execSync("ps -ef | grep -v grep | grep 'gina-v' | awk '{print $2\" \"$8\" \"$9}'").toString().replace(/\n$/, '').split(/\n/g);
+
+
+        if (!list.length || list[0] == "") {
+            return;
+        }
+
+        // console.debug('pids list ', list);
+        for (let p=0, len=list.length; p<len; p++) {
+            if ( !/^\d+\s+gina\-/.test(list[p]) ) {
+                continue;
+            }
+
+            let pidArr = list[p].split(/\s/);
+            let pid = pidArr[0];
+            let title = pidArr[1];
+            let isZombie = ( typeof(pidArr[2]) != 'undefined' && /defunct/.test(pidArr[2]) ) ? true : false;
+
+            // remove defunct process
+            if (isZombie) {
+                execSync("kill -9 "+ pid);
+                continue;
+            }
+
+            let file = title +'.pid';
+            if ( pidFiles.indexOf( file ) < 0) {
+                fs.writeFileSync( _(GINA_RUNDIR +'/'+ file, true), pid );
+                pidFiles.push(title +'.pid');
+            }
+        }
+
+    }
+
+    var status = function(opt, cmd) {
+        var pidFiles = null;
+        try {
+            pidFiles = fs.readdirSync(GINA_RUNDIR);
+        } catch (fileError) {
+            throw fileError
+        }
+        checkUnregistered(pidFiles);
+        console.debug('Reading `'+ GINA_RUNDIR +'` ',pidFiles);
+
+        var runningVersions = [], runningLog = '';
+        for (let i=0, len=pidFiles.length; i<len; i++) {
+            let file = pidFiles[i];
+            if ( !/^gina\-/.test(file) ) {
+                continue;
+            }
+            let pid = fs.readFileSync(_(GINA_RUNDIR +'/'+ file)).toString().trim() || null;
+            if (!pid) {
+                continue;
+            }
+
+            if ( !isWin32() ) {
+                try {
+                    let found = execSync("ps -a "+ pid).toString().replace(/\n$/, '').split(/\n/g);
+                } catch (err) {
+                    console.debug('file to remove: '+ _(GINA_RUNDIR +'/'+ file));
+                    fs.unlinkSync(_(GINA_RUNDIR +'/'+ file));
+                    continue;
+                }
+            }
+
+
+            runningVersions.push({
+                title   : file.replace(/\.pid$/, ''),
+                pid     : ~~pid
+            });
+
+            let version = file.replace(/^gina\-/, '').replace(/\.pid$/, '');
+            runningLog +=  '['+ ~~pid+'] Running: '+ version;
+            if (version == 'v'+GINA_VERSION ) {
+                runningLog += ' (default)'
+            }
+            runningLog += '\n';
+        }
+
+
+        if ( runningVersions.length > 0 ) {
+            console.log(runningLog);
+            return end()
+        }
+
+        console.log('Gina is not running');
+        end();
+    }
+
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
+
+    init(opt, cmd)
+}
+
+module.exports = Status;

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.1}/lib/cmd/framework/stop.js

@@ -13,12 +13,12 @@ var console     = lib.logger;
  *  or
  *  gina stop
  *  or
- *  gina stop @1.0.0 
+ *  gina stop @1.0.0
  *
  * */
 function Stop(opt, cmd) {
     var self    = {
-        // Current version of the framework by default 
+        // Current version of the framework by default
         // But can be overriden with argument: @{version_number}
         // eg.: gina stop @1.0.0
         version: GINA_VERSION,
@@ -26,21 +26,21 @@ function Stop(opt, cmd) {
         // This is required if you don't use gina (gina/bin/cli) as a daemon
         fakeDeamonPid: false
     };
-    
 
-    var init = function(opt, cmd) {        
+
+    var init = function(opt, cmd) {
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
-        
+
         // check CMD configuration
         //if (!isCmdConfigured()) return false;
-        
+
         var err = null;
         var argv = opt.argv;
-        for (let i = 0, len = argv.length; i < len; i++) {            
+        for (let i = 0, len = argv.length; i < len; i++) {
             // checkcking version number
             if ( /^\@/.test(argv[i]) ) {
-                let version = argv[i].replace(/\@/, '');            
+                let version = argv[i].replace(/\@/, '');
                 let shortVersion = version.split('.').splice(0,2).join('.');
                 if ( !/^\d\.\d/.test(shortVersion) ) {
                     err = new Error('Wrong version: '+ version);
@@ -53,24 +53,24 @@ function Stop(opt, cmd) {
                     console.log(err.message);
                     break;
                 }
-                
+
                 self.version = version;
                 continue;
             }
         }
-        
+
         if ( err ) {
             return;
         }
         console.debug('Stopping framework v'+ self.version);
-        
+
         // if (!self.name) {
         //     stop(opt, cmd, 0);
         // } else {
             stop(opt, cmd);
-        // }        
+        // }
     }
-    
+
     var stop = function(opt, cmd) {
         var pidFiles = null, err = null;
         try {
@@ -78,23 +78,25 @@ function Stop(opt, cmd) {
         } catch (fileError) {
             throw fileError
         }
-        
+
         var runningVersions = [];
         for (let i=0, len=pidFiles.length; i<len; i++) {
             let file = pidFiles[i];
             if ( !/^gina\-/.test(file) ) {
                 continue;
             }
-            let pid = fs.readFileSync(_(GINA_RUNDIR +'/'+ file)).toString().trim() || null;
+            let pid = fs.readFileSync(_(GINA_RUNDIR +'/'+ file, true)).toString().trim() || null;
+            new _(GINA_RUNDIR +'/'+ file, true).rmSync();
+
             runningVersions.push({
                 title   : file.replace(/\.pid$/, ''),
                 pid     : ~~pid
             });
         }
         var pid = null, fakeDaemonPid = null;
-        if ( runningVersions.length > 0 ) {
+        if ( runningVersions.length > 0 && new _(GINA_HOMEDIR +'/procs.json', true).existsSync() ) {
             // retrieve running pid vs running version
-            var runningProcs = requireJSON(_(GINA_HOMEDIR +'/procs.json', true));            
+            var runningProcs = requireJSON(_(GINA_HOMEDIR +'/procs.json', true));
             for (let name in runningProcs) {
                 if (runningProcs[name].version == self.version) {
                     pid = runningProcs[name].pid;
@@ -112,7 +114,7 @@ function Stop(opt, cmd) {
                 } catch (fakeDaemonErr) {
                     // this only means that it does not exists or has already been killed
                 }
-                
+
             }
             if (pid) {
                 for (let i=0, len=runningVersions.length; i<len; i++) {
@@ -122,12 +124,23 @@ function Stop(opt, cmd) {
                         break;
                     }
                 }
-                
-                console.log('Gina v'+ self.version + ' has been stopped');
-                return
-            }   
+
+                // console.log('Gina v'+ self.version + ' has been stopped');
+                // return end('Gina v'+ self.version + ' has been stopped');
+                return setTimeout(() => {
+                    out = execSync("ps -ef | grep -v grep | grep 'gina-v"+ self.version +"' | awk '{print $2}'").toString() || null;
+                    if ( out && typeof(out) == 'string' && out.trim().length > 0) {
+                        pid = out.trim();
+                        process.kill(pid, 'SIGKILL');
+                    }
+
+                    return setTimeout(() => {
+                        end('Gina v'+ self.version + ' has been stopped')
+                    }, 100);
+                }, 200);
+            }
         }
-        
+
         // Double check in case of a bug ...
         if ( !isWin32() ) {
             var out  = null;
@@ -138,20 +151,40 @@ function Stop(opt, cmd) {
                 if ( out && typeof(out) == 'string' && out.trim().length > 0) {
                     pid = out.trim();
                     console.debug('Found unlinked process ['+ pid +']\nNow trying to kill it ...');
-                    
-                    process.kill(pid, 'SIGTERM');
-                    console.log('Gina v'+ self.version + ' has been stopped');
-                    return   
+
+                    process.kill(pid, 'SIGKILL');
+                    // console.log('Gina v'+ self.version + ' has been stopped');
+                    return end('Gina v'+ self.version + ' has been stopped');
                 }
             } catch(execErr) {
                 // Silence is golden ...
                 throw execErr
-            }            
+            }
         }
-        
-        console.log('Gina v'+ self.version + ' is not running');        
+
+        console.log('Gina v'+ self.version + ' is not running');
+        end()
     }
-    
+
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
 
     init(opt, cmd)
 }