gina 0.1.6-alpha.6 → 0.1.6-alpha.60

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/core/template/boilerplate/bundle/controllers/setup.js

@@ -53,7 +53,7 @@ function SetupClass(req, res, next){
     /**
      * Sample of a swig filter to render markdown content
      * To activate this code, you will need :
-     * 1) to install `marked` dependency : npm install marked --save
+     * 1) to install `marked` dependency : npm install marked@4.0.10 --save
      * 2) uncomment imports on the top of this script
      * 3) uncomment the following filter definition
      */
@@ -64,7 +64,7 @@ function SetupClass(req, res, next){
     //     tables      : false,
     //     breaks      : true, // Enable GFM line breaks. This option requires the gfm option to be true.
     //     pedantic    : false, // Conform to obscure parts of markdown.pl as much as possible. Don't fix any of the original markdown bugs or poor behavior.
-    //     // deprecated since version 0.7.0
+    //     // deprecated since version 0.7.0 - "sanitize-html": "^2.7.0" or DOMPurify
     //     // sanitize    : false, // Sanitize the output. Ignore any HTML that has been input.
     //     smartLists  : true, // Use smarter list behavior than the original markdown. May eventually be default with the old behavior moved into pedantic.
     //     smartypants : false // Use "smart" typograhic punctuation for things like quotes and dashes.

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/helpers/context.js

@@ -326,17 +326,22 @@ function ContextHelper(contexts) {
             , confPath      = null
         ;
 
-        if ( typeof(ctxFilename) != 'undefined' ) {
-            ctx = JSON.parse(fs.readFileSync(_(ctxFilename, true)));
-            if (!ctx.gina) {
-                ctx.gina = {
-                    Config : require('./../core/config')
-                };
-
-                ctx.gina.config = merge(ctx.config, ctx.gina.Config);
-            }
-            for (let name in ctx) {
-                setContext(name, ctx[name], false)
+        if ( typeof(ctxFilename) != 'undefined'  ) {
+            var ctxFileObj = new _(ctxFilename, true);
+            if ( ctxFileObj.existsSync() ) {
+                ctx = JSON.parse(fs.readFileSync(_(ctxFilename, true)));
+                if (!ctx.gina) {
+                    ctx.gina = {
+                        Config : require('./../core/config')
+                    };
+
+                    ctx.gina.config = merge(ctx.config, ctx.gina.Config);
+                }
+                for (let name in ctx) {
+                    setContext(name, ctx[name], false)
+                }
+            } else {
+                ctx = self.contexts
             }
 
         } else {

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/helpers/path.js

@@ -423,7 +423,9 @@ function PathHelper() {
                 fs.mkdirSync(path, permission);
                 mkdirSync(self, permission, pathArr, i, path)
             } catch (err) {
-                console.debug(err.stack); // always keep trace of the original stack
+                if ( typeof(console.debug) != 'undefined' ) {
+                    console.debug(err.stack); // always keep trace of the original stack
+                }
                 throw new Error(err.message)
             }
         };
@@ -479,7 +481,7 @@ function PathHelper() {
                             if (p == path  && typeof(callback) != 'undefined' && typeof(self.created) == 'undefined' ) {
                                 if (typeof(callback) != 'undefined') {
                                     callback(err, path)
-                                } else {
+                                } else if ( typeof(console.debug) != 'undefined' ) {
                                     console.debug("no callback defined for mkdir ", path)
                                 }
                             }
@@ -881,7 +883,9 @@ function PathHelper() {
                     if (err) {
                         console.error(err.stack)
                     }
-                    console.debug('cp() completed copy to: ', method);
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug('cp() completed copy to: ', method);
+                    }
                     callback(err, destination, method)
                 })
             }
@@ -1163,10 +1167,14 @@ function PathHelper() {
     }
 
     var mv = function(self, target) {
-        console.debug("starting mv/copy from ", self.value, " to ", target);
+        if ( typeof(console.debug) != 'undefined' ) {
+            console.debug("starting mv/copy from ", self.value, " to ", target);
+        }
         cp(self.value, target)
             .onComplete(function onCpMv(err) {
-                console.debug("cp done... now unlinking source ", self.value);
+                if ( typeof(console.debug) != 'undefined' ) {
+                    console.debug("cp done... now unlinking source ", self.value);
+                }
                 if (err) {
                     e.emit('mv#complete', err);
                     return;
@@ -1174,7 +1182,9 @@ function PathHelper() {
 
 
                 rm(self.value).onComplete( function(err, path){
-                    console.debug('rm() complete');
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug('rm() complete');
+                    }
                     e.emit('mv#complete', err, path)
                 })
             })
@@ -1237,7 +1247,9 @@ function PathHelper() {
                     ++l;
                     removeFoldersSync(list, l, i)
                 } catch(err) {
-                    console.debug(err.stack); // always keep trace of the original stack
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug(err.stack); // always keep trace of the original stack
+                    }
                     throw new Error(err.message)
                 }
             } else {
@@ -1246,7 +1258,9 @@ function PathHelper() {
                     fs.rmdirSync(list[l][i]);
                     removeFoldersSync(list, l, i)
                 } catch(err) {
-                    console.debug(err.stack); // always keep trace of the original stack
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug(err.stack); // always keep trace of the original stack
+                    }
                     throw new Error(err.message)
                 }
             }
@@ -1257,7 +1271,9 @@ function PathHelper() {
         try {
             fs.unlinkSync(filename)
         } catch (err) {
-            console.debug(err.stack); // always keep trace of the original stack
+            if ( typeof(console.debug) != 'undefined' ) {
+                console.debug(err.stack); // always keep trace of the original stack
+            }
             throw new Error(err.message)
         }
     }

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/bundle/add.js

@@ -368,7 +368,8 @@ function Add(opt, cmd) {
                 content[local.bundle] = {}
             }
             content[local.bundle][ self.envs[e] ] = {
-                "host" : local.bundle + "-{env}-{scope}-v{projectVersionMajor}.{rootDomain}"
+                "host_if_dns_resolution" : "{rootDomain}",
+                "host" : "localhost"
             };
 
         }

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/bundle/start.js

@@ -84,7 +84,7 @@ function Start(opt, cmd) {
         var projectArchFile = projectArchFileObj.toString();
         var projectPlatformFileObj = new _(gnaPath +'/platform', true);
         var projectPlatformFile = projectPlatformFileObj.toString();
-        var nodeModulesContentArr = ( nodeModulesPathObj.existsSync() ) ? fs.readdirSync(nodeModulesPathObj.toString()) : [];
+        var nodeModulesContentArr = ( nodeModulesPathObj.existsSync() && !nodeModulesPathObj.isSymlinkSync() ) ? fs.readdirSync(nodeModulesPathObj.toString()) : [];
         var newNodeModulesContentArr = [], n = 0;
         for (let f in nodeModulesContentArr) {
             if (/^\./.test(nodeModulesContentArr[f]) ) {
@@ -96,19 +96,23 @@ function Start(opt, cmd) {
         newNodeModulesContentArr = null;
 
         var pack = requireJSON(packagePath);
+        var scope = process.env.NODE_SCOPE || self.defaultScope;
 
         if (
             !projectArchFileObj.existsSync()
             ||
             !projectPlatformFileObj.existsSync()
             ||
-            projectArchFileObj.existsSync() && fs.readFileSync(projectArchFile).toString() != currentArch
+            projectArchFileObj.existsSync()
+            && fs.readFileSync(projectArchFile).toString() != currentArch
             ||
-            projectPlatformFileObj.existsSync() && fs.readFileSync(projectPlatformFile).toString() != currentPlatform
+            projectPlatformFileObj.existsSync()
+            && fs.readFileSync(projectPlatformFile).toString() != currentPlatform
             ||
             !nodeModulesPathObj.existsSync()
             ||
             nodeModulesPathObj.existsSync()
+            && !nodeModulesPathObj.isSymlinkSync()
             && !nodeModulesContentArr.length
             ||
             nodeModulesPathObj.existsSync()
@@ -117,9 +121,11 @@ function Start(opt, cmd) {
             && typeof(pack.dependencies) != 'object'
             && pack.dependencies.count() > 0
         ) {
-            isNodeModulesReinstallNeeded = true;
+            if (scope == "local")
+                isNodeModulesReinstallNeeded = true;
         }
 
+        opt.client.write('\nScope: '+ scope);
         opt.client.write('\nArch: '+ currentArch);
         // opt.client.write('\nprojectArchFile: '+ projectArchFile);
         opt.client.write('\nPlatform: '+ currentPlatform);
@@ -314,6 +320,7 @@ function Start(opt, cmd) {
                         }
                     }
 
+                    terminal.debug('Spawning '+ opt.argv[0] +' [with args] '+ params);
                     var child = spawn(opt.argv[0], params,
                         {
                             // cwd: bundleDir,
@@ -605,7 +612,9 @@ function Start(opt, cmd) {
         }
 
         //Checking root.
-        if ( new _(d, true).existsSync() ) {
+        var dExists = new _(d, true).existsSync();
+        terminal.debug('[Checking bundle bootstrap] `'+ d +'`: '+ dExists);
+        if ( dExists ) {
             //checking bundle directory.
             fs.stat(p, function(err, stats) {
                 if (err) {

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/framework/build.js

@@ -21,7 +21,7 @@ function Build(opt, cmd){
     var self    = {};
 
     var init = function(opt, cmd) {
-        console.debug('Building framework...');
+        console.log('Building framework, please wait ...');
 
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/framework/init.js

@@ -291,6 +291,20 @@ function Initialize(opt) {
     self.checkArch = function(done) {
 
         var currentArch = process.arch;
+        switch (process.arch) {
+            case 'x64':
+                currentArch = 'amd64'
+                break;
+            case 'armv7l':
+                currentArch = 'armhf'
+                break;
+            case 'x86':
+                currentArch = 'i386'
+                break;
+            default:
+                break;
+        }
+
         var currentPlatform = process.platform;
         // ignored for framework:set
         var mainConfig = require( self.opt.homedir + '/main.json' );
@@ -493,6 +507,10 @@ function Initialize(opt) {
              * make sure to complete : self.checkIfMain()
              */
 
+            // Check GINA_HOST_V4 for changes in case of k8s environement
+            // Get current host IP, compare with getEnvVar('GINA_HOST_V4')
+            // IF changed: setEnvVar('GINA_HOST_V4', new_host_v4)
+
             var dic = {
                 'prefix' : prefix,
                 'global_mode': globalMode,

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/framework/link-node-modules.js

@@ -83,15 +83,14 @@ var console         = lib.logger;
                 sourceObj.mkdirSync()
             }
             // link from homdir to project path
-
             var destination = _(self.projectLocation + '/node_modules', true);
-
+            console.debug('[ FRAMEWORK ][ link-node-modules ] Linking ['+ sourceObj.toString() +'] to [ '+ destination +' ] ');
             err = sourceObj.symlinkSync(destination);
             if (err instanceof Error) {
                 return end(err, 'error')
             }
 
-            return end('Node modules link updated to '+ sourceObj.toString())
+            return end('Node modules link updated from ['+ sourceObj.toString() +'] to ['+ sourceObj.toString() +']');
         }
 
         // nothing to do

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/framework/link.js

@@ -103,6 +103,7 @@ var console        = lib.logger;
                 return end(err, 'error');
             }
 
+            console.debug('[ FRAMEWORK ][ link ] Linking ['+ source.toString() +'] to [ '+ destination.toString() +' ] ');
             err = source.symlinkSync(destination.toString());
 
             if (err instanceof Error) {

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/framework/tail.js

@@ -13,7 +13,7 @@ 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`
+ * tail from exiting, you should use `--follow`
  * This will also will restart bundle in case of crach
  *
  * e.g.
@@ -21,7 +21,7 @@ var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js
  *  or
  *  gina tail
  *  or
- *  gina tail --keep-alive
+ *  gina tail --follow
  *
  * */
 function Tail(opt, cmd) {
@@ -117,7 +117,7 @@ function Tail(opt, cmd) {
 
         client.on('error', (data) => {
             var err = data.toString();
-            console.error('[MQTail] ' + err + ' - Gina might not be running');
+            console.error('[MQTail] ' + err + ' - Gina might not be running, or host IP has changed.');
             console.info('[MQTail] Waitting for `MQListener` to be started ...');
 
             // var mqPort = null;
@@ -218,7 +218,7 @@ function Tail(opt, cmd) {
                                     project= bundleDesc[2];
                                 } // else, must be `gina` (the framework)
 
-                                if (opt.argv.indexOf('--keep-alive') < 0) {
+                                if (opt.argv.indexOf('--follow') < 0) {
                                     // TODO - exits only if no other bundle is runing in the project
                                     // let projectStatus = execSync("gina project:status @"+project);
                                     // if ( /is\ running/.test(projectStatus) ) {
@@ -233,7 +233,7 @@ function Tail(opt, cmd) {
                                 }
                                 // TODO - restart bundle if not starting or restarting
                                 else if (
-                                    opt.argv.indexOf('--keep-alive') > -1
+                                    opt.argv.indexOf('--follow') > -1
                                     && ! /(SIGKILL|SIGTERM|SIGINT)/.test(pl.content)
                                 ) {
                                     // only for debug

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/framework/version.js

@@ -5,13 +5,27 @@ var console = lib.logger;
 function Version(opt){
 
     var init = function(opt){
+        var arch = process.arch;
+        switch (process.arch) {
+            case 'x64':
+                arch = 'amd64'
+                break;
+            case 'armv7l':
+                arch = 'armhf'
+                break;
+            case 'x86':
+                arch = 'i386'
+                break;
+            default:
+                break;
+        }
         var vers = "",
             short = ( typeof(process.argv[3]) != 'undefined') ? process.argv[3]: false,
             msg = require('./msg.json'),
             version = {
                 "number"        : GINA_VERSION,
                 "platform"      : process.platform,
-                "arch"          : process.arch,
+                "arch"          : arch,
                 "middleware"    : fs.readFileSync(_( opt.frameworkPath + '/MIDDLEWARE')).toString() || 'none',
                 "copyright"     : require(opt.pack).copyright
             };

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/helper.js

@@ -524,7 +524,7 @@ function CmdHelper(cmd, client, debug) {
                                     ) ? _(cmd.projects[cmd.projectName].homedir, true)
                                     : _(getUserHome() +'/.'+ cmd.projectName, true);
             var projectHomedirObject = new _(cmd.projectHomedir, true);
-            console.debug('Creating project homedir');
+            console.debug('Checking project homedir: '+ projectHomedirObject.toString());
             if (projectHomedirObject.existsSync() && !projectHomedirObject.isDirectory() ) {
                 throw new Error('Found ' + projectHomedirObject.toString() + ': but it appears to be a symbolik link !');
             } else if (!projectHomedirObject.existsSync() ) {
@@ -557,6 +557,7 @@ function CmdHelper(cmd, client, debug) {
                 bundlesLinkPathObj.rmSync();
             }
             if (!bundlesLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectBundlesPathObj.toString() +'] to [ '+ bundlesLinkPathObj.toString() +' ] ');
                 projectBundlesPathObj.symlinkSync(bundlesLinkPathObj.toString());
             }
             projectBundlesPathObj = null;
@@ -573,11 +574,13 @@ function CmdHelper(cmd, client, debug) {
                 releaseLinkPathObj.existsSync()
                 && !releaseLinkPathObj.isSymlinkSync()
                 ||
-                fs.readlinkSync(releaseLinkPathObj.toString()) != cmd.projectReleasesPath
+                releaseLinkPathObj.existsSync()
+                && fs.readlinkSync(releaseLinkPathObj.toString()) != cmd.projectReleasesPath
             ) {
                 releaseLinkPathObj.rmSync();
             }
             if (!releaseLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectReleasesPathObj.toString() +'] to [ '+ releaseLinkPathObj.toString() +' ] ');
                 projectReleasesPathObj.symlinkSync(releaseLinkPathObj.toString());
             }
 
@@ -595,11 +598,13 @@ function CmdHelper(cmd, client, debug) {
                 logLinkPathObj.existsSync()
                 && !logLinkPathObj.isSymlinkSync()
                 ||
-                fs.readlinkSync(logLinkPathObj.toString()) != cmd.projectLogsPath
+                logLinkPathObj.existsSync()
+                && fs.readlinkSync(logLinkPathObj.toString()) != cmd.projectLogsPath
             ) {
                 logLinkPathObj.rmSync();
             }
             if (!logLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectLogsPathObj.toString() +'] to [ '+ logLinkPathObj.toString() +' ] ');
                 projectLogsPathObj.symlinkSync(logLinkPathObj.toString());
             }
             projectLogsPathObj = null;
@@ -616,11 +621,13 @@ function CmdHelper(cmd, client, debug) {
                 tmpLinkPathObj.existsSync()
                 && !tmpLinkPathObj.isSymlinkSync()
                 ||
-                fs.readlinkSync(tmpLinkPathObj.toString()) != cmd.projectTmpPath
+                tmpLinkPathObj.existsSync()
+                && fs.readlinkSync(tmpLinkPathObj.toString()) != cmd.projectTmpPath
             ) {
                 tmpLinkPathObj.rmSync();
             }
             if (!tmpLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectTmpPathObj.toString() +'] to [ '+ tmpLinkPathObj.toString() +' ] ');
                 projectTmpPathObj.symlinkSync(tmpLinkPathObj.toString());
             }
             projectTmpPathObj = null;
@@ -845,7 +852,7 @@ function CmdHelper(cmd, client, debug) {
             cmd.configured = true;
 
 
-            // linking gina
+            // linking node-modules & gina
             if (
                 cmd.projectName != null
                 && /^true$/i.test(GINA_GLOBAL_MODE)

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/project/add.js

@@ -661,8 +661,9 @@ function Add(opt, cmd) {
 
 
             var version = '0.0.1';
-            var scopes  = self.projects[self.projectName].scopes;
-            var envs    = self.projects[self.projectName].envs;
+            var scopes  = self.projects[self.projectName].scopes || self.scopes || self.mainConfig['scopes'][ GINA_SHORT_VERSION ];
+            var envs    = self.projects[self.projectName].envs || self.envs || self.mainConfig['envs'][ GINA_SHORT_VERSION ];
+
             data.bundles[local.bundle] = {
                 "_comment"  : "Your comment goes here.",
                 "version"   : version,

package/framework/{v0.1.6-alpha.6 → v0.1.6-alpha.60}/lib/cmd/project/build.js

@@ -27,7 +27,7 @@ var console     = lib.logger;
             return end( new Error('No bundle found in your project `'+ self.projectName +'`') );
         }
 
-        console.debug('Building project `'+ self.projectName +'`');
+        console.debug('[build] Building project `'+ self.projectName +'`');
         buildBundle(0);
     }
 
@@ -84,7 +84,7 @@ var console     = lib.logger;
             return end(err)
         }
 
-        console.debug('Building bundle `'+ bundle + '@'+ self.projectName + '`');
+        console.debug('[build] Building bundle `'+ bundle + '@'+ self.projectName + '`');
         buildEnv(self.defaultScope, b, e);
 
     }
@@ -110,7 +110,7 @@ var console     = lib.logger;
             , srcPath       = _(self.bundlesLocation +'/'+ bundle, true)
         ;
 
-        console.debug('Building bundle env `'+ env +'` for `'+ bundle + '@'+ self.projectName + '`');
+        console.debug('[build] Building bundle env `'+ env +'` for `'+ bundle + '@'+ self.projectName + '`');
 
         // cleanup
         if (release.existsSync()) {
@@ -124,7 +124,7 @@ var console     = lib.logger;
             // creating internal node_modules symlink
             var internalNodeModulesPathObj = new _( self.projectLocation +'/node_modules', true);
             if (internalNodeModulesPathObj.existsSync() ) {
-                console.debug('Linking node_modules to from `'+ internalNodeModulesPathObj.toString() +'` to `'+ destination +'/node_modules' +'`');
+                console.debug('[build] Linking node_modules to from `'+ internalNodeModulesPathObj.toString() +'` to `'+ _(destination +'/node_modules', true) +'`');
                 internalNodeModulesPathObj.symlinkSync(_(destination +'/node_modules', true));
             }
             internalNodeModulesPathObj = null;