gina 0.1.1-alpha.92 → 0.1.1-alpha.95

package/utils/helper.js

@@ -26,11 +26,25 @@ function MainHelper(opt) {
         var packObj = require(pack);
         var version =  getEnvVar('GINA_VERSION') || packObj.version;
         var frameworkPath = ginaPath + '/framework/v' + version;
-
+        var pkg = null;
         try {
             lib         = require(frameworkPath + '/lib');
             console     = lib.logger;
             merge       = lib.merge;
+
+            try {
+                //
+                pkg = packObj;
+                self.optionalPrefix = pkg.config.optionalPrefix.replace(/^\~/, getUserHome());
+            } catch(err) {
+                try {
+                    pkg = execSync('npm list -g gina --long --json').toString().replace(/\n$/g, '');
+                    self.optionalPrefix = JSON.parse(pkg).dependencies.gina.config.optionalPrefix.replace(/^\~/, getUserHome());
+                } catch (_err) {
+                    throw new Error(_err.stack +'\n'+ err.stack)
+                }
+            }
+
         } catch (err) {
             // this can happen in certain conditions
             // like scripts running out of the framework context
@@ -295,7 +309,7 @@ function MainHelper(opt) {
             return logDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         if ( isWin32() ) {
             logDir = process.env.LOG ||
@@ -341,7 +355,7 @@ function MainHelper(opt) {
                 logDirObj.mkdirSync();
             }
 
-            if ( !/gina$/.test(logDir) ) {
+            if ( !/gina$/.test(logDir) && self.optionalPrefix != prefix ) {
                 logDir += '/gina';
                 logDirObj = new _(logDir);
             }
@@ -371,7 +385,7 @@ function MainHelper(opt) {
             return runDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : prefix + '/var/lock';
 
@@ -414,10 +428,12 @@ function MainHelper(opt) {
             throw new Error('location error: `'+ runDir+'`\n'+ err.stack);
         }
 
-        runDir += ( isWin32() ) ? '\\gina' : '/gina';
-        runDirObj = new _( runDir, true );
-        if ( !runDirObj.existsSync() ) {
-            fs.mkdirSync(runDir)
+        if (self.optionalPrefix != prefix) {
+            runDir += ( isWin32() ) ? '\\gina' : '/gina';
+            runDirObj = new _( runDir, true );
+            if ( !runDirObj.existsSync() ) {
+                fs.mkdirSync(runDir)
+            }
         }
 
         return runDir;
@@ -434,7 +450,7 @@ function MainHelper(opt) {
             return dir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         // support for node 0.10.x & 0.11.x
         var tmp = (os.tmpdir) ? os.tmpdir : function() {

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

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