gina 0.1.1-alpha.43 → 0.1.1-alpha.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.43",
+  "version": "0.1.1-alpha.44",
   "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.43/core/gna",
+  "main": "./framework/v0.1.1-alpha.44/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js -g",
     "preinstall": "node ./script/pre_install.js -g",

package/script/pre_install.js

@@ -60,6 +60,16 @@ var isWritableSync = function(path) {
     // 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';
+
+    if ( !isWin32() && /^\/usr\/local/.test(runDir) && !isWritableSync('/usr/local') ) {
+        runDir = getUserHome() +'/.gina/run';
+        if ( !existsSync(runDir) ) {
+            fs.mkdirSync(runDir)
+        }
+
+        return runDir
+    }
+
     if ( existsSync(runDir) ) {
         if ( !isWritableSync(runDir) ) {
             throw new Error('location `'+ runDir +'` found but not writable !' )
@@ -92,20 +102,40 @@ var isWritableSync = function(path) {
 
 var getTmpDir = function() {
     // support for node 0.10.x & 0.11.x
-    var tmp = os.tmpdir || function() {
+    var tmp = (os.tmpdir) ? os.tmpdir : function() {
+        var tmpDir = null;
         if ( isWin32() ) {
-            return process.env.TEMP ||
+            tmpDir = process.env.TEMP ||
                 process.env.TMP ||
                 (process.env.SystemRoot || process.env.windir) + '\\Temp'
+            ;
         } else {
-            return process.env.TMPDIR ||
+            tmpDir = process.env.TMPDIR ||
                 process.env.TMP ||
                 process.env.TEMP ||
                 '/usr/local/var/tmp'
+            ;
+
+            if ( /^\/usr\/local/.test(tmpDir) && !isWritableSync('/usr/local') ) {
+                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 ( !existsSync(tmpDir) ) {
+            fs.mkdirSync(tmpDir);
         }
+
+        return tmpDir
     };
 
-    return ( typeof(tmp) == 'function') ?  tmp() : tmp
+    return tmp()
 };
 
 /**
@@ -122,6 +152,15 @@ var getLogDir = function() {
             process.env.LOGS ||
             (process.env.SystemRoot || process.env.windir) + '\\System32\\Winevt\\Logs'
         ;
+
+        if ( !logDir || logDir == '' ) {
+            throw new Error('Log directory not defined or not found !');
+        }
+
+        if ( !isWritableSync(logDir) ) {
+            throw new Error('Log directory found but not writable: need permissions for `'+ logDir +'`');
+        }
+
         if ( !/gina$/.test(logDir) ) {
             logDir += '\\gina'
         }
@@ -131,16 +170,52 @@ var getLogDir = function() {
             process.env.LOGS ||
             '/usr/local/var/log'
         ;
+
+        if ( /^\/usr\/local/.test(logDir) && !isWritableSync('/usr/local') ) {
+            logDir = getUserHome() +'/.gina/log';
+            if ( !existsSync(logDir) ) {
+                fs.mkdirSync(logDir)
+            }
+
+            return logDir
+        }
+
+        if ( /^\/usr\/local\/var/.test(logDir) && !existsSync('/usr/local/var') ) {
+            fs.mkdirSync('/usr/local/var');
+        }
+
+        if ( !existsSync(logDir) ) {
+            fs.mkdirSync(logDir);
+        }
+
         if ( !/gina$/.test(logDir) ) {
             logDir += '/gina'
         }
     }
 
+    if ( !existsSync(logDir) ) {
+        fs.mkdirSync(logDir)
+    }
+
     return logDir;
 };
 
 var getUserHome = function() {
-    return process.env[(isWin32()) ? 'USERPROFILE' : 'HOME']
+    var home = os.homedir ? os.homedir : function() {
+        var homeDir = process.env[(isWin32()) ? 'USERPROFILE' : 'HOME'];
+
+        if ( !homeDir || homeDir == '' ) {
+            throw new Error('Home directory not defined or not found !');
+        }
+
+        if ( !isWritableSync(homeDir) ) {
+            throw new Error('Home directory found but not writable: need permissions for `'+ homeDir +'`');
+        }
+
+        return homeDir;
+    };
+
+    return home()
 };
 
 var helpers = null;
@@ -159,6 +234,7 @@ function PreInstall() {
     var init = function() {
 
         self.isGlobalInstall = false;
+        self.isResetNeeded = false;
         self.isGinaInstall = false;
         self.prefix = execSync('npm config get prefix');
         self.isCustomPrefix = false;
@@ -167,7 +243,12 @@ function PreInstall() {
         for (; i < len; ++i) {
             if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
                 self.isGlobalInstall = true;
-                break;
+                continue;
+            }
+
+            if ( /^\-\-reset$/.test(args[i]) ) {
+                self.isResetNeeded = true;
+                continue;
             }
 
             if ( /^\-\-prefix\=/.test(args[i] ) ) {
@@ -228,6 +309,11 @@ function PreInstall() {
             return done( new Error('Windows in not yet fully supported. Thank you for your patience'));
         }
 
+        var ginaHome = getUserHome() + ( isWin32() ? '\\.gina' : '/.gina' );
+        if ( self.isResetNeeded && existsSync(ginaHome) ) {
+            fs.rmSync(dir, { recursive: true, force: true });
+        }
+
         // Let's temporarily install `colors` into `GINA_DIR` it will be removed by the `post_install.js` script
         var initialDir = process.cwd();
         var frameworkPath   = __dirname +'/..';
@@ -238,10 +324,11 @@ function PreInstall() {
             process.chdir(initialDir);
         }
 
+
         if ( !fs.existsSync(frameworkPath +'/node_modules/gina') ) {
             return done();
         }
-        self.isGinaInstall = true;
+
         self.isWin32 = isWin32();
 
 
@@ -255,7 +342,12 @@ function PreInstall() {
 
     self.checkRequiredFolders = function(done) {
 
-        // check for `/usr/local/tmp`
+        var ginaHomeDir = getUserHome() + ((isWin32()) ? '\\.gina': '/.gina');
+        if (!existsSync(ginaHomeDir) ) {
+            fs.mkdirSync(ginaHomeDir)
+        }
+
+        // check for `/usr/local/tmp` or `/tmp`
         var tmpDir = getTmpDir();
         console.info('`tmp` dir -> '+ tmpDir);
         if ( !existsSync(tmpDir) ) {
@@ -266,16 +358,21 @@ function PreInstall() {
         // check for `/usr/local/run`
         var runDir = getRunDir();
         console.info('`run` dir -> '+ runDir);
-        if ( !existsSync(runDir) ) {
-            fs.mkdirSync(runDir)
-        }
 
         // check for `/usr/local/log`
         var logDir = getLogDir();
         console.info('`log` dir -> '+ logDir);
-        if ( !existsSync(runDir) ) {
-            fs.mkdirSync(logDir)
-        }
+
+        // var settingsBackupPath = tmpDir +  ((isWin32()) ? '\\': '/') + 'gina-install-settings.json';
+        // console.info('tmp folder backup -> '+ settingsBackupPath);
+        // var data =  JSON.stringify({
+        //     prefix: self.prefix,
+        //     rundir: runDir,
+        //     logdir: logDir,
+        //     tmpdir: tmpDir
+        // }, null, 4);
+        // fs.writeFileSync(settingsBackupPath, data);
+        // fs.chmodSync(settingsBackupPath, 0755);
 
         done()
     }
@@ -358,6 +455,7 @@ function PreInstall() {
             return done();
         }
 
+
         // Backup current version
 
         // check for ~/.gina