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

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

@@ -1,3 +1,4 @@
+const { execSync } = require('child_process');
 var fs = require('fs');
 var exec = require('child_process').exec;
 
@@ -8,7 +9,7 @@ var console = lib.logger;
  *
  * e.g.
  *  gina bundle:stop <bundle_name> @<project_name>
- * 
+ *
  *  // stop all bundles within the project
  *  gina bundle:stop @<project_name>
  *
@@ -17,26 +18,26 @@ function Stop(opt, cmd) {
     var self = {};
 
     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;
-        
-        // start all bundles   
-        opt.offlineCount = 0;   
-        opt.notStopped = [];  
-        
+
+        // start all bundles
+        opt.offlineCount = 0;
+        opt.notStopped = [];
+
         if (!self.name) {
             stop(opt, cmd, 0);
         } else {
             stop(opt, cmd);
-        }  
+        }
     }
-    
+
     var stop = function(opt, cmd, bundleIndex) {
-        
+
         var isBulkStop = (typeof(bundleIndex) != 'undefined') ? true : false;
         var bundle = (isBulkStop) ? self.bundles[bundleIndex] : self.name;
 
@@ -44,70 +45,86 @@ function Stop(opt, cmd) {
         if (!isBulkStop && !isDefined('bundle', bundle)) {
             msg = 'Bundle [ ' + bundle + ' ] is not registered inside `@' + self.projectName + '`';
             console.error(msg);
-            end(opt, cmd, isBulkStop, bundleIndex, true)
+            opt.msg = msg;
+            return end(opt, cmd, isBulkStop, bundleIndex, true)
+        }
 
-        } else {
+        isRealApp(bundle, function(err, appPath) {
 
-            isRealApp(bundle, function(err, appPath) {
+            if (err) {
+                console.error(err.stack || err.message)
+            }
 
-                if (err) {
-                    console.error(err.stack || err.message)
+            var error = null;
+            var proc = null;
+            var isSpecialCase = false;
+            var pidPath = _(GINA_RUNDIR +'/'+ bundle +'@'+ self.projectName +'.pid', true);
+            try {
+                proc = fs.readFileSync(_(GINA_RUNDIR+'/'+bundle + '@' + self.projectName +'.pid')).toString().replace(/\n/g, '');
+                proc = parseInt(proc);
+
+            } catch(err) {
+                isSpecialCase = true;
+                // Some how pid file could have been deleted leaving a zombie process running
+                var list = execSync("ps -ef | grep -v grep | grep 'gina: "+ bundle + '@' + self.projectName +"' | awk '{print $2\" \"$8$9}'").toString().replace(/\n$/, '').split(/\n/g);
+                if (list.length && list[0] != '') {
+                    proc = ~~list[0].split(/\s+/)[0];
+                } else {
+                    error = err.toString();
+                    console.debug(error);
                 }
+            }
 
-                //console.info('Trying to stop bundle [ ' + bundle + '@' + self.projectName + ' ]');
-                var error = null;
-                exec('ps -Af|grep "gina: ' + bundle + '@' + self.projectName + '"', function(err, data) {
+            msg = 'Trying to stop bundle [ ' + bundle + '@' + self.projectName + ' ]\n\r';
+            opt.client.write('\n\r'+msg);
 
-                    if (err) {
-                        error = err.toString();
-                        console.error(error);
-                        opt.notStopped.push(bundle + '@' + self.projectName);
-                        end(opt, cmd, isBulkStop, bundleIndex, true)
-                        //process.exit(1)
-                    }
+            // if ( !re.test(row[0]) ) {
+            if (proc) {
+                //console.debug('\n'+ row.join('\n'));
+                //console.debug('kill -TERM ', proc, arr);
 
-                    var row = data.split(/\n/g)
-                        , r = 0
-                        , len = row.length
-                        , arr = row[0].replace(/(?:\\[rn]|[\r\n])/g, '').split(/\s+/g)
-                        , proc = (arr[2] != '') ? arr[2] : arr[3]; // arr[4] is for minions;
-
-                    // matching `grep` CMD PID to be excluded in the next test    
-                    var re = new RegExp('(\\bgrep\\W+)(gina: '+ bundle+'@'+ self.projectName+')');
-                    msg = 'Trying to stop bundle [ ' + bundle + '@' + self.projectName + ' ]\n\r';
-                    opt.client.write('\n\r'+msg);
-                    
-                    if ( !re.test(row[0]) ) {
-                        //console.debug('\n'+ row.join('\n'));
-                        //console.debug('kill -TERM ', proc, arr);
-
-                        exec('kill -9 ' + proc, function(err, data) {
-                            if (!err) {
-                                ++opt.offlineCount;
-                                //console.info('Bundle [ ' + bundle + '@' + self.projectName + ' ] with PID [ ' + proc + ' ] stopped !');
-                                opt.client.write('  [ ' + bundle + '@' + self.projectName + ' ] with PID [ ' + proc + ' ] stopped !\n');
-                                
-                                end(opt, cmd, isBulkStop, bundleIndex)
-                            } else {
-                                console.error( err.toString())
-                            }
-                        })
-                    } else { // not running
-                        //console.info('Bundle `' + bundle + '@' + self.projectName + '` is not running');
-                        opt.client.write('  [ ' + bundle + '@' + self.projectName + ' ] is not running\n');
-                        
+                exec('kill -9 ' + proc, function(err, data) {
+                    // just in case
+                    if ( new _(pidPath).existsSync() ) {
+                        isSpecialCase = true;
+                        fs.unlinkSync( pidPath );
+                    }
+                    if (!err) {
                         ++opt.offlineCount;
-                        opt.notStopped.push(bundle + '@' + self.projectName);
+
+                        // resume logging
+                        process.emit('gina#bundle-logging', GINA_MQ_PORT, GINA_HOST_V4, bundle + '@' + self.projectName);
+
+                        //console.info('Bundle [ ' + bundle + '@' + self.projectName + ' ] with PID [ ' + proc + ' ] stopped !');
+                        opt.client.write('  [ ' + bundle + '@' + self.projectName + ' ] with PID [ ' + proc + ' ] stopped !\n');
+
                         end(opt, cmd, isBulkStop, bundleIndex)
+                    } else {
+                        if (!isSpecialCase) {
+                            console.error( err.toString())
+                        } else {
+                            end(opt, cmd, isBulkStop, bundleIndex)
+                        }
                     }
-                });
-            })//EO isRealApp
-        }
+                })
+            } else { // not running
+                //console.info('Bundle `' + bundle + '@' + self.projectName + '` is not running');
+                opt.client.write('  [ ' + bundle + '@' + self.projectName + ' ] is not running\n');
+
+                ++opt.offlineCount;
+                opt.notStopped.push(bundle + '@' + self.projectName);
+                end(opt, cmd, isBulkStop, bundleIndex)
+            }
+        })//EO isRealApp
+
     }
-    
+
     var end = function (opt, cmd, isBulkStop, i, error) {
-        if (isBulkStop) {            
-            ++i;            
+        if ( typeof(opt.msg) != 'undefined' ) {
+            opt.client.write('\n\r'+ opt.msg);
+        }
+        if (isBulkStop) {
+            ++i;
             if ( typeof(self.bundles[i]) != 'undefined' ) {
                 stop(opt, cmd, i)
             } else {
@@ -117,26 +134,26 @@ function Stop(opt, cmd) {
                     notStoppedMsg = '\nThe following bundles could not be stopped or were not running: \n - '+ opt.notStopped.join('\n - ') + '\n\r';
                     opt.client.write(notStoppedMsg);
                 }
-                
-                
+
+
                 if ( typeof(error) != 'undefined') {
                     process.exit(1);
                 }
                 if (!opt.client.destroyed)
                     opt.client.emit('end');
-                    
+
                 process.exit(0);
             }
         } else {
             if ( typeof(error) != 'undefined') {
                 process.exit(1);
             }
-            
+
             if (!opt.client.destroyed)
-                opt.client.emit('end');        
-                
+                opt.client.emit('end');
+
             process.exit(0);
-        }        
+        }
     }
 
 
@@ -151,11 +168,13 @@ function Stop(opt, cmd) {
             , bundleDir = null
             , bundlesPath = null
             , bundleInit = null
+            , pkg = null
+            , path = null
         ;
 
         try {
             //This is mostly for dev.
-            var pkg = requireJSON(_(root + '/manifest.json')).bundles;
+            pkg = requireJSON(_(root + '/manifest.json')).bundles;
 
             if ( typeof(pkg[bundle].version) == 'undefined' && typeof (pkg[bundle].tag) != 'undefined' ) {
                 pkg[bundle].version = pkg[bundle].tag
@@ -163,7 +182,7 @@ function Stop(opt, cmd) {
             if (
                 pkg[bundle] != 'undefined' && pkg[bundle]['src'] != 'undefined' && isDev
             ) {
-                var path = pkg[bundle].src;
+                path = pkg[bundle].src;
 
                 p = _(root + '/' + path);//path.replace('/' + bundle, '')
                 d = _(root + '/' + path + '/index.js');
@@ -175,7 +194,7 @@ function Stop(opt, cmd) {
 
             } else {
                 //Others releases.
-                var path = 'releases/' + bundle + '/' + env + '/' + pkg[bundle].version;
+                path = 'releases/' + bundle + '/' + env + '/' + pkg[bundle].version;
                 var version = pkg[bundle].version;
                 p = _(root + '/' + path);//path.replace('/' + bundle, '')
                 d = _(root + '/' + path + '/index.js');
@@ -195,7 +214,7 @@ function Stop(opt, cmd) {
             d = _(root + '/' + bundleDir + '/' + bundle + '/index.js');
             bundleInit = d;
         }
-        
+
         // removing mounting point
         var coreEnv = getCoreEnv(bundle);
         new _(coreEnv.mountPath +'/'+ bundle, true).rmSync();
@@ -219,7 +238,7 @@ function Stop(opt, cmd) {
             })
         } else {
             //callback(new Error('[ ' + d + ' ] does not exists'))
-            console.debug('[ ' + d + ' ] does not exists'); 
+            console.debug('[ ' + d + ' ] does not exists');
             callback(false)
         }
     }

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/lib/cmd/env/add.js

@@ -1,8 +1,8 @@
 var fs      = require('fs');
 
 var CmdHelper   = require('./../helper');
-var console = lib.logger;
-var scan    = require('../port/inc/scan.js');
+var console     = lib.logger;
+var scan        = require('../port/inc/scan.js');
 
 /**
  * Add new environment for a given project
@@ -18,11 +18,11 @@ function Add(opt, cmd) {
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
-        self.projects = requireJSON(_(GINA_HOMEDIR + '/projects.json'));        
+
+        self.projects = requireJSON(_(GINA_HOMEDIR + '/projects.json', true));
         self.bundles = [];
         self.portsAvailable = {};
-        
+
         var i = 3, envs = [];
         for (; i<process.argv.length; ++i) {
             if ( /^\@[a-z0-9_.]/.test(process.argv[i]) ) {
@@ -31,19 +31,21 @@ function Add(opt, cmd) {
                     process.exit(1);
                 }
 
-            } else if (/^[a-z0-9_.]/.test(process.argv[i])) {
-                envs.push(process.argv[i])
+            }
+            else if (/^[a-z0-9_.]/.test(process.argv[i])) {
+                local.env = process.argv[i];
+                envs.push(process.argv[i]);
             }
         }
-        
-        
+
+
         if ( typeof(self.projectName) == 'undefined') {
             var folder = new _(process.cwd()).toArray().last();
             if ( isDefined('project', folder) ) {
                 self.projectName = folder
             }
         }
-        
+
         if ( isDefined('project', self.projectName) && envs.length > 0) {
             self.envs = envs;
             saveEnvs()
@@ -53,7 +55,7 @@ function Add(opt, cmd) {
             process.exit(1)
         }
     }
- 
+
 
     var saveEnvs = function() {
         var file    = _(self.projects[self.projectName].path + '/env.json')
@@ -78,7 +80,7 @@ function Add(opt, cmd) {
                     if ( self.portsList.indexOf(p) > -1 ) continue;
                     self.portsList.push(p)
                 }
-            }            
+            }
         }
         self.portsList.sort();
         for (let b in self.project.bundles) {
@@ -136,15 +138,15 @@ function Add(opt, cmd) {
 
             local.bundle    = bundle;
             local.b         = b;
-                                   
-                        
+
+
             // find available port
             var options = {
                 ignore  : getPortsList(),
                 limit   : getBundleScanLimit(bundle)
             };
             console.log('['+bundle+'] starting ports scan' );
-            
+
             scan(options, function(err, ports){
                 if (err) {
                     rollback(err);
@@ -155,7 +157,7 @@ function Add(opt, cmd) {
                     self.portsList.push(ports[p])
                 }
                 self.portsList.sort();
-                
+
                 console.debug('available ports '+ JSON.stringify(ports, null, 2));
                 //self.portsAvailable = ports;
                 setPorts(local.bundle, ports, function onPortsSet(err) {
@@ -163,7 +165,7 @@ function Add(opt, cmd) {
                         rollback(err);
                         return;
                     }
-                    
+
                     //console.debug('available ports '+ JSON.stringify(self.portsAvailable[local.bundle], null, 2));
                     ++local.b;
                     addEnvToBundles(local.b)
@@ -206,14 +208,14 @@ function Add(opt, cmd) {
     //         , allProjectProtocols   = self.projects[self.projectName].protocols
     //         , allProjectSchemes     = self.projects[self.projectName].schemes
     //     ;
-        
-        
-        
+
+
+
     //     // BO project/env.json
     //     if ( typeof(content[bundle]) == 'undefined' ) {
     //         content[bundle] = {}
     //     }
-        
+
     //     // getting available all envs
     //     for (let n in self.envs) {
     //         let newEnv = self.envs[n];
@@ -238,7 +240,7 @@ function Add(opt, cmd) {
     //             allProjectSchemes.push(newScheme);
     //         }
     //     }
-        
+
     //     // editing env.json to add host infos
     //     for (let e in allProjectEnvs) {
     //         let env = allProjectEnvs[e];
@@ -247,24 +249,24 @@ function Add(opt, cmd) {
     //                 "host" : "localhost"
     //             }
     //         }
-    //     }            
+    //     }
     //     // EO project/env.json
-        
-        
+
+
     //     // BO ~/.gina/ports.reverse.json - part 1/2
     //     if ( typeof(portsReverse[bundle + '@' + self.projectName]) == 'undefined' ) {
     //         portsReverse[bundle + '@' + self.projectName] = {}
     //     }
-    //     if ( 
+    //     if (
     //         typeof(portsReverse[bundle + '@' + self.projectName][env]) == 'undefined'
     //         ||
     //         /^string$/i.test( typeof(portsReverse[bundle + '@' + self.projectName][env]) )
     //     ) {
     //         portsReverse[bundle + '@' + self.projectName][env] = {}
-    //     }          
+    //     }
     //     // EO ~/.gina/ports.reverse.json - part 1/2
 
-        
+
     //     // BO ~/.gina/ports.json
     //     for (let p in allProjectProtocols) {
     //         let protocol = allProjectProtocols[p];
@@ -287,7 +289,7 @@ function Add(opt, cmd) {
     //             if ( typeof(portsReverse[bundle + '@' + self.projectName][env][protocol][scheme]) == 'undefined' ) {
     //                 portsReverse[bundle + '@' + self.projectName][env][protocol][scheme] = {}
     //             }
-                
+
     //             let assigned = [];
     //             if ( ports[protocol][scheme].count() > 0 ) {
     //                 for (let port in ports[protocol][scheme]) {
@@ -299,18 +301,18 @@ function Add(opt, cmd) {
     //                         self.portsAvailable[bundle][env].unshift(port);
     //                         continue;
     //                     }
-    //                     assigned.push(portDescription);                    
+    //                     assigned.push(portDescription);
     //                 }
     //             }
-                    
-                
+
+
     //             let stringifiedScheme = JSON.stringify(ports[protocol][scheme]);
     //             let patt = new RegExp(bundle +'@'+ self.projectName +'/'+ env);
     //             let found = false;
     //             let portToAssign = null;
     //             // do not override if existing
     //             if ( patt.test(stringifiedScheme) ) { // there can multiple matches
-    //                 found = true;                    
+    //                 found = true;
     //                 // reusing the same for portsReverse
     //                 let re = new RegExp('([0-9]+)\"\:(|\s+)\"('+ bundle +'\@'+ self.projectName +'\/'+ env +')', 'g');
     //                 let m;
@@ -318,12 +320,12 @@ function Add(opt, cmd) {
     //                     // This is necessary to avoid infinite loops with zero-width matches
     //                     if (m.index === re.lastIndex) {
     //                         re.lastIndex++;
-    //                     }                        
+    //                     }
     //                     // The result can be accessed through the `m`-variable.
     //                     try {
     //                         m.forEach((match, groupIndex) => {
     //                             //console.debug(`Found match, group ${groupIndex}: ${match}`);
-    //                             if (groupIndex == 1) {                                    
+    //                             if (groupIndex == 1) {
     //                                 portToAssign = ~~match;
     //                                 //console.debug('['+bundle+'] port to assign '+ portToAssign + ' - ' + protocol +' '+ scheme);
     //                                 throw new Error('breakExeception');
@@ -333,9 +335,9 @@ function Add(opt, cmd) {
     //                         break;
     //                     }
     //                 }
-                    
+
     //             }
-                
+
     //             if (!portToAssign) {
     //                 //console.debug('['+bundle+'] No port to assign '+ portToAssign + ' - ' + protocol +' '+ scheme);
     //                 portToAssign = self.portsAvailable[bundle][env][0];
@@ -343,17 +345,17 @@ function Add(opt, cmd) {
     //                 self.portsAvailable[bundle][env].splice(0,1);
     //             }
     //             ports[protocol][scheme][portToAssign] = bundle +'@'+ self.projectName +'/'+ env;
-                
+
     //             // BO ~/.gina/ports.reverse.json - part 2/2
     //             //override needed since it is relying on ports definitions
     //             portsReverse[bundle + '@' + self.projectName][env][protocol][scheme] = ~~portToAssign;
     //             // EO ~/.gina/ports.reverse.json - part 2/2
-                    
+
     //         } // EO for (let scheme in schemes)
-    //     } // for (let protocol in protocols)        
+    //     } // for (let protocol in protocols)
     //     // EO ~/.gina/ports.json
-        
-        
+
+
 
     //     try {
     //         // save to /<project_path>/env.json
@@ -362,7 +364,7 @@ function Add(opt, cmd) {
     //         // save to ~/.gina/projects.json
     //         // lib.generator.createFileFromDataSync(ports, portsPath);
     //         // self.projectsDataWrote = true;
-            
+
     //         // save to ~/.gina/ports.json
     //         lib.generator.createFileFromDataSync(ports, portsPath);
     //         self.portsDataWrote = true;
@@ -398,13 +400,30 @@ function Add(opt, cmd) {
         //writing
         lib.generator.createFileFromDataSync(
             projects,
-            self.projectsPath
+            self.projectConfigPath
         );
         self.projectDataWrote = true
     }
-    
+
     var updateManifest = function() {
-        
+        // projectManifestPath
+        var env             = local.env
+            , projectData   = JSON.clone(self.projectData)
+        ;
+
+        // for (let bundle in projectData.bundles) {
+        //     if (
+        //         typeof(projectData.bundles[bundle].releases[env]) != 'undefined'
+        //         && typeof(projectData.bundles[bundle].releases[env].target) != 'undefined'
+        //     ) {
+        //         delete projectData.bundles[bundle].releases[env].target
+        //     }
+        // }
+
+        // lib.generator.createFileFromDataSync(projectData, self.projectManifestPath);
+
+        end()
+
     }
 
     var rollback = function(err) {
@@ -413,16 +432,16 @@ function Add(opt, cmd) {
 
         var writeFiles = function() {
             //restore env.json
-            lib.generator.createFileFromDataSync(self.envData, self.envPath);            
+            lib.generator.createFileFromDataSync(self.envData, self.envPath);
 
             //restore ports.json
             lib.generator.createFileFromDataSync(self.portsData, self.portsPath);
 
             //restore ports.reverse.json
             lib.generator.createFileFromDataSync(self.portsReverseData, self.portsReversePath);
-            
+
             // restore projects.json
-            lib.generator.createFileFromDataSync(self.projects, self.projectsPath);
+            lib.generator.createFileFromDataSync(self.projects, self.projectConfigPath);
 
             process.exit(1)
         };
@@ -430,6 +449,25 @@ function Add(opt, cmd) {
         writeFiles()
     };
 
+    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()
 };
 

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/lib/cmd/env/list.js

@@ -10,6 +10,7 @@ function List(opt, cmd){
     var init = function(){
 
         self.projects = require(_(GINA_HOMEDIR + '/projects.json'));
+        var err = null;
 
         if ( typeof(process.argv[3]) != 'undefined') {
             if (process.argv[3] === '--all') {
@@ -32,8 +33,8 @@ function List(opt, cmd){
         } else if ( typeof(self.name) != 'undefined' && isDefined(self.name) ) {
             listProjectOnly()
         } else {
-            console.error('[ '+self.name+' ] is not a valid project name.');
-            process.exit(1)
+            err = new Error('[ '+self.name+' ] is not a valid project name.');
+            end(err, 'log', true);
         }
     }
 
@@ -84,7 +85,8 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     }
 
     var listProjectOnly = function (){
@@ -102,9 +104,29 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        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()
 };