gina 0.1.1-alpha.71 → 0.1.1-alpha.74

package/package.json

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

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');
         self.isCustomPrefix = false;
 
         var args = process.argv, i = 0, len = args.length;
@@ -80,6 +80,8 @@ function PostInstall() {
             self.isCustomPrefix = true;
         }
 
+        process.env.npm_config_prefix = self.prefix;
+
         // check for ~/.gina (first installation ?)
         var ginaHomeDir = getUserHome() + ( isWin32() ? '\\.gina' : '/.gina' );
         self.version = require( self.gina + ( isWin32() ? '\\' : '/' ) +'package.json' ).version;

package/script/pre_install.js

@@ -56,7 +56,7 @@ var isWritableSync = function(path) {
  * Get run\lock path
  * @returns {string} rundir
  * */
- var getRunDir = function() {
+ var getRunDir = function(prefix) {
     // Trying to retrieve original value if already defined
     // Means `/usr/local/var/lock` or `/usr/local/var/run` by default.
     var runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : '/usr/local/var/lock';
@@ -84,7 +84,12 @@ var isWritableSync = function(path) {
     }
 
     try {
-        runDir = '/usr/local/var/run';//by default.
+        //by default.
+        runDir = '/usr/local/var';
+        if ( !existsSync(runDir) ) {
+            fs.mkdirSync(runDir)
+        }
+        runDir += '/run';
         if ( !existsSync(runDir) ) {
             fs.mkdirSync(runDir)
         }
@@ -100,7 +105,7 @@ var isWritableSync = function(path) {
     return runDir;
 };
 
-var getTmpDir = function() {
+var getTmpDir = function(prefix) {
     // support for node 0.10.x & 0.11.x
     var tmp = (os.tmpdir) ? os.tmpdir : function() {
         var tmpDir = null;
@@ -143,7 +148,7 @@ var getTmpDir = function() {
  *
  * @returns {string} logPath
  * */
-var getLogDir = function() {
+var getLogDir = function(prefix) {
     // Trying to retrieve original value if already defined
     var logDir = null;
 
@@ -239,7 +244,7 @@ function PreInstall() {
         self.isGlobalInstall = false;
         self.isResetNeeded = process.env.npm_config_reset || false;
         self.isGinaInstall = false;
-        self.prefix = execSync('npm config get prefix');
+        self.prefix = process.env.npm_config_prefix || execSync('npm config get prefix');
         self.isCustomPrefix = false;
 
         var args = process.argv, i = 0, len = args.length;
@@ -262,6 +267,7 @@ function PreInstall() {
         }
 
         self.prefix = self.prefix.toString().replace(/\n/g, '');
+        process.env.npm_config_prefix = self.prefix;
         console.debug('process.env.npm_config_prefix => '+ process.env.npm_config_prefix);
         if (
             process.env.npm_config_prefix

package/utils/helper.js

@@ -362,13 +362,11 @@ function MainHelper(opt) {
         var runDir = getEnvVar('GINA_RUNDIR') || null;
         var runDirObj = null;
         if ( runDir ) {
-            if ( runDir ) {
-                runDirObj = new _(runDir, true);
-                if ( !runDirObj.existsSync() ) {
-                    runDirObj.mkdirSync()
-                }
-                return runDir
+            runDirObj = new _(runDir, true);
+            if ( !runDirObj.existsSync() ) {
+                runDirObj.mkdirSync()
             }
+            return runDir
         }
 
         runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : '/usr/local/var/lock';
@@ -400,7 +398,7 @@ function MainHelper(opt) {
         }
 
         try {
-            if ( /^\/usr\/local\/var/.test(logDir) && !new _('/usr/local/var').existsSync() ) {
+            if ( /^\/usr\/local\/var/.test(runDir) && !new _('/usr/local/var').existsSync() ) {
                 fs.mkdirSync('/usr/local/var');
             }
 
@@ -422,6 +420,16 @@ function MainHelper(opt) {
     }
 
     getTmpDir = function() {
+
+        var dir = getEnvVar('GINA_TMPDIR') || null;
+        if (dir) {
+            dirObj = new _(dir, true);
+            if ( !dirObj.existsSync() ) {
+                dirObj.mkdirSync()
+            }
+            return dir
+        }
+
         // support for node 0.10.x & 0.11.x
         var tmp = (os.tmpdir) ? os.tmpdir : function() {
             var tmpDir = null;

package/framework/v0.1.1-alpha.71/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.71