gina 0.1.1-alpha.162 → 0.1.1-alpha.164

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

@@ -70,13 +70,19 @@ function Start(opt, cmd) {
             return cb(false);
         }
 
+        var gnaPath    =  _(projectObj.path +'/.gna', true);
+        var gnaPathObj  =  new _(gnaPath, true);
+        if ( ! gnaPathObj.existsSync() ) {
+            gnaPathObj.mkdirSync()
+        }
 
         var isNodeModulesReinstallNeeded = false;
         var nodeModulesPathObj = new _(projectObj.path +'/node_modules', true);
 
-        var projectArchFileObj = new _(projectObj.path +'/.gna/arch', true);
+
+        var projectArchFileObj = new _(gnaPath +'/arch', true);
         var projectArchFile = projectArchFileObj.toString();
-        var projectPlatformFileObj = new _(projectObj.path +'/.gna/platform', true);
+        var projectPlatformFileObj = new _(gnaPath +'/platform', true);
         var projectPlatformFile = projectPlatformFileObj.toString();
         var nodeModulesContentArr = ( nodeModulesPathObj.existsSync() ) ? fs.readdirSync(nodeModulesPathObj.toString()) : [];
         var newNodeModulesContentArr = [], n = 0;
@@ -249,6 +255,7 @@ function Start(opt, cmd) {
         ;
 
         isRealApp(bundle, function(err, appPath){
+
             if (err) {
                 terminal.error(err.stack||err.message)
             } else {

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

@@ -10,6 +10,7 @@ function List(opt, cmd){
     var init = function(){
 
         self.projects = require(_(GINA_HOMEDIR + '/projects.json'));
+        var err = null;
 
         if ( typeof(process.argv[3]) != 'undefined') {
             if (process.argv[3] === '--all') {
@@ -32,8 +33,8 @@ function List(opt, cmd){
         } else if ( typeof(self.name) != 'undefined' && isDefined(self.name) ) {
             listProjectOnly()
         } else {
-            console.error('[ '+self.name+' ] is not a valid project name.');
-            process.exit(1)
+            err = new Error('[ '+self.name+' ] is not a valid project name.');
+            end(err, 'log', true);
         }
     }
 
@@ -84,7 +85,8 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     }
 
     var listProjectOnly = function (){
@@ -102,9 +104,23 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        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);
+            if ( typeof(type) != 'undefined' ) {
+                console[type](out)
+            } else {
+                console.error(out);
+            }
+        }
+
+        process.exit( err ? 1:0 );
+    }
+
     init()
 };
 

package/framework/{v0.1.1-alpha.162 → v0.1.1-alpha.164}/lib/cmd/framework/build.js

@@ -49,7 +49,7 @@ function Build(opt, cmd){
 
         // to handle sync vs async to allow execution in order of declaration
         if (funct) {
-            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(-1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();');// jshint ignore:line
+            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();');// jshint ignore:line
         } else {
             end();
         }

package/framework/{v0.1.1-alpha.162 → v0.1.1-alpha.164}/lib/cmd/framework/init.js

@@ -2,11 +2,15 @@ var fs              = require('fs');
 var EventEmitter    = require('events').EventEmitter;
 var e               = new EventEmitter();
 const { execSync }  = require('child_process');
-const { arch } = require('os');
+const { arch }      = require('os');
+var util            = require('util');
+var promisify       = util.promisify;
 
 var console         = lib.logger;
+var Domain          = lib.Domain;
 var ginaPath        = getPath('gina').root;
 var help            = require(ginaPath + '/utils/helper');
+// var helpers         = require(getPath('gina').helpers, true);
 
 
 var aliases = require( getPath('gina').lib + '/cmd/aliases.json' );
@@ -23,23 +27,51 @@ function Initialize(opt) {
     /**
      * Bebin Checking - Will run checking tasks in order of declaration
      * */
-    var begin = function() {
-        var i = 0;
-        var funcs = [];
-        for (var t in self) {
-            if( typeof(self[t]) == 'function') {
-                var func = 'self.' + t + '()';
-                console.debug('Running [ ' + func + ' ]');
-                eval(func);// jshint ignore:line
-                ++i
-            }
+    // var begin = function() {
+    //     var i = 0;
+    //     var funcs = [];
+    //     for (var t in self) {
+    //         if( typeof(self[t]) == 'function') {
+    //             var func = 'self.' + t + '()';
+    //             console.debug('Running [ ' + func + ' ]');
+    //             eval(func);// jshint ignore:line
+    //             ++i
+    //         }
+
+    //         if ( i == self.functionCount() ) {
+    //             e.emit('init#complete', false, run, self.opt);
+    //             break
+    //         }
+    //     }
+    // }
 
-            if ( i == self.functionCount() ) {
-                e.emit('init#complete', false, run, self.opt);
-                break
+    var begin = async function(i) {
+        i = (typeof(i) == 'undefined') ? 0 : i;
+        //console.debug('i is ', i);
+        var n = 0, funct = null, functName = null;
+        for (let t in self) {
+            if ( typeof(self[t]) == 'function') {
+                if (n == i) {
+                    //let func = 'self.' + t + '()';
+                    let func = 'self.' + t;
+                    console.debug('Running [ ' + func + '() ]');
+                    funct       = func;
+                    functName   = t;
+                    break;
+                }
+                n++;
             }
         }
+
+        // to handle sync vs async to allow execution in order of declaration
+        if (funct) {
+            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
+        } else if ( i == self.functionCount() ) {
+            e.emit('init#complete', false, run, self.opt);
+        }
     }
+
+
     var checkForAliases = function(task) {
         try {
             var aliasArr = aliases[task.topic].toArray();
@@ -70,11 +102,11 @@ function Initialize(opt) {
             if (opt.client) {
                 opt.client.write('Gina has some troubles with command [ ', process.argv.join(' ') + ' ]\n' + err.stack);
             }
-            process.exit(-1);
+            process.exit(1);
         }
     }
 
-    self.checkIfHome = function() {
+    self.checkIfHome = function(done) {
         var path = self.opt.homedir;
         console.debug('Checking home... [ '+ path +' ]');
 
@@ -88,14 +120,17 @@ function Initialize(opt) {
             try {
                 fs.mkdirSync(path, 0775)
             } catch (err) {
-                console.error(err.stack);
-                process.exit(1)
+                // console.error(err.stack);
+                // process.exit(1)
+                return done(err)
             }
         }
+
+        done()
     }
 
 
-    self.checkIfVersionDir = function() {
+    self.checkIfVersionDir = function(done) {
 
         var version = require(self.opt.pack).version;
 
@@ -124,13 +159,15 @@ function Initialize(opt) {
             try {
                 fs.mkdirSync(releasePath, 0775)
             } catch (err) {
-                console.error(err.stack);
-                process.exit(1)
+                // console.error(err.stack);
+                // process.exit(1)
+                return done(err)
             }
         }
+        done()
     }
 
-    self.checkIfMain = function() {
+    self.checkIfMain = function(done) {
         console.debug('Checking main...');
         var source      = getPath('gina').root + '/resources/home/main.json';
         var target      = self.opt.homedir + '/main.json';
@@ -152,8 +189,9 @@ function Initialize(opt) {
             try {
                 lib.generator.createFileFromDataSync(data, target)
             } catch (err) {
-                console.error(err.stack);
-                process.exit(1)
+                // console.error(err.stack);
+                // process.exit(1)
+                return done(err)
             }
         }
         // update if needed : like the version number ...
@@ -232,13 +270,15 @@ function Initialize(opt) {
         // Attenion: remove this part in case of troubles
         setEnvVar('GINA_PREFIX', defPrefix);
         setEnvVar('GINA_GLOBAL_MODE', defGlobalMode);
+
+        done()
     }
 
     /**
      * Check arch
      *
      * */
-    self.checkArch = function() {
+    self.checkArch = function(done) {
 
         var currentArch = process.arch;
         var currentPlatform = process.platform;
@@ -318,14 +358,16 @@ function Initialize(opt) {
             )
         }
 
-        // scanning project
+        // TODO - Scanning project
+
+        done()
     }
 
     /**
      * Checking ports
      *
      **/
-    self.checkIfPorts = function() {
+    self.checkIfPorts = function(done) {
         console.debug('Checking ports...');
         var mainConfig  = require(self.opt.homedir + '/main.json');
         var target = _(self.opt.homedir +'/ports.json');
@@ -347,13 +389,15 @@ function Initialize(opt) {
                 target
             )
         }
+
+        done()
     }
 
     /**
      * Checking ports.reverse
      *
      **/
-    self.checkIfPortsReverse = function() {
+    self.checkIfPortsReverse = function(done) {
         console.debug('Checking ports.reverse...');
         var target = _(self.opt.homedir +'/ports.reverse.json');
 
@@ -363,6 +407,8 @@ function Initialize(opt) {
                 target
             )
         }
+
+        done()
     }
 
 
@@ -370,16 +416,19 @@ function Initialize(opt) {
      * Check env
      *
      * */
-    self.checkEnv = function() {
+    self.checkEnv = function(done) {
         // ignored for framework:set
         //if (self.opt.task.Action != 'set' && self.opt.task.topic != 'framework') {
-        var main = require( self.opt.homedir + '/main.json' );
+        var err     = null;
+        var main    = require( self.opt.homedir + '/main.json' );
         //has registered env ?
         var env     = getEnvVar('GINA_ENV') || main['dev_env'][self.release]; // dev by default
 
         if ( main.envs[self.release].indexOf(env) < 0 ) {
-            console.error('Environment [ ' + env + ' ] not registered. See [ man gina-env ].');
-            process.exit(1)
+            // console.error('Environment [ ' + env + ' ] not registered. See [ man gina-env ].');
+            // process.exit(1)
+            err = new Error('Environment [ ' + env + ' ] not registered. See [ man gina-env ].');
+            return done(err)
         }
 
         // has dev env ?
@@ -389,25 +438,31 @@ function Initialize(opt) {
             typeof(main['dev_env'][self.release]) != 'undefined' &&
             main.envs[self.release].indexOf(main['dev_env'][self.release]) < 0
         ) {
-            console.error('the framework has no dev env linked to any' +
-                'environment to gina\'s.\nUse: $ gina env:link-dev <your_new_dev_env>');
+            err = new Error('the framework has no dev env linked to any' +
+                            'environment to gina\'s.\nUse: $ gina env:link-dev <your_new_dev_env>');
 
-            process.exit(1)
+            // process.exit(1)
+            return done(err)
         }
+
+        done()
     }
 
     /**
      * Check scope
      *
      * */
-    self.checkScope = function() {
+    self.checkScope = function(done) {
         // ignored for framework:set
-        var main = require( self.opt.homedir + '/main.json' );
+        var err     = null;
+        var main    = require( self.opt.homedir + '/main.json' );
         //has registered scope ?
         var scope   = getEnvVar('GINA_SCOPE') || main['local_scope'][self.release]; // scope by default
         if ( main.scopes[self.release].indexOf(scope) < 0 ) {
-            console.error('Scope [ ' + scope + ' ] not registered. See [ man gina-scope ].');
-            process.exit(1)
+            // console.error('Scope [ ' + scope + ' ] not registered. See [ man gina-scope ].');
+            // process.exit(1)
+            err = new Error('Scope [ ' + scope + ' ] not registered. See [ man gina-scope ].');
+            return done(err)
         }
 
 
@@ -418,21 +473,27 @@ function Initialize(opt) {
             typeof(main['local_scope'][self.release]) != 'undefined' &&
             main.scopes[self.release].indexOf(main['local_scope'][self.release]) < 0
         ) {
-            console.error('the framework has no local scope linked to any ' +
-                'scope to gina\'s.\nUse: $ gina scope:link-local <your_new_local_scope>');
+            // console.error('the framework has no local scope linked to any ' +
+            //     'scope to gina\'s.\nUse: $ gina scope:link-local <your_new_local_scope>');
 
-            process.exit(1)
+            // process.exit(1)
+            err = new Error('the framework has no local scope linked to any ' +
+                            'scope to gina\'s.\nUse: $ gina scope:link-local <your_new_local_scope>');
+
+            return done(err)
         }
+
+        done()
     }
 
 
 
     /**
      * Checking settings, defining constants
-     * Also done during bin/cmd init() ... so if you change here ...
+     * Also done during bin/cmd::init() ... so if you change here ...
      **/
 
-    self.checkIfSettings = function() {
+    self.checkIfSettings = function(done) {
         console.debug('Checking framework settings...');
         var main            = require( _(self.opt.homedir + '/main.json', true) )
             , version       = getEnvVar('GINA_VERSION')
@@ -546,19 +607,22 @@ function Initialize(opt) {
                 target
             )
         } catch (err) {
-            console.error(err.stack);
-            process.exit(1)
+            // console.error(err.stack);
+            // process.exit(1)
+            return done(err)
         }
+
+        done()
     }
 
     /**
      * Checking projects
      *
      **/
-     self.checkIfProjects = function() {
+     self.checkIfProjects = function(done) {
         console.debug('Checking projects...');
-        var main = requireJSON( self.opt.homedir + '/main.json' );
-        var target = _(self.opt.homedir +'/projects.json', true);
+        var main    = requireJSON( self.opt.homedir + '/main.json' );
+        var target  = _(self.opt.homedir +'/projects.json', true);
 
         if ( !fs.existsSync(target) ) {
             lib.generator.createFileFromDataSync(
@@ -578,7 +642,12 @@ function Initialize(opt) {
                 if ( !newProjects[name][prop] /**&& Array.isArray(main[prop][self.release])*/ ) {
                     newProjects[name][prop] = null;
                 }
-                newProjects[name][prop] = JSON.clone(main[prop][self.release])
+
+                try {
+                    newProjects[name][prop] = JSON.clone(main[prop][self.release])
+                } catch (err) {
+                    return done(err)
+                }
             }
         }
 
@@ -586,11 +655,36 @@ function Initialize(opt) {
         lib.generator.createFileFromDataSync(
             newProjects,
             target
-        )
+        );
+
+        done()
+    }
+
+    self.checkDomainLibRequirements = function(done) {
+        // check for `public_suffix_list.dat`
+        var domainLibPath   = _( getEnvVar('GINA_FRAMEWORK_DIR') + '/lib/domain', true);
+        var distPathObj     = new _(domainLibPath + '/dist', true);
+
+        if ( !distPathObj.existsSync() ) {
+            distPathObj.mkdirSync();
+        }
+        console.debug('Checking for PSL file');
+        var datFilenameObj = new _(distPathObj.toString() + '/public_suffix_list.dat', true);
+        if ( !datFilenameObj.existsSync() ) {
+            // try {
+            //     new Domain({isCachingRrequired: true}, done);
+            // } catch (err) {
+            //     // console.error(err.stack||err.message||err);
+            //     // process.exit(1)
+            //     return done(err)
+            // }
+            new Domain({isCachingRrequired: true}, done);
+        }
 
+        done()
     }
 
-    self.checkIfCertificatesDir = function() {
+    self.checkIfCertificatesDir = function(done) {
         var certsDir = new _( getEnvVar('GINA_HOMEDIR') + '/certificates', true);
         var theRSARootCertsDir = new _(certsDir.toString() + '/RSARootCerts', true);
         var scopesDir = new _(certsDir.toString() + '/scopes', true);
@@ -613,38 +707,34 @@ function Initialize(opt) {
             if ( !scopeDir.existsSync() ) {
                 scopeDir.mkdirSync()
             }
-
         }
-    }
-
-    // self.setLoggers = function() {
-    //     //var terminal = lib.logger('terminal', require() );
-    // }
-
 
-    // self.checkFrameworkLocals = function() {
+        done()
+    }
 
-    // }
 
-    self.readSettings = function() {
+    self.readSettings = function(done) {
         for (let s in self.settings) {
             if (!/^\_/.test(s) && !getEnvVar('GINA_' + s.toUpperCase()) ) {
                 setEnvVar('GINA_' + s.toUpperCase(), self.settings[s])
             }
         }
+
+        done();
     }
 
     /**
      * Checking PIDs for cleanup
      *
      **/
-    self.checkRunningPids = function() {
+    self.checkRunningPids = function(done) {
         console.debug('Checking PIDs for cleanup...');
         if ( /true/.test(getEnvVar('GINA_IS_WIN32')) ) {
             console.debug(' Skipping for windows...');
         }
-        var runDirObj = new _( getEnvVar('GINA_RUNDIR'), true );
-        var runDir = runDirObj.toString();
+        var err         = null;
+        var runDirObj   = new _( getEnvVar('GINA_RUNDIR'), true );
+        var runDir      = runDirObj.toString();
 
         if ( runDirObj.existsSync() ) {
             console.debug('Run dir: ', runDir );
@@ -681,10 +771,13 @@ function Initialize(opt) {
         } else {
             console.warn('Run directory `'+ runDir +'` not found !')
         }
+
+        done()
     }
 
-    self.end = function() {
-        defineDefault(process.gina)
+    self.end = function(done) {
+        defineDefault(process.gina);
+        done()
     }
 
     return {