gina 0.1.1-alpha.108 → 0.1.1-alpha.110

package/framework/v0.1.1-alpha.110/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;

package/framework/{v0.1.1-alpha.108 → v0.1.1-alpha.110}/lib/cmd/framework/open.js

@@ -42,8 +42,23 @@ Open = function(){
             default:
                 console.log('gina: shortcut not indexed [' + process.argv[3] + ']' );
         }
+
+        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.108 → v0.1.1-alpha.110}/lib/cmd/framework/restart.js

@@ -14,19 +14,19 @@ var console     = lib.logger;
  *  or
  *  gina restart
  *  or
- *  gina restart @1.0.0 
+ *  gina restart @1.0.0
  *
  * */
 function Restart(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
     };
-    
 
-    var init = function(opt, cmd) {        
+
+    var init = function(opt, cmd) {
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
         var err = null;
@@ -34,7 +34,7 @@ function Restart(opt, cmd) {
         //if (!isCmdConfigured()) return false;
         // checkcking version number
         if ( typeof(opt.argv[3]) != 'undefined' && /^@/.test(opt.argv[3]) ) {
-            var version = opt.argv[3].replace(/\@/, '');            
+            var version = opt.argv[3].replace(/\@/, '');
             var shortVersion = version.split('.').splice(0,2).join('.');
             if ( !/^\d\.\d/.test(shortVersion) ) {
                 err = new Error('Wrong version: '+ version);
@@ -47,76 +47,104 @@ function Restart(opt, cmd) {
                 console.log(err.message);
                 return;
             }
-            
+
             self.version = version;
         }
         console.debug('Restarting framework v'+ self.version);
-        
+
         // if (!self.name) {
         //     stop(opt, cmd, 0);
         // } else {
             restart(opt, cmd);
-        // }        
+        // }
     }
-    
+
     var restart = function(opt, cmd) {
         stop();
         start();
     }
-    
+
     var stop = function() {
         var out = null;
         try {
             out = execSync('gina stop @'+self.version).toString();
-            console.debug(out);
+            console.debug('out => ', out);
         } catch (err) {
             throw err;
         }
     }
-    
+
     /**
      * start
-     * 
+     *
      * We need to spawn this one as detached
      * because of the `process.kill(..., 'SIGSTOP')` used inside the orginal `start` script
      * or else, the restart script will be pending forever.
      */
-    var start = async function() {        
-        try {            
+    var start = async function() {
+        console.debug('continue with start now');
+        try {
+            // var child = spawn('gina', ['start', '@'+self.version],
             var child = spawn('gina', ['start', '@'+self.version, '--restart-pid='+ process.pid],
                 {
                     detached: true
                 }
             );
-            
+
             var frameworkPid = null;
             child.stdout.setEncoding('utf8');
             child.stdout.on('data', function(data) {
                 //process.stdout.write(data);
                 if ( new RegExp('Gina server started with PID','gi').test(data) ) {
+                    restartRunningBunldes();
                     frameworkPid = data.match(/\`\d+\`/)[0];
                     process.stdout.write('Gina server started with PID '+ frameworkPid + '\r\n');
                 }
-                
+
                 if ( /\[ quit \]/.test(data) ) {
                     // TODO - restart all running bundles
-                    
-                    process.exit(0)
+                    end()
                 }
             });
-            
+
             child.stderr.setEncoding('utf8');
             var error = null;
             child.stderr.on('data', function(err) {
                 error = err.toString();
                 console.error(error);
-            });            
-            
+            });
+
         } catch (err) {
             throw err;
-        }        
+        }
+    }
+
+    var restartRunningBunldes = function() {
+        var list = fs.readdirSync(_(GINA_RUNDIR, true));
+        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 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)
 }

package/framework/{v0.1.1-alpha.108 → v0.1.1-alpha.110}/lib/cmd/framework/set.js

@@ -19,6 +19,7 @@ function Set(opt){
             console.debug('Preprocessing `framework:set '+ process.argv[i] +'`');
             set(k,v);
         }
+        end()
     };
 
 
@@ -69,8 +70,9 @@ function Set(opt){
             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);
 
         }
     }
@@ -210,6 +212,19 @@ function Set(opt){
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
 
+    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)
 };
 

package/framework/{v0.1.1-alpha.108 → v0.1.1-alpha.110}/lib/cmd/framework/start.js

@@ -1,5 +1,6 @@
 'use strict';
 var fs      = require('fs');
+const {execSync}    = require('child_process');
 var help    = require( getPath('gina').root + '/utils/helper');
 // var child   = require('child_process');
 var lib     = require( getPath('gina').lib );
@@ -29,8 +30,8 @@ function Start(opt){
     //};
 
     var init = function(opt){
-        
-        
+
+
         self.pid        = opt.pid;
         setEnvVar('GINA_PID', opt.pid);
         self.projects   = require(GINA_HOMEDIR + '/projects.json');
@@ -38,10 +39,25 @@ function Start(opt){
         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));
+        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)
@@ -54,22 +70,17 @@ 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();
@@ -82,14 +93,26 @@ function Start(opt){
                     try {
                         new _(path +'/'+ files[f]).rmSync()
                     } catch(err) {
-                        console.error(err.stack||err.message);
-                        process.exit(1);
+                        return end(err)
                     }
                 }
             }
         }
     }
 
+    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)
 }
 

package/framework/v0.1.1-alpha.110/lib/cmd/framework/status.js

@@ -0,0 +1,121 @@
+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('pidFiles ',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;
+            runningVersions.push({
+                title   : file.replace(/\.pid$/, ''),
+                pid     : ~~pid
+            });
+
+            let version = file.replace(/^gina\-/, '').replace(/\.pid$/, '');
+            runningLog +=  '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 (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 = Status;

package/framework/{v0.1.1-alpha.108 → v0.1.1-alpha.110}/lib/cmd/framework/stop.js

@@ -85,7 +85,9 @@ function Stop(opt, cmd) {
             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
@@ -139,7 +141,7 @@ function Stop(opt, cmd) {
                     pid = out.trim();
                     console.debug('Found unlinked process ['+ pid +']\nNow trying to kill it ...');
 
-                    process.kill(pid, 'SIGTERM');
+                    process.kill(pid, 'SIGKILL');
                     console.log('Gina v'+ self.version + ' has been stopped');
                     return
                 }
@@ -150,6 +152,20 @@ function Stop(opt, cmd) {
         }
 
         console.log('Gina v'+ self.version + ' is not running');
+        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 )
     }
 
 

package/framework/{v0.1.1-alpha.108 → v0.1.1-alpha.110}/lib/cmd/framework/version.js

@@ -31,11 +31,20 @@ function Version(opt){
             console.error(msg.basic[5])
         }
 
-        // end();
+        end();
     };
 
-    var end = function(err) {
-        process.exit( err ? -1:0 )
+    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)

package/framework/{v0.1.1-alpha.108 → v0.1.1-alpha.110}/lib/cmd/project/add.js

@@ -190,13 +190,6 @@ function Add(opt, cmd) {
             target
         );
 
-        if (
-            typeof(isCreatedFromExistingPackage) != 'undefined'
-            && /^true$/i.test(isCreatedFromExistingPackage)
-        ) {
-            return end()
-        }
-
         end(true)
     }
 
@@ -221,7 +214,7 @@ function Add(opt, cmd) {
         };
 
         // create/update ports, protocols & schemes
-        if ( /^true$/.test(local.imported) || /^false$/.test(local.imported) && typeof(self.projects[self.projectName]) == 'undefined' ) {
+        if ( /^true$/.test(local.imported) ) {
             addBundlePorts(0);
         }
 
@@ -265,6 +258,8 @@ function Add(opt, cmd) {
                 linkGina(onError, onSuccess)
             }
 
+        } else {
+            onSuccess()
         }
     }