gina 0.1.1-alpha.74 → 0.1.1-alpha.77

package/script/pre_install.js

@@ -57,11 +57,14 @@ var isWritableSync = function(path) {
  * @returns {string} rundir
  * */
  var getRunDir = function(prefix) {
+    if ( !prefix || typeof(prefix) == 'undefined' || prefix == '' ) {
+        prefix = '/usr/local'
+    }
     // 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';
+    var runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : prefix+'/var/lock';
 
-    if ( !isWin32() && /^\/usr\/local/.test(runDir) && !isWritableSync('/usr/local') ) {
+    if ( !isWin32() && new RegExp('^'+ prefix).test(runDir) && !isWritableSync(prefix) ) {
         runDir = getUserHome() +'/.gina/run';
         if ( !existsSync(runDir) ) {
             fs.mkdirSync(runDir)
@@ -85,7 +88,7 @@ var isWritableSync = function(path) {
 
     try {
         //by default.
-        runDir = '/usr/local/var';
+        runDir = prefix+'/var';
         if ( !existsSync(runDir) ) {
             fs.mkdirSync(runDir)
         }
@@ -106,6 +109,9 @@ var isWritableSync = function(path) {
 };
 
 var getTmpDir = function(prefix) {
+    if ( !prefix || typeof(prefix) == 'undefined' || prefix == '' ) {
+        prefix = '/usr/local'
+    }
     // support for node 0.10.x & 0.11.x
     var tmp = (os.tmpdir) ? os.tmpdir : function() {
         var tmpDir = null;
@@ -118,18 +124,18 @@ var getTmpDir = function(prefix) {
             tmpDir = process.env.TMPDIR ||
                 process.env.TMP ||
                 process.env.TEMP ||
-                '/usr/local/var/tmp'
+                prefix+'/var/tmp'
             ;
 
-            if ( /^\/usr\/local/.test(tmpDir) && !isWritableSync('/usr/local') ) {
+            if ( new RegExp('^'+ prefix).test(tmpDir) && !isWritableSync(prefix) ) {
                 tmpDir = getUserHome() +'/.gina/tmp';
                 if ( !existsSync(tmpDir) ) {
                     fs.mkdirSync(tmpDir)
                 }
             }
 
-            if ( /^\/usr\/local\/var/.test(tmpDir) && !existsSync('/usr/local/var') ) {
-                fs.mkdirSync('/usr/local/var');
+            if ( new RegExp('^'+ prefix +'/var').test(tmpDir) && !existsSync(prefix+'/var') ) {
+                fs.mkdirSync(prefix+'/var');
             }
         }
 
@@ -149,6 +155,9 @@ var getTmpDir = function(prefix) {
  * @returns {string} logPath
  * */
 var getLogDir = function(prefix) {
+    if ( !prefix || typeof(prefix) == 'undefined' || prefix == '' ) {
+        prefix = '/usr/local'
+    }
     // Trying to retrieve original value if already defined
     var logDir = null;
 
@@ -173,10 +182,10 @@ var getLogDir = function(prefix) {
         logDir = process.env.LOGDIR ||
             process.env.LOG ||
             process.env.LOGS ||
-            '/usr/local/var/log'
+            prefix+'/var/log'
         ;
 
-        if ( /^\/usr\/local/.test(logDir) && !isWritableSync('/usr/local') ) {
+        if ( new RegExp('^'+ prefix).test(logDir) && !isWritableSync(prefix) ) {
             logDir = getUserHome() +'/.gina/log';
             if ( !existsSync(logDir) ) {
                 fs.mkdirSync(logDir)
@@ -185,8 +194,8 @@ var getLogDir = function(prefix) {
             return logDir
         }
 
-        if ( /^\/usr\/local\/var/.test(logDir) && !existsSync('/usr/local/var') ) {
-            fs.mkdirSync('/usr/local/var');
+        if ( new RegExp('^'+ prefix +'/var').test(logDir) && !existsSync(prefix+'/var') ) {
+            fs.mkdirSync(prefix+'/var');
         }
 
         if ( !existsSync(logDir) ) {
@@ -244,7 +253,7 @@ function PreInstall() {
         self.isGlobalInstall = false;
         self.isResetNeeded = process.env.npm_config_reset || false;
         self.isGinaInstall = false;
-        self.prefix = process.env.npm_config_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;
@@ -266,24 +275,26 @@ 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
-            && 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.toString();
             self.isCustomPrefix = true;
         }
 
-        if ( !self.isGlobalInstall ) { //global install
-            self.root = process.cwd(); // project path
-            self.tmpDir = os.tmpdir(); // default tmp path
-            console.error('local installation is not supported for this version at the moment.');
-            console.info('please use `npm install -g gina`');
-            process.exit(1);
+        if ( !self.isGlobalInstall ) { // none global install
+            self.prefix = process.env.npm_config_prefix = process.cwd();
+            // self.root = process.cwd(); // project path
+            // self.tmpDir = os.tmpdir(); // default tmp path
+            // console.error('local installation is not supported for this version at the moment.');
+            // console.info('please use `npm install -g gina`\n    or\nif you are trying to link gina to your project, use `npm link gina` if Gina has already been installed');
+            // process.exit(1);
         }
+        console.debug('self.prefix => '+ self.prefix);
 
 
         begin(0);
@@ -369,7 +380,7 @@ function PreInstall() {
         }
 
         // check for `/usr/local/tmp` or `/tmp`
-        var tmpDir = getTmpDir();
+        var tmpDir = getTmpDir(self.prefix);
         console.info('`tmp` dir -> '+ tmpDir);
         if ( !existsSync(tmpDir) ) {
             fs.mkdirSync(tmpDir)
@@ -377,11 +388,11 @@ function PreInstall() {
 
 
         // check for `/usr/local/run`
-        var runDir = getRunDir();
+        var runDir = getRunDir(self.prefix);
         console.info('`run` dir -> '+ runDir);
 
         // check for `/usr/local/log`
-        var logDir = getLogDir();
+        var logDir = getLogDir(self.prefix);
         console.info('`log` dir -> '+ logDir);
 
         // var settingsBackupPath = tmpDir +  ((isWin32()) ? '\\': '/') + 'gina-install-settings.json';

package/utils/helper.js

@@ -35,8 +35,6 @@ function MainHelper(opt) {
             // like scripts running out of the framework context
             // we'll just ignore it
         }
-
-
     }
 
     /**
@@ -275,6 +273,10 @@ function MainHelper(opt) {
         return process.gina
     }
 
+    getProtected = function() {
+        return self.protectedVars
+    }
+
     /**
      * Get log path - %SystemRoot%\system32\winevt\logs or /
      *
@@ -292,6 +294,8 @@ function MainHelper(opt) {
             return logDir
         }
 
+        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n/g, '');
+
         if ( isWin32() ) {
             logDir = process.env.LOG ||
                 process.env.LOGS ||
@@ -315,10 +319,10 @@ function MainHelper(opt) {
             logDir = process.env.LOGDIR ||
                 process.env.LOG ||
                 process.env.LOGS ||
-                '/usr/local/var/log'
+                prefix+'/var/log'
             ;
             logDirObj = new _(logDir);
-            if ( /^\/usr\/local/.test(logDir) && !new _('/usr/local').isWritableSync() ) {
+            if ( new RegExp('^'+ prefix).test(logDir) && !new _(prefix).isWritableSync() ) {
                 logDir = getUserHome() +'/.gina/log';
                 logDirObj = new _(logDir);
                 if ( !logDirObj.existsSync() ) {
@@ -328,8 +332,8 @@ function MainHelper(opt) {
                 return logDir
             }
 
-            if ( /^\/usr\/local\/var/.test(logDir) && !new _('/usr/local/var').existsSync() ) {
-                fs.mkdirSync('/usr/local/var');
+            if ( new RegExp('^'+ prefix +'/var').test(logDir) && !new _(prefix +'/var').existsSync() ) {
+                fs.mkdirSync(prefix +'/var');
             }
 
             if ( !logDirObj.existsSync() ) {
@@ -349,9 +353,6 @@ function MainHelper(opt) {
         return logDir;
     }
 
-    getProtected = function() {
-        return self.protectedVars
-    }
 
     /**
      * Get run\lock path
@@ -369,9 +370,11 @@ function MainHelper(opt) {
             return runDir
         }
 
-        runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : '/usr/local/var/lock';
+        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n/g, '');
+
+        runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : prefix + '/var/lock';
 
-        if ( !isWin32() && /^\/usr\/local/.test(runDir) && !new _('/usr/local').isWritableSync() ) {
+        if ( !isWin32() && new RegExp('^'+ prefix).test(runDir) && !new _(prefix).isWritableSync() ) {
             runDir = getUserHome() +'/.gina/run';
             runDirObj = new _( runDir, true );
             if ( !runDirObj.existsSync() ) {
@@ -398,11 +401,11 @@ function MainHelper(opt) {
         }
 
         try {
-            if ( /^\/usr\/local\/var/.test(runDir) && !new _('/usr/local/var').existsSync() ) {
-                fs.mkdirSync('/usr/local/var');
+            if ( new RegExp('^'+ prefix +'/var').test(runDir) && !new _(prefix + '/var').existsSync() ) {
+                fs.mkdirSync(prefix +'/var');
             }
 
-            runDir = '/usr/local/var/run';//by default.
+            runDir = prefix +'/var/run';//by default.
             if ( !existsSync(runDir) ) {
                 fs.mkdirSync(runDir)
             }
@@ -430,6 +433,8 @@ function MainHelper(opt) {
             return dir
         }
 
+        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() {
             var tmpDir = null;
@@ -441,18 +446,18 @@ function MainHelper(opt) {
                 tmpDir = process.env.TMPDIR ||
                     process.env.TMP ||
                     process.env.TEMP ||
-                    '/usr/local/var/tmp'
+                    prefix+'/var/tmp'
                 ;
 
-                if ( /^\/usr\/local/.test(tmpDir) && !isWritableSync('/usr/local') ) {
+                if ( new RegExp('^'+ prefix).test(tmpDir) && !isWritableSync(prefix) ) {
                     tmpDir = getUserHome() +'/.gina/tmp';
                     if ( !existsSync(tmpDir) ) {
                         fs.mkdirSync(tmpDir)
                     }
                 }
 
-                if ( /^\/usr\/local\/var/.test(tmpDir) && !existsSync('/usr/local/var') ) {
-                    fs.mkdirSync('/usr/local/var');
+                if ( new RegExp('^'+ prefix +'/var').test(tmpDir) && !existsSync(prefix +'/var') ) {
+                    fs.mkdirSync(prefix +'/var');
                 }
             }
 

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

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