gina 0.1.1-alpha.146 → 0.1.1-alpha.148

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/helpers/plugins/src/api-error.js

@@ -3,46 +3,46 @@ var merge = require('./../../../lib/merge');
 var statusCodes = requireJSON(__dirname + '/../../../core/status.codes');
 //var statusCodes = requireJSON( _( getPath('gina').core + '/status.codes') );
 /**
- * 
+ *
  * Usage:
  *  var e = null;
  *  // Server errors
  *  e = new ApiError('This is a generic server error.'); // default error.status -> 500
  *  e = new ApiError('This a server specific server error.', 501);
- * 
+ *
  *  // Client errors
  *  e = new ApiError('This is client error.', 498);
  *  e = new ApiError('This is client error.', 'token', 498); // where `token` is the frontend field: <input type="hiden" name="token">
  *  or
  *  e = new ApiError('This is client error.', 'token');
  *  e.status = 498;
- * 
+ *
  *  // Client bundled error
  *  e = new ApiError(['This is preconditioned #1 client error.', 'This is preconditioned #2 client error.'], ['firstName', 'lastName']);
- * 
+ *
  * @param {string|array} errorMessage
  * @param {string} [fieldName]
  * @param {number} [errorStatus] - 500 by default for the server and 412 for the client
- * 
+ *
  * @returns {object} errorObject
  */
 function ApiError(errorMessage, fieldName, errorStatus) {
     var e = null;
-    
+
     if ( typeof(merge) != 'function' ) {
         merge = require('./../../../lib/merge');
-    }    
-    if ( typeof(statusCodes) == 'undefined' ) {
-        var statusCodes = requireJSON(__dirname + '/../../../core/status.codes');
     }
-    
+    // if ( typeof(statusCodes) == 'undefined' ) {
+        var statusCodes = requireJSON(__dirname + '/../../../core/status.codes');
+    // }
+
     if ( typeof(errorMessage) == 'object' && errorMessage instanceof Error ) {
         e = JSON.clone(errorMessage);
         errorMessage = e.message || e.stack;
     } else {
-        e = new Error(errorMessage);   
+        e = new Error(errorMessage);
     }
-     
+
     var isClientError = (arguments.length == 3) ? true : false;
     if ( arguments.length == 2 ) {
         // server error
@@ -53,7 +53,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
             }
             fieldName = null;
         }
-        // client error 
+        // client error
         else if ( Array.isArray(arguments[1]) || typeof(arguments[1]) == 'string' ) {
             isClientError = true;
             errorStatus = 412; // by default
@@ -70,7 +70,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
         // TODO - Reformat stack to remove the first lines
         if (!e.status)
             e.status    = errorStatus || 500;
-            
+
         if ( typeof(statusCodes[e.status]) != 'undefined' ) {
             e.error = statusCodes[e.status];
         } else {
@@ -78,7 +78,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
         }
         if (!e.message)
             e.message   = errorMessage;
-        
+
         return e;
     }
     // Client Error
@@ -98,8 +98,8 @@ function ApiError(errorMessage, fieldName, errorStatus) {
         fields  : {},
         path    : ''
     }, e);
-    
-    
+
+
     var formatClientError = function(ctx, error, errorMessage, fieldName) {
         error.fields[fieldName] = errorMessage;
         var bundleName      = ctx.bundle
@@ -117,7 +117,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
                         path = paths.models.substr(paths.models.lastIndexOf(bundleName)) +'/'+ filename.substr(filename.lastIndexOf(bundleName+'\/models'));
                         error.tag += 'model:'
                     }
-                    // controller 
+                    // controller
                     else {
                         path = paths.controllers.substr(paths.controllers.lastIndexOf(bundleName)) +'/'+ filename.substr(filename.lastIndexOf(bundleName+'\/controllers'));
                         error.tag += 'controller:';
@@ -132,15 +132,15 @@ function ApiError(errorMessage, fieldName, errorStatus) {
             } catch (err) {
                 error.tag   = 'N/A';
                 error.stack = err.stack;
-            }        
+            }
         } else {
             //error.fields[fieldName]['isApiError'] = errorMessage;
             error.tag   = 'N/A';
-        }     
-         
+        }
+
         return error;
     }
-    
+
     if ( Array.isArray(fieldName) ) {
         for (let i = 0, len = errorMessage.length; i < len; i++) {
             clientError = formatClientError(ctx, clientError, errorMessage[i], fieldName[i]);
@@ -148,7 +148,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
     } else {
         clientError = formatClientError(ctx, clientError, errorMessage, fieldName);
     }
-    
+
     return clientError;
 }
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/lib/cmd/bundle/help.txt

@@ -44,8 +44,8 @@
 
     [ Starting a bundle in debug mode ]
 
-    $ gina bundle:start <bundle_name> @<project_name> --debug-brk=5656
-    
+    $ gina bundle:start <bundle_name> @<project_name> --debug-brk=5656 --max-old-space-size=2048
+
 
 [ Stopping a bundle ]
 

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/lib/cmd/bundle/start.js

@@ -12,6 +12,8 @@ var console     = lib.logger;
  *
  * // start all bundles within the project
  *  gina bundle:start @<project_name>
+ * or
+ *  gina bundle:start @<project_name> --max-old-space-size=4096 --inspect=5858
  *
  * */
 function Start(opt, cmd) {
@@ -169,7 +171,7 @@ function Start(opt, cmd) {
                 var checkCaseCount = 2
                     // The 2 flags we need to free the child.stdout if we do not want the command to wait for a timeout
                     // NB.: you can place flag by using console.notice
-                    , checkCaseRe = new RegExp('('+bundle + '@' + self.projectName + ' mounted !|Bundle started !)', 'i')
+                    , checkCaseRe = new RegExp('('+bundle + '@' + self.projectName + ' mounted !|Bundle started !)', 'g')
                     , url = null
                     , debuggerOn = null
                 ;
@@ -219,9 +221,13 @@ function Start(opt, cmd) {
                     }
 
                     // Expecting 2 flags (checkCaseCount) to free the child stdout !!
-                    if ( checkCaseRe.test(data) ) {
-                        --checkCaseCount;
+                    // console.debug('BO case count '+ checkCaseCount);
+                    var _matched =  data.match(checkCaseRe);
+                    if ( _matched ) {
+                        // console.warn('case count: '+ checkCaseCount +'\nMatched: '+ _matched.length + '\n'+ checkCaseRe +'\n-> '+ data + '<-\n');
+                        checkCaseCount -= _matched.length;
                     }
+                    // console.debug('EO case count: '+ checkCaseCount + ' -> '+ data);
 
                     // cache bundle state info given by the server while starting
                     if ( !debuggerOn && new RegExp('Debugger listening on','gmi').test(data)) {
@@ -250,8 +256,6 @@ function Start(opt, cmd) {
                         opt.client.write('  [ ' + bundle + '@' + self.projectName + ' ] started V(-.o)V'+ url + debuggerOn);
 
 
-
-
                         end(opt, cmd, isBulkStart, bundleIndex);
                         return;
                     }
@@ -282,7 +286,7 @@ function Start(opt, cmd) {
                     // handles only signals that cannot be cannot be caught or ignored
                     // ref.: `framework/<version>/lib/proc.js`
                     if (/(SIGKILL|SIGSTOP)/i.test(signal)) {
-                        console.emerg('[' + this.pid + '] exiting with signal: ', signal);
+                        console.emerg('[' + this.pid + '] `'+ self.name +'@'+ self.projectName +'` exiting with signal: ', signal);
                         cmd.proc.dismiss(this.pid, signal);
                     }
                 });

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/lib/cmd/framework/init.js

@@ -238,6 +238,12 @@ function Initialize(opt) {
         var mainConfig  = require(self.opt.homedir + '/main.json');
         var target = _(self.opt.homedir +'/ports.json');
 
+        if ( !fs.existsSync(mainConfig) ) {
+            console.error('It looks like `'+ mainConfig +'` where not found !');
+
+            process.exit(1)
+        }
+
         if ( !fs.existsSync(target) ) {
 
             var protocols   = mainConfig.protocols[self.release]

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/lib/cmd/framework/link.js

@@ -57,7 +57,12 @@ var console     = lib.logger;
                     console.debug('Skipping symlink: same source, not overriding.');
                     return end();
                 }
-                destination.rmSync()
+                destination.rmSync();
+                var ginaFileObj = new _(self.projectLocation + '/gina');
+                if ( ginaFileObj.existsSync() ) {
+                    ginaFileObj.rmSync()
+                }
+
             }
 
             err = source.symlinkSync(destination.toString());

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/lib/cmd/framework/status.js

@@ -80,6 +80,21 @@ function Status(opt, cmd) {
                 continue;
             }
             let pid = fs.readFileSync(_(GINA_RUNDIR +'/'+ file)).toString().trim() || null;
+            if (!pid) {
+                continue;
+            }
+
+            if ( !isWin32() ) {
+                try {
+                    let found = execSync("ps -a "+ pid).toString().replace(/\n$/, '').split(/\n/g);
+                } catch (err) {
+                    console.debug('file to remove: '+ _(GINA_RUNDIR +'/'+ file));
+                    fs.unlinkSync(_(GINA_RUNDIR +'/'+ file));
+                    continue;
+                }
+            }
+
+
             runningVersions.push({
                 title   : file.replace(/\.pid$/, ''),
                 pid     : ~~pid

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/lib/cmd/framework/tail.js

@@ -12,11 +12,15 @@ var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js
 
 /**
  * Framework tail
+ * By default, tail will exit when a bundle is exiting. If you want to prevent
+ * tail from exiting, you should use `--keep-alive`
  *
  * e.g.
  *  gina framework:tail
  *  or
  *  gina tail
+ *  or
+ *  gina tail --keep-alive
  *
  * */
 function Tail(opt, cmd) {
@@ -176,7 +180,10 @@ function Tail(opt, cmd) {
 
                         try {
                             process.stdout.write( format(pl.group, pl.level, pl.content) );
-                            if ( /(exiting|Got exit code)(.*)(SIGKILL|SIGTERM|SIGINT)/.test(pl.content) ) {
+                            if (
+                                /(exiting|Got exit code)(.*)(SIGKILL|SIGTERM|SIGINT)/.test(pl.content)
+                                && opt.argv.indexOf('--keep-alive') < 0
+                            ) {
                                 client.destroy();
                                 return end()
                             }

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/lib/cmd/helper.js

@@ -560,20 +560,20 @@ function CmdHelper(cmd, client, debug) {
             cmd.configured = true;
 
             // detect node_modules vs platform
-            if (
-                cmd.projectName != null
-                && /^true$/i.test(GINA_GLOBAL_MODE)
-                && !/\:(link|link-node-modules)$/.test(cmd.task)
-                && !/(project\:add)$/.test(cmd.task)
-            ) {
-                console.debug('Running: gina link-node-modules @'+cmd.projectName);
-                err = execSync('gina link-node-modules @'+cmd.projectName); // +' --inspect-gina'
-                console.debug(err.toString());
-                if (err instanceof Error) {
-                    console.error(err.message || err.stack);
-                    return exit(err.message || err.stack);
-                }
-            }
+            // if (
+            //     cmd.projectName != null
+            //     && /^true$/i.test(GINA_GLOBAL_MODE)
+            //     && !/\:(link|link-node-modules)$/.test(cmd.task)
+            //     && !/(project\:add)$/.test(cmd.task)
+            // ) {
+            //     console.debug('Running: gina link-node-modules @'+cmd.projectName);
+            //     err = execSync('gina link-node-modules @'+cmd.projectName); // +' --inspect-gina'
+            //     console.debug(err.toString());
+            //     if (err instanceof Error) {
+            //         console.error(err.message || err.stack);
+            //         return exit(err.message || err.stack);
+            //     }
+            // }
 
             // linking gina
             if (

package/framework/{v0.1.1-alpha.146 → v0.1.1-alpha.148}/lib/cmd/port/list.js

@@ -15,6 +15,7 @@ var Collection = lib.Collection;
  * You can also filter
  *  gina port:list @<project_name> --format=json,null,2 --protocol=http/2.0 --scheme=https --bundle=frontend,backend
  *
+ *
  * You can also export the output to a file with: `--filename`
  *  gina port:list @<project_name> --format=conf --protocol=http/2.0 --scheme=https --filename=$HOME/my_ports.conf
  * */
@@ -84,10 +85,29 @@ function List(opt, cmd) {
                 // e.g:
                 // --bundle=frontend,backend
                 self.selectedBundles = process.argv[i].split(/\=/)[1].split(/\,/);
-                self.selectedBundles.sort();
+
+                if ( /\-\-debug\-ports\=/.test(process.argv.join(',')) ) {
+                    // e.g:
+                    // --debug-ports=5656,5858
+                    self.selectedDebugPorts = {};
+                    var selectedDebugPorts = process.argv.join(';');
+                    var found = selectedDebugPorts.match(/\-\-debug-ports\=[,0-9]+/);
+                    selectedDebugPorts = null;
+                    if (found) {
+                        selectedDebugPorts = found[0].split('\=')[1].split(',')
+                    }
+                    // console.log(selectedDebugPorts)
+                    for (let i = 0, len = self.selectedBundles.length; i<len; i++) {
+                        if ( typeof(selectedDebugPorts[i]) == 'undefined' ) {
+                            continue;
+                        }
+                        self.selectedDebugPorts[self.selectedBundles[i]] = ~~(selectedDebugPorts[i]);
+                    }
+                }
             }
 
 
+
             if ( /^\-\-all\=/.test(process.argv[i]) || !self.projectName ) {
                 isListingAll = true;
             }
@@ -137,6 +157,13 @@ function List(opt, cmd) {
                 while (i<len) {
                     let d = data[i];
                     str += d.env +'_'+ d.bundle +'_'+ d.protocol +'_'+ d.scheme +'='+ d.port +':'+ d.port +'\n';
+                    // Adding debug port
+                    if (
+                        typeof(self.selectedDebugPorts) != 'undefined'
+                        && typeof(self.selectedDebugPorts[d.bundle]) != 'undefined'
+                    ) {
+                        str += d.env +'_'+ d.bundle +'_debug_port='+ d.debug_port +':'+ d.debug_port +'\n';
+                    }
                     i++;
                 }
 
@@ -246,6 +273,14 @@ function List(opt, cmd) {
                             jsonPort.port = ~~port;
                             jsonPort.bundle = _bundle;
                             jsonPort.env = _env;
+                            // Adding debug port
+                            if (
+                                typeof(self.selectedDebugPorts) != 'undefined'
+                                && typeof(self.selectedDebugPorts[_bundle]) != 'undefined'
+                            ) {
+                                jsonPort.debug_port = self.selectedDebugPorts[_bundle];
+                            }
+
                             if ( !jsonCollection.findOne({ "port": ~~port }) ) {
                                 jsonCollection = jsonCollection.insert(jsonPort);
                             }
@@ -316,6 +351,13 @@ function List(opt, cmd) {
                         jsonPort.port = ~~port;
                         jsonPort.bundle = _bundle;
                         jsonPort.env = _env;
+                        // Adding debug port
+                        if (
+                            typeof(self.selectedDebugPorts) != 'undefined'
+                            && typeof(self.selectedDebugPorts[_bundle]) != 'undefined'
+                        ) {
+                            jsonPort.debug_port = self.selectedDebugPorts[_bundle];
+                        }
                         if ( !jsonCollection.findOne({ "port": ~~port }) ) {
                             jsonCollection = jsonCollection.insert(jsonPort);
                         }
@@ -369,6 +411,13 @@ function List(opt, cmd) {
                         jsonPort.port = ~~port;
                         jsonPort.bundle = _bundle;
                         jsonPort.env = _env;
+                        // Adding debug port
+                        if (
+                            typeof(self.selectedDebugPorts) != 'undefined'
+                            && typeof(self.selectedDebugPorts[_bundle]) != 'undefined'
+                        ) {
+                            jsonPort.debug_port = self.selectedDebugPorts[_bundle];
+                        }
                         if ( !jsonCollection.findOne({ "port": ~~port }) ) {
                             jsonCollection = jsonCollection.insert(jsonPort);
                         }