gina 0.1.1-alpha.17 → 0.1.1-alpha.170

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/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.17 → v0.1.1-alpha.170}/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,23 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     };
 
+    var end = function (err, type, messageOnly) {
+        if ( typeof(err) != 'undefined') {
+            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
+            if ( typeof(type) != 'undefined' ) {
+                console[type](out)
+            } else {
+                console.error(out);
+            }
+        }
+
+        process.exit( err ? 1:0 );
+    }
+
     init()
 };
 

package/framework/{v0.1.1-alpha.17/lib/cmd/scope → v0.1.1-alpha.170/lib/cmd/env}/use.js

@@ -63,16 +63,36 @@ function Use(opt, cmd) {
     }
 
     var useEnv = function(env, projects, target) {
-        //console.log('proj.: ', self.name, projects[self.name]);
+        // console.debug('proj.: ', self.name, projects[self.name] , '\nEnv:' + env);
         if (env !== projects[self.name]['def_env']) {
+            console.log('Project [ '+ self.name+' ] env `'+ projects[self.name]['def_env'] +'` set to '+ env);
             projects[self.name]['def_env'] = env;
             lib.generator.createFileFromDataSync(
                 projects,
                 target
             )
         }
+
+
+        end();
     };
 
+    var end = function(err) {
+        if (err) {
+            if (GINA_ENV_IS_DEV) {
+                console.error(err.stack);
+            } else {
+                console.error(err.message);
+            }
+
+            return process.exit(1);
+        }
+
+
+
+        return process.exit(0)
+    }
+
     init()
 };
 

package/framework/v0.1.1-alpha.170/lib/cmd/framework/build.js

@@ -0,0 +1,85 @@
+'use strict';
+var fs          = require('fs');
+const {spawn}       = require('child_process');
+const {execSync}    = require('child_process');
+var util        = require('util');
+var promisify   = util.promisify;
+
+var CmdHelper   = require('./../helper');
+var console = lib.logger;// jshint ignore:line
+/**
+ * Framework build command
+ * e.g.
+ *  gina framework:build
+ *  or
+ *  gina build
+ *
+ * @param {object} opt - Constructor options
+ * */
+function Build(opt, cmd){
+
+    var self    = {};
+
+    var init = function(opt, cmd) {
+        console.debug('Building framework...');
+
+        // import CMD helpers
+        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
+
+        begin(0);
+    }
+    /**
+     * Bebin - Will run checking tasks in order of declaration
+     * */
+     var begin = async function(i) {
+        var n = 0, funct = null, functName = null;
+        for (let t in self) {
+            if ( typeof(self[t]) == 'function') {
+                if (n == i){
+                    //let func = 'self.' + t + '()';
+                    let func = 'self.' + t;
+                    console.debug('Running [ ' + func + '() ]');
+                    funct       = func;
+                    functName   = t;
+                    break;
+                }
+                n++;
+            }
+        }
+
+        // to handle sync vs async to allow execution in order of declaration
+        if (funct) {
+            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();');// jshint ignore:line
+        } else {
+            end();
+        }
+    }
+
+    self.buildToolbar = function(done) {
+        var pluginDir       = _(GINA_CORE +'/asset/plugin', true);// jshint ignore:line
+        var toolbarDistObj  = new _(pluginDir +'/dist/toolbar', true);
+        if ( toolbarDistObj.existsSync() ) {
+            toolbarDistObj.rmSync()
+        }
+
+        var toolbarSrcObj   = new _(pluginDir +'/src/gina/toolbar', true);
+        var excludedList    = ['.gitignore', 'mock.gina.json', 'mock.user.json', 'readme.md', 'sass', 'svg-src'];
+        toolbarSrcObj.cp(toolbarDistObj.toString(), excludedList, done);
+    }
+
+    var end = function (err, type, messageOnly) {
+        if ( typeof(err) != 'undefined') {
+            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
+            if ( typeof(type) != 'undefined' ) {
+                console[type](out)
+            } else {
+                console.error(out);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
+    init(opt, cmd)
+}
+module.exports = Build;