gina 0.1.1-alpha.38 → 0.1.1-alpha.40

package/package.json

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

package/script/post_install.js

@@ -349,19 +349,14 @@ function PostInstall() {
 
     var npmInstall = function(done) {
 
-        // done();
-
         console.info('now installing modules: please, wait ...');
         console.info('Prefix ('+ self.isCustomPrefix +'): '+ self.prefix);
         var cmd = self.prefix +'/bin/';
         cmd += ( isWin32() ) ? 'npm.cmd install' : 'npm install';
 
-        console.info('running: '+ cmd +' from '+ _(self.path) );
-        console.info('running TMP: '+  _(getTmpDir(), true) );
+        console.info('running: `'+ cmd +'` from '+ _(self.path) );
+        console.info('running using TMPDIR: '+  _(getTmpDir(), true) );
 
-        // if ( !new _(self.root +'/tmp').existsSync() ) {
-        //     new _(self.root +'/tmp').mkdirSync()
-        // }
         run(cmd, { cwd: _(self.path), tmp: _(getTmpDir(), true), outToProcessSTD: true })
             .onData(function onData(data){
                 console.info(data)

package/script/pre_install.js

@@ -126,6 +126,36 @@ function PreInstall() {
         done();
     }
 
+    self.checkRequiredFolders = function(done) {
+
+        // check for `/usr/local/tmp`
+        var tmpDir = getTmpDir();
+        console.info('`tmp` dir -> '+ tmpDir);
+        var tmpDirObj = new _(tmpDir, true);
+        if ( !tmpDirObj.existsSync() ) {
+            tmpDirObj.mkdirSync()
+        }
+
+
+        // check for `/usr/local/run`
+        var runDir = getRunDir();
+        console.info('`run` dir -> '+ runDir);
+        var runDirObj = new _(runDir, true);
+        if ( !runDirObj.existsSync() ) {
+            runDirObj.mkdirSync()
+        }
+
+        // check for `/usr/local/log`
+        var logDir = getLogDir();
+        console.info('`log` dir -> '+ logDir);
+        var logDirObj = new _(logDir, true);
+        if ( !logDirObj.existsSync() ) {
+            logDirObj.mkdirSync()
+        }
+
+        done()
+    }
+
 
     /**
      * Setup global installation path
@@ -199,7 +229,7 @@ function PreInstall() {
 
     self.checkIfGinaIsAlreadyInstalled = async function(done) {
 
-        console.debug('Checking if Gina is already installed');
+        console.debug('Checking if Gina is already installed: '+ self.isGinaInstall);
         if (!self.isGinaInstall) {
             return done();
         }
@@ -277,37 +307,6 @@ function PreInstall() {
             }
         }
         // It is not required to update `~/.gina/main.json` &&  `~/.gina/{shortVersion}/settings.json`
-
-        self.checkRequiredFolders = function(done) {
-
-            // check for `/usr/local/tmp`
-            var tmpDir = getTmpDir()
-            console.info('`tmp` dir -> '+ tmpDir);
-            var tmpDirObj = new _(tmpDir, true);
-            if ( !tmpDirObj.existsSync() ) {
-                tmpDirObj.mkdirSync()
-            }
-
-            // check for `/usr/local/run`
-            var runDir = getRunDir();
-            console.info('`run` dir -> '+ runDir);
-            var runDirObj = new _(runDir, true);
-            if ( !runDirObj.existsSync() ) {
-                runDirObj.mkdirSync()
-            }
-
-            // check for `/usr/local/log`
-            var logDir = getLogDir();
-            console.info('`log` dir -> '+ logDir);
-            var logDirObj = new _(logDir, true);
-            if ( !logDirObj.existsSync() ) {
-                logDirObj.mkdirSync()
-            }
-
-            done()
-        }
-
-
         done()
     }
 

package/utils/helper.js

@@ -25,7 +25,7 @@ function MainHelper(opt) {
         var packObj = require(pack);
         var version =  getEnvVar('GINA_VERSION') || packObj.version;
         var frameworkPath = ginaPath + '/framework/v' + version;
-        
+
         try {
             lib         = require(frameworkPath + '/lib');
             console     = lib.logger;
@@ -35,8 +35,8 @@ function MainHelper(opt) {
             // like scripts running out of the framework context
             // we'll just ignore it
         }
-        
-        
+
+
     }
 
     /**
@@ -199,7 +199,7 @@ function MainHelper(opt) {
         }
 
         var newArgv = {};
-        for (var a in process.argv) {            
+        for (var a in process.argv) {
             if ( /\-\-/.test(process.argv[a]) && process.argv[a].indexOf('=') > -1 ) {
                 evar = ( (process.argv[a].replace(/--/, ''))
                     .replace(/-/, '_') )
@@ -301,7 +301,7 @@ function MainHelper(opt) {
                 logDir += '/gina'
             }
         }
-        
+
         return logDir;
     }
 
@@ -322,17 +322,38 @@ function MainHelper(opt) {
             }
             return runDir
         }
-        
+
         if ( isWin32() ) {
             console.debug('check /gina/utils/helper.js around on getRunDir()')
-        } else {                        
+        } else {
+
             // Means `/usr/local/var/lock` or `/usr/local/var/run` by default.
             runDirObj = new _('/usr/local/var/lock', true);
             if ( runDirObj.existsSync() ) {
-                return _( runDirObj.toUnixStyle() +'/gina', true );
+                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 _('/usr/local/var/run/gina', true)//by default.
+            // return _( runDirObj.toUnixStyle() +'/gina', true );
+            return runDirObj.toUnixStyle();
         }
     }
 
@@ -387,14 +408,14 @@ function MainHelper(opt) {
         }
     }
 
-    setEnvVar = function(key, val, isProtected) {        
+    setEnvVar = function(key, val, isProtected) {
         key = key.toUpperCase();
         var err                     = null
-            // related task `framework:set` & framework/v.xxx/lib/cmd/framework/init.js 
+            // related task `framework:set` & framework/v.xxx/lib/cmd/framework/init.js
             , specialCases          = ['GINA_PORT', 'GINA_DEBUG_PORT', 'GINA_CULTURE', 'GINA_TIMEZONE']
             , isOverrrideAllowed    = (specialCases.indexOf(key) > -1) ? true : false
         ;
-        
+
         if (
             key.substr(0, 5) !== 'GINA_' &&
             key.substr(0, 7) !== 'VENDOR_' &&
@@ -418,10 +439,10 @@ function MainHelper(opt) {
                 process['gina'] = {}
             }
             process['gina'][key] = val;
-            if ( typeof(isProtected) != 'undefined' && isProtected == true) {                
+            if ( typeof(isProtected) != 'undefined' && isProtected == true) {
                 self.protectedVars.push(key)
-            }            
-        }        
+            }
+        }
     }
 
     defineDefault = function(obj) {

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

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