gina 0.1.1-alpha.1 → 0.1.1-alpha.12

package/framework/{v0.1.1-alpha.1 → v0.1.1-alpha.12}/lib/logger/src/main.js

@@ -79,7 +79,12 @@ function Logger() {
         homeDir += '/.gina';
         shortVersion = requireJSON( _(frameworkPath +'/package.json', true) ).version;// jshint ignore:line
         shortVersion = shortVersion.split('.').splice(0,2).join('.').replace(/^v/, '');
-        defaultLogLevel = requireJSON( _(homeDir +'/'+ shortVersion +'/settings.json', true) ).log_level;// jshint ignore:line
+        if ( new _(homeDir +'/'+ shortVersion +'/settings.json', true).existsSync() ) {
+            defaultLogLevel = requireJSON( _(homeDir +'/'+ shortVersion +'/settings.json', true) ).log_level;// jshint ignore:line
+        } else {
+            defaultLogLevel = 'info'
+        }
+
     } catch(logLevelError) {
         // It is ok to fail  ... do not worry
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.1",
+  "version": "0.1.1-alpha.12",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -43,7 +43,7 @@
     "./doc/man/gina-model.1",
     "./doc/man/gina-env.1"
   ],
-  "main": "./framework/v0.1.1-alpha.1/core/gna",
+  "main": "./framework/v0.1.1-alpha.12/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js -g",
     "preinstall": "node ./script/pre_install.js -g",

package/script/post_install.js

@@ -38,12 +38,18 @@ function PostInstall() {
         self.root = self.gina; // by default
         self.isGlobalInstall = 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' ) {
                 self.isGlobalInstall = true;
-                break;
+                continue;
+            }
+            if (args[i] == '--prefix' ) {
+                self.isCustomPrefix = true;
+                self.prefix = args[i].split(/\=/)[1];
+                continue;
             }
         }
 
@@ -161,7 +167,7 @@ function PostInstall() {
         done();
     }
 
-    var configureGina = function(callback) {
+    var configureGina = function() {
         // link to ./bin/cli to binaries dir
         if (!self.isWin32) {
             var binPath     = _(self.prefix+'/bin', true);
@@ -229,16 +235,16 @@ function PostInstall() {
                 })
             } else {
 
-                configureGina();
+                // configureGina();
                 callback(false)
             }
         } else {
             if ( !self.isGlobalInstall ) {
                 lib.generator.createFileFromTemplate(source, target)
-            } else {
-
-                configureGina();
             }
+            // else {
+            //     configureGina();
+            // }
         }
     }
 
@@ -322,8 +328,10 @@ function PostInstall() {
 
     var npmInstall = function(done) {
         console.info('now installing modules: please, wait ...');
+        console.info('Prefix ('+ self.isCustomPrefix +'): '+ self.prefix);
         var cmd = ( isWin32() ) ? 'npm.cmd install' : 'npm install';
-
+        cmd = self.prefix +'/'+ cmd;
+        console.info('running: '+ cmd +' from '+ _(self.path) );
         run(cmd, { cwd: _(self.path), tmp: _(self.root +'/tmp'), outToProcessSTD: true })
             .onData(function onData(data){
                 console.info(data)
@@ -346,6 +354,7 @@ function PostInstall() {
             var initialDir = process.cwd();
             process.chdir(frameworkPath);
             var cmd = ( isWin32() ) ? 'npm.cmd rm colors' : 'npm rm colors';
+            cmd = self.prefix +'/'+ cmd
             try {
                 execSync(cmd);
                 console.debug('Removed default `colors` module from `GINA_DIR`... This is normal ;)');

package/script/pre_install.js

@@ -19,6 +19,8 @@ var isWin32 = function() {
     return (process.platform === 'win32') ? true : false;
 };
 
+var helpers = null;
+
 /**
  * Pre install constructor
  *
@@ -34,6 +36,7 @@ function PreInstall() {
 
         self.isGlobalInstall = false;
         self.prefix = execSync('npm config get prefix');
+        self.isGinaInstall = false;
 
         var args = process.argv, i = 0, len = args.length;
         for (; i < len; ++i) {
@@ -51,6 +54,7 @@ function PreInstall() {
             process.exit(1);
         }
 
+
         begin(0);
         // TODO check old framework version to be archived
     }
@@ -98,6 +102,14 @@ function PreInstall() {
             execSync(cmd);
             process.chdir(initialDir);
         }
+
+        if ( !fs.existsSync(frameworkPath +'/node_modules/gina') ) {
+            return done();
+        }
+        self.isGinaInstall = true;
+
+        helpers = require(frameworkPath+ '/utils/helpers');
+
         lib = require('./lib');
         console = lib.logger;
 
@@ -188,6 +200,9 @@ function PreInstall() {
     self.checkIfGinaIsAlreadyInstalled = async function(done) {
 
         console.debug('Checking if Gina is already installed');
+        if (!self.isGinaInstall) {
+            return done();
+        }
 
         // Backup current version
 

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

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