gina 0.1.1-alpha.68 → 0.1.1-alpha.70

package/package.json

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

package/script/post_install.js

@@ -21,9 +21,12 @@ var initialDir = process.cwd();
 var frameworkPath   = __dirname +'/..';
 if ( !fs.existsSync(frameworkPath +'/node_modules/colors') ) {
     process.chdir(frameworkPath);
+    var oldConfigGlobal = process.env.npm_config_global;
+    process.env.npm_config_global=false;
     var cmd = ( isWin32() ) ? 'npm.cmd install colors@1.4.0' : 'npm install colors@1.4.0';
     execSync(cmd);
     process.chdir(initialDir);
+    process.env.npm_config_global=oldConfigGlobal;
 }
 
 var lib         = require('./lib');
@@ -379,17 +382,6 @@ function PostInstall() {
         console.info('Prefix ('+ self.isCustomPrefix +'): '+ self.prefix);
         var initialDir = process.cwd();
 
-        var deps = require(_(self.path + '/package.json', true)).dependencies;
-
-
-
-
-        // var cmd = self.prefix +'/bin/';
-        // cmd += ( isWin32() ) ? 'npm.cmd install' : 'npm install';
-        // cmd += ' --prefix='+ self.path;
-
-        // var cmd = 'cd '+ self.path +' && ';
-        // cmd += ( isWin32() ) ? 'npm.cmd install' : 'npm install';
 
         var cmd = ( isWin32() ) ? 'npm.cmd install' : 'npm install';
 
@@ -398,22 +390,20 @@ function PostInstall() {
         console.info('running using TMPDIR: '+  _(getTmpDir(), true) );
 
         process.env.npm_config_global=false;
-        // execSync(cmd);
-
-        // if ( !new _(self.path + '/node_modules').existsSync() ) {
-        //     new _(self.path + '/node_modules').mkdirSync()
+        execSync(cmd);
+
+        // var deps = require(_(self.path + '/package.json', true)).dependencies;
+        // for (let d in deps) {
+        //     try {
+        //         console.info('running: `'+ cmd +' '+ d +'@"'+ deps[d] +'"` from '+ self.path );
+        //         execSync(cmd +' '+ d +'@"'+ deps[d] +'"');
+        //     } catch (err) {
+        //         return done(err)
+        //     }
         // }
-
-        for (let d in deps) {
-            try {
-                console.info('running: `'+ cmd +' '+ d +'@"'+ deps[d] +'"` from '+ self.path );
-                // execSync(cmd +' '+ d +'@"'+ deps[d] +'" --cwd '+ self.path);
-                execSync(cmd +' '+ d +'@"'+ deps[d] +'"');
-            } catch (err) {
-                return done(err)
-            }
-        }
         process.chdir(initialDir);
+        process.env.npm_config_global=true;
+
         done()
 
 
@@ -440,8 +430,14 @@ function PostInstall() {
         if ( new _(frameworkPath +'/node_modules/colors', true).existsSync() ) {
             var initialDir = process.cwd();
             process.chdir(frameworkPath);
-            var cmd = self.prefix +'/bin/';
-            cmd += ( isWin32() ) ? 'npm.cmd rm colors' : 'npm rm colors';
+            var oldConfigGlobal = process.env.npm_config_global;
+            process.env.npm_config_global=false;
+
+            // var cmd = self.prefix +'/bin/';
+            // cmd += ( isWin32() ) ? 'npm.cmd rm colors' : 'npm rm colors';
+
+            var cmd = ( isWin32() ) ? 'npm.cmd rm colors' : 'npm rm colors';
+
             try {
                 execSync(cmd);
                 console.debug('Removed default `colors` module from `GINA_DIR`... This is normal ;)');
@@ -450,6 +446,7 @@ function PostInstall() {
             }
 
             process.chdir(initialDir);
+            process.env.npm_config_global=oldConfigGlobal;
         }
 
         done()

package/script/pre_install.js

@@ -331,9 +331,12 @@ function PreInstall() {
         var frameworkPath   = __dirname +'/..';
         if ( !fs.existsSync(frameworkPath +'/node_modules/colors') ) {
             process.chdir(frameworkPath);
+            var oldConfigGlobal = process.env.npm_config_global;
+            process.env.npm_config_global=false;
             var cmd = ( isWin32() ) ? 'npm.cmd install colors@1.4.0' : 'npm install colors@1.4.0';
             execSync(cmd);
             process.chdir(initialDir);
+            process.env.npm_config_global=oldConfigGlobal;
         }
 
 

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

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