gina 0.1.1-alpha.186 → 0.1.1-alpha.188

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.188}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.186/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.188/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.186/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.188/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.188}/core/controller/controller.js

@@ -3278,6 +3278,8 @@ function SuperController(options) {
                 //config = Object.freeze(local.options.conf.content[name]);
                 //Object.seal(local.options.conf.content[name]);
                 //Object.freeze(local.options.conf.content[name]);
+                // if ( self.isCacheless() ) {
+                // }
                 return JSON.clone(local.options.conf.content[name]);
             } catch (err) {
                 return undefined;

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.188}/core/server.isaac.js

@@ -1,4 +1,4 @@
-//"use strict";
+"use strict";
 /**
  * Isaac Server Integration
  *
@@ -12,6 +12,7 @@ const inherits          = lib.inherits;
 const merge             = lib.merge;
 const console           = lib.logger;
 
+
 const env       = process.env.NODE_ENV
     , isDev     = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
 ;
@@ -158,7 +159,16 @@ function ServerEngineClass(options) {
         // See `${core}/router.js` & `${core}/controller/controller.js`
 
         server.on('request', (request, response) => {
-
+            // healthcheck
+            // TODO - add a top level API : server.api.js (check, get ...)
+            // TODO - on 90% RAM usage, redirect to `come back later then restart bundle`
+            // TODO - check url against wroot : getContext() ?
+            if ( /^get$/i.test(request.method) && /\_gina\/health\/check$/i.test(request.url) ) {
+                // server.toApi(reques, response)
+                response.setHeader('content-type', 'application/json; charset=utf8' );
+                response.setHeader('x-powered-by', 'Gina/'+ GINA_VERSION );
+                return response.end('{"status":"ok"}');
+            }
             if (isDev) {
                 refreshCore()
             }

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.188}/core/server.js

@@ -1147,25 +1147,57 @@ function Server(options) {
             re = new RegExp(authority);
             allowedOrigin = ( typeof(conf.server.response.header['access-control-allow-origin']) != 'undefined' && conf.server.response.header['access-control-allow-origin'] != '' ) ? conf.server.response.header['access-control-allow-origin'] : authority;
             var found = null, origin = null, origins = null; // to handles multiple origins
+            // var originHostReplacement = function(name) {
+            //     name = name.replace(/\{|\}/g, '');
+            //     name = name.split(/\@/);
+            //     var bundle      = name[0]
+            //         , project   = name[1]
+            //         , arr       = null
+            //         , domain    = null
+            //     ;
+            //     var env     = conf.env; // current env by default
+            //     if ( /\//.test(name[1]) ) {
+            //         arr     = name[1].split(/\//);
+            //         project = arr[0];
+            //         env     = (arr[1]) ? arr[1] : env;
+            //     }
+
+            //     domain      = ( !/^http/.test(self.conf[bundle][env].hostname) || /^\/\//.test(self.conf[bundle][env].hostname) ) ? scheme +'://'+ self.conf[bundle][env].hostname.replace(/^\/\//, '') : self.conf[bundle][env].hostname;
+            //     // sameOrigin  = (domain == self.conf[bundle][env].hostname) ? self.conf[bundle][env].hostname : false;
+
+            //     return domain
+            // }
+
             var originHostReplacement = function(name) {
-                name = name.replace(/\{|\}/g, '');
-                name = name.split(/\@/);
-                var bundle      = name[0]
-                    , project   = name[1]
-                    , arr       = null
-                    , domain    = null
-                ;
-                var env     = conf.env; // current env by default
-                if ( /\//.test(name[1]) ) {
-                    arr     = name[1].split(/\//);
-                    project = arr[0];
-                    env     = (arr[1]) ? arr[1] : env;
+                var matched = name.match(/{([-_A-z]+?@[-_A-z]+?)}/g);
+                if (!matched || !Array.isArray(matched) || Array.isArray(matched) && matched.length == 0 ) {
+                    return name
                 }
+                var env = self.conf.env;
+
+                for (let i=0, len=matched.length; i<len; ++i) {
+                    let oldHost = matched[i];
+                    let newHost = matched[i].replace(/\{|\}|\s+/g, '');
+                    newHost = newHost.split(/\@/);
+                    let bundle      = newHost[0]
+                        , project   = newHost[1]
+                        , arr       = null
+                        , hostname  = null
+                        , scheme    = null
+                    ;
+                    if ( /\//.test(newHost[1]) ) {
+                        arr     = newHost[1].split(/\//);
+                        project = arr[0];
+                        env     = (arr[1]) ? arr[1] : env;
+                    }
+                    scheme  = self.conf[bundle][env].server.scheme;
+                    hostname  = ( !self.conf[bundle][env].hostname ) ? self.conf[bundle][env].server.scheme + '://' + self.conf[bundle][env].host + ':' + self.conf[bundle][env].server.port : self.conf[bundle][env].hostname;
+                    name    = name.replace(oldHost, hostname);
+                }
+                matched = null;
+                env = null;
 
-                domain      = ( !/^http/.test(self.conf[bundle][env].hostname) || /^\/\//.test(self.conf[bundle][env].hostname) ) ? scheme +'://'+ self.conf[bundle][env].hostname.replace(/^\/\//, '') : self.conf[bundle][env].hostname;
-                sameOrigin  = (domain == self.conf[bundle][env].hostname) ? self.conf[bundle][env].hostname : false;
-
-                return domain
+                return name;
             }
 
             var headerValue = null, re = new RegExp('\{\s*(.*)\s*\}', 'g');
@@ -1179,7 +1211,6 @@ function Server(options) {
                             origin = sameOrigin
                         } else {
                             if ( /\,/.test(allowedOrigin) ) {
-                                // origins = allowedOrigin.replace(/\s+/g, '').replace(/([a-z0-9_-]+\@[a-z0-9_-]+|[a-z0-9_-]+\@[a-z0-9_-]+\/[a-z0-9_-]+\@[a-z0-9_-]+)/ig, originHostReplacement).split(/\,/g);
                                 origins = allowedOrigin.replace(/\s+/g, '').replace(re, originHostReplacement).split(/\,/g);
 
                                 found = ( origins.indexOf(authority) > -1 ) ? origins[origins.indexOf(authority)] : false;
@@ -1187,7 +1218,6 @@ function Server(options) {
                                     origin = found
                                 }
                             } else {
-                                // origin = allowedOrigin.replace(/\s+/g, '').replace(/([a-z0-9_-]+\@[a-z0-9_-]+|[a-z0-9_-]+\@[a-z0-9_-]+\/[a-z0-9_-]+\@[a-z0-9_-]+)/ig, originHostReplacement);
                                 origin = allowedOrigin.replace(/\s+/g, '').replace(re, originHostReplacement);
                             }
                         }
@@ -1566,7 +1596,7 @@ function Server(options) {
                                 header['pragma'] = 'no-cache';
                                 header['expires'] = '0';
                             }
-                            request = checkPreflightRequest(request);
+                            request = checkPreflightRequest(request, response);
                             header  = completeHeaders(header, request, response);
 
                             if (!stream.destroyed) {
@@ -1576,7 +1606,7 @@ function Server(options) {
 
                         } else {
                             response.setHeader('location', request.url);
-                            request = checkPreflightRequest(request);
+                            request = checkPreflightRequest(request, response);
                             completeHeaders(null, request, response);
                             if (cacheless) {
                                 response.writeHead(301, {
@@ -1889,21 +1919,23 @@ function Server(options) {
              * */
             request.isWithCredentials  = ( request.headers['access-control-allow-credentials'] && request.headers['access-control-allow-credentials'] == true ) ? true : false;
             /**
-             * Intercept gina headers
+             * Intercept gina headers for:
+             *  - form valdiation
+             *  - form security
              */
-            if ( typeof(request.headers['x-gina-form-id']) != 'undefined' ) {
-                var ginaHeaders = {
-                    form: {
-                        id: request.headers['x-gina-form-id']
-                    }
-                };
-                if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
-                    var rule = request.headers['x-gina-form-rule'].split(/\@/);
-                    ginaHeaders.form.rule = rule[0];
-                    ginaHeaders.form.bundle = rule[1];
-                }
-                request.ginaHeaders = ginaHeaders;
+            var ginaHeaders = {
+                form: {}
+            };
+            // if (/x\-gina\-form\-id/i.test(request.headers['access-control-request-headers']) ) {
+            if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
+                ginaHeaders.form.id = request.headers['x-gina-form-id'];
+            }
+            if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
+                var rule = request.headers['x-gina-form-rule'].split(/\@/);
+                ginaHeaders.form.rule = rule[0];
+                ginaHeaders.form.bundle = rule[1];
             }
+            request.ginaHeaders = ginaHeaders;
 
             local.request = request;
 
@@ -1990,8 +2022,6 @@ function Server(options) {
             if (
                 staticProps.isStaticFilename && staticsArr.indexOf(request.url) > -1
                 || staticProps.isStaticFilename && staticsArr.indexOf( request.url.replace(request.url.substr(request.url.lastIndexOf('/')+1), '') ) > -1
-                //|| staticProps.isStaticFilename && staticsArr.indexOf(staticProps.firstLevel) > -1
-                // take ^/dir/sub/*
                 || staticProps.isStaticFilename && new RegExp('^'+ staticProps.firstLevel).test(request.url)
                 || /\/$/.test(request.url) && !isWebrootHandledByRouting && !/\/engine\.io\//.test(request.url)
             ) {
@@ -2005,7 +2035,7 @@ function Server(options) {
                     'method': 'GET',
                     'bundle' : self.appName
                 };
-                request = checkPreflightRequest(request);
+                request = checkPreflightRequest(request, response);
                 local.request = request; // update request
                 // filtered to handle only html for now
                 if ( /text\/html/.test(request.headers['accept'])
@@ -2083,6 +2113,8 @@ function Server(options) {
                      *  - https://developers.google.com/web/updates/2012/06/How-to-convert-ArrayBuffer-to-and-from-String
                      *  - https://jsperf.com/arraybuffer-string-conversion/4
                      *
+                     * TODO - Test with audio content
+                     *
                      * @param {string} str
                      *
                      * @returns {array} buffer
@@ -2729,7 +2761,7 @@ function Server(options) {
         });
     };
 
-    var checkPreflightRequest = function(request) {
+    var checkPreflightRequest = function(request, response) {
         var config = self.conf[self.appName][self.env];
         // by default, if not set in `${projectPath}/env.json`
         var corsMethod = 'GET, POST, HEAD';
@@ -2773,7 +2805,7 @@ function Server(options) {
             } else {
                 request.method = method
             }
-            accessControlRequestHeaders = ( typeof(request.headers['access-control-request-headers']) != 'undefined' ) ? request.headers['access-control-request-headers'] : '';
+            accessControlRequestHeaders = ( typeof(request.headers['access-control-request-headers']) != 'undefined' ) ? request.headers['access-control-request-headers'].replace(/\s+/, '').split(/\,/g) : '';
             if ( typeof(request.headers['access-control-request-credentials']) != 'undefined' && typeof(serverResponseHeaders['access-control-allow-credentials']) != 'undefined' ) {
                 request.isWithCredentials = true;
             }
@@ -2783,6 +2815,7 @@ function Server(options) {
                         request.isXMLRequest = true;
                     }
                 }
+                response.setHeader('access-control-allow-headers', request.headers['access-control-request-headers']);
             }
         }
 
@@ -2801,7 +2834,7 @@ function Server(options) {
 
         //matched = routingLib.getRouteByUrl(req.url, bundle, (req.method||req[':method']), req);
 
-        req = checkPreflightRequest(req);
+        req = checkPreflightRequest(req, res);
         var params      = {}
             , _routing  = {}
             , method    = ( /http\/2/.test(self.conf[self.appName][self.env].server.protocol) ) ? req.headers[':method'] : req.method
@@ -2987,7 +3020,7 @@ function Server(options) {
 
         if (!res.headersSent) {
             // res.headersSent = true;
-            local.request = checkPreflightRequest(local.request);
+            local.request = checkPreflightRequest(local.request, local.response);
             // updated filter on controller.js : 2020/09/25
             //if (isXMLRequest || !withViews || !isUsingTemplate ) {
             if (isXMLRequest || !withViews || !isUsingTemplate || withViews && !isUsingTemplate ) {

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.188}/helpers/path.js

@@ -241,6 +241,19 @@ function PathHelper() {
         return self
     }
 
+    var isDirectory = function(value) {
+        try {
+            if ( fs.lstatSync(value).isDirectory() && !fs.lstatSync(value).isSymbolicLink() ) {
+                return true
+            }
+        } catch (dirErr) {}
+
+        return false;
+    }
+    _.prototype.isDirectory = function() {
+        return isDirectory(this.value)
+    }
+
     var isSymlinkSync = function(value) {
         try {
             if ( fs.lstatSync(value).isSymbolicLink() ) {

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

@@ -324,8 +324,8 @@ function Add(opt, cmd) {
         }
 
         try {
-            //var path = self.projectPath.replace(/\.json$/, env + '.json');
-            lib.generator.createFileFromDataSync(data, self.projectPath);
+            //var path = self.projectManifestPath.replace(/\.json$/, env + '.json');
+            lib.generator.createFileFromDataSync(data, self.projectManifestPath);
             local.projectDataWrote = true;
 
             callback(false, data)
@@ -390,7 +390,7 @@ function Add(opt, cmd) {
 
         loadAssets();
 
-        var projectData = require(self.projectPath)
+        var projectData = requireJSON(self.projectManifestPath)
             , target    = _( self.projects[self.projectName].path +'/'+ projectData.bundles[local.bundle].src, true )
             , sample    = new _( getPath('gina').core + '/template/boilerplate/bundle/' );
 
@@ -529,11 +529,11 @@ function Add(opt, cmd) {
             //restore env.json
             lib.generator.createFileFromDataSync(self.envData, self.envPath);
 
-            //restore project.json
+            //restore manifest.json
             if ( typeof(self.projectData.bundles[local.bundle]) != 'undefined') {
                 delete self.projectData.bundles[local.bundle]
             }
-            lib.generator.createFileFromDataSync(self.projectData, self.projectPath);
+            lib.generator.createFileFromDataSync(self.projectData, self.projectManifestPath);
 
             //restore ports.json
             lib.generator.createFileFromDataSync(self.portsData, self.portsPath);

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.188}/lib/cmd/bundle/remove.js

@@ -203,7 +203,7 @@ function Remove(opt, cmd) {
             // }
             lib.generator.createFileFromDataSync(
                 self.projectData,
-                self.projectPath
+                self.projectManifestPath
             );
         // }
 
@@ -216,12 +216,21 @@ function Remove(opt, cmd) {
     }
 
 
-    var end = function() {
-
-
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output)
+            } else {
+                console.log(output);
+            }
+        }
 
-        process.exit(0)
-    };
+        process.exit( err ? 1:0 )
+    }
 
     init(opt)
 };

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.188}/lib/cmd/env/add.js

@@ -18,11 +18,11 @@ function Add(opt, cmd) {
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
-        self.projects = requireJSON(_(GINA_HOMEDIR + '/projects.json'));        
+
+        self.projects = requireJSON(_(GINA_HOMEDIR + '/projects.json'));
         self.bundles = [];
         self.portsAvailable = {};
-        
+
         var i = 3, envs = [];
         for (; i<process.argv.length; ++i) {
             if ( /^\@[a-z0-9_.]/.test(process.argv[i]) ) {
@@ -35,15 +35,15 @@ function Add(opt, cmd) {
                 envs.push(process.argv[i])
             }
         }
-        
-        
+
+
         if ( typeof(self.projectName) == 'undefined') {
             var folder = new _(process.cwd()).toArray().last();
             if ( isDefined('project', folder) ) {
                 self.projectName = folder
             }
         }
-        
+
         if ( isDefined('project', self.projectName) && envs.length > 0) {
             self.envs = envs;
             saveEnvs()
@@ -53,7 +53,7 @@ function Add(opt, cmd) {
             process.exit(1)
         }
     }
- 
+
 
     var saveEnvs = function() {
         var file    = _(self.projects[self.projectName].path + '/env.json')
@@ -78,7 +78,7 @@ function Add(opt, cmd) {
                     if ( self.portsList.indexOf(p) > -1 ) continue;
                     self.portsList.push(p)
                 }
-            }            
+            }
         }
         self.portsList.sort();
         for (let b in self.project.bundles) {
@@ -136,15 +136,15 @@ function Add(opt, cmd) {
 
             local.bundle    = bundle;
             local.b         = b;
-                                   
-                        
+
+
             // find available port
             var options = {
                 ignore  : getPortsList(),
                 limit   : getBundleScanLimit(bundle)
             };
             console.log('['+bundle+'] starting ports scan' );
-            
+
             scan(options, function(err, ports){
                 if (err) {
                     rollback(err);
@@ -155,7 +155,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;
                 setPorts(local.bundle, ports, function onPortsSet(err) {
@@ -163,7 +163,7 @@ function Add(opt, cmd) {
                         rollback(err);
                         return;
                     }
-                    
+
                     //console.debug('available ports '+ JSON.stringify(self.portsAvailable[local.bundle], null, 2));
                     ++local.b;
                     addEnvToBundles(local.b)
@@ -206,14 +206,14 @@ function Add(opt, cmd) {
     //         , allProjectProtocols   = self.projects[self.projectName].protocols
     //         , allProjectSchemes     = self.projects[self.projectName].schemes
     //     ;
-        
-        
-        
+
+
+
     //     // BO project/env.json
     //     if ( typeof(content[bundle]) == 'undefined' ) {
     //         content[bundle] = {}
     //     }
-        
+
     //     // getting available all envs
     //     for (let n in self.envs) {
     //         let newEnv = self.envs[n];
@@ -238,7 +238,7 @@ function Add(opt, cmd) {
     //             allProjectSchemes.push(newScheme);
     //         }
     //     }
-        
+
     //     // editing env.json to add host infos
     //     for (let e in allProjectEnvs) {
     //         let env = allProjectEnvs[e];
@@ -247,24 +247,24 @@ function Add(opt, cmd) {
     //                 "host" : "localhost"
     //             }
     //         }
-    //     }            
+    //     }
     //     // EO project/env.json
-        
-        
+
+
     //     // BO ~/.gina/ports.reverse.json - part 1/2
     //     if ( typeof(portsReverse[bundle + '@' + self.projectName]) == 'undefined' ) {
     //         portsReverse[bundle + '@' + self.projectName] = {}
     //     }
-    //     if ( 
+    //     if (
     //         typeof(portsReverse[bundle + '@' + self.projectName][env]) == 'undefined'
     //         ||
     //         /^string$/i.test( typeof(portsReverse[bundle + '@' + self.projectName][env]) )
     //     ) {
     //         portsReverse[bundle + '@' + self.projectName][env] = {}
-    //     }          
+    //     }
     //     // EO ~/.gina/ports.reverse.json - part 1/2
 
-        
+
     //     // BO ~/.gina/ports.json
     //     for (let p in allProjectProtocols) {
     //         let protocol = allProjectProtocols[p];
@@ -287,7 +287,7 @@ function Add(opt, cmd) {
     //             if ( typeof(portsReverse[bundle + '@' + self.projectName][env][protocol][scheme]) == 'undefined' ) {
     //                 portsReverse[bundle + '@' + self.projectName][env][protocol][scheme] = {}
     //             }
-                
+
     //             let assigned = [];
     //             if ( ports[protocol][scheme].count() > 0 ) {
     //                 for (let port in ports[protocol][scheme]) {
@@ -299,18 +299,18 @@ function Add(opt, cmd) {
     //                         self.portsAvailable[bundle][env].unshift(port);
     //                         continue;
     //                     }
-    //                     assigned.push(portDescription);                    
+    //                     assigned.push(portDescription);
     //                 }
     //             }
-                    
-                
+
+
     //             let stringifiedScheme = JSON.stringify(ports[protocol][scheme]);
     //             let patt = new RegExp(bundle +'@'+ self.projectName +'/'+ env);
     //             let found = false;
     //             let portToAssign = null;
     //             // do not override if existing
     //             if ( patt.test(stringifiedScheme) ) { // there can multiple matches
-    //                 found = true;                    
+    //                 found = true;
     //                 // reusing the same for portsReverse
     //                 let re = new RegExp('([0-9]+)\"\:(|\s+)\"('+ bundle +'\@'+ self.projectName +'\/'+ env +')', 'g');
     //                 let m;
@@ -318,12 +318,12 @@ function Add(opt, cmd) {
     //                     // This is necessary to avoid infinite loops with zero-width matches
     //                     if (m.index === re.lastIndex) {
     //                         re.lastIndex++;
-    //                     }                        
+    //                     }
     //                     // The result can be accessed through the `m`-variable.
     //                     try {
     //                         m.forEach((match, groupIndex) => {
     //                             //console.debug(`Found match, group ${groupIndex}: ${match}`);
-    //                             if (groupIndex == 1) {                                    
+    //                             if (groupIndex == 1) {
     //                                 portToAssign = ~~match;
     //                                 //console.debug('['+bundle+'] port to assign '+ portToAssign + ' - ' + protocol +' '+ scheme);
     //                                 throw new Error('breakExeception');
@@ -333,9 +333,9 @@ function Add(opt, cmd) {
     //                         break;
     //                     }
     //                 }
-                    
+
     //             }
-                
+
     //             if (!portToAssign) {
     //                 //console.debug('['+bundle+'] No port to assign '+ portToAssign + ' - ' + protocol +' '+ scheme);
     //                 portToAssign = self.portsAvailable[bundle][env][0];
@@ -343,17 +343,17 @@ function Add(opt, cmd) {
     //                 self.portsAvailable[bundle][env].splice(0,1);
     //             }
     //             ports[protocol][scheme][portToAssign] = bundle +'@'+ self.projectName +'/'+ env;
-                
+
     //             // BO ~/.gina/ports.reverse.json - part 2/2
     //             //override needed since it is relying on ports definitions
     //             portsReverse[bundle + '@' + self.projectName][env][protocol][scheme] = ~~portToAssign;
     //             // EO ~/.gina/ports.reverse.json - part 2/2
-                    
+
     //         } // EO for (let scheme in schemes)
-    //     } // for (let protocol in protocols)        
+    //     } // for (let protocol in protocols)
     //     // EO ~/.gina/ports.json
-        
-        
+
+
 
     //     try {
     //         // save to /<project_path>/env.json
@@ -362,7 +362,7 @@ function Add(opt, cmd) {
     //         // save to ~/.gina/projects.json
     //         // lib.generator.createFileFromDataSync(ports, portsPath);
     //         // self.projectsDataWrote = true;
-            
+
     //         // save to ~/.gina/ports.json
     //         lib.generator.createFileFromDataSync(ports, portsPath);
     //         self.portsDataWrote = true;
@@ -402,9 +402,10 @@ function Add(opt, cmd) {
         );
         self.projectDataWrote = true
     }
-    
+
     var updateManifest = function() {
-        
+        // projectManifestPath
+
     }
 
     var rollback = function(err) {
@@ -413,14 +414,14 @@ function Add(opt, cmd) {
 
         var writeFiles = function() {
             //restore env.json
-            lib.generator.createFileFromDataSync(self.envData, self.envPath);            
+            lib.generator.createFileFromDataSync(self.envData, self.envPath);
 
             //restore ports.json
             lib.generator.createFileFromDataSync(self.portsData, self.portsPath);
 
             //restore ports.reverse.json
             lib.generator.createFileFromDataSync(self.portsReverseData, self.portsReversePath);
-            
+
             // restore projects.json
             lib.generator.createFileFromDataSync(self.projects, self.projectsPath);
 

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.188}/lib/cmd/env/list.js

@@ -108,17 +108,20 @@ function List(opt, cmd){
         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);
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
             if ( typeof(type) != 'undefined' ) {
-                console[type](out)
+                console[type](output)
             } else {
-                console.error(out);
+                console.log(output);
             }
         }
 
-        process.exit( err ? 1:0 );
+        process.exit( err ? 1:0 )
     }
 
     init()