gina 0.1.1-alpha.8 → 0.1.1-alpha.82

package/framework/{v0.1.1-alpha.8 → v0.1.1-alpha.82}/helpers/task.js

@@ -1,4 +1,5 @@
 var fs              = require('fs');
+var os              = require("os");
 var EventEmitter    = require('events').EventEmitter;
 var spawn           = require('child_process').spawn;
 
@@ -8,7 +9,7 @@ module.exports = function () {
 
 	 /**
      * Run commande on local cli
-     * 
+     *
      * Could also be used to open an url but need some tweaking
      * // sample of a cross platform `open` command
      *  e.g.: var openCmd = (process.platform == 'darwin'? 'open': process.platform == 'win32'? 'start': 'xdg-open');
@@ -19,15 +20,18 @@ module.exports = function () {
      *
      * */
 	run = function(cmdline, opt, cb) {
-        
+
 		var pathArr = (new _(__dirname).toUnixStyle().split(/\//g));
 		var root =  pathArr.splice(0, pathArr.length-6).join('/');
 
-        var opt = opt || {};
-        if (!opt.cwd)
+        opt = opt || {};
+        if (!opt.cwd) {
             opt.cwd = root;
+        }
+        process.chdir(opt.cwd);
+
 
-        var tmp = opt.tmp || process.cwd();
+        var tmp = opt.tmp || os.tmpdir() || process.cwd();
 
         if ( !fs.existsSync(tmp) ) {
             fs.mkdirSync(tmp)
@@ -41,7 +45,7 @@ module.exports = function () {
         var result, error = false;
         var hasCalledBack = false;
         var e = new EventEmitter();
-        
+
         e.onData = function(callback) {
             e.once('run#data', callback);
 
@@ -66,20 +70,20 @@ module.exports = function () {
         if (typeof(cmdline) == 'string') {
             cmdline = cmdline.split(' ')
         }
-        
+
         console.debug('opt.outToProcessSTD => ', opt.outToProcessSTD);
         if ( typeof(opt) != 'undefined' && typeof(opt.outToProcessSTD) != 'undefined' && /^true$/i.test(opt.outToProcessSTD) ) {
             // mainly used for task like `npm install`. This is not the default setup
             cmd = spawn(cmdline.splice(0,1).toString(), cmdline, { cwd: opt.cwd, stdio: [ process.stdin, process.stdout, process.stderr ] });
         } else {
             cmd = spawn(cmdline.splice(0,1).toString(), cmdline, { cwd: opt.cwd, stdio: [ 'ignore', out, err ] });
-        }   
+        }
         cmd.on('stdout', function(data) {
             var str = data.toString();
             var lines = str.split(/(\r?\n)/g);
             result = lines.join('');
             console.log('out: ', result);
-            
+
             e.emit('run#data', result)
         });
 
@@ -88,10 +92,10 @@ module.exports = function () {
             var str = err.toString();
             error = str || false;
             console.log('err: ', error);
-            
+
             e.emit('run#err', error)
         });
-        
+
         // cmd.on('exit', function (code){
         //     console.debug('exiting with code '+ code +' ....');
         // });
@@ -130,11 +134,14 @@ module.exports = function () {
                     }
                     e.emit('run#complete', error, result)
                 } else {
+                    if (error) {
+                        console.debug('task::run encountered an error: ' + error);
+                    }
                     if (cb) {
-                        cb('task::run encountered an error: ' + error, result);
+                        cb(error, result);
                         return;
                     }
-                    e.emit('run#complete', 'task::run encountered an error: ' + error, result)
+                    e.emit('run#complete', error, result)
                 }
 
 
@@ -143,7 +150,7 @@ module.exports = function () {
             }
         });
 
-        
+
 
         return e
 	};

package/framework/{v0.1.1-alpha.8 → v0.1.1-alpha.82}/lib/cmd/framework/init.js

@@ -1,6 +1,8 @@
 var fs              = require('fs');
 var EventEmitter    = require('events').EventEmitter;
 var e               = new EventEmitter();
+const { execSync }  = require('child_process');
+
 var console         = lib.logger;
 var ginaPath        = getPath('gina').root;
 var help            = require(ginaPath + '/utils/helper');
@@ -129,11 +131,13 @@ function Initialize(opt) {
         var source  = getPath('gina').root + '/resources/home/main.json';
         var target  = self.opt.homedir + '/main.json';
         var version = 'v' + getEnvVar('GINA_VERSION');
+        var prefix  = execSync('npm config get prefix').toString().replace(/\n/g, '');
 
         var data = require(source);
         var dic = {
             'release' : self.release,
-            'version' : version
+            'version' : version,
+            'prefix' : prefix
         };
         data = whisper(dic, data);
 
@@ -157,7 +161,6 @@ function Initialize(opt) {
             }
         }
 
-
         // envs
         mainConfig.envs = merge(mainConfig.envs, data.envs, true);
         // scopes
@@ -176,6 +179,7 @@ function Initialize(opt) {
         var defCulture  = (mainConfig['def_culture']) ? mainConfig['def_culture'][self.release] : data.def_culture[self.release];
         var defTimezone = (mainConfig['def_timezone']) ? mainConfig['def_timezone'][self.release] : data.def_timezone[self.release];
         var defLogLevel = (mainConfig['def_log_level']) ? mainConfig['def_log_level'][self.release] : data.def_log_level[self.release];
+        var defPrefix   = (mainConfig['def_prefix']) ? mainConfig['def_prefix'][self.release] : data.def_prefix[self.release];
 
 
         if ( mainConfig.protocols[self.release].indexOf(defProtocol) < 0 )
@@ -187,18 +191,20 @@ function Initialize(opt) {
         if ( mainConfig.cultures[self.release].indexOf(defCulture) < 0 )
             mainConfig.cultures[self.release].push(defCulture);
 
-        if ( mainConfig.cultures[self.release].indexOf(defCulture) < 0 )
-            mainConfig.cultures[self.release].push(defCulture);
 
         // Update only when needed
         if (!mainConfig.def_culture)
             mainConfig.def_culture = data.def_culture;
+
         if (!mainConfig.def_timezone)
             mainConfig.def_timezone = data.def_timezone;
 
         if (!mainConfig.def_log_level)
             mainConfig.def_log_level = data.def_log_level;
 
+        if (!mainConfig.def_prefix)
+            mainConfig.def_prefix = data.def_prefix;
+
         mainConfig.protocols[self.release].sort();
         mainConfig.schemes[self.release].sort();
         mainConfig.cultures[self.release].sort();
@@ -257,6 +263,7 @@ function Initialize(opt) {
         }
     }
 
+
     /**
      * Check env
      *
@@ -326,6 +333,7 @@ function Initialize(opt) {
         console.debug('Checking framework settings...');
         var main            = require( _(self.opt.homedir + '/main.json', true) )
             , version       = getEnvVar('GINA_VERSION')
+            , prefix        = getEnvVar('GINA_PREFIX') || main['def_prefix'][self.release]
             , env           = getEnvVar('GINA_ENV') || main['def_env'][self.release]
             , scope         = getEnvVar('GINA_SCOPE') || main['def_scope'][self.release]
             , settings      = requireJSON( _( getPath('gina').root + '/resources/home/settings.json', true ) )
@@ -335,7 +343,13 @@ function Initialize(opt) {
 
         // case of port & debug_port updated
         var targetObj = new _(target);
-        var localUserSettings = requireJSON(target);
+        var localUserSettings = null;
+        if ( targetObj.existsSync() ) {
+            localUserSettings = requireJSON(target);
+        } else {
+            localUserSettings = JSON.clone(settings);
+        }
+
         if ( !getEnvVar('GINA_PORT') && targetObj.existsSync() ) {
             if ( typeof(localUserSettings.port) != 'undefined' ) {
                 setEnvVar('GINA_PORT', ~~localUserSettings.port);
@@ -362,6 +376,7 @@ function Initialize(opt) {
              */
 
             var dic = {
+                'prefix' : prefix,
                 'version' : version,
                 'env' : env,
                 'env_is_dev' : (main['dev_env'][self.release] == env) ? true : false,

package/framework/{v0.1.1-alpha.8 → v0.1.1-alpha.82}/lib/cmd/framework/set.js

@@ -1,7 +1,7 @@
 var console = lib.logger;
 
 function Set(opt){
-    
+
     var mainConfPath        = _(GINA_HOMEDIR + '/main.json')
         , mainConf          = require(mainConfPath)
         , mainSettingsPath  = _(GINA_HOMEDIR +'/'+ GINA_SHORT_VERSION + '/settings.json')
@@ -9,7 +9,7 @@ function Set(opt){
     ;
 
     var init = function(opt){
-        
+
         var a = [], k = null, v = null;
         for (let i=3; i<process.argv.length; ++i) {
             a = process.argv[i].split(/=/);
@@ -28,41 +28,64 @@ function Set(opt){
             k = k.replace(/-—/, '--');
         }
         switch(k) {
+            case '--prefix':
+                setPrefix(v);
+            break;
+
             case '--log_level':
             case '--log-level':
                 setLogLevel(v);
             break;
-            
+
             case '--env':
                 setEnv(v);
             break;
-            
+
             case '--scope':
                 setScope(v)
             break;
-            
+
             case '--culture':
                 setCulture(v);
             break;
-            
+
             case '--port':
                 setPort(v);
-            break;  
-            
+            break;
+
             case '--debug_port':
             case '--debug-port':
                 setDebugPort(v);
-            break;            
-            
+            break;
+
             case '--timezone':
                 setTimezone(v);
             break;
-            
+
             default:
                 err = new Error('Setting environment variable `'+ k +'` is not supported');
                 console.error(err.message);
-                
+
+        }
+    }
+
+    var setPrefix = function(prefix) {
+        var err = null;
+        if ( !prefix || typeof(prefix) == 'undefined' || prefix == '' ) {
+            err = new Error('Prefix cannot be left empty or undefined');
+            console.error(err.message);
+            return
         }
+        // save to ~/.gina/main.json
+        if ( typeof(mainConf['def_prefix']) == 'undefined' ) {
+            mainConf['def_prefix'] = {}
+        }
+        mainConf['def_prefix'][GINA_SHORT_VERSION] = prefix;
+        lib.generator.createFileFromDataSync(mainConf, mainConfPath);
+        // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
+        process['gina']['prefix'] = prefix;
+        mainSettingsConf['prefix'] = prefix;
+        lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
 
     var setLogLevel = function(level) {
@@ -75,14 +98,14 @@ function Set(opt){
             return;
         }
         // save to ~/.gina/main.json
-        mainConf['def_log_level'][GINA_SHORT_VERSION] = level;        
+        mainConf['def_log_level'][GINA_SHORT_VERSION] = level;
         lib.generator.createFileFromDataSync(mainConf, mainConfPath);
         // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
         process['gina']['log_level'] = level;
         mainSettingsConf['log_level'] = level;
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
-        
+
     var setEnv = function(env) {
         var supported   = mainConf['envs'][GINA_SHORT_VERSION]
             , err       = null
@@ -96,7 +119,7 @@ function Set(opt){
         // save to ~/.gina/main.json
         lib.generator.createFileFromDataSync(mainConf, mainConfPath);
     }
-    
+
     var setScope = function(scope) {
         var supported   = mainConf['scopes'][GINA_SHORT_VERSION]
             , err       = null
@@ -110,8 +133,8 @@ function Set(opt){
         // save to ~/.gina/main.json
         lib.generator.createFileFromDataSync(mainConf, mainConfPath);
     }
-    
-    var setCulture = function(culture) {        
+
+    var setCulture = function(culture) {
         var supported   = mainConf['cultures'][GINA_SHORT_VERSION]
             , err       = null
         ;
@@ -121,14 +144,14 @@ function Set(opt){
             return;
         }
         // save to ~/.gina/main.json
-        mainConf['def_culture'][GINA_SHORT_VERSION] = culture;        
+        mainConf['def_culture'][GINA_SHORT_VERSION] = culture;
         lib.generator.createFileFromDataSync(mainConf, mainConfPath);
         // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
         process['gina']['culture'] = culture;
         mainSettingsConf['culture'] = culture;
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
-    
+
     var setPort = function(port) {
         console.debug('Setting `port` to #'+ port);
         // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
@@ -136,7 +159,7 @@ function Set(opt){
         mainSettingsConf['port'] = ~~port;
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
-    
+
     var setDebugPort = function(port) {
         console.debug('Setting `debug port` to #'+ port);
         // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
@@ -144,10 +167,10 @@ function Set(opt){
         mainSettingsConf['debug_port'] = ~~port;
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
-    
+
     var setTimezone = function(timezone) {
         // save to ~/.gina/main.json
-        mainConf['def_timezone'][GINA_SHORT_VERSION] = timezone;        
+        mainConf['def_timezone'][GINA_SHORT_VERSION] = timezone;
         lib.generator.createFileFromDataSync(mainConf, mainConfPath);
         // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
         process['gina']['timezone'] = timezone;