gina 0.1.1-alpha.115 → 0.1.1-alpha.118

package/framework/{v0.1.1-alpha.115 → v0.1.1-alpha.118}/lib/cmd/bundle/add.js

@@ -33,7 +33,7 @@ function Add(opt, cmd) {
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
+
         // var i = 3, envs = [];
         // for (; i<process.argv.length; ++i) {
         //     if ( /^\@[a-z0-9_.]/.test(process.argv[i]) ) {
@@ -62,8 +62,8 @@ function Add(opt, cmd) {
             process.exit(1)
         }
     }
-    
-    
+
+
 
     /**
      * Add bundles
@@ -90,7 +90,7 @@ function Add(opt, cmd) {
 
             local.b             = b;
             local.bundle        = bundle;
-            
+
             local.envFileSaved  = false;
 
             // find available port
@@ -111,7 +111,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;
                 try {
@@ -131,6 +131,32 @@ function Add(opt, cmd) {
 
         if ( typeof(self.projectData.bundles[local.bundle]) != 'undefined' ) {
 
+            if ( /\-\-(import|replace)/.test(opt.argv.join(',')) ) {
+                var pArr                = null
+                    , importModeEnabled = false
+                    , replaceModeEnabled = false
+                ;
+                for (let i = 0, len = opt.argv.length; i<len; i++) {
+                    if (  !/\-\-(import|replace)/.test(opt.argv[i]) )
+                        continue;
+
+                    pArr = opt.argv[i].replace(/\s+/g, '').split(/=/);
+                    importModeEnabled   = /\-import/.test(pArr[0]) ? true : false;
+                    replaceModeEnabled  = /\-replace/.test(pArr[0]) ? true : false;
+                    // only allowing one argument
+                    break;
+                }
+                if (importModeEnabled) {
+                    local.envFileSaved = true;
+                    makeBundle(local.bundle, false);
+                }
+
+                if (replaceModeEnabled) {
+                    makeBundle(local.bundle, true);
+                }
+                return;
+            }
+
             rl.setPrompt('Bundle [ '+ local.bundle +' ] already exists !\n(r) Replace - All existing files will be lost !\n(c) Cancel\n(i) Import\n> ');
 
             rl.prompt();
@@ -193,7 +219,7 @@ function Add(opt, cmd) {
     var makeBundle = async function(bundle, rewrite) {
 
         loadAssets();
-        
+
         // if ( /^true$/i.test(rewrite) ) {
         //     fixPorts
         //     return
@@ -204,7 +230,7 @@ function Add(opt, cmd) {
                 rollback(err);
                 return;
             }
-            
+
             if (!local.envFileSaved) {
                 saveEnvFile(function doneSavingEnv(err){
 
@@ -344,19 +370,19 @@ function Add(opt, cmd) {
                 rollback(err);
                 return;
             }
-            
+
             // Browse, parse and replace keys
             local.source        = target;
             local.isInstalled   = false;
-            
+
             // check installed bundle
-            browse(local.source);            
+            browse(local.source);
 
             if (local.isInstalled) {
-                
+
                 // remove files we don't want yet
                 new _(destination + '/config/templates.json', true).rmSync();
-                
+
                 // if first bundle of th project, modify webroot
                 if (self.bundlesByProject[self.projectName].count() == 1) {
                     var settingsServerPath = _(destination + '/config/settings.server.json', true);
@@ -364,15 +390,15 @@ function Add(opt, cmd) {
                     serverSettings = serverSettings.replace('"webroot": "/{bundle}"', '"webroot": "/"');
                     lib.generator.createFileFromDataSync(serverSettings, settingsServerPath);
                 }
-                    
-                
-                
+
+
+
                 console.log('Bundle [ '+ local.bundle +' ] has been added to your project with success ;)');
                 rl.clearLine();
                 ++local.b;
                 addBundles(local.b)
             }
-            
+
         })
     }
 
@@ -471,7 +497,7 @@ function Add(opt, cmd) {
         var writeFiles = function() {
             //restore env.json
             lib.generator.createFileFromDataSync(self.envData, self.envPath);
-            
+
             //restore project.json
             if ( typeof(self.projectData.bundles[local.bundle]) != 'undefined') {
                 delete self.projectData.bundles[local.bundle]

package/framework/v0.1.1-alpha.118/lib/cmd/bundle/arguments.json

@@ -0,0 +1,6 @@
+[
+  "--env",
+  "--force",
+  "--import",
+  "--replace"
+]

package/framework/{v0.1.1-alpha.115 → v0.1.1-alpha.118}/lib/cmd/framework/init.js

@@ -29,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
             }
 
@@ -371,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)
@@ -401,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,
@@ -418,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.115 → v0.1.1-alpha.118}/lib/cmd/framework/set.js

@@ -57,12 +57,26 @@ 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 '--hostname':
+                setKeyVal('hostname', v);
             break;
 
             case '--timezone':
@@ -77,6 +91,24 @@ function Set(opt){
         }
     }
 
+    /**
+     * 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 == '' ) {
@@ -99,6 +131,7 @@ function Set(opt){
         lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
     }
 
+
     var setGlobalMode = function(globalMode) {
         var err = null;
         if ( !globalMode || typeof(globalMode) == 'undefined' || globalMode == '' ) {
@@ -186,21 +219,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
@@ -226,6 +260,5 @@ function Set(opt){
     }
 
     init(opt)
-};
-
-module.exports = Set
+}
+module.exports = Set;

package/framework/{v0.1.1-alpha.115 → v0.1.1-alpha.118}/lib/cmd/framework/status.js

@@ -36,6 +36,7 @@ function Status(opt, cmd) {
         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]) ) {
@@ -59,6 +60,7 @@ function Status(opt, cmd) {
                 pidFiles.push(title +'.pid');
             }
         }
+
     }
 
     var status = function(opt, cmd) {
@@ -69,7 +71,7 @@ function Status(opt, cmd) {
             throw fileError
         }
         checkUnregistered(pidFiles);
-        console.debug('pidFiles ',pidFiles);
+        console.debug('Reading `'+ GINA_RUNDIR +'` ',pidFiles);
 
         var runningVersions = [], runningLog = '';
         for (let i=0, len=pidFiles.length; i<len; i++) {

package/framework/{v0.1.1-alpha.115 → v0.1.1-alpha.118}/lib/cmd/framework/tail.js

@@ -35,7 +35,7 @@ function Tail(opt, cmd) {
         process.on('gina#mqlistener-started', function onGinaStarted(mqPort) {
             clearInterval(nIntervId);
             nIntervId = null;
-            opt.port = mqPort;
+            opt.mqPort = mqPort;
             tail(opt, cmd);
         });
 
@@ -49,8 +49,10 @@ function Tail(opt, cmd) {
 
     var tail = function(opt, cmd) {
 
-        var port = opt.port || 8125;
+        var port = opt.mqPort || GINA_MQ_PORT || 8125;
+        var host = opt.hostV4 || GINA_HOST_V4 || '127.0.0.1';
         var clientOptions = {
+            host    : host,
             port    : port,
             request : 'tail'
         }
@@ -76,7 +78,8 @@ function Tail(opt, cmd) {
 
             // 'connect' listener.
             console.resumeReporting();
-            console.info('[MQTail] connected to server :)');
+            // console.debug('[MQTail] connected with opt `'+ JSON.stringify(opt, null, 2) +'` :)');
+            console.info('[MQTail] connected to server `'+ host +'` on port `'+ port +'` :)');
 
             // send request
             client.write( JSON.stringify(clientOptions) +'\r\n');

package/framework/{v0.1.1-alpha.115 → v0.1.1-alpha.118}/lib/cmd/index.js

@@ -37,7 +37,7 @@ cmd.setOption = function(option) {
             cmd.option[option[i].name] = option[i].content
         }
     } else {
-        cmd.option[options.name] = option.content
+        cmd.option[options.name] = option.content// jshint ignore:line
     }
 }
 
@@ -46,8 +46,8 @@ cmd.getString = function() {
         .toString()
         .replace(/,/g,' ')
         .replace(/node\s/g, 'gina ');
-        //.replace(/node/g, 'gina');    
-    
+        //.replace(/node/g, 'gina');
+
     var cmdArr = cmd.split('/');
     cmd = cmdArr[cmdArr.length-1];
     return cmd
@@ -71,14 +71,14 @@ cmd.getOptions = function() {
 
 
 cmd.onExec = function(client, isFromFramework, opt) {
-    
-    var console = lib.logger;
+
+    var console = lib.logger;// jshint ignore:line
     cmd.option = opt;
-        
-    var Proc = require( getPath('gina').lib + '/proc');
+
+    var Proc = require( getPath('gina').lib + '/proc');// jshint ignore:line
     var self = {};
 
-    cmd.msg = require( _(__dirname + '/framework/msg.json') );
+    cmd.msg = require( _(__dirname + '/framework/msg.json') );// jshint ignore:line
     self.isFromFramework = opt.isFromFramework || isFromFramework || false;
     self.isOnlineCommand = opt.isOnlineCommand || false;
 
@@ -93,38 +93,38 @@ cmd.onExec = function(client, isFromFramework, opt) {
 
     var init = null;
     if (self.isFromFramework) {
-        
+
         init = require('./framework/init')(opt);
         //Framework CMD.
         if (opt.task.action == 'start') {
-            // 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
-            self.version = getEnvVar('GINA_VERSION');
+            self.version = getEnvVar('GINA_VERSION');// jshint ignore:line
             // checkcking version number
             if ( typeof(opt.argv[3]) != 'undefined' && /^@/.test(opt.argv[3]) ) {
                 var err = null;
-                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);
                     console.log(err.message);
                     return;
                 }
-                var availableVersions = requireJSON(_(getEnvVar('GINA_HOMEDIR') +'/main.json', true)).frameworks[shortVersion];
+                var availableVersions = requireJSON(_(getEnvVar('GINA_HOMEDIR') +'/main.json', true)).frameworks[shortVersion];// jshint ignore:line
                 if ( availableVersions.indexOf(version) < 0 ) {
                     err = new Error('Version not installed: '+ version);
                     console.log(err.message);
                     return;
                 }
-                
+
                 self.version = version;
             }
-            
+
             init.onComplete( function done(err, run){
                 console.debug('loading task `',  opt.task.topic +':'+ opt.task.action, '`');
-                
-                //Setting master process with its own PID file.                
+
+                //Setting master process with its own PID file.
                 cmd.proc = new Proc('gina-v' + self.version, process);
                 cmd.proc.setMaster(process.pid);
 
@@ -142,7 +142,7 @@ cmd.onExec = function(client, isFromFramework, opt) {
                 })
             })
         } else { // Offline CMD
-            init.onComplete( function done(err, run, opt){                
+            init.onComplete( function done(err, run, opt){
                 run(opt)
             })
         }
@@ -154,11 +154,11 @@ cmd.onExec = function(client, isFromFramework, opt) {
         }
         opt.task.topic  = arr[0];
         opt.task.action = arr[1];
-        
+
         console.debug('[ FRAMEWORK ] is starting online CLI '+ arr[0] +':'+arr[1]);
-        
+
         init = require('./framework/init')(opt);
-        init.onListen( function done(err, run, opt){            
+        init.onListen( function done(err, run, opt){
             run(opt, cmd)
         })