gina 0.1.1-alpha.73 → 0.1.1-alpha.76

package/framework/{v0.1.1-alpha.73 → v0.1.1-alpha.76}/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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.73",
+  "version": "0.1.1-alpha.76",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -37,12 +37,15 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.73/core/gna",
+  "main": "./framework/v0.1.1-alpha.76/core/gna",
   "preferGlobal": true,
+  "config": {
+    "prefix": "~/.npm-global"
+  },
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
-    "preinstall": "node ./script/pre_install.js -g --prefix=~/.npm-global",
-    "postinstall": "node ./script/post_install.js -g --prefix=~/.npm-global"
+    "preinstall": "node ./script/pre_install.js",
+    "postinstall": "node ./script/post_install.js"
   },
   "license": "MIT",
   "readmeFilename": "README.md"

package/resources/home/main.json

@@ -3,10 +3,13 @@
         "{release}": [ "{version}" ]
     },
     "def_framework": "{version}",
+    "def_prefix": {
+        "{release}": "{prefix}"
+    },
     "scopes": {
         "{release}": [
-        "local",
-        "production"
+            "local",
+            "production"
         ]
     },
     "local_scope": {

package/resources/home/settings.json

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

package/script/post_install.js

@@ -55,7 +55,7 @@ function PostInstall() {
         self.gina = getEnvVar('GINA_DIR');
         self.root = self.gina; // by default
         self.isGlobalInstall = false;
-        self.prefix = execSync('npm config get prefix');
+        self.prefix = process.env.npm_config_prefix || execSync('npm config get prefix').toString().replace(/\n/g, '');
         self.isCustomPrefix = false;
 
         var args = process.argv, i = 0, len = args.length;
@@ -71,15 +71,18 @@ function PostInstall() {
             }
         }
 
-        self.prefix = self.prefix.toString().replace(/\n/g, '');
         if (
-            process.env.npm_config_prefix
-            && self.prefix != process.env.npm_config_prefix.toString().replace(/\n/g, '')
+            // process.env.npm_config_prefix
+            // &&
+            self.prefix != process.env.npm_config_prefix
         ) {
-            self.prefix = process.env.npm_config_prefix.toString().replace(/\n/g, '');
+            // self.prefix = process.env.npm_config_prefix;
             self.isCustomPrefix = true;
         }
 
+        process.env.npm_config_prefix = self.prefix;
+        setEnvVar('GINA_PREFIX', self.prefix); // for the `helper.js`
+
         // check for ~/.gina (first installation ?)
         var ginaHomeDir = getUserHome() + ( isWin32() ? '\\.gina' : '/.gina' );
         self.version = require( self.gina + ( isWin32() ? '\\' : '/' ) +'package.json' ).version;
@@ -690,6 +693,8 @@ function PostInstall() {
 
         restoreSymlinks();
 
+        execSync(_(self.prefix +'/bin/gina framework:set --prefix='+ self.prefix, true));
+
         // Update middleware file
         var filename = _(self.path) + '/MIDDLEWARE';
         var msg = "Gina's command line tool has been installed.";