gina 0.1.1-alpha.41 → 0.1.1-alpha.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.41",
+  "version": "0.1.1-alpha.42",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -42,7 +42,7 @@
     "./doc/man/gina-model.1",
     "./doc/man/gina-env.1"
   ],
-  "main": "./framework/v0.1.1-alpha.41/core/gna",
+  "main": "./framework/v0.1.1-alpha.42/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js -g",
     "preinstall": "node ./script/pre_install.js -g",

package/script/post_install.js

@@ -43,7 +43,7 @@ function PostInstall() {
 
         var args = process.argv, i = 0, len = args.length;
         for (; i < len; ++i) {
-            if (args[i] == '-g' ) {
+            if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
                 self.isGlobalInstall = true;
                 continue;
             }

package/script/pre_install.js

@@ -18,8 +18,8 @@ var lib     = null;
 var isWin32 = function() {
     return (process.platform === 'win32') ? true : false;
 };
-var ginaMainhelper  = require(ginaPath + '/utils/helper.js');
-var helpers         = null;
+
+var helpers = null;
 
 /**
  * Pre install constructor
@@ -35,17 +35,26 @@ function PreInstall() {
     var init = function() {
 
         self.isGlobalInstall = false;
-        self.prefix = execSync('npm config get prefix');
         self.isGinaInstall = false;
+        self.prefix = execSync('npm config get prefix');
+        self.isCustomPrefix = false;
 
         var args = process.argv, i = 0, len = args.length;
         for (; i < len; ++i) {
-            if (args[i] == '-g' ) {
+            if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
                 self.isGlobalInstall = true;
                 break;
             }
+
+            if ( /^\-\-prefix\=/.test(args[i] ) ) {
+                self.isCustomPrefix = true;
+                self.prefix = args[i].split(/\=/)[1];
+                continue;
+            }
         }
 
+        self.prefix = self.prefix.toString().replace(/\n/g, '');
+
         if ( !self.isGlobalInstall ) { //global install
             self.root = process.cwd(); // project path
             self.tmpDir = os.tmpdir(); // default tmp path
@@ -87,6 +96,76 @@ function PreInstall() {
         }
     }
 
+    /**
+     * Get run\lock path
+     * @returns {string} rundir
+     * */
+     var getRunDir = function() {
+        // Trying to retrieve original value if already defined
+        var runDir = getEnvVar('GINA_RUNDIR') || null;
+        if ( runDir ) {
+            if ( !/gina$/.test(runDir) ) {
+                runDir += ( isWin32() ) ? '\\gina' : '/gina'
+            }
+            return runDir
+        }
+
+        if ( isWin32() ) {
+            console.debug('check /gina/utils/helper.js around on getRunDir()')
+        } else {
+
+            // Means `/usr/local/var/lock` or `/usr/local/var/run` by default.
+            runDirObj = new _('/usr/local/var/lock', true);
+            if ( runDirObj.existsSync() ) {
+                if ( !runDirObj.isWritableSync() ) {
+                    throw new Error('location '+ runDirObj.toUnixStyle() +' found but not writable !' )
+                }
+
+                runDirObj = new _( runDirObj.toUnixStyle() +'/gina', true );
+                if ( !runDirObj.existsSync() ) {
+                    runDirObj.mkdirSync()
+                }
+
+                return runDirObj.toUnixStyle();
+            }
+
+            runDirObj = new _('/usr/local/var/run', true);//by default.
+            if ( !runDirObj.isWritableSync() ) {
+                throw new Error('location '+ runDirObj.toUnixStyle() +' found but not writable !' )
+            }
+
+            runDirObj = new _( runDirObj.toUnixStyle() +'/gina', true );
+            if ( !runDirObj.existsSync() ) {
+                runDirObj.mkdirSync()
+            }
+            // by default
+            // return _( runDirObj.toUnixStyle() +'/gina', true );
+            return runDirObj.toUnixStyle();
+        }
+    }
+
+    var getTmpDir = function() {
+        // support for node 0.10.x & 0.11.x
+        var tmp = os.tmpdir || function() {
+            if ( isWin32() ) {
+                return process.env.TEMP ||
+                    process.env.TMP ||
+                    (process.env.SystemRoot || process.env.windir) + '\\Temp'
+            } else {
+                return process.env.TMPDIR ||
+                    process.env.TMP ||
+                    process.env.TEMP ||
+                    '/usr/local/var/tmp'
+            }
+        };
+
+        return ( typeof(tmp) == 'function') ?  tmp() : tmp
+    }
+
+    var getUserHome = function() {
+        return process.env[(isWin32()) ? 'USERPROFILE' : 'HOME']
+    }
+
     self.checkRequirements = async function(done) {
         // TODO - handle windows case
         if ( /true/i.test(self.isWin32) ) {

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

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