gina 0.1.1-alpha.237 → 0.1.1-alpha.238

package/framework/{v0.1.1-alpha.237 → v0.1.1-alpha.238}/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.237/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.238/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.237/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.238/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.237 → v0.1.1-alpha.238}/core/config.js

@@ -468,9 +468,9 @@ function Config(opt, contextResetNeeded) {
     //  TODO - replace `bundle`@`project` in `server.response.header['access-control-allow-origin']`
     // This will allow replacement of variables before the bundle is loaded, saving some time while routing
     // var getAllProjects = function(env) {
-    //     var projectsPath        = _(GINA_HOMEDIR + '/projects.json', true)
+    //     var projectConfigPath        = _(GINA_HOMEDIR + '/projects.json', true)
     //         , projectsList      = []
-    //         , projects          = requireJSON(projectsPath)
+    //         , projects          = requireJSON(projectConfigPath)
     //         , p                 = 0
     //         , bundlesInfosPath  = _(GINA_HOMEDIR + '/ports.reverse.json', true)
     //         , bundlesInfos      = requireJSON(bundlesInfosPath)

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

@@ -398,7 +398,7 @@ function Add(opt, cmd) {
         //writing
         lib.generator.createFileFromDataSync(
             projects,
-            self.projectsPath
+            self.projectConfigPath
         );
         self.projectDataWrote = true
     }
@@ -423,7 +423,7 @@ function Add(opt, cmd) {
             lib.generator.createFileFromDataSync(self.portsReverseData, self.portsReversePath);
 
             // restore projects.json
-            lib.generator.createFileFromDataSync(self.projects, self.projectsPath);
+            lib.generator.createFileFromDataSync(self.projects, self.projectConfigPath);
 
             process.exit(1)
         };

package/framework/{v0.1.1-alpha.237 → v0.1.1-alpha.238}/lib/cmd/framework/init.js

@@ -94,8 +94,9 @@ function Initialize(opt) {
         var path = getPath('gina').lib + filename;
 
         try {
-            if ( GINA_ENV_IS_DEV || GINA_SCOPE_IS_LOCAL)
+            if ( GINA_ENV_IS_DEV || GINA_SCOPE_IS_LOCAL) {
                 delete require.cache[require.resolve(path)];
+            }
             require(path)(opt, cmd)
         } catch(err) {
             console.crit('Gina has some troubles with command [ ', process.argv.join(' ') + ' ]\n' + err.stack);

package/framework/{v0.1.1-alpha.237 → v0.1.1-alpha.238}/lib/cmd/framework/link.js

@@ -65,10 +65,25 @@ var console        = lib.logger;
                     return end(err, 'error')
                 }
             }
+            // Safety check for node_modules
+            else if ( destination.isSymlinkSync() && !new _(destination.getSymlinkSourceSync()).existsSync() ) {
+                // Means that the symlink is not up to date
+                err = destination.mkdirSync();
+                if (err instanceof Error) {
+                    return end(err, 'error')
+                }
+
+                console.debug('Running: gina link-node-modules @'+self.projectName);
+                err = execSync('gina link-node-modules @'+self.projectName);// +' --inspect-gina'
+                if (err instanceof Error) {
+                    return end(err, 'error')
+                }
+            }
             destination = new _(destination.toString() +'/gina', true);
             var source = new _(GINA_PREFIX + '/lib/node_modules/gina', true);
 
 
+
             console.debug('Link '+ source + ' -> '+destination + ' [ exists ] ? '+ destination.existsSync() );
             if ( destination.existsSync() ) {
                 if ( destination.isSymlinkSync() && destination.getSymlinkSourceSync() == source.toString() ) {

package/framework/{v0.1.1-alpha.237 → v0.1.1-alpha.238}/lib/cmd/helper.js

@@ -46,12 +46,11 @@ function CmdHelper(cmd, client, debug) {
         projectArgvList: [],
         // global projects collection {collection}
         projects : null, // defined by filterArgs()
-        projectsPath : _(GINA_HOMEDIR + '/projects.json', true), // ~/.gina/project.json
         projectsList : [], // Array of project names, asc sorted
         // current project paths
         projectManifestPath : null, // local project/manifest.json - defined by filterArgs()
-        projectConfigPath: null, // path to .gina/project.json
-        projectHomedir: null, // path to ~/.<my-project> ( project $home)
+        projectConfigPath: null, // path to .gina/projects.json
+        projectHomedir: null, // path to ~/.<my-project> ( project $home), defined by loadAssets()
         projectData: {}, // Project manifest object
         // current project bundles list {array}
         bundles : [], // defined by filterArgs()
@@ -194,7 +193,7 @@ function CmdHelper(cmd, client, debug) {
             }
             cmd.mainConfig  = requireJSON( cmd.mainConfigPath );
 
-            // projectsprojects
+            // projects
             cmd.projectConfigPath = _(GINA_HOMEDIR + '/projects.json', true);
             if ( typeof(require.cache[cmd.projectConfigPath]) != 'undefined') {
                 delete require.cache[require.resolve(cmd.projectConfigPath)]
@@ -302,6 +301,22 @@ function CmdHelper(cmd, client, debug) {
                         }
                     }
 
+                    if ( cmd.projectName && !cmd.projects.count() ) {
+                        cmd.projects[cmd.projectName] = {
+                            "path": cmd.projectLocation,
+                            "homedir": cmd.projectHomedir,
+                            "def_prefix": GINA_PREFIX,
+                            "framework": "v" + GINA_VERSION,
+                            "envs": cmd.envs,
+                            "def_env": cmd.defaultEnv,
+                            "dev_env": cmd.devEnv,
+                            "protocols": cmd.protocolsAvailable,
+                            "def_protocol": cmd.defaultProtocol,
+                            "schemes": cmd.schemesAvailable,
+                            "def_scheme": cmd.defaultScheme
+                        }
+                    }
+
                     cmd.projectArgvList.push( argv[i].replace('@', '') )
 
                 } else if (mightBeASomeBundle && !/^\@/.test(argv[i]) && isValidName(argv[i]) ) { // bundles list
@@ -477,8 +492,11 @@ function CmdHelper(cmd, client, debug) {
                 cmd.projects[cmd.projectName].homedir = projectHomedirObject.toString();
             }
 
-            if ( typeof(cmd.projects[cmd.projectName].homedir) == 'undefined' ) {
-                cmd.projects[cmd.projectName].homedir = cmd.projectHomedir
+            if (
+                typeof(cmd.projects[cmd.projectName].homedir) == 'undefined'
+                || cmd.projects[cmd.projectName].homedir != projectHomedirObject.toString()
+            ) {
+                cmd.projects[cmd.projectName].homedir = projectHomedirObject.toString()
             }
 
 
@@ -503,27 +521,29 @@ function CmdHelper(cmd, client, debug) {
             cmd.def_framework_short = ( typeof(cmd.projects[cmd.projectName].framework) != 'undefined' ) ? (cmd.projects[cmd.projectName].framework.replace(/^v/, '').split(/\./g).splice(0,2)).join('.') : (cmd.mainConfig.def_framework.split(/\./g).splice(0,2)).join('.');
             console.debug('default def_framework_short ', cmd.def_framework_short);
 
-            // // updating default scopes list
-            // cmd.scopes = [];
-            // for (let e in cmd.projects[cmd.projectName].scopes) {
-            //     cmd.scopes.push(cmd.projects[cmd.projectName].scopes[e])
-            // }
-            // cmd.scopes.sort();
-
-            // // updating default envs list
-            // cmd.envs = [];
-            // for (let e in cmd.projects[cmd.projectName].envs) {
-            //     cmd.envs.push(cmd.projects[cmd.projectName].envs[e])
-            // }
-            // cmd.envs.sort();
 
 
             // getting default scopes list
-            cmd.scopes = (cmd.projectName != null && typeof(cmd.projects[cmd.projectName]) != 'undefined') ? cmd.projects[cmd.projectName]['scopes'] : cmd.mainConfig['scopes'][ GINA_SHORT_VERSION ];
+            cmd.scopes = (
+                            cmd.projectName != null
+                            && typeof(cmd.projects[cmd.projectName]) != 'undefined'
+                            && Array.isArray(cmd.projects[cmd.projectName]['scopes'])
+                            && cmd.projects[cmd.projectName]['scopes'].length > 0
+                        ) ? cmd.projects[cmd.projectName]['scopes'] : cmd.mainConfig['scopes'][ GINA_SHORT_VERSION ];
             // getting default scope
-            cmd.defaultScope = (cmd.projectName != null && typeof(cmd.projects[cmd.projectName]) != 'undefined' ) ? cmd.projects[cmd.projectName]['def_scope'] : cmd.mainConfig['def_scope'][ GINA_SHORT_VERSION ];
+            cmd.defaultScope = (
+                            cmd.projectName != null
+                            && typeof(cmd.projects[cmd.projectName]) != 'undefined'
+                            && typeof(cmd.projects[cmd.projectName]['def_scope']) != 'undefined'
+                            && cmd.projects[cmd.projectName]['def_scope']
+                        ) ? cmd.projects[cmd.projectName]['def_scope'] : cmd.mainConfig['def_scope'][ GINA_SHORT_VERSION ];
             // getting dev scope
-            cmd.localScope = (cmd.projectName != null &&typeof(cmd.projects[cmd.projectName]) != 'undefined' ) ? cmd.projects[cmd.projectName]['local_scope'] : cmd.mainConfig['local_scope'][ GINA_SHORT_VERSION ];
+            cmd.localScope = (
+                                cmd.projectName != null
+                                && typeof(cmd.projects[cmd.projectName]) != 'undefined'
+                                && typeof(cmd.projects[cmd.projectName]['local_scope']) != 'undefined'
+                                && cmd.projects[cmd.projectName]['local_scope']
+                            ) ? cmd.projects[cmd.projectName]['local_scope'] : cmd.mainConfig['local_scope'][ GINA_SHORT_VERSION ];
             // project or bundle scope override through : --scope=<some scope>
             if ( typeof(cmd.params.scope) != 'undefined' && /\:(start|stop|restart|build|deploy)/i.test(cmd.task) ) {
                 console.debug('Overriding default project scope: '+ cmd.defaultScope +' => '+ cmd.params.scope);
@@ -539,18 +559,33 @@ function CmdHelper(cmd, client, debug) {
             cmd.scopes.sort();
 
             // getting default envs list
-            cmd.envs = (cmd.projectName != null && typeof(cmd.projects[cmd.projectName]) != 'undefined') ? cmd.projects[cmd.projectName]['envs'] : cmd.mainConfig['envs'][ GINA_SHORT_VERSION ];
+            cmd.envs = (
+                            cmd.projectName != null
+                            && typeof(cmd.projects[cmd.projectName]) != 'undefined'
+                            && Array.isArray(cmd.projects[cmd.projectName]['envs'])
+                            && cmd.projects[cmd.projectName]['envs'].length > 0
+                        ) ? cmd.projects[cmd.projectName]['envs'] : cmd.mainConfig['envs'][ GINA_SHORT_VERSION ];
             // getting default env
-            cmd.defaultEnv = (cmd.projectName != null && typeof(cmd.projects[cmd.projectName]) != 'undefined' ) ? cmd.projects[cmd.projectName]['def_env'] : cmd.mainConfig['def_env'][ GINA_SHORT_VERSION ];
+            cmd.defaultEnv = (
+                                cmd.projectName != null
+                                && typeof(cmd.projects[cmd.projectName]) != 'undefined'
+                                && typeof(cmd.projects[cmd.projectName]['def_env']) != 'undefined'
+                                && cmd.projects[cmd.projectName]['def_env']
+                            ) ? cmd.projects[cmd.projectName]['def_env'] : cmd.mainConfig['def_env'][ GINA_SHORT_VERSION ];
             // getting dev env
-            cmd.devEnv = (cmd.projectName != null &&typeof(cmd.projects[cmd.projectName]) != 'undefined' ) ? cmd.projects[cmd.projectName]['dev_env'] : cmd.mainConfig['dev_env'][ GINA_SHORT_VERSION ];
+            cmd.devEnv = (
+                            cmd.projectName != null
+                            && typeof(cmd.projects[cmd.projectName]) != 'undefined'
+                            && typeof(cmd.projects[cmd.projectName]['dev_env']) != 'undefined'
+                            && cmd.projects[cmd.projectName]['dev_env']
+                        ) ? cmd.projects[cmd.projectName]['dev_env'] : cmd.mainConfig['dev_env'][ GINA_SHORT_VERSION ];
             //cmd.bundlesByProject[cmd.projectName][cmd.name].def_env = cmd.defaultEnv; // by default
             // project or bundle environment override through : --env=<some env>
             if ( typeof(cmd.params.env) != 'undefined' && /\:(start|stop|restart|build|deploy)/i.test(cmd.task) ) {
                 console.debug('Overriding default project env: '+ cmd.defaultEnv +' => '+ cmd.params.env);
                 if (cmd.envs.indexOf(cmd.params.env) < 0) {
                     errMsg = 'Environment `'+ cmd.params.env +'` not found in your project ['+ cmd.projectName +']';
-                    console.error(errMsg);
+                    console.emerg(errMsg);
                     return false;
                 }
                 cmd.defaultEnv = process.env.NODE_ENV = cmd.params.env;
@@ -644,21 +679,6 @@ function CmdHelper(cmd, client, debug) {
 
             cmd.configured = true;
 
-            // detect lib/node_modules
-            // 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.237 → v0.1.1-alpha.238}/lib/cmd/port/inc/scan.js

@@ -53,7 +53,7 @@ module.exports = function Scanner(opt, cb){
         , total = ~~opt.limit
     ;
 
-    var find = function(port) {
+    var find = function(port, cb) {
 
         if (port > self.end) { // not available port found
             console.warn('found '+ ports.length +'/'+ total);
@@ -100,7 +100,7 @@ module.exports = function Scanner(opt, cb){
                     cb(false, ports);
                 } else {
                     port++;
-                    find(port);
+                    find(port, cb);
                 }
                 return;
             } else if (err) {
@@ -116,9 +116,9 @@ module.exports = function Scanner(opt, cb){
             s.destroy();
 
             port++;
-            find(port);
+            find(port, cb);
         })
     };
 
-    find(port)
+    find(port, cb)
 }

package/framework/{v0.1.1-alpha.237 → v0.1.1-alpha.238}/lib/cmd/port/reset.js

@@ -60,21 +60,6 @@ function Reset(opt, cmd) {
         // }
     }
 
-    //  check if bundle is defined
-    // var isDefined = function(name) {
-    //     if (typeof (self.projects[name]) != 'undefined') {
-    //         return true
-    //     }
-    //     return false
-    // }
-
-    // var isValidName = function(name) {
-    //     if (name == undefined) return false;
-
-    //     self.name = name.replace(/\@/, '');
-    //     var patt = /^[a-z0-9_.]/;
-    //     return patt.test(self.name)
-    // }
 
     var reset = function() {
         // get bundles list

package/framework/{v0.1.1-alpha.237 → v0.1.1-alpha.238}/lib/cmd/project/add.js

@@ -1,4 +1,6 @@
 var fs          = require('fs');
+var util        = require('util');
+var promisify   = util.promisify;
 
 var CmdHelper   = require('./../helper');
 var Shell       = lib.Shell;
@@ -34,7 +36,7 @@ function Add(opt, cmd) {
             }
         }
 
-        local.imported = false;
+        local.imported = ( /\:import/i.test(self.task) ) ? true : false;
         if ( checkImportMode() ) {
             return;
         }
@@ -198,7 +200,7 @@ function Add(opt, cmd) {
         end(true)
     }
 
-    var end = function(created) {
+    var end = async function(created) {
 
         var target = _(GINA_HOMEDIR + '/projects.json')
             , projects = JSON.clone(self.projects)
@@ -221,7 +223,16 @@ function Add(opt, cmd) {
 
         // create/update ports, protocols & schemes
         if ( /^true$/.test(local.imported) ) {
-            addBundlePorts(0);
+            self.bundles.sort();
+            var bundlePortsErr = null;
+            await promisify(addBundlePorts)(0)
+                .catch( function onBundlePortsError(err) {
+                    bundlePortsErr = err;
+                });
+            if (bundlePortsErr) {
+                console.error('Could not finalize [ addBundlePorts ] \n'+ bundlePortsErr.stack);
+                process.exit(1)
+            }
         }
 
 
@@ -234,7 +245,7 @@ function Add(opt, cmd) {
 
 
         var onSuccess = function () {
-            if ( self.task == 'project:add' ) {
+            if ( /project\:add/i.test(self.task) ) {
                 console.log('Project [ '+ self.projectName +' ] has been added');
             } else {
                 console.log('Project [ '+ self.projectName +' ] has been imported');
@@ -294,8 +305,11 @@ function Add(opt, cmd) {
      * NB.: also used in `port:reset` task
      *
      * @param {number} b - Bundle index
+     * @callback done
+     *  @param {object|bool} err
+     *  @param {array} ports
      */
-    var addBundlePorts = function(b) {
+    var addBundlePorts = async function(b, done) {
         loadAssets();
 
         if (b > self.bundles.length-1) { // writing to files on complete
@@ -357,6 +371,12 @@ function Add(opt, cmd) {
 
                     for (let scheme in ports[protocol]) {
 
+                        // skipping none `https` schemes for `http/2`
+                        if ( /^http\/2/.test(protocol) && scheme != 'https' ) {
+                            console.debug('skipping none `https` schemes for `http/2`');
+                            continue;
+                        }
+
                         if ( !ports[protocol][scheme].count() ) {
                             ports[protocol][scheme][ portsList[i] ] = null;
                         }
@@ -469,7 +489,7 @@ function Add(opt, cmd) {
             lib.generator.createFileFromDataSync( merge(self.portsReverseData, portsReverse), self.portsReversePath);
 
 
-            return;
+            return done(false);
         }
 
         //console.debug('Bundles list on project import [ '+ b +' ]', self.bundles.length, self.bundles);
@@ -497,8 +517,28 @@ function Add(opt, cmd) {
                 options.startFrom = ~~(''+ (self.projectsList.indexOf(self.projectName)+3) + 100);
             }
             // scanning for available ports ...
-            scan(options, function(err, ports){
-
+            // var scanErr = null;
+            // await promisify(scan)(options)
+            //     .catch(function onScanErr(err) {
+            //         scanErr = err;
+            //     })
+            //     .then( function onPortsFound(ports) {
+            //         for (let p = 0; p < ports.length; ++p) {
+            //             local.ports.push(ports[p])
+            //         }
+
+            //         local.ports.sort();
+
+            //         ++local.b;
+            //         addBundlePorts(local.b, done);
+            //     });
+
+            // if (scanErr) {
+            //     console.error(err.stack|err.message);
+            //     process.exit(1)
+            // }
+
+            await scan(options, function(err, ports){
                 if (err) {
                     console.error(err.stack|err.message);
                     process.exit(1)
@@ -512,7 +552,7 @@ function Add(opt, cmd) {
                 local.ports.sort();
 
                 ++local.b;
-                addBundlePorts(local.b);
+                addBundlePorts(local.b, done);
 
             });
 
@@ -520,8 +560,9 @@ function Add(opt, cmd) {
 
 
         } else {
-            console.error('[ '+ bundle+' ] is not a valid bundle name')
-            process.exit(1)
+            // console.error('[ '+ bundle+' ] is not a valid bundle name')
+            // process.exit(1)
+            return done( new Error('[ '+ bundle+' ] is not a valid bundle name'))
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.237",
+  "version": "0.1.1-alpha.238",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.237/core/gna",
+  "main": "./framework/v0.1.1-alpha.238/core/gna",
   "scripts": {
     "prepare": "node script/prepare_version.js",
     "postpublish": "node script/post_publish.js",

package/framework/v0.1.1-alpha.237/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.237