gina 0.1.6-alpha.57 → 0.1.6-alpha.59

package/framework/{v0.1.6-alpha.57 → v0.1.6-alpha.59}/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.6-alpha.57/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.59/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":8,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.57/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.59/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","isProxyHost","__defineGetter__","_this","Date","parseInt","getTime","timeout","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","headEls","existingLinks","console","debug","insertBefore","appendChild","Toolbar"]
 }

package/framework/{v0.1.6-alpha.57 → v0.1.6-alpha.59}/core/config.js

@@ -123,7 +123,7 @@ function Config(opt, contextResetNeeded) {
 
         self.env    = env;
         self.scope  = scope;
-        console.debug('[ config ] Loading conf...');
+        console.debug('[CONFIG] Loading conf...');
 
         // framework settings
         var filename = null, content = null;
@@ -341,7 +341,7 @@ function Config(opt, contextResetNeeded) {
         },
 
         set : function(env) {
-            this.current = env || this.template.defEnv;
+            this.current = env || process.env.NODE_ENV || this.template.defEnv;
         },
 
         /**
@@ -436,7 +436,7 @@ function Config(opt, contextResetNeeded) {
     this.Scope = {
         template : requireJSON( getEnvVar('GINA_FRAMEWORK_DIR') +'/core/template/conf/env.json'),
         set : function(scope) {
-            this.current = scope || this.template.defScope;
+            this.current = scope || process.env.NODE_SCOPE || this.template.defScope;
         },
 
         /**
@@ -558,9 +558,12 @@ function Config(opt, contextResetNeeded) {
         var isStandalone    = true,
             masterPort      = null,
             appPort         = null,
-            env             = self.Env.get(),
-            envIsDev        = ( /^true$/i.test(process.env.NODE_ENV_IS_DEV) ) ? true : false
-            scope           = self.Scope.get(),
+            // env             = self.Env.get(),
+            env             = (typeof(process.env.NODE_ENV) != 'undefined' ) ? process.env.NODE_ENV: self.Env.get(),
+            envIsDev        = ( /^true$/i.test(process.env.NODE_ENV_IS_DEV) ) ? true : false,
+            // scope           = self.Scope.get(),
+            scope           = (typeof(process.env.NODE_SCOPE) != 'undefined' ) ? process.env.NODE_SCOPE: self.Scope.get(),
+            scopeIsLocal    = ( /^true$/i.test(process.env.NODE_SCOPE_IS_LOCAL) ) ? true : false,
             appsPath        = '',
             modelsPath      = '',
             projectPath     = '',
@@ -568,6 +571,8 @@ function Config(opt, contextResetNeeded) {
             projectConf     = ctx.project,
             portsReverse    = ctx.portsReverse
         ;
+        console.debug('[CONFIG] Reading env: '+ env);
+        console.debug('[CONFIG] Reading scope: '+ scope);
 
         if (!self.projectName) {
             self.projectName = ctx.config.projectName
@@ -626,14 +631,14 @@ function Config(opt, contextResetNeeded) {
 
         for (let app in content) {
             //Checking if genuine app.
-            console.debug('Checking if application [ '+ app +' ] is registered ');
+            console.debug('[CONFIG] Checking if application [ '+ app +' ] is registered ');
             if ( typeof(pkg[app]) == 'undefined' ) {
-                console.debug('Skipping app [ '+ app +' ]; not registered ...');
+                console.debug('[CONFIG] Skipping app [ '+ app +' ]; not registered ...');
                 continue;
             }
 
             appPath = _(root +'/'+ pkg[app].link, true);
-            console.debug('Checking appPath [ '+ appPath +' ] ');
+            console.debug('[CONFIG] Checking appPath [ '+ appPath +' ] ');
             // cleanup symlinks
             let targetAppPathObj = new _(appPath, true);
             if ( targetAppPathObj.existsSync() ) {
@@ -642,11 +647,11 @@ function Config(opt, contextResetNeeded) {
             try {
                 if (envIsDev) {
                     targetAppPathObj = new _(root +'/'+ pkg[app].src, true);
-                    console.debug('[Config][envIsDev:'+ envIsDev +'] Linking ['+ targetAppPathObj.toString() +'] to [ '+ appPath +' ] ');
+                    console.debug('[CONFIG][env:'+env+'][envIsDev:'+ envIsDev +'] Linking ['+ targetAppPathObj.toString() +'] to [ '+ appPath +' ] ');
                     targetAppPathObj.symlinkSync(appPath);
                 } else {
                     targetAppPathObj = new _(root +'/'+ pkg[app].releases[scope][env].target, true);
-                    console.debug('[Config][envIsDev:'+ envIsDev +'] Linking ['+ targetAppPathObj.toString() +'] to [ '+ appPath +' ] ');
+                    console.debug('[CONFIG][env'+env+'][envIsDev:'+ envIsDev +'] Linking ['+ targetAppPathObj.toString() +'] to [ '+ appPath +' ] ');
                     targetAppPathObj.symlinkSync(appPath);
                 }
             } catch (releaseError) {
@@ -674,13 +679,13 @@ function Config(opt, contextResetNeeded) {
                     configFiles = fs.readdirSync(_(appPath + '/config'));
                 } catch (mountingError) {
                     //console.emerg('Dependency bundle config not found for `'+ app +'/'+ env +'`: trying to load on the fly from src');
-                    console.warn('Dependency bundle config not found for `'+ app +'/'+ env +'`: trying to load on the fly from src');
+                    console.warn('[CONFIG] Dependency bundle config not found for `'+ app +'/'+ env +'`: trying to load on the fly from src');
                     let appSrcPath = _(root +'/'+ pkg[app].src, true);
                     configFiles = fs.readdirSync(_(appSrcPath + '/config'));
                     setPath('bundles', _(appSrcPath, true));
                     appPath = appSrcPath;
                     newContent[app][env].bundlesPath = bundlesPath = appSrcPath.replace( new RegExp('/'+ app), '' );
-                    console.warn('Dependency bundle config loaded from '+ appSrcPath);
+                    console.warn('[CONFIG] Dependency bundle config loaded from '+ appSrcPath);
                 }
 
 
@@ -879,7 +884,7 @@ function Config(opt, contextResetNeeded) {
                 try {
                     appPort = portsReverse[app+'@'+self.projectName][env][ newContent[app][env].server.protocol ][ newContent[app][env].server.scheme ];
                 } catch (err) {
-                    console.emerg('[ config ][ settings.server.protocol ] Protocol or scheme settings inconsistency found in `'+ app +'/config/settings`. To fix this, try to run `gina project:import @'+ self.projectName +' --path='+  projectConf.path +'`\n\r'+ err.stack);
+                    console.emerg('[CONFIG][ settings.server.protocol ] Protocol or scheme settings inconsistency found in `'+ app +'/config/settings`. To fix this, try to run `gina project:import @'+ self.projectName +' --path='+  projectConf.path +'`\n\r'+ err.stack);
                     process.exit(1)
                 }
                 //I had to for this one...
@@ -968,16 +973,16 @@ function Config(opt, contextResetNeeded) {
                     "projectPath"           : projectPath,
                     "bundlesPath"           : appsPath,
                     "modelsPath"            : modelsPath,
+                    "bundle"                : app,
+                    "env"                   : env,
+                    "scope"                 : scope,
                     "tmpPath"               : newContent[app][env].tmpPath,
-                    "scope"                 : newContent[app][env].server.scope,
+                    // "scope"                 : newContent[app][env].server.scope,
                     "rootDomain"            : rootDomain,
                     "projectVersion"        : manifest,
                     "projectVersionMajor"   : manifest.version.split(/\./g)[0],
                     "host"                  : newContent[app][env].host,
                     "scheme"                : newContent[app][env].server.scheme,
-                    "env"                   : env,
-                    "scope"                 : scope,
-                    "bundle"                : app,
                     "version"               : version
                 };
 
@@ -1237,11 +1242,11 @@ function Config(opt, contextResetNeeded) {
         // environment
         var cacheless       = self.isCacheless()
             , isStandalone  = self.Host.isStandalone()
-            , env           = self.env || self.Env.get() // env
-            , scope         = self.scope || self.Scope.get() // scope
+            , env           = process.env.NODE_ENV || self.env || self.Env.get() // env
+            , scope         = process.env.NODE_SCOPE || self.scope || self.Scope.get() // scope
             , conf          = self.envConf // env conf
         ;
-        console.debug('[ CONFIG ] loading `'+ bundle +'/'+ env +'` configuration, please wait ...');
+        console.debug('[CONFIG] Loading `'+ bundle +'/'+ env +':'+ scope +'` configuration, please wait ...');
 
 
         self.setServerCoreConf(bundle, env, scope, conf.core);

package/framework/{v0.1.6-alpha.57 → v0.1.6-alpha.59}/core/connectors/couchbase/lib/connector.v4.js

@@ -70,10 +70,12 @@ function Connector(dbString) {
         var onError = function (err, next) {
             delete self.instance.reconnecting;
             self.instance.reconnected = self.instance.connected = false;
-            console.error('[ CONNECTOR ][ ' + local.bundle +' ] couchbase could not be reached !!\n'+ ( err.stack || err.message || err ) );
+            console.debug('[CONNECTOR][' + local.bundle +'] Scope is: '+ process.env.NODE_SCOPE );
+            console.debug('[CONNECTOR][' + local.bundle +'] Env is: '+ process.env.NODE_ENV );
+            console.error('[CONNECTOR][' + local.bundle +'] Couchbase could not be reached !!\n'+ ( err.stack || err.message || err ) );
 
             // reconnecting
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] trying to reconnect in a few secs...');
+            console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Trying to reconnect in a few secs...');
             self.instance.reconnecting = true;
 
             setTimeout( function onRetry(){
@@ -88,8 +90,8 @@ function Connector(dbString) {
 
         // once
         var onConnect = function onConnect(cb){
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ] couchbase is alive !!');
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ] now connected...');
+            console.debug('[CONNECTOR][' + local.bundle +'] Couchbase is alive !!');
+            console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'] Now connected...');
 
             self.instance.reconnected  = self.instance.connected   = true;
             var options = local.options;
@@ -110,7 +112,7 @@ function Connector(dbString) {
                 local.env       = env;
 
                 if ( typeof(cb) != 'undefined' ) { // this portition is not working yet on Mac OS X
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] connected to couchbase !!');
+                    console.debug('[CONNECTOR][' + local.bundle +']['+ env +'] Connected to couchbase !!');
 
 
                     modelUtil.setConnection(bundle, name, self.instance);
@@ -124,11 +126,11 @@ function Connector(dbString) {
                                 cb(err)
                             })
                     } else {
-                        cb(new Error('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] '+ modelsPath+ ' not found') )
+                        cb(new Error('[CONNECTOR][' + local.bundle +']['+ env +'] '+ modelsPath+ ' not found') )
                     }
 
                 } else {
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] connection to bucket `'+ name +'` is being kept alive ...');
+                    console.debug('[CONNECTOR][' + local.bundle +']['+ env +'] Connection to bucket `'+ name +'` is being kept alive ...');
                 }
             });
             // intercepting conn event thru gina
@@ -150,7 +152,7 @@ function Connector(dbString) {
                     || /cannot perform operations on a shutdown bucket/.test(err.message ) && !self.reconnecting && !self.reconnected
                 ) {
                     // reconnecting
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] trying to reconnect in 5 secs...');
+                    console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Trying to reconnect in 5 secs...');
                     self.reconnecting = true;
 
                     setTimeout( function onRetry(){
@@ -167,14 +169,14 @@ function Connector(dbString) {
                     if (typeof(next) != 'undefined') {
                         next(err); // might just be a "false" error: `err` is replaced with cb() caller `data`
                     } else {
-                        console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
+                        console.error('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
                         return;
                     }
                 } else {
 
                     if (err && err instanceof Error) {
 
-                        console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
+                        console.error('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
 
                         if ( typeof(err) == 'object' ) {
                             res.end(JSON.stringify({
@@ -192,7 +194,7 @@ function Connector(dbString) {
                         if (typeof(next) != 'undefined') {
                             next(err); // might just be a "false" error: `err` is replaced with cb() caller `data`
                         } else {
-                            console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
+                            console.error('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
                             return;
                         }
                     }
@@ -209,13 +211,13 @@ function Connector(dbString) {
         dbString.bucketName = dbString.database;
 
         try {
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] Trying to connect to bucket `'+ dbString.bucketName +'`');
+            console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Trying to connect to bucket `'+ dbString.bucketName +'`');
             // if ( typeof(dbString.password) != 'undefined' && typeof(self.cluster.authenticate) == 'undefined' ) {
                 // conn = await self.cluster.openBucket(dbString.database, dbString.password, function onBucketOpened(bErr) {
                 conn = await couchbase.connect(dbString.protocol + dbString.host, dbString, function onBucketOpened(bErr, conn) {
                     if (bErr) {
-                        // console.emerg('[ CONNECTOR ][ ' + local.bundle +' ] Could not connect to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (bErr.stack || bErr.message || bErr) + '\nCheck:\n - if couchbabse is running\n - if bucket `'+dbString.bucketName+'` exists\n - if you have permission to access couchabase' );
-                        var cErr = new Error('Could not connect to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (bErr.stack || bErr.message || bErr) + '\nCheck:\n - if couchbabse is running\n - if bucket `'+dbString.bucketName+'` exists\n - if you have permission to access couchabase');
+                        // console.emerg('[CONNECTOR][' + local.bundle +'] Could not connect to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (bErr.stack || bErr.message || bErr) + '\nCheck:\n - if couchbabse is running\n - if bucket `'+dbString.bucketName+'` exists\n - if you have permission to access couchabase' );
+                        var cErr = new Error('[CONNECTOR][' + local.bundle +'] Could not connect to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (bErr.stack || bErr.message || bErr) + '\nCheck:\n - if couchbabse is running\n - if bucket `'+dbString.bucketName+'` exists\n - if you have permission to access couchabase');
 
                         if ( typeof(cb) != 'undefined' ) {
                             return cb(cErr)
@@ -227,7 +229,7 @@ function Connector(dbString) {
                     conn.sdk        = sdk;
 
                     // open bucket
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] Connecting to bucket `'+ dbString.bucketName +'`');
+                    console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Connecting to bucket `'+ dbString.bucketName +'`');
                     var bucketConn = conn.bucket(dbString.bucketName);
                     bucketConn.sdk = sdk;
                     // Get a reference to the default collection, required only for older Couchbase server versions
@@ -255,7 +257,7 @@ function Connector(dbString) {
             // }
 
         } catch (err) {
-            console.error('[ CONNECTOR ][ ' + local.bundle +' ] '+ local.env +' ] couchbase could not connect to bucket `'+ dbString.database +'`\n'+ (err.stack || err.message || err) );
+            console.error('[CONNECTOR][' + local.bundle +']['+ local.env +'] Couchbase could not connect to bucket `'+ dbString.database +'`\n'+ (err.stack || err.message || err) );
             onError(err, cb)
         }
 
@@ -273,11 +275,15 @@ function Connector(dbString) {
      * */
     var init = function(dbString) {
         try {
+            local.bundle    = getConfig().bundle;// jshint ignore:line
+            console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] Checking dbString.host: '+ dbString.host);
+            // console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] dbString:\n'+ JSON.stringify(dbString, null, 2));
+            // console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] local.options:\n'+ JSON.stringify(local.options, null, 2));
             dbString        = merge(dbString, local.options);
             local.options   = dbString;
-            local.bundle    = getConfig().bundle;// jshint ignore:line
 
-            console.info('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ][ ' + dbString.database +' ] authenticating to couchbase cluster @'+ dbString.protocol + dbString.host);
+
+            console.info('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] authenticating to couchbase cluster @'+ dbString.protocol + dbString.host);
 
             try {
                 self.cluster = new couchbase.Cluster(dbString.protocol + dbString.host);
@@ -285,10 +291,10 @@ function Connector(dbString) {
                 if ( typeof(self.cluster.authenticate) != 'undefined' )
                     self.cluster.authenticate(dbString.username, dbString.password);
             } catch(_err) {
-                console.error('[ CONNECTOR ][ ' + local.bundle +' ] could not authenticate to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (_err.stack || _err.message || _err) );
+                console.error('[CONNECTOR][' + local.bundle +'] Could not authenticate to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (_err.stack || _err.message || _err) );
             }
 
-            console.info('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ][ ' + dbString.database +' ] connecting to couchbase cluster @'+ dbString.protocol + dbString.host);
+            console.info('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] Connecting to couchbase cluster @'+ dbString.protocol + dbString.host);
 
             self.connect(dbString)
 
@@ -347,7 +353,7 @@ function Connector(dbString) {
             self.pingId = setInterval(function onTimeout(){
 
                 if (!self.instance.connected) {
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ] connecting to couchbase');
+                    console.debug('[CONNECTOR][' + local.bundle +'] Connecting to couchbase');
 
                     self.instance.reconnected = false;
                     self.instance.reconnecting = true;
@@ -365,7 +371,7 @@ function Connector(dbString) {
 
             ncb(cb)
         } else {
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ] sent ping to couchbase ...');
+            console.debug('[CONNECTOR][' + local.bundle +'] Sent ping to couchbase ...');
             self.ping(interval, cb, ncb);
         }
     }

package/framework/{v0.1.6-alpha.57 → v0.1.6-alpha.59}/core/gna.js

@@ -598,6 +598,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
          * */
         gna.onInitialize = process.onInitialize = function(callback) {
 
+            console.debug('[ FRAMEWORK ] Bootstrap Initialization... ');
             gna.initialized = true;
             e.once('init', function(instance, middleware, conf) {
 

package/framework/{v0.1.6-alpha.57 → v0.1.6-alpha.59}/core/model/index.js

@@ -54,8 +54,8 @@ function Model(namespace, _config) {
 
 
     var setup = function(namespace) {
-        if ( typeof(namespace) == 'undefined' || namespace == '') {
-            console.error('[ MODEL ][ '+ namespace +' ] MODEL:ERR:1 EEMPTY: Model namespace',  __stack);
+        if ( typeof(namespace) == 'undefined' || namespace == '') {
+            console.error('[MODEL]['+ namespace +'] MODEL:ERR:1 EEMPTY: Model namespace',  __stack);
         }
 
         var model, namespace = namespace.split(/\//g);
@@ -75,8 +75,8 @@ function Model(namespace, _config) {
         }
 
 
-        console.debug('[ MODEL ][ ' + model +' ] Bundle: '+ bundle);
-        //console.debug('[ MODEL ][ ' + model +' ] Model: '+ model);
+        console.debug('[MODEL][' + model +'] Bundle: '+ bundle);
+        //console.debug('[MODEL][' + model +'] Model: '+ model);
         self.name       = _connector;
         self.bundle     = bundle;
         self.model      = model;
@@ -115,29 +115,31 @@ function Model(namespace, _config) {
             _configuration = conf.connectors;
             self.connector = _configuration[self.name].connector;
 
-            console.debug('[ MODEL ][ ' + model +' ] About to scan: '+ conf.path);
+            console.debug('[MODEL][' + model +'] About to scan: '+ conf.path);
             //TODO - More controls...
 
             //For now, I just need the F..ing entity name.
             connectorPath       = local.connectorPath = _(GINA_FRAMEWORK_DIR +'/core/connectors/'+ self.connector);
             var modelPath       = local.modelPath = _(conf.path + '/' + modelDirName);
             var entitiesPath    = local.entitiesPath = _(modelPath + '/entities');
-            console.debug('[ MODEL ][ ' + model +' ] Scanning model entities: ', entitiesPath +' - Existing path ? '+ fs.existsSync(entitiesPath) );
+            console.debug('[MODEL][' + model +'] Scanning model entities: ', entitiesPath +' - Existing path ? '+ fs.existsSync(entitiesPath) );
             if (!fs.existsSync(entitiesPath)) {
                 //fs.mkdirSync(entitiesPath) // creating empty path
                 new _(entitiesPath).mkdirSync();
             }
 
             connectorPath   = _(connectorPath + '/lib/connector.js');
-            console.debug('[ MODEL ][ ' + model +' ] Loading connector: ' + connectorPath);
+            console.debug('[MODEL][' + model +'] Loading Connector: ' + connectorPath);
             //Getting Entities Manager.
             var exists = fs.existsSync(connectorPath);
             if (exists) {
-                if (cacheless)
+                if (cacheless) {
                     delete require.cache[require.resolve(_(connectorPath, true))];
+                }
 
+                console.debug('[MODEL][' + model +'] Using connector path: ' + _(connectorPath, true));
                 var Connector = require(_(connectorPath, true));
-
+                console.debug('[MODEL][' + model +'] Connecting ... ');
                 self.connect(
                     Connector,
                     function onConnect(err, conn) {
@@ -154,12 +156,12 @@ function Model(namespace, _config) {
             } else {//Means that no connector was found in models.
 
                 //finished.
-                self.emit('model#ready', new Error('[ MODEL ][ '+ model +' ] No connector found'), self.bundle, self.name, conn)
+                self.emit('model#ready', new Error('[MODEL]['+ model +'] No connector found'), self.bundle, self.name, conn)
             }
 
         } else {
-            console.warn('[ MODEL ][ ' + model +' ] no configuration found...');
-            self.emit('model#ready', new Error('[ MODEL ][ ' + model +' ] no configuration found for your model: ' + model), self.bundle, self.name, null)
+            console.warn('[MODEL][' + model +'] No configuration found...');
+            self.emit('model#ready', new Error('[MODEL][' + model +'] No configuration found for your model: ' + model), self.bundle, self.name, null)
         }
 
         return self
@@ -168,7 +170,7 @@ function Model(namespace, _config) {
 
     this.connect = function(Connector, callback) {
         if ( typeof(self.connectors[_connector]) == 'undefined' ) {
-            //console.debug('[ MODEL ] Need to create connector instance ...');
+            //console.debug('[MODEL] Need to create connector instance ...');
             self.connectors[_connector] = {};
             var connector = new Connector( self.getConfig(_connector) );
 
@@ -204,7 +206,10 @@ function Model(namespace, _config) {
         var i = i || 0;
 
         var configuration = null;
-        var env = null, conf = null, connectors = null;
+        var env             = null
+            , conf          = null
+            , connectors    = null
+        ;
         if ( typeof (_config) != 'undefined' ) {
             configuration = _config;
             env = _config.env;
@@ -215,21 +220,21 @@ function Model(namespace, _config) {
             env = configuration.Env.current;
             conf = configuration.Env.getConf(bundle, env);
         }
-        console.debug('[ MODEL ][ ' + _connector + ' ] env ', conf.env);
-        console.debug('[ MODEL ][ ' + _connector + ' ] configuration modelsPath ', conf.modelsPath);
-        console.debug('[ MODEL ][ ' + _connector + ' ] connectors ', connectors);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] env ', conf.env);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] configuration modelsPath ', conf.modelsPath);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] connectors ', connectors);
 
         // try {
 
         //     var locals = _locals = configLib.getSync('gina', 'locals.json')
         // } catch (err) {
-        //     console.emerg('[ MODEL ][ ' + _connector +' ] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
+        //     console.emerg('[MODEL][' + _connector +'] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
         //     if ( i < 10) {
-        //         console.debug('[ MODEL ][ ' + _connector +' ] about to retry to load locals.json');
+        //         console.debug('[MODEL][' + _connector +'] About to retry to load locals.json');
         //         setTimeout(function(){
 
         //             i = i+1;
-        //             console.debug('[ MODEL ][ ' + _connector +' ] retry ('+i+') ...');
+        //             console.debug('[MODEL][' + _connector +'] Retry ('+i+') ...');
         //             return getConfigSync(bundle, i)
         //         }, 300)
 
@@ -245,13 +250,12 @@ function Model(namespace, _config) {
             // configuration object.
             var confObj = {
                 connectors  : connectors,
-                path        : conf.modelsPath/**,
-                locals      : locals*/
+                path        : conf.modelsPath
             };
 
             return confObj
         } else {
-            throw new Error('[ MODEL ][ ' + _connector +' ] Config not instantiated');
+            throw new Error('[MODEL][' + _connector +'][getConfigSync] Config not instantiated');
             return undefined
         }
     }
@@ -277,7 +281,7 @@ function Model(namespace, _config) {
             // entities == null when the database server has not started.
             if ( err ) {
                 console.error(err.stack||err.message)
-                //console.log('No entities found for [ '+ self.name +':'+ entityName +'].\n 1) Check if the database is started.\n2) Check if exists: /models/entities/'+ entityName);
+                //console.debug('No entities found for ['+ self.name +':'+ entityName +'].\n 1) Check if the database is started.\n2) Check if exists: /models/entities/'+ entityName);
             }
             callback(err, bundle, model, conn)
         });

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

@@ -320,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,
@@ -612,7 +613,7 @@ function Start(opt, cmd) {
 
         //Checking root.
         var dExists = new _(d, true).existsSync();
-        terminal.debug('[Checking bundle index] `'+ d +'`: '+ dExists);
+        terminal.debug('[Checking bundle bootstrap] `'+ d +'`: '+ dExists);
         if ( dExists ) {
             //checking bundle directory.
             fs.stat(p, function(err, stats) {

package/framework/{v0.1.6-alpha.57 → v0.1.6-alpha.59}/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', true) +'`');
+                console.debug('[build] Linking node_modules to from `'+ internalNodeModulesPathObj.toString() +'` to `'+ _(destination +'/node_modules', true) +'`');
                 internalNodeModulesPathObj.symlinkSync(_(destination +'/node_modules', true));
             }
             internalNodeModulesPathObj = null;

package/framework/{v0.1.6-alpha.57 → v0.1.6-alpha.59}/lib/session-store.js

@@ -23,14 +23,14 @@ function SessionStore(session) {
     try {
         connector         = conf.content.connectors[session.name].connector;
     } catch (err) {
-        throw new Error('SessionStore could not be loaded: Connector issue. Please check your bundle configuration @config/connectors.json\n'+ err.stack);
+        throw new Error('[SessionStore] Could not be loaded: Connector issue. Please check your bundle configuration @config/connectors.json\n'+ err.stack);
     }
 
     var connectorName = 'couchbase';
     var filename = _(connectorsPath + '/'+ connector +'/lib/session-store.js', true);
 
     if ( !fs.existsSync(filename) ) {
-        throw new Error('SessionStore could not be loaded: `'+ filename+'` is missing');
+        throw new Error('[SessionStore] Could not be loaded: `'+ filename+'` is missing');
     }
 
     return require(filename)(session, bundle)

package/package.json

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

package/framework/v0.1.6-alpha.57/VERSION

@@ -1 +0,0 @@
-0.1.6-alpha.57

package/framework/v0.1.6-alpha.57/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.57/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}