gina 0.1.1-alpha.95 → 0.1.1-alpha.98

package/framework/{v0.1.1-alpha.95 → v0.1.1-alpha.98}/lib/cmd/framework/init.js

@@ -128,16 +128,18 @@ function Initialize(opt) {
 
     self.checkIfMain = function() {
         console.debug('Checking main...');
-        var source  = getPath('gina').root + '/resources/home/main.json';
-        var target  = self.opt.homedir + '/main.json';
-        var version = 'v' + getEnvVar('GINA_VERSION');
-        var prefix  = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var source      = getPath('gina').root + '/resources/home/main.json';
+        var target      = self.opt.homedir + '/main.json';
+        var version     = 'v' + getEnvVar('GINA_VERSION');
+        var prefix      = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var globalMode  = getEnvVar('GINA_GLOBAL_MODE');
 
         var data = require(source);
         var dic = {
             'release' : self.release,
             'version' : version,
-            'prefix' : prefix
+            'prefix' : prefix,
+            'global_mode': globalMode
         };
         data = whisper(dic, data);
 
@@ -174,12 +176,13 @@ function Initialize(opt) {
 
 
         // don't remove def_protocol
-        var defProtocol = (mainConfig['def_protocol']) ? mainConfig['def_protocol'][self.release] : data.def_protocol[self.release];
-        var defScheme   = (mainConfig['def_scheme']) ? mainConfig['def_scheme'][self.release] : data.def_scheme[self.release];
-        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];
+        var defProtocol     = (mainConfig['def_protocol']) ? mainConfig['def_protocol'][self.release] : data.def_protocol[self.release];
+        var defScheme       = (mainConfig['def_scheme']) ? mainConfig['def_scheme'][self.release] : data.def_scheme[self.release];
+        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];
+        var defGlobalMode   = (mainConfig['def_global_mode']) ? mainConfig['def_global_mode'][self.release] : data.def_global_mode[self.release];
 
 
         if ( mainConfig.protocols[self.release].indexOf(defProtocol) < 0 )
@@ -205,6 +208,9 @@ function Initialize(opt) {
         if (!mainConfig.def_prefix)
             mainConfig.def_prefix = data.def_prefix;
 
+        if (!mainConfig.def_global_mode)
+            mainConfig.def_global_mode = data.def_global_mode;
+
         mainConfig.protocols[self.release].sort();
         mainConfig.schemes[self.release].sort();
         mainConfig.cultures[self.release].sort();
@@ -212,11 +218,15 @@ function Initialize(opt) {
         // commit
         lib.generator.createFileFromDataSync(mainConfig, target);
 
+        process.env.TZ = defTimezone;
+        process.env.LOG_LEVEL = defLogLevel;
+
         setEnvVar('GINA_CULTURES', mainConfig.cultures[self.release]);
         setEnvVar('GINA_CULTURE', defCulture);
         setEnvVar('GINA_TIMEZONE', defTimezone);
-        process.env.TZ = defTimezone;
-        process.env.LOG_LEVEL = defLogLevel;
+        // Attenion: remove this part in case of troubles
+        setEnvVar('GINA_PREFIX', defPrefix);
+        setEnvVar('GINA_GLOBAL_MODE', defGlobalMode);
     }
 
     /**
@@ -334,6 +344,7 @@ function Initialize(opt) {
         var main            = require( _(self.opt.homedir + '/main.json', true) )
             , version       = getEnvVar('GINA_VERSION')
             , prefix        = getEnvVar('GINA_PREFIX') || main['def_prefix'][self.release]
+            , globalMode    = getEnvVar('GINA_GLOBAL_MODE') || main['def_global_mode'][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 ) )
@@ -377,6 +388,7 @@ function Initialize(opt) {
 
             var dic = {
                 'prefix' : prefix,
+                'global_mode': globalMode,
                 'version' : version,
                 'env' : env,
                 'env_is_dev' : (main['dev_env'][self.release] == env) ? true : false,

package/framework/{v0.1.1-alpha.95 → v0.1.1-alpha.98}/lib/cmd/framework/set.js

@@ -2,10 +2,11 @@ var console = lib.logger;
 
 function Set(opt){
 
-    var mainConfPath        = _(GINA_HOMEDIR + '/main.json')
+    var mainConfPath        = _(GINA_HOMEDIR + '/main.json', true)
         , mainConf          = require(mainConfPath)
-        , mainSettingsPath  = _(GINA_HOMEDIR +'/'+ GINA_SHORT_VERSION + '/settings.json')
+        , mainSettingsPath  = _(GINA_HOMEDIR +'/'+ GINA_SHORT_VERSION + '/settings.json', true)
         , mainSettingsConf  = require(mainSettingsPath)
+        , pack              = require(_(GINA_DIR +'/package.json', true ))
     ;
 
     var init = function(opt){
@@ -32,6 +33,11 @@ function Set(opt){
                 setPrefix(v);
             break;
 
+            case '--global_mode':
+            case '--global-mode':
+                setGlobalMode(v);
+            break;
+
             case '--log_level':
             case '--log-level':
                 setLogLevel(v);
@@ -86,6 +92,32 @@ function Set(opt){
         process['gina']['prefix'] = prefix;
         mainSettingsConf['prefix'] = prefix;
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
+        // update package.json
+        pack.config.prefix = prefix;
+        lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
+    }
+
+    var setGlobalMode = function(globalMode) {
+        var err = null;
+        if ( !globalMode || typeof(globalMode) == 'undefined' || globalMode == '' ) {
+            err = new Error('Global Mode cannot be left empty or undefined');
+            console.error(err.message);
+            return
+        }
+        globalMode = /^true$/i.test(globalMode) ? true : false;
+        // save to ~/.gina/main.json
+        if ( typeof(mainConf['def_global_mode']) == 'undefined' ) {
+            mainConf['def_global_mode'] = {}
+        }
+        mainConf['def_global_mode'][GINA_SHORT_VERSION] = globalMode;
+        lib.generator.createFileFromDataSync(mainConf, mainConfPath);
+        // save to ~/.gina/{GINA_VERSION_SHORT}/settings.json
+        process['gina']['global_mode'] = globalMode;
+        mainSettingsConf['global_mode'] = globalMode;
+        lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
+        // update package.json
+        pack.config.globalMode = globalMode;
+        lib.generator.createFileFromDataSync(pack, _(GINA_DIR +'/package.json', true ));
     }
 
     var setLogLevel = function(level) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.95",
+  "version": "0.1.1-alpha.98",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -15,6 +15,7 @@
     "gina.io",
     "ginajs"
   ],
+  "homepage": "https://gina.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/rhinostone/gina.git"
@@ -43,14 +44,17 @@
     "node >=0.10.25"
   ],
   "config": {
-    "optionalPrefix": "~/.npm-global"
+    "optionalPrefix": "~/.npm-global",
+    "prefix": "/usr/local",
+    "globalMode": true
   },
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.95/core/gna",
+  "main": "./framework/v0.1.1-alpha.98/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
+    "postpublish": "node ./script/post_publish.js",
     "preinstall": "node ./script/pre_install.js",
     "postinstall": "node ./script/post_install.js"
   },

package/resources/home/main.json

@@ -6,6 +6,9 @@
     "def_prefix": {
         "{release}": "{prefix}"
     },
+    "def_global_mode": {
+        "{release}": "{global_mode}"
+    },
     "scopes": {
         "{release}": [
             "local",

package/resources/home/settings.json

@@ -1,6 +1,7 @@
 {
     "_comment": "To update these values, go through the command line arguments: --tmpdir=/some/path/tmp --logdir=/some/path/logs",
     "prefix": "{prefix}",
+    "global_mode": "{global_mode}",
     "version": "{version}",
     "env": "{env}",
     "env_is_dev": "{env_is_dev}",