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

package/utils/helper.js

@@ -254,6 +254,12 @@ function MainHelper(opt) {
         setContext('envVars', process['gina']);
     }
 
+    /**
+     * getEnvVar
+     * Will read from `process.gina` which is set mostly in `cli.js`
+     *
+     * @param {string} key
+     */
     getEnvVar = function(key) {
         if (
             typeof(process['gina']) != 'undefined' &&
@@ -277,19 +283,33 @@ function MainHelper(opt) {
     getLogDir = function() {
         // Trying to retrieve original value if already defined
         var logDir = getEnvVar('GINA_LOGDIR') || null;
+        var logDirObj = null;
         if ( logDir ) {
-            if ( !/gina$/.test(logDir) ) {
-                logDir += ( isWin32() ) ? '\\gina' : '/gina'
+            logDirObj = new _(logDir, true);
+            if ( !logDirObj.existsSync() ) {
+                logDirObj.mkdirSync()
             }
             return logDir
         }
+
         if ( isWin32() ) {
             logDir = process.env.LOG ||
                 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 !');
+            }
+
+            logDirObj = new _(logDir);
+            if ( !logDirObj.isWritableSync() ) {
+                throw new Error('Log directory found but not writable: need permissions for `'+ logDir +'`');
+            }
+
             if ( !/gina$/.test(logDir) ) {
-                logDir += '\\gina'
+                logDir += '\\gina';
+                logDirObj = new _(logDir);
             }
         } else {
             logDir = process.env.LOGDIR ||
@@ -297,11 +317,35 @@ function MainHelper(opt) {
                 process.env.LOGS ||
                 '/usr/local/var/log'
             ;
+            logDirObj = new _(logDir);
+            if ( /^\/usr\/local/.test(logDir) && !new _('/usr/local').isWritableSync() ) {
+                logDir = getUserHome() +'/.gina/log';
+                logDirObj = new _(logDir);
+                if ( !logDirObj.existsSync() ) {
+                    logDirObj.mkdirSync()
+                }
+
+                return logDir
+            }
+
+            if ( /^\/usr\/local\/var/.test(logDir) && !new _('/usr/local/var').existsSync() ) {
+                fs.mkdirSync('/usr/local/var');
+            }
+
+            if ( !logDirObj.existsSync() ) {
+                logDirObj.mkdirSync();
+            }
+
             if ( !/gina$/.test(logDir) ) {
-                logDir += '/gina'
+                logDir += '/gina';
+                logDirObj = new _(logDir);
             }
         }
 
+        if ( !logDirObj.existsSync() ) {
+            logDirObj.mkdirSync()
+        }
+
         return logDir;
     }
 
@@ -316,67 +360,173 @@ function MainHelper(opt) {
     getRunDir = function() {
         // Trying to retrieve original value if already defined
         var runDir = getEnvVar('GINA_RUNDIR') || null;
+        var runDirObj = null;
         if ( runDir ) {
-            if ( !/gina$/.test(runDir) ) {
-                runDir += ( isWin32() ) ? '\\gina' : '/gina'
+            if ( runDir ) {
+                runDirObj = new _(runDir, true);
+                if ( !runDirObj.existsSync() ) {
+                    runDirObj.mkdirSync()
+                }
+                return runDir
             }
-            return runDir
         }
 
-        if ( isWin32() ) {
-            console.debug('check /gina/utils/helper.js around on getRunDir()')
-        } else {
+        runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : '/usr/local/var/lock';
 
-            // 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 !' )
-                }
+        if ( !isWin32() && /^\/usr\/local/.test(runDir) && !new _('/usr/local').isWritableSync() ) {
+            runDir = getUserHome() +'/.gina/run';
+            runDirObj = new _( runDir, true );
+            if ( !runDirObj.existsSync() ) {
+                runDirObj.mkdirSync()
+            }
 
-                runDirObj = new _( runDirObj.toUnixStyle() +'/gina', true );
-                if ( !runDirObj.existsSync() ) {
-                    runDirObj.mkdirSync()
-                }
+            return runDir
+        }
 
-                return runDirObj.toUnixStyle();
-            }
 
-            runDirObj = new _('/usr/local/var/run', true);//by default.
+        runDirObj = new _( runDir, true );
+        if ( runDirObj.existsSync() ) {
             if ( !runDirObj.isWritableSync() ) {
-                throw new Error('location '+ runDirObj.toUnixStyle() +' found but not writable !' )
+                throw new Error('location `'+ runDir +'` found but not writable !' )
             }
 
-            runDirObj = new _( runDirObj.toUnixStyle() +'/gina', true );
+            runDir += ( isWin32() ) ? '' : '/gina';
+            runDirObj = new _( runDir, true );
             if ( !runDirObj.existsSync() ) {
                 runDirObj.mkdirSync()
             }
-            // by default
-            // return _( runDirObj.toUnixStyle() +'/gina', true );
-            return runDirObj.toUnixStyle();
+
+            return runDir;
+        }
+
+        try {
+            if ( /^\/usr\/local\/var/.test(logDir) && !new _('/usr/local/var').existsSync() ) {
+                fs.mkdirSync('/usr/local/var');
+            }
+
+            runDir = '/usr/local/var/run';//by default.
+            if ( !existsSync(runDir) ) {
+                fs.mkdirSync(runDir)
+            }
+        } catch (err) {
+            throw new Error('location error: `'+ runDir+'`\n'+ err.stack);
+        }
+
+        runDir += ( isWin32() ) ? '\\gina' : '/gina';
+        runDirObj = new _( runDir, true );
+        if ( !runDirObj.existsSync() ) {
+            fs.mkdirSync(runDir)
         }
+
+        return runDir;
+
+
+            // // 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();
+
     }
 
     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');
+                }
+            }
+
+            var tmpDirObj = new _(tmpDir);
+            if ( !tmpDirObj.existsSync() ) {
+                tmpDirObj.mkdirSync();
             }
         };
 
-        return ( typeof(tmp) == 'function') ?  tmp() : tmp
+        return tmp()
     }
 
+    /**
+     * isWritableSync
+     * Only used for `getUserHome()`
+     *
+     * @param {string} path
+     */
+    var isWritableSync = function(path) {
+        var canWrite = false;
+        if ( typeof(fs.accessSync) != 'undefined' ) {
+            try {
+                fs.accessSync(path, fs.constants.W_OK);
+                canWrite = true;
+            } catch (err) {
+                canWrite = false;
+            }
+        } else { // support for old version of nodejs
+
+            try {
+                canWrite = (fs.statSync(path).mode & (fs.constants.S_IRUSR | fs.constants.S_IRGRP | fs.constants.S_IROTH));
+            } catch (err) {
+                canWrite = false
+            }
+        }
+
+        return canWrite
+    };
+
     getUserHome = function() {
-        return process.env[(isWin32()) ? 'USERPROFILE' : 'HOME']
+        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
     }
 
     getVendorsConfig = function(vendor) {

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

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