gina 0.1.5-alpha.2 → 0.1.6-alpha.10

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.10}/core/gna.js

@@ -201,9 +201,9 @@ setContext('gina.plugins', plugins);
 
 
 //Setting env.
-var env                     = projects[projectName]['def_env'] || process.env.NODE_ENV
+var env                     = (typeof(process.env.NODE_ENV) != 'undefined' && process.env.NODE_ENV) ? process.env.NODE_ENV : projects[projectName]['def_env']
     , isDev                 = (env === projects[projectName]['dev_env']) ? true: false
-    , scope                 = projects[projectName]['def_scope'] || process.env.NODE_SCOPE
+    , scope                 = (typeof(process.env.NODE_SCOPE) != 'undefined' && process.env.NODE_SCOPE) ? process.env.NODE_SCOPE : projects[projectName]['def_scope']
     , isLocalScope          = (scope === projects[projectName]['local_scope']) ? true : false
     , isProductionScope     = (scope === projects[projectName]['production_scope']) ? true : false
 ;
@@ -317,16 +317,19 @@ var isBundleMounted = function(projects, bundlesPath, bundle, cb) {
         isMounted = false;
     }
     if (!isMounted) {
-        var source = null, linkPath = null;
+        var source      = null
+            , linkPath  = null
+        ;
         try {
-            source = (isDev) ? _( root +'/'+manifest.bundles[bundle].src) : _( root +'/'+ manifest.bundles[bundle].releases[env].target );
+            source = (isDev) ? _( root +'/'+manifest.bundles[bundle].src) : _( root +'/'+ manifest.bundles[bundle].releases[scope][env].target );
             linkPath =  _( root +'/'+ manifest.bundles[bundle].link );
             console.debug('Mounting bundle `'+ bundle +'` to : ', linkPath);
         } catch (err) {
             return cb(err)
         }
 
-        gna.mount(bundlesPath, source, linkPath, cb)
+        gna.mount(bundlesPath, source, linkPath, cb);
+
     }
 }
 
@@ -460,7 +463,12 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
 
     // hack to test none-dev env without building: in case you did not build your bundle, but you have the src available
     if (!isSourceFound && !isDev) {
-        var srcPathObj = new _( root +'/'+ gna.project.bundles[gna.core.startingApp].src);
+        var srcPathObj = null;
+        try {
+            srcPathObj = new _( root +'/'+ gna.project.bundles[gna.core.startingApp].src);
+        } catch (buildError) {
+            return callback( new Error('Built not found for your selected scope !'));
+        }
         if ( srcPathObj.existsSync() ) {
             var d =(d = _(source).split(/\//g)).splice(0, d.length-1).join('/');
             var destinationObj = new _(d);
@@ -770,181 +778,166 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                 setContext( JSON.parse(process.argv[3]) )
             }
 
-            //check here for mount point source...
-            // if ( typeof(project.bundles[core.startingApp].version) == 'undefined' && typeof(project.bundles[core.startingApp].tag) != 'undefined') {
-            //     project.bundles[core.startingApp].version = project.bundles[core.startingApp].tag
-            // }
-            // project.bundles[core.startingApp].releases[env].target = 'releases/'+ core.startingApp +'/' + env +'/'+ project.bundles[core.startingApp].version;
-            // var source = (isDev) ? _( root +'/'+project.bundles[core.startingApp].src) : _( root +'/'+ project.bundles[core.startingApp].releases[env].target );
-            // var linkPath =  _( root +'/'+ project.bundles[core.startingApp].link );
-            // console.debug('Mounting bundle `'+ appName +'` to : ', linkPath);
-            // gna.mount( bundlesPath, source, linkPath, function onBundleMounted(mountErr) {
-
-            //     if (mountErr) {
-            //         abort(mountErr.stack);
-            //     }
-
-                if (!Config.instance) {
-                    config = new Config({
-                        env             : env,
-                        scope           : scope,
-                        executionPath   : core.executionPath,
-                        projectName     : core.projectName,
-                        startingApp     : core.startingApp,
-                        ginaPath        : core.ginaPath
-                    });
-                } else {
-                    config = Config.instance
-                }
-
+            if (!Config.instance) {
+                config = new Config({
+                    env             : env,
+                    scope           : scope,
+                    executionPath   : core.executionPath,
+                    projectName     : core.projectName,
+                    startingApp     : core.startingApp,
+                    ginaPath        : core.ginaPath
+                });
+            } else {
+                config = Config.instance
+            }
 
-                setContext('gina.config', config);
-                config.onReady( function(err, obj){
-                    var isStandalone = obj.isStandalone;
 
-                    if (err) console.error(err, err.stack);
+            setContext('gina.config', config);
+            config.onReady( function(err, obj){
+                var isStandalone = obj.isStandalone;
 
-                    var initialize = function(err, instance, middleware, conf) {
-                        var errMsg = null;
-                        if (!err) {
+                if (err) console.error(err, err.stack);
 
-                            //On user conf complete.
-                            e.on('complete', function(instance){
+                var initialize = function(err, instance, middleware, conf) {
+                    var errMsg = null;
+                    if (!err) {
 
-                                server.on('started', async function (conf) {
+                        //On user conf complete.
+                        e.on('complete', function(instance){
 
-                                    // setting default global middlewares
-                                    if ( typeof(instance.use) == 'function' ) {
+                            server.on('started', async function (conf) {
 
-                                        // catching unhandled errors
-                                        instance.use( function cathUnhandledErrorMiddlewar(error, request, response, next){
+                                // setting default global middlewares
+                                if ( typeof(instance.use) == 'function' ) {
 
-                                            if (arguments.length < 4) {
-                                                next        = response;
-                                                response    = request;
-                                                request     = error;
-                                                error       = false ;
-                                            }
+                                    // catching unhandled errors
+                                    instance.use( function cathUnhandledErrorMiddlewar(error, request, response, next){
 
-                                            if (error) {
-                                                e.emit('error', error, request, response, next)
-                                            } else {
-                                                next()
-                                            }
-                                        });
+                                        if (arguments.length < 4) {
+                                            next        = response;
+                                            response    = request;
+                                            request     = error;
+                                            error       = false ;
+                                        }
 
+                                        if (error) {
+                                            e.emit('error', error, request, response, next)
+                                        } else {
+                                            next()
+                                        }
+                                    });
 
-                                        instance.use( function composeHeadersMiddleware(error, request, response, next) {
 
-                                            if (arguments.length < 4) {
-                                                next        = response;
-                                                response    = request;
-                                                request     = error;
-                                                error       = false ;
-                                            }
+                                    instance.use( function composeHeadersMiddleware(error, request, response, next) {
 
-                                            if (error) {
-                                                return e.emit('error', error, request, response, next);
-                                            }
+                                        if (arguments.length < 4) {
+                                            next        = response;
+                                            response    = request;
+                                            request     = error;
+                                            error       = false ;
+                                        }
 
-                                            instance.completeHeaders(null, request, response);
+                                        if (error) {
+                                            return e.emit('error', error, request, response, next);
+                                        }
 
-                                            if (
-                                                typeof(request.isPreflightRequest) != 'undefined'
-                                                && request.isPreflightRequest
-                                            ) {
-                                                var ext = 'html';
-                                                var headers = {
-                                                    // Responses to the OPTIONS method are not cacheable. - https://tools.ietf.org/html/rfc7231#section-4.3.7
-                                                    //'cache-control': 'no-cache, no-store, must-revalidate', // preventing browsers from using cache
-                                                    'cache-control': 'no-cache',
-                                                    'pragma': 'no-cache',
-                                                    'expires': '0',
-                                                    'content-type': conf.server.coreConfiguration.mime[ext]
-                                                };
+                                        instance.completeHeaders(null, request, response);
 
-                                                response.writeHead(200, headers);
-                                                response.end();
+                                        if (
+                                            typeof(request.isPreflightRequest) != 'undefined'
+                                            && request.isPreflightRequest
+                                        ) {
+                                            var ext = 'html';
+                                            var headers = {
+                                                // Responses to the OPTIONS method are not cacheable. - https://tools.ietf.org/html/rfc7231#section-4.3.7
+                                                //'cache-control': 'no-cache, no-store, must-revalidate', // preventing browsers from using cache
+                                                'cache-control': 'no-cache',
+                                                'pragma': 'no-cache',
+                                                'expires': '0',
+                                                'content-type': conf.server.coreConfiguration.mime[ext]
+                                            };
+
+                                            response.writeHead(200, headers);
+                                            response.end();
 
-                                            }
-                                            else {
-                                                next(false, request, response)
-                                            }
+                                        }
+                                        else {
+                                            next(false, request, response)
+                                        }
 
-                                        })
-                                    }
+                                    })
+                                }
 
 
-                                    e.emit('server#started', conf);
+                                e.emit('server#started', conf);
 
-                                    setTimeout( async function onStarted() {
+                                setTimeout( async function onStarted() {
 
-                                        if (
-                                            conf.server.scheme == 'https'
-                                            && !/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)
-                                        ) {
-                                            try {
-                                                await server.verifyCertificate(conf.host, conf.server.port);
-                                            } catch (err) {
-                                                // console.emerg(err.stack);
-                                                throw err;
-                                            }
+                                    if (
+                                        conf.server.scheme == 'https'
+                                        && !/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)
+                                    ) {
+                                        try {
+                                            await server.verifyCertificate(conf.host, conf.server.port);
+                                        } catch (err) {
+                                            // console.emerg(err.stack);
+                                            throw err;
                                         }
+                                    }
 
-                                        console.info('is now online V(-.o)V',
-                                        '\nbundle: [ ' + conf.bundle +' ]',
-                                        '\nenv: [ '+ conf.env +' ]',
-                                        '\nscope: [ '+ conf.scope +' ]',
-                                        '\nengine: ' + conf.server.engine,
-                                        '\nprotocol: ' + conf.server.protocol,
-                                        '\nscheme: ' + conf.server.scheme,
-                                        '\nport: ' + conf.server.port,
-                                        '\ndebugPort: ' + conf.server.debugPort,
-                                        '\npid: ' + process.pid,
-                                        '\nThis way please -> '+ conf.hostname + conf.server.webroot
-                                        );
-                                        // placing end:flag to allow the CLI to retrieve bundl info from here
-                                        console.notice('[ FRAMEWORK ] Bundle started !');
-                                    }, 700); // 1000 - Wait to make sure that the bundle is mounted on the file system
-                                });
-
-                                // placing strat:flag to allow the CLI to retrieve bundl info from here
-                                console.notice('[ FRAMEWORK ][ '+ process.pid +' ] '+ conf.bundle +'@'+ core.projectName +' mounted !');
-                                server.start(instance);
-
+                                    console.info('is now online V(-.o)V',
+                                    '\nbundle: [ ' + conf.bundle +' ]',
+                                    '\nenv: [ '+ conf.env +' ]',
+                                    '\nscope: [ '+ conf.scope +' ]',
+                                    '\nengine: ' + conf.server.engine,
+                                    '\nprotocol: ' + conf.server.protocol,
+                                    '\nscheme: ' + conf.server.scheme,
+                                    '\nport: ' + conf.server.port,
+                                    '\ndebugPort: ' + conf.server.debugPort,
+                                    '\npid: ' + process.pid,
+                                    '\nThis way please -> '+ conf.hostname + conf.server.webroot
+                                    );
+                                    // placing end:flag to allow the CLI to retrieve bundl info from here
+                                    console.notice('[ FRAMEWORK ] Bundle started !');
+                                }, 700); // 1000 - Wait to make sure that the bundle is mounted on the file system
                             });
 
-                            // -- BO
-                            e.emit('init', instance, middleware, conf);
-                            //In case there is no user init.
-                            if (!gna.initialized) {
-                                e.emit('complete', instance);
-                            }
-                            // -- EO
+                            // placing strat:flag to allow the CLI to retrieve bundl info from here
+                            console.notice('[ FRAMEWORK ][ '+ process.pid +' ] '+ conf.bundle +'@'+ core.projectName +' mounted !');
+                            server.start(instance);
 
-                        } else {
-                            errMsg = new Error('[ FRAMEWORK ] '+ (err.stack||err.message));
-                            console.error(errMsg);
+                        });
+
+                        // -- BO
+                        e.emit('init', instance, middleware, conf);
+                        //In case there is no user init.
+                        if (!gna.initialized) {
+                            e.emit('complete', instance);
                         }
-                    };
-
-                    var opt = {
-                        projectName     : core.projectName,
-                        bundle          : core.startingApp,
-                        //Apps list.
-                        bundles         : obj.bundles,
-                        allBundles      : obj.allBundles,
-                        env             : obj.env,
-                        scope           : obj.scope,
-                        isStandalone    : isStandalone,
-                        executionPath   : core.executionPath,
-                        conf            : obj.conf
-                    };
-
-                    var server = new Server(opt);
-                    server.onConfigured(initialize);
-                })//EO config.
-            //})//EO mount.
+                        // -- EO
+
+                    } else {
+                        errMsg = new Error('[ FRAMEWORK ] '+ (err.stack||err.message));
+                        console.error(errMsg);
+                    }
+                };
+
+                var opt = {
+                    projectName     : core.projectName,
+                    bundle          : core.startingApp,
+                    //Apps list.
+                    bundles         : obj.bundles,
+                    allBundles      : obj.allBundles,
+                    env             : obj.env,
+                    scope           : obj.scope,
+                    isStandalone    : isStandalone,
+                    executionPath   : core.executionPath,
+                    conf            : obj.conf
+                };
+
+                var server = new Server(opt);
+                server.onConfigured(initialize);
+            })//EO config.
         }
 
         /**
@@ -973,9 +966,10 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
 
 
 
-        var appName = null, path = null;
-
-        var packs = project.bundles;
+        var appName = null
+            , path  = null
+            , packs = project.bundles
+        ;
         if (isLoadedThroughCLI) {
             appName = getContext('bundle');
             if (!isPath) {
@@ -983,8 +977,8 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                 if (typeof (packs[appName].version) == 'undefined' && typeof (packs[appName].tag) != 'undefined') {
                     packs[appName].version = packs[appName].tag
                 }
-                packs[appName].releases[env].target = 'releases/' + appName + '/' + env + '/' + packs[appName].version;
-                path = (isDev) ? packs[appName].src : packs[appName].releases[env].target
+                packs[appName].releases[scope][env].target = 'releases/' + appName + '/' + scope + '/' + env + '/' + packs[appName].version;
+                path = (isDev) ? packs[appName].src : packs[appName].releases[scope][env].target
             } else {
                 path = _(process.argv[1])
             }
@@ -995,9 +989,9 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
         path = path.replace(root + '/', '');
 
         if ((/index.js/).test(path) || p[p.length - 1] == 'index') {
-            var self = null;
-            path = (self = path.split('/')).splice(0, self.length - 1).join('/');
-            self = null;
+            var _self = null;
+            path = (_self = path.split('/')).splice(0, _self.length - 1).join('/');
+            _self = null;
         }
 
         try {
@@ -1012,15 +1006,17 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                     let tmp = '';
                     // For all but dev
                     if (
-                        typeof (packs[bundle].releases) != 'undefined' && !isDev
+                        typeof (packs[bundle].releases) != 'undefined'
+                        && !isDev
                     ) {
-
-
-                        if (typeof (packs[bundle].version) == 'undefined' && typeof (packs[bundle].tag) != 'undefined') {
+                        if (
+                            typeof (packs[bundle].version) == 'undefined'
+                            && typeof (packs[bundle].tag) != 'undefined'
+                        ) {
                             packs[bundle].version = packs[bundle].tag
                         }
-                        packs[bundle].releases[env].target = 'releases/' + bundle + '/' + env + '/' + packs[bundle].version;
-                        tmp = packs[bundle].releases[env].target.replace(/\//g, '').replace(/\\/g, '');
+                        packs[bundle].releases[scope][env].target = 'releases/' + bundle + '/' + scope + '/' + '/' + env + '/' + packs[bundle].version;
+                        tmp = packs[bundle].releases[scope][env].target.replace(/\//g, '').replace(/\\/g, '');
 
                         if (!appName && tmp == path.replace(/\//g, '').replace(/\\/g, '')) {
                             appName = bundle;

package/framework/v0.1.6-alpha.10/core/template/_gitignore

@@ -0,0 +1,19 @@
+# SCM
+.svn
+.git
+
+# Desktop
+.DS_Store
+._.DS_Store
+desktop.ini
+
+# Project
+.gna
+bundles
+package-lock.json
+node_modules
+npm-debug.log
+releases
+bundles
+logs
+tmp

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.10}/core/template/boilerplate/bundle/controllers/controller.content.js

@@ -24,7 +24,7 @@ function {Bundle}ContentController() {
         self.renderJSON(data);
 
         // use this to render errors
-        // self.throwError( new Error('Error sample') );
+        // return self.throwError( new Error('Error sample') );
     }
 
     // The onReady Event is called when the controller is loaded

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.10}/core/template/conf/env.json

@@ -11,9 +11,10 @@
     "error"
   ],
   "defExt": "",
-  "mountPath": "{executionPath}/bundles",
-  "globalTmpPath": "{executionPath}/tmp",
-  "logsPath": "{executionPath}/logs",
+  "homedir": "~/.{projectName}",
+  "mountPath": "{homedir}/bundles",
+  "globalTmpPath": "{homedir}/tmp",
+  "logsPath": "{homedir}/var/logs",
   "{bundle}": {
     "{env}": {
       // This this the Root Domain
@@ -26,9 +27,9 @@
       // Since overrides are possible, last defined value will be the one taken in consideration by gina
       "rootDomain": "",
       "projectPath": "{executionPath}",
-      "projectVersion": "",
-      "projectVersionMajor": "",
-      "bundlesPath": "{executionPath}/bundles",
+      "projectVersion": "{projectVersion}",
+      "projectVersionMajor": "{projectVersionMajor}",
+      "bundlesPath": "{homedir}/bundles",
       "bundlePath": "{bundlesPath}/{bundle}",
       "sharedPath": "{executionPath}/shared",
       "cachePath": "{executionPath}/cache",
@@ -36,7 +37,8 @@
       "cronsPath": "{bundlesPath}/{bundle}/crons",
       "modelsPath": "{bundlesPath}/{bundle}/models",
       "libPath": "{bundlesPath}/{bundle}/lib",
-      "releases": "{executionPath}/releases",
+      "releases": "{homedir}/releases",
+      // "releases": "{executionPath}/releases",
       "sources": "{executionPath}/src",
       "tmpPath": "{executionPath}/tmp",
       "publicPath": "{bundlesPath}/{bundle}/public",

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.10}/lib/cmd/bundle/add.js

@@ -302,6 +302,8 @@ function Add(opt, cmd) {
         var data    = JSON.clone(self.projectData);
         var version = '0.0.1';
         var envs    = self.projects[self.projectName].envs;
+        var scopes  = self.projects[self.projectName].scopes;
+
         data.bundles[local.bundle] = {
             "_comment" : "Your comment goes here.",
             "version"   : version,
@@ -310,19 +312,27 @@ function Add(opt, cmd) {
             "link"      : "bundles/"+ local.bundle,
             "releases" : {}
         };
-        //"release/"+ local.bundle +"/prod/" + version
-        for (let i = 0, len = envs.length; i < len; ++i) {
-            let env = envs[i];
-            // ignore target for dev env
-            if ( self.projects[self.projectName]['dev_env'] == env ) {
-                continue;
+        //"release/"+ local.bundle +"/local/" +"/prod/" + version
+        for (let s = 0, sLen = scopes.length; s < sLen; ++s) {
+            let scope = scopes[s];
+            if ( typeof(data.bundles[local.bundle].releases[scope]) == 'undefined' ) {
+                data.bundles[local.bundle].releases[scope] = {}
             }
-            if ( typeof(data.bundles[local.bundle].releases[env]) == 'undefined' ) {
-                data.bundles[local.bundle].releases[env] = {}
+
+            for (let i = 0, len = envs.length; i < len; ++i) {
+                let env = envs[i];
+                // ignore target for dev env
+                if ( self.projects[self.projectName]['dev_env'] == env ) {
+                    continue;
+                }
+                if ( typeof(data.bundles[local.bundle].releases[scope][env]) == 'undefined' ) {
+                    data.bundles[local.bundle].releases[scope][env] = {}
+                }
+                data.bundles[local.bundle].releases[scope][env].target = "releases/"+ local.bundle +"/"+ scope +"/"+ env +"/" + version;
             }
-            data.bundles[local.bundle].releases[env].target = "releases/"+ local.bundle +"/"+ env +"/" + version;
         }
 
+
         try {
             lib.generator.createFileFromDataSync(data, self.projectManifestPath);
             local.projectDataWrote = true;

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.10}/lib/cmd/bundle/restart.js

@@ -190,7 +190,7 @@ function Restart(opt, cmd) {
 
             } else {
                 //Others releases.
-                var path    = 'releases/'+ bundle +'/' + env +'/'+ pkg[bundle].version;
+                var path    = 'releases/'+ bundle +'/' + scope +'/' + env +'/'+ pkg[bundle].version;
                 var version = pkg[bundle].version;
                 p = _( root +'/'+ path );//path.replace('/' + bundle, '')
                 d = _( root +'/'+ path + '/index.js' );

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.10}/lib/cmd/bundle/start.js

@@ -255,7 +255,7 @@ function Start(opt, cmd) {
             , len       = null
         ;
 
-        isRealApp(bundle, function(err, appPath){
+        isRealApp(bundle, function(err, appPath, bundleDir){
 
             if (err) {
                 terminal.error(err.stack||err.message)
@@ -288,6 +288,8 @@ function Start(opt, cmd) {
                     setContext('debugPort', opt.debugPort);
                     setContext('debugBrkEnabled', opt.debugBrkEnabled);
 
+                    // setPath('node_modules', _(self.projectLocation + '/node_modules', true));
+
                     params = [
                         // node arguments will be passed by gina
                         appPath,
@@ -312,9 +314,9 @@ function Start(opt, cmd) {
                         }
                     }
 
-
                     var child = spawn(opt.argv[0], params,
                         {
+                            // cwd: bundleDir,
                             detached: true
                         }
                     );
@@ -551,6 +553,7 @@ function Start(opt, cmd) {
             , d             = null
             , env           = self.projects[self.projectName]['def_env']
             , isDev         = ( self.projects[self.projectName]['dev_env'] == env ) ? true : false
+            , scope         = self.projects[self.projectName]['def_scope']
             , root          = self.projectLocation
             , bundleDir     = null
             , bundlesPath   = null
@@ -580,7 +583,7 @@ function Start(opt, cmd) {
 
             } else {
                 //Others releases.
-                path    = 'releases/'+ bundle +'/' + env +'/'+ pkg[bundle].version;
+                path    = 'releases/'+ bundle +'/' + scope +'/' + env +'/'+ pkg[bundle].version;
                 version = pkg[bundle].version;
                 p = _( root +'/'+ path );//path.replace('/' + bundle, '')
                 d = _( root +'/'+ path + '/index.js' );
@@ -610,7 +613,7 @@ function Start(opt, cmd) {
                 } else {
 
                     if (stats.isDirectory()) {
-                        callback(false, d)
+                        callback(false, d, p)
                     } else {
                         callback(new Error('[ ' + d + ' ] is not a directory'))
                     }