gina 0.1.1-alpha.100 → 0.1.1-alpha.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.100",
+  "version": "0.1.1-alpha.103",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.100/core/gna",
+  "main": "./framework/v0.1.1-alpha.103/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
     "postpublish": "node ./script/post_publish.js",

package/script/post_install.js

@@ -393,7 +393,7 @@ function PostInstall() {
 
     //Creating framework command line file for nix.
     var createGinaFile = function(win32Name, callback) {
-        // Created by NPM for global installations
+        // local install only
         if (self.isGlobalInstall) {
             return callback(false);
         }
@@ -404,34 +404,26 @@ function PostInstall() {
         var name = require( _(self.gina + '/package.json', true) ).name;
         console.info('Package name: '+ name );
         console.info('Creating framework command line:');
-        var appPath = process.cwd();
-        // _( self.gina.substring(0, (self.gina.length - ("node_modules/" + name + '/').length)) );
-
-
+        var appPath = process.env.INIT_CWD;//process.cwd();
         console.debug('App path: '+ appPath);
-        var source = _(self.versionPath + '/core/template/command/gina.tpl', true);
+        // var source = _(self.versionPath + '/core/template/command/gina.tpl', true);
+        var source = _(appPath + '/node_modules/.bin/gina', true);
         console.debug('Source: '+ source);
         var target = _(appPath +'/'+ name, true);
-        console.debug('Target: '+ target);
-
         if ( win32Name && typeof(win32Name) != 'undefined') {
-            target = _(appPath +'/'+ win32Name)
+            target = _(appPath +'/'+ win32Name, true)
         }
-        //Will override.
-        console.info('linking to binaries dir: '+ source +' -> '+ target);
+        console.debug('Target: '+ target);
+
         if ( callback && typeof(callback) != 'undefined') {
-            if ( !self.isGlobalInstall ) { // local install only
-                lib.generator.createFileFromTemplate(source, target, function onGinaFileCreated(err) {
-                    return callback(err)
-                })
-            } else {
-                // configureGina();
-                return callback(false)
-            }
-        } else {
-            if ( !self.isGlobalInstall ) {
-                lib.generator.createFileFromTemplate(source, target)
+            console.info('linking to binaries dir: '+ source +' -> '+ target);
+            try {
+                new _(source).symlinkSync(target)
+            } catch (err) {
+                return callback(err)
             }
+
+            return callback(false);
         }
     }
 
@@ -793,12 +785,6 @@ function PostInstall() {
     self.end = function(done) {
 
         restoreSymlinks();
-        // update package.json
-        // var pkgObj = require(pack);
-        // pkgObj.config.prefix = self.prefix;
-        // pkgObj.config.globalMode = self.isGlobalInstall;
-        // new _(pack, true).rmSync();
-        // lib.generator.createFileFromDataSync(JSON.stringify(pkgObj, null, 2), pack);
 
         // configuring Gina
         var ginaBinanry = _(self.gina + '/bin/gina', true);

package/script/pre_install.js

@@ -486,12 +486,16 @@ function PreInstall() {
             return runDir
         }
 
+        if (!self.isGlobalInstall) {
+            runDir = runDir.replace(/\/var\//, '/')
+        }
+
         if ( existsSync(runDir) ) {
             if ( !isWritableSync(runDir) ) {
                 throw new Error('location `'+ runDir +'` found but not writable !' )
             }
 
-            runDir += ( isWin32() ) ? '' : '/gina'
+            runDir += ( isWin32() || !self.isGlobalInstall ) ? '' : '/gina'
             if ( !existsSync(runDir) ) {
                 fs.mkdirSync(runDir)
             }
@@ -501,7 +505,11 @@ function PreInstall() {
 
         try {
             //by default.
-            runDir = prefix+'/var';
+            runDir = prefix;
+            if (!self.isGlobalInstall) {
+                runDir += '/var';
+            }
+
             if ( !existsSync(runDir) ) {
                 fs.mkdirSync(runDir)
             }
@@ -513,7 +521,7 @@ function PreInstall() {
             throw new Error('location error: `'+ runDir+'`\n'+ err.stack);
         }
 
-        if (self.optionalPrefix != prefix) {
+        if (self.optionalPrefix != prefix && self.isGlobalInstall) {
             runDir += ( isWin32() ) ? '\\gina' : '/gina'
             if ( !existsSync(runDir) ) {
                 fs.mkdirSync(runDir)

package/utils/helper.js

@@ -320,7 +320,7 @@ function MainHelper(opt) {
             return logDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         if ( isWin32() ) {
             logDir = process.env.LOG ||
@@ -396,7 +396,7 @@ function MainHelper(opt) {
             return runDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : prefix + '/var/lock';
 
@@ -461,7 +461,7 @@ function MainHelper(opt) {
             return dir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix  || self.defaultPrefix || 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() {

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

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