gina 0.1.1-alpha.8 → 0.1.1-alpha.82

package/framework/{v0.1.1-alpha.8 → v0.1.1-alpha.82}/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;

package/framework/v0.1.1-alpha.82/package.json

@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "busboy": "^0.2.14",
+    "colors": "^1.4.0",
+    "engine.io": "^6.2.0",
+    "engine.io-client": "^6.2.2",
+    "requirejs": "^2.3.6",
+    "sanitize-html": "^2.7.0",
+    "ssl-checker": "^2.0.7",
+    "swig": "^1.4.2",
+    "uuid": "^7.0.3",
+    "zlib": "^1.0.5"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.8",
+  "version": "0.1.1-alpha.82",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -19,6 +19,10 @@
     "type": "git",
     "url": "https://github.com/rhinostone/gina.git"
   },
+  "bugs": {
+    "url": "https://github.com/rhinostone/gina/issues",
+    "email": "bugs@gina.io"
+  },
   "author": {
     "name": "Rhinostone",
     "email": "contact@gina.io"
@@ -30,24 +34,18 @@
   "engine": [
     "node >=0.10.25"
   ],
-  "preferGlobal": true,
   "bin": {
-    "gina": "./bin/cli",
-    "gina-debug": "./bin/cli-debug"
+    "gina": "./bin/gina"
+  },
+  "main": "./framework/v0.1.1-alpha.82/core/gna",
+  "preferGlobal": true,
+  "config": {
+    "prefix": "~/.npm-global"
   },
-  "man": [
-    "./doc/man/gina.1",
-    "./doc/man/gina-framework.1",
-    "./doc/man/gina-project.1",
-    "./doc/man/gina-bundle.1",
-    "./doc/man/gina-model.1",
-    "./doc/man/gina-env.1"
-  ],
-  "main": "./framework/v0.1.1-alpha.8/core/gna",
   "scripts": {
-    "prepare": "node ./script/prepare_version.js -g",
-    "preinstall": "node ./script/pre_install.js -g",
-    "postinstall": "node ./script/post_install.js -g"
+    "prepare": "node ./script/prepare_version.js",
+    "preinstall": "node ./script/pre_install.js",
+    "postinstall": "node ./script/post_install.js"
   },
   "license": "MIT",
   "readmeFilename": "README.md"

package/resources/home/main.json

@@ -3,6 +3,21 @@
         "{release}": [ "{version}" ]
     },
     "def_framework": "{version}",
+    "def_prefix": {
+        "{release}": "{prefix}"
+    },
+    "scopes": {
+        "{release}": [
+            "local",
+            "production"
+        ]
+    },
+    "local_scope": {
+        "{release}": "local"
+    },
+    "def_scope": {
+        "{release}": "local"
+    },
     "envs": {
         "{release}": [ "dev", "prod" ]
     },
@@ -12,7 +27,7 @@
     "dev_env": {
         "{release}": "dev"
     },
-    
+
     "protocols": {
         "_comment": "e.g.:  http/1.1, http/2.0, net",
         "{release}": [  "http/1.1", "http/2.0" ]

package/resources/home/settings.json

@@ -1,5 +1,6 @@
 {
     "_comment": "To update these values, go through the command line arguments: --tmpdir=/some/path/tmp --logdir=/some/path/logs",
+    "prefix": "{prefix}",
     "version": "{version}",
     "env": "{env}",
     "env_is_dev": "{env_is_dev}",

package/resources/home/user/extensions/logger/default/config.json

@@ -1,5 +1,5 @@
 {
-    "_comment": "For `text colors` definitions: https://www.npmjs.com/package/colors"
+    "_comment": "For `text colors` definitions: https://www.npmjs.com/package/colors",
     "template": "[%d] [%s][%a] %m",
     "flows": [],
     "levels" : {

package/resources/package.json.template

@@ -19,6 +19,10 @@
     "type": "git",
     "url": "https://github.com/rhinostone/gina.git"
   },
+  "bugs": {
+    "url" : "https://github.com/rhinostone/gina/issues",
+    "email" : "bugs@gina.io"
+  },
   "author": {
     "name": "Rhinostone",
     "email": "contact@gina.io"
@@ -32,8 +36,7 @@
   ],
   "preferGlobal": true,
   "bin": {
-    "gina": "./bin/cli",
-    "gina-debug": "./bin/cli-debug"
+    "gina": "./bin/gina"
   },
   "man": [
     "./doc/man/gina.1",
@@ -43,8 +46,12 @@
     "./doc/man/gina-model.1",
     "./doc/man/gina-env.1"
   ],
-  "main": "./framework/v{version}/core/gna",
-  "scripts": {},
+  "main": "./framework/v0.1.1-alpha.70/core/gna",
+  "scripts": {
+    "prepare": "node ./script/prepare_version.js -g",
+    "preinstall": "node ./script/pre_install.js -g",
+    "postinstall": "node ./script/post_install.js -g"
+  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }