gina 0.1.1-alpha.82 → 0.1.1-alpha.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.82",
+  "version": "0.1.1-alpha.85",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -37,7 +37,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.82/core/gna",
+  "main": "./framework/v0.1.1-alpha.85/core/gna",
   "preferGlobal": true,
   "config": {
     "prefix": "~/.npm-global"

package/script/post_install.js

@@ -81,13 +81,14 @@ function PostInstall() {
         }
 
         if ( !self.isGlobalInstall ) { // none global install
-            self.prefix = process.env.npm_config_prefix = process.cwd();
+            process.env.npm_config_prefix = process.cwd();
+            self.prefix = process.cwd();
             // self.root = process.cwd(); // project path
             // console.error('local installation is not supported for this version at the moment.');
             // console.info('please use `npm install -g gina`');
             // process.exit(1);
         }
-        setEnvVar('GINA_PREFIX', self.prefix); // for the `helper.js`
+        // setEnvVar('GINA_PREFIX', self.prefix); // for the `helper.js`
 
         // check for ~/.gina (first installation ?)
         var ginaHomeDir = getUserHome() + ( isWin32() ? '\\.gina' : '/.gina' );
@@ -269,18 +270,18 @@ function PostInstall() {
 
     //Creating framework command line file for nix.
     var createGinaFile = function(win32Name, callback) {
-        console.info('Current prefix: '+ self.prefix);
+        console.info('Current prefix: '+ getEnvVar('GINA_PREFIX') );
         console.info('Creating framework command line: '+  _(self.gina + '/package.json', true) );
         var name = require( _(self.gina + '/package.json') ).name;
         console.info('Package name: '+ name );
-        var appPath = _( self.path.substring(0, (self.path.length - ("node_modules/" + name + '/').length)) );
+        var appPath = _( self.gina.substring(0, (self.gina.length - ("node_modules/" + name + '/').length)) );
         var source = _(self.path + '/core/template/command/gina.tpl');
         var target = _(appPath +'/'+ name);
         if ( typeof(win32Name) != 'undefined') {
             target = _(appPath +'/'+ win32Name)
         }
         //Will override.
-        console.info('linking to binaries dir ... ');
+        console.info('linking to binaries dir: '+ source +' -> '+ target);
         if ( typeof(callback) != 'undefined') {
             if ( !self.isGlobalInstall ) { // local install only
                 lib.generator.createFileFromTemplate(source, target, function onGinaFileCreated(err) {
@@ -383,7 +384,7 @@ function PostInstall() {
     var npmInstall = function(done) {
 
         console.info('now installing modules: please, wait ...');
-        console.info('Prefix ('+ self.isCustomPrefix +'): '+ self.prefix);
+        console.info('Prefix ('+ self.isCustomPrefix +'): '+ getEnvVar('GINA_PREFIX'));
         var initialDir = process.cwd();
 
 
@@ -446,6 +447,7 @@ function PostInstall() {
                 execSync(cmd);
                 console.debug('Removed default `colors` module from `GINA_DIR`... This is normal ;)');
             } catch (npmErr) {
+                process.chdir(initialDir);
                 return done(npmErr);
             }
 
@@ -694,7 +696,6 @@ function PostInstall() {
 
         restoreSymlinks();
 
-        execSync(_(self.prefix +'/bin/gina framework:set --prefix='+ self.prefix, true));
 
         // Update middleware file
         var filename = _(self.path) + '/MIDDLEWARE';
@@ -715,7 +716,8 @@ function PostInstall() {
         if ( typeof(middleware) == 'undefined' && fs.existsSync(expressPackage) ) {
             middleware = require(expressPackage).version;
             middleware = 'express@' + middleware;
-        } else if (typeof(middleware) == 'undefined') {
+        }
+        else if (typeof(middleware) == 'undefined') {
             return done( new Error('No middleware found !!') );
         }
 
@@ -727,6 +729,8 @@ function PostInstall() {
                     if (err) {
                         return done(err)
                     }
+                    console.info('def !== middleware case');
+                    // execSync(self.prefix +'/bin/gina framework:set --prefix='+ self.prefix);
                     console.info(msg);
                     done()
                 })
@@ -736,6 +740,8 @@ function PostInstall() {
                 if (err) {
                     return done(err)
                 }
+                console.info('File created case');
+                // execSync(self.prefix+'/bin/gina framework:set --prefix='+ self.prefix);
                 console.info(msg);
                 done()
             })

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

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