gina 0.1.1-alpha.40 → 0.1.1-alpha.43

package/package.json

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

package/script/post_install.js

@@ -43,7 +43,7 @@ function PostInstall() {
 
         var args = process.argv, i = 0, len = args.length;
         for (; i < len; ++i) {
-            if (args[i] == '-g' ) {
+            if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
                 self.isGlobalInstall = true;
                 continue;
             }

package/script/pre_install.js

@@ -18,6 +18,130 @@ var lib     = null;
 var isWin32 = function() {
     return (process.platform === 'win32') ? true : false;
 };
+var existsSync = function(path) {
+    if ( typeof(fs.accessSync) != 'undefined' ) {
+        try {
+            fs.accessSync(path, fs.constants.F_OK);
+            return true;
+        } catch (err) {
+            return false;
+        }
+    } else { // support for old version of nodejs
+        return fs.existsSync(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
+};
+
+/**
+ * Get run\lock path
+ * @returns {string} rundir
+ * */
+ var getRunDir = function() {
+    // 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 ( existsSync(runDir) ) {
+        if ( !isWritableSync(runDir) ) {
+            throw new Error('location `'+ runDir +'` found but not writable !' )
+        }
+
+        runDir += ( isWin32() ) ? '' : '/gina'
+        if ( !existsSync(runDir) ) {
+            fs.mkdirSync(runDir)
+        }
+
+        return runDir;
+    }
+
+    try {
+        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'
+    if ( !existsSync(runDir) ) {
+        fs.mkdirSync(runDir)
+    }
+
+    return runDir;
+};
+
+var getTmpDir = function() {
+    // support for node 0.10.x & 0.11.x
+    var tmp = os.tmpdir || function() {
+        if ( isWin32() ) {
+            return process.env.TEMP ||
+                process.env.TMP ||
+                (process.env.SystemRoot || process.env.windir) + '\\Temp'
+        } else {
+            return process.env.TMPDIR ||
+                process.env.TMP ||
+                process.env.TEMP ||
+                '/usr/local/var/tmp'
+        }
+    };
+
+    return ( typeof(tmp) == 'function') ?  tmp() : tmp
+};
+
+/**
+ * Get log path - %SystemRoot%\system32\winevt\logs or /
+ *
+ * @returns {string} logPath
+ * */
+var getLogDir = function() {
+    // Trying to retrieve original value if already defined
+    var logDir = null;
+
+    if ( isWin32() ) {
+        logDir = process.env.LOG ||
+            process.env.LOGS ||
+            (process.env.SystemRoot || process.env.windir) + '\\System32\\Winevt\\Logs'
+        ;
+        if ( !/gina$/.test(logDir) ) {
+            logDir += '\\gina'
+        }
+    } else {
+        logDir = process.env.LOGDIR ||
+            process.env.LOG ||
+            process.env.LOGS ||
+            '/usr/local/var/log'
+        ;
+        if ( !/gina$/.test(logDir) ) {
+            logDir += '/gina'
+        }
+    }
+
+    return logDir;
+};
+
+var getUserHome = function() {
+    return process.env[(isWin32()) ? 'USERPROFILE' : 'HOME']
+};
 
 var helpers = null;
 
@@ -30,22 +154,31 @@ var helpers = null;
  * @constructor
  * */
 function PreInstall() {
-    var self = {}, _this = this;
+    var self = {};
 
     var init = function() {
 
         self.isGlobalInstall = false;
-        self.prefix = execSync('npm config get prefix');
         self.isGinaInstall = false;
+        self.prefix = execSync('npm config get prefix');
+        self.isCustomPrefix = false;
 
         var args = process.argv, i = 0, len = args.length;
         for (; i < len; ++i) {
-            if (args[i] == '-g' ) {
+            if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
                 self.isGlobalInstall = true;
                 break;
             }
+
+            if ( /^\-\-prefix\=/.test(args[i] ) ) {
+                self.isCustomPrefix = true;
+                self.prefix = args[i].split(/\=/)[1];
+                continue;
+            }
         }
 
+        self.prefix = self.prefix.toString().replace(/\n/g, '');
+
         if ( !self.isGlobalInstall ) { //global install
             self.root = process.cwd(); // project path
             self.tmpDir = os.tmpdir(); // default tmp path
@@ -87,9 +220,11 @@ function PreInstall() {
         }
     }
 
+
+
     self.checkRequirements = async function(done) {
         // TODO - handle windows case
-        if ( /true/i.test(self.isWin32) ) {
+        if ( /^true$/i.test(isWin32()) ) {
             return done( new Error('Windows in not yet fully supported. Thank you for your patience'));
         }
 
@@ -107,21 +242,13 @@ function PreInstall() {
             return done();
         }
         self.isGinaInstall = true;
+        self.isWin32 = isWin32();
 
-        helpers = require(frameworkPath+ '/utils/helpers');
-
-        lib = require('./lib');
-        console = lib.logger;
-
-        self.isWin32 = isWin32();//getEnvVar('GINA_IS_WIN32');
-        self.path = getEnvVar('GINA_FRAMEWORK');
-        self.gina = getEnvVar('GINA_DIR');
-        self.root = self.gina; // by default
 
         console.debug('framework path: ' + self.gina);
         console.debug('framework version path: ' + self.path);
         console.debug('cwd path: ' + self.root );
-        console.debug('this is a global install ...');
+        console.debug('Is this a global install: '+ self.isGlobalInstall);
 
         done();
     }
@@ -131,26 +258,23 @@ function PreInstall() {
         // check for `/usr/local/tmp`
         var tmpDir = getTmpDir();
         console.info('`tmp` dir -> '+ tmpDir);
-        var tmpDirObj = new _(tmpDir, true);
-        if ( !tmpDirObj.existsSync() ) {
-            tmpDirObj.mkdirSync()
+        if ( !existsSync(tmpDir) ) {
+            fs.mkdirSync(tmpDir)
         }
 
 
         // check for `/usr/local/run`
         var runDir = getRunDir();
         console.info('`run` dir -> '+ runDir);
-        var runDirObj = new _(runDir, true);
-        if ( !runDirObj.existsSync() ) {
-            runDirObj.mkdirSync()
+        if ( !existsSync(runDir) ) {
+            fs.mkdirSync(runDir)
         }
 
         // check for `/usr/local/log`
         var logDir = getLogDir();
         console.info('`log` dir -> '+ logDir);
-        var logDirObj = new _(logDir, true);
-        if ( !logDirObj.existsSync() ) {
-            logDirObj.mkdirSync()
+        if ( !existsSync(runDir) ) {
+            fs.mkdirSync(logDir)
         }
 
         done()
@@ -237,12 +361,20 @@ function PreInstall() {
         // Backup current version
 
         // check for ~/.gina
-        var ginaHomeDir = _(getUserHome() + '/.gina', true);
+        var ginaHomeDir = getUserHome() + ((isWin32()) ? '\\.gina': '/.gina');
         // if not found -> skip because it means that gina might not be installed or configured yet
-        if ( !new _(ginaHomeDir).existsSync() ) {
+        if (!existsSync(ginaHomeDir) ) {
             return done();
         }
 
+        helpers = require(frameworkPath+ '/utils/helpers');
+        lib = require('./lib');
+
+        console = lib.logger;
+        self.path = getEnvVar('GINA_FRAMEWORK');
+        self.gina = getEnvVar('GINA_DIR');
+        self.root = self.gina; // by default
+
         // check if framework version folder is found
         var versionsFolders = null, frameworkPath = null;
         try {

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

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