gina 0.1.1-alpha.13 → 0.1.1-alpha.130

package/framework/{v0.1.1-alpha.13/lib/cmd/scope → v0.1.1-alpha.130/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.130/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.13 → v0.1.1-alpha.130}/lib/cmd/framework/init.js

@@ -1,6 +1,8 @@
 var fs              = require('fs');
 var EventEmitter    = require('events').EventEmitter;
 var e               = new EventEmitter();
+const { execSync }  = require('child_process');
+
 var console         = lib.logger;
 var ginaPath        = getPath('gina').root;
 var help            = require(ginaPath + '/utils/helper');
@@ -27,7 +29,7 @@ function Initialize(opt) {
             if( typeof(self[t]) == 'function') {
                 var func = 'self.' + t + '()';
                 console.debug('Running [ ' + func + ' ]');
-                eval(func);
+                eval(func);// jshint ignore:line
                 ++i
             }
 
@@ -126,14 +128,18 @@ function Initialize(opt) {
 
     self.checkIfMain = function() {
         console.debug('Checking main...');
-        var source  = getPath('gina').root + '/resources/home/main.json';
-        var target  = self.opt.homedir + '/main.json';
-        var version = 'v' + getEnvVar('GINA_VERSION');
+        var source      = getPath('gina').root + '/resources/home/main.json';
+        var target      = self.opt.homedir + '/main.json';
+        var version     = 'v' + getEnvVar('GINA_VERSION');
+        var prefix      = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var globalMode  = getEnvVar('GINA_GLOBAL_MODE');
 
         var data = require(source);
         var dic = {
             'release' : self.release,
-            'version' : version
+            'version' : version,
+            'prefix' : prefix,
+            'global_mode': globalMode
         };
         data = whisper(dic, data);
 
@@ -157,7 +163,6 @@ function Initialize(opt) {
             }
         }
 
-
         // envs
         mainConfig.envs = merge(mainConfig.envs, data.envs, true);
         // scopes
@@ -171,11 +176,13 @@ function Initialize(opt) {
 
 
         // don't remove def_protocol
-        var defProtocol = (mainConfig['def_protocol']) ? mainConfig['def_protocol'][self.release] : data.def_protocol[self.release];
-        var defScheme   = (mainConfig['def_scheme']) ? mainConfig['def_scheme'][self.release] : data.def_scheme[self.release];
-        var defCulture  = (mainConfig['def_culture']) ? mainConfig['def_culture'][self.release] : data.def_culture[self.release];
-        var defTimezone = (mainConfig['def_timezone']) ? mainConfig['def_timezone'][self.release] : data.def_timezone[self.release];
-        var defLogLevel = (mainConfig['def_log_level']) ? mainConfig['def_log_level'][self.release] : data.def_log_level[self.release];
+        var defProtocol     = (mainConfig['def_protocol']) ? mainConfig['def_protocol'][self.release] : data.def_protocol[self.release];
+        var defScheme       = (mainConfig['def_scheme']) ? mainConfig['def_scheme'][self.release] : data.def_scheme[self.release];
+        var defCulture      = (mainConfig['def_culture']) ? mainConfig['def_culture'][self.release] : data.def_culture[self.release];
+        var defTimezone     = (mainConfig['def_timezone']) ? mainConfig['def_timezone'][self.release] : data.def_timezone[self.release];
+        var defLogLevel     = (mainConfig['def_log_level']) ? mainConfig['def_log_level'][self.release] : data.def_log_level[self.release];
+        var defPrefix       = (mainConfig['def_prefix']) ? mainConfig['def_prefix'][self.release] : data.def_prefix[self.release];
+        var defGlobalMode   = (mainConfig['def_global_mode']) ? mainConfig['def_global_mode'][self.release] : data.def_global_mode[self.release];
 
 
         if ( mainConfig.protocols[self.release].indexOf(defProtocol) < 0 )
@@ -187,18 +194,23 @@ function Initialize(opt) {
         if ( mainConfig.cultures[self.release].indexOf(defCulture) < 0 )
             mainConfig.cultures[self.release].push(defCulture);
 
-        if ( mainConfig.cultures[self.release].indexOf(defCulture) < 0 )
-            mainConfig.cultures[self.release].push(defCulture);
 
         // Update only when needed
         if (!mainConfig.def_culture)
             mainConfig.def_culture = data.def_culture;
+
         if (!mainConfig.def_timezone)
             mainConfig.def_timezone = data.def_timezone;
 
         if (!mainConfig.def_log_level)
             mainConfig.def_log_level = data.def_log_level;
 
+        if (!mainConfig.def_prefix)
+            mainConfig.def_prefix = data.def_prefix;
+
+        if (!mainConfig.def_global_mode)
+            mainConfig.def_global_mode = data.def_global_mode;
+
         mainConfig.protocols[self.release].sort();
         mainConfig.schemes[self.release].sort();
         mainConfig.cultures[self.release].sort();
@@ -206,11 +218,15 @@ function Initialize(opt) {
         // commit
         lib.generator.createFileFromDataSync(mainConfig, target);
 
+        process.env.TZ = defTimezone;
+        process.env.LOG_LEVEL = defLogLevel;
+
         setEnvVar('GINA_CULTURES', mainConfig.cultures[self.release]);
         setEnvVar('GINA_CULTURE', defCulture);
         setEnvVar('GINA_TIMEZONE', defTimezone);
-        process.env.TZ = defTimezone;
-        process.env.LOG_LEVEL = defLogLevel;
+        // Attenion: remove this part in case of troubles
+        setEnvVar('GINA_PREFIX', defPrefix);
+        setEnvVar('GINA_GLOBAL_MODE', defGlobalMode);
     }
 
     /**
@@ -257,6 +273,7 @@ function Initialize(opt) {
         }
     }
 
+
     /**
      * Check env
      *
@@ -326,6 +343,8 @@ function Initialize(opt) {
         console.debug('Checking framework settings...');
         var main            = require( _(self.opt.homedir + '/main.json', true) )
             , version       = getEnvVar('GINA_VERSION')
+            , prefix        = getEnvVar('GINA_PREFIX') || main['def_prefix'][self.release]
+            , globalMode    = getEnvVar('GINA_GLOBAL_MODE') || main['def_global_mode'][self.release]
             , env           = getEnvVar('GINA_ENV') || main['def_env'][self.release]
             , scope         = getEnvVar('GINA_SCOPE') || main['def_scope'][self.release]
             , settings      = requireJSON( _( getPath('gina').root + '/resources/home/settings.json', true ) )
@@ -335,7 +354,13 @@ function Initialize(opt) {
 
         // case of port & debug_port updated
         var targetObj = new _(target);
-        var localUserSettings = requireJSON(target);
+        var localUserSettings = null;
+        if ( targetObj.existsSync() ) {
+            localUserSettings = requireJSON(target);
+        } else {
+            localUserSettings = JSON.clone(settings);
+        }
+
         if ( !getEnvVar('GINA_PORT') && targetObj.existsSync() ) {
             if ( typeof(localUserSettings.port) != 'undefined' ) {
                 setEnvVar('GINA_PORT', ~~localUserSettings.port);
@@ -346,6 +371,21 @@ function Initialize(opt) {
                 setEnvVar('GINA_DEBUG_PORT', ~~localUserSettings.debug_port);
             }
         }
+        if ( !getEnvVar('GINA_MQ_PORT') && targetObj.existsSync() ) {
+            if ( typeof(localUserSettings.mq_port) != 'undefined' ) {
+                setEnvVar('GINA_MQ_PORT', ~~localUserSettings.mq_port);
+            }
+        }
+        if ( !getEnvVar('GINA_HOST_V4') && targetObj.existsSync() ) {
+            if ( typeof(localUserSettings.host_v4) != 'undefined' ) {
+                setEnvVar('GINA_HOST_V4', localUserSettings.host_v4);
+            }
+        }
+        if ( !getEnvVar('GINA_HOSTNAME') && targetObj.existsSync() ) {
+            if ( typeof(localUserSettings.hostname) != 'undefined' ) {
+                setEnvVar('GINA_HOSTNAME', localUserSettings.hostname);
+            }
+        }
 
 
         // updated on framework start : you never know which user is going to start gina (root ? sudo ? regular user)
@@ -362,6 +402,8 @@ function Initialize(opt) {
              */
 
             var dic = {
+                'prefix' : prefix,
+                'global_mode': globalMode,
                 'version' : version,
                 'env' : env,
                 'env_is_dev' : (main['dev_env'][self.release] == env) ? true : false,
@@ -374,6 +416,9 @@ function Initialize(opt) {
                 'node_version': process.version,
                 'port' : getEnvVar('GINA_PORT') || 8124, // TODO - scan for the next available port
                 'debug_port' : getEnvVar('GINA_DEBUG_PORT') || process.debugPort || 5757,
+                'host_v4' : getEnvVar('GINA_HOST_V4') || '127.0.0.1',
+                'mq_port' : getEnvVar('GINA_MQ_PORT') || 8125,
+                'hostname' : getEnvVar('GINA_HOSTNAME') || 'localhost',
                 'user' : process.env.USER,
                 'uid' : uid,
                 'gid' : gid,
@@ -391,6 +436,9 @@ function Initialize(opt) {
 
             setEnvVar('GINA_PORT', settings['port']);
             setEnvVar('GINA_DEBUG_PORT', settings['debug_port']);
+            // setEnvVar('GINA_MQ_PORT', settings['mq_port']);
+            // setEnvVar('GINA_HOST_V4', settings['host_v4']);
+            // setEnvVar('GINA_HOSTNAME', settings['hostname']);
             setEnvVar('GINA_ENV_IS_DEV', settings['env_is_dev']);
             setEnvVar('GINA_SCOPE_IS_LOCAL', settings['scope_is_local']);
 

package/framework/{v0.1.1-alpha.13 → v0.1.1-alpha.130}/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.13 → v0.1.1-alpha.130}/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
+     * because of the `process.kill(..., 'SIGABRT')` 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)
 }