gina 0.1.1-alpha.7 → 0.1.1-alpha.72

package/framework/{v0.1.1-alpha.7 → v0.1.1-alpha.72}/helpers/task.js

@@ -1,4 +1,5 @@
 var fs              = require('fs');
+var os              = require("os");
 var EventEmitter    = require('events').EventEmitter;
 var spawn           = require('child_process').spawn;
 
@@ -8,7 +9,7 @@ module.exports = function () {
 
 	 /**
      * Run commande on local cli
-     * 
+     *
      * Could also be used to open an url but need some tweaking
      * // sample of a cross platform `open` command
      *  e.g.: var openCmd = (process.platform == 'darwin'? 'open': process.platform == 'win32'? 'start': 'xdg-open');
@@ -19,15 +20,18 @@ module.exports = function () {
      *
      * */
 	run = function(cmdline, opt, cb) {
-        
+
 		var pathArr = (new _(__dirname).toUnixStyle().split(/\//g));
 		var root =  pathArr.splice(0, pathArr.length-6).join('/');
 
-        var opt = opt || {};
-        if (!opt.cwd)
+        opt = opt || {};
+        if (!opt.cwd) {
             opt.cwd = root;
+        }
+        process.chdir(opt.cwd);
+
 
-        var tmp = opt.tmp || process.cwd();
+        var tmp = opt.tmp || os.tmpdir() || process.cwd();
 
         if ( !fs.existsSync(tmp) ) {
             fs.mkdirSync(tmp)
@@ -41,7 +45,7 @@ module.exports = function () {
         var result, error = false;
         var hasCalledBack = false;
         var e = new EventEmitter();
-        
+
         e.onData = function(callback) {
             e.once('run#data', callback);
 
@@ -66,20 +70,20 @@ module.exports = function () {
         if (typeof(cmdline) == 'string') {
             cmdline = cmdline.split(' ')
         }
-        
+
         console.debug('opt.outToProcessSTD => ', opt.outToProcessSTD);
         if ( typeof(opt) != 'undefined' && typeof(opt.outToProcessSTD) != 'undefined' && /^true$/i.test(opt.outToProcessSTD) ) {
             // mainly used for task like `npm install`. This is not the default setup
             cmd = spawn(cmdline.splice(0,1).toString(), cmdline, { cwd: opt.cwd, stdio: [ process.stdin, process.stdout, process.stderr ] });
         } else {
             cmd = spawn(cmdline.splice(0,1).toString(), cmdline, { cwd: opt.cwd, stdio: [ 'ignore', out, err ] });
-        }   
+        }
         cmd.on('stdout', function(data) {
             var str = data.toString();
             var lines = str.split(/(\r?\n)/g);
             result = lines.join('');
             console.log('out: ', result);
-            
+
             e.emit('run#data', result)
         });
 
@@ -88,10 +92,10 @@ module.exports = function () {
             var str = err.toString();
             error = str || false;
             console.log('err: ', error);
-            
+
             e.emit('run#err', error)
         });
-        
+
         // cmd.on('exit', function (code){
         //     console.debug('exiting with code '+ code +' ....');
         // });
@@ -130,11 +134,14 @@ module.exports = function () {
                     }
                     e.emit('run#complete', error, result)
                 } else {
+                    if (error) {
+                        console.debug('task::run encountered an error: ' + error);
+                    }
                     if (cb) {
-                        cb('task::run encountered an error: ' + error, result);
+                        cb(error, result);
                         return;
                     }
-                    e.emit('run#complete', 'task::run encountered an error: ' + error, result)
+                    e.emit('run#complete', error, result)
                 }
 
 
@@ -143,7 +150,7 @@ module.exports = function () {
             }
         });
 
-        
+
 
         return e
 	};

package/framework/{v0.1.1-alpha.7 → v0.1.1-alpha.72}/lib/cmd/framework/init.js

@@ -335,7 +335,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);

package/framework/{v0.1.1-alpha.7 → v0.1.1-alpha.72}/lib/cmd/framework/tail.js

@@ -1,4 +1,5 @@
 var fs          = require('fs');
+var os          = require("os");
 var util        = require('util');
 var net         = require('net');
 
@@ -18,18 +19,18 @@ var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js
 function Tail(opt, cmd) {
     var self        = {};
     var nIntervId   = null;
-    var mqPortFile  = _(GINA_DIR +'/tmp/mq-listener-v'+ GINA_VERSION +'.port', true);
+    var mqPortFile  = _(getTmpDir() +'/mq-listener-v'+ GINA_VERSION +'.port', true);
 
     var init = function(opt, cmd) {
-        
+
         console.debug('Getting framework logs');
-        
+
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
-                        
+
         // check CMD configuration
         //if (!isCmdConfigured()) return false;
-        
+
         // handle server not started yet or server exited
         process.on('gina#mqlistener-started', function onGinaStarted(mqPort) {
             clearInterval(nIntervId);
@@ -37,56 +38,56 @@ function Tail(opt, cmd) {
             opt.port = mqPort;
             tail(opt, cmd);
         });
-                
+
         // if (!self.name) {
         //     status(opt, cmd, 0);
         // } else {
             tail(opt, cmd);
-        // }        
+        // }
     }
-    
-        
+
+
     var tail = function(opt, cmd) {
-        
+
         var port = opt.port || 8125;
         var clientOptions = {
             port    : port,
-            request : 'tail' 
+            request : 'tail'
         }
         var loggerOptions   = console.getOptions();
         var loggers         = console.getLoggers();
         var loggerHelper    = LoggerHelper(loggerOptions, loggers);
         var format          = loggerHelper.format;
-        
+
         var delayedMessages = [];
         var resumeTail = function() {
             var i = 0;
             while (i < delayedMessages.length) {
                 let pl = delayedMessages[i];
-                
+
                 process.stdout.write( format(pl.group, pl.level, pl.content) );
                 i++;
             }
             delayedMessages = []
         }
-        
-        
+
+
         var client = net.createConnection(clientOptions, () => {
-            
+
             // 'connect' listener.
             console.resumeReporting();
-            console.info('[MQTail] connected to server :)');            
-            
+            console.info('[MQTail] connected to server :)');
+
             // send request
             client.write( JSON.stringify(clientOptions) +'\r\n');
-            
+
         });
         client.on('error', (data) => {
             var err = data.toString();
             console.error('[MQTail] ' + err + ' - Gina might not be running');
             console.info('[MQTail] waitting for `MQListener` to be started ...');
-            
-            var mqPort = null;            
+
+            var mqPort = null;
             nIntervId = setInterval(() => {
                 try {
                     mqPort = ~~(fs.readFileSync(mqPortFile).toString());
@@ -96,23 +97,23 @@ function Tail(opt, cmd) {
                 } catch (fileErr) {}
             }, 100);
         });
-        
+
         var payloads = null, i = null;
         client.on('data', (data) => {
             //console.log('[MQTail]  (data): ' + data.toString());
             payloads = data.toString();
-                
+
             // from speakers & tail
             if ( /^(\{\"|\[\{\")/.test(payloads) ) {
                 payloads = payloads.split(/\r\n/g);
                 //console.log(payloads);
-                i = -1; 
-                while(i < payloads.length) { 
+                i = -1;
+                while(i < payloads.length) {
                     i++;
                     let payload = payloads[i];
-                    if ( 
+                    if (
                         /^\{/.test(payload) && /\}$/.test(payload)
-                        || /^\[\{/.test(payload) && /\}\]$/.test(payload) 
+                        || /^\[\{/.test(payload) && /\}\]$/.test(payload)
                     ) {
                         let pl = null;
                         try {
@@ -120,33 +121,33 @@ function Tail(opt, cmd) {
                         } catch(plErr) {
                             process.stdout.write( '[MQTail] (exception) '+ payload +'\n' );
                             continue;
-                        }                
-                            
-                        
-                        if (!pl.content) {                            
+                        }
+
+
+                        if (!pl.content) {
                             // only for debug
                             // process.stdout.write( '[MQTail] (undefined content) '+ JSON.stringify(pl, null) +'\n' );
-                            
+
                             // updating logger context since it can run on different processes
                             if ( pl.sessionId && !clientOptions.sessionId ) {
                                 clientOptions.sessionId = pl.sessionId;
                                 // acknowledging
                                 client.write( JSON.stringify(clientOptions) +'\r\n');
                             }
-                            
+
                             if (pl.loggers) {
                                 loggers = merge(loggers, pl.loggers);
                                 if (delayedMessages.length > 0) {
                                     resumeTail()
                                 }
-                            }                            
+                            }
                             continue;
                         }
-                        
+
                         // only for debug
                         //process.stdout.write(  '[MQTail] '+ pl.content +'\n' );
-                        
-                        try {                            
+
+                        try {
                             process.stdout.write( format(pl.group, pl.level, pl.content) );
                         } catch (writeErr) {
                             // means that the related MQSpeaker is not connected yet
@@ -154,16 +155,16 @@ function Tail(opt, cmd) {
                             // we'll then delay the output until MQSpeaker is ready
                             delayedMessages.push(pl);
                         }
-                        
-                    }                        
-                }                
+
+                    }
+                }
             }
-            
+
         });
         client.on('end', () => {
             console.warn('[MQTail] disconnected from server');
             console.info('[MQTail] waitting for `MQListener` to be started ...');
-            var mqPort = null;            
+            var mqPort = null;
             nIntervId = setInterval(() => {
                 try {
                     mqPort = ~~(fs.readFileSync(mqPortFile).toString());
@@ -175,9 +176,9 @@ function Tail(opt, cmd) {
         });
         // setInterval(() => {}, 1 << 30);
     }
-    
 
-    init(opt, cmd);    
+
+    init(opt, cmd);
 }
 
 module.exports = Tail;