gina 0.1.1-alpha.3 → 0.1.1-alpha.32

package/package.json

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

package/resources/home/main.json

@@ -3,6 +3,18 @@
         "{release}": [ "{version}" ]
     },
     "def_framework": "{version}",
+    "scopes": {
+        "{release}": [
+        "local",
+        "production"
+        ]
+    },
+    "local_scope": {
+        "{release}": "local"
+    },
+    "def_scope": {
+        "{release}": "local"
+    },
     "envs": {
         "{release}": [ "dev", "prod" ]
     },
@@ -12,7 +24,7 @@
     "dev_env": {
         "{release}": "dev"
     },
-    
+
     "protocols": {
         "_comment": "e.g.:  http/1.1, http/2.0, net",
         "{release}": [  "http/1.1", "http/2.0" ]

package/resources/home/user/extensions/logger/default/config.json

@@ -1,5 +1,5 @@
 {
-    "_comment": "For `text colors` definitions: https://www.npmjs.com/package/colors"
+    "_comment": "For `text colors` definitions: https://www.npmjs.com/package/colors",
     "template": "[%d] [%s][%a] %m",
     "flows": [],
     "levels" : {

package/script/post_install.js

@@ -38,15 +38,38 @@ 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 ( /^\-\-prefix\=/.test(args[i] ) ) {
+                self.isCustomPrefix = true;
+                self.prefix = args[i].split(/\=/)[1];
+                continue;
             }
         }
 
+        self.prefix = self.prefix.toString().replace(/\n/g, '');
+
+        // check for ~/.gina (first installation ?)
+        var ginaHomeDir = _(getUserHome() + '/.gina', true);
+        self.version = require( _(self.gina + '/package.json') ).version;
+        self.shortVersion = self.version.split('.');
+        self.shortVersion.splice(2);
+        self.shortVersion = self.shortVersion.join('.');
+
+        // if not found -> skip because it means that gina might not be installed or configured yet
+        if ( !new _(ginaHomeDir).existsSync() ) {
+            new _(ginaHomeDir).mkdirSync()
+        }
+        if ( !new _(ginaHomeDir +'/'+ self.shortVersion ).existsSync() ) {
+            new _(ginaHomeDir +'/'+ self.shortVersion).mkdirSync()
+        }
+
         console.debug('Is this for Windows ? ' +  self.isWin32);
 
         if ( !self.isGlobalInstall ) { //global install
@@ -145,7 +168,7 @@ function PostInstall() {
 
 
     self.createVersionFile = function(done) {
-        var version = require( _(self.gina + '/package.json') ).version;
+        var version = self.version;
         console.debug('writting version number: '+ version);
 
         var target = _(self.path + '/VERSION');
@@ -161,7 +184,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);
@@ -212,7 +235,10 @@ function PostInstall() {
 
     //Creating framework command line file for nix.
     var createGinaFile = function(win32Name, callback) {
+        console.info('Creating framework command line: '+  _(self.path + '/package.json') );
+
         var name = require( _(self.path + '/package.json') ).name;
+        console.info('Package name: '+ name );
         var appPath = _( self.path.substring(0, (self.path.length - ("node_modules/" + name + '/').length)) );
         var source = _(self.path + '/core/template/command/gina.tpl');
         var target = _(appPath +'/'+ name);
@@ -229,16 +255,16 @@ function PostInstall() {
                 })
             } else {
 
-                configureGina();
+                // configureGina();
                 callback(false)
             }
         } else {
             if ( !self.isGlobalInstall ) {
                 lib.generator.createFileFromTemplate(source, target)
-            } else {
-
-                configureGina();
             }
+            // else {
+            //     configureGina();
+            // }
         }
     }
 
@@ -321,17 +347,30 @@ function PostInstall() {
 
 
     var npmInstall = function(done) {
+
+        done();
+
         console.info('now installing modules: please, wait ...');
-        var cmd = ( isWin32() ) ? 'npm.cmd install' : 'npm install';
+        console.info('Prefix ('+ self.isCustomPrefix +'): '+ self.prefix);
+        var cmd = self.prefix +'/bin/';
+        cmd += ( isWin32() ) ? 'npm.cmd install' : 'npm install';
 
+        console.info('running: '+ cmd +' from '+ _(self.path) );
+        console.info('running TMP: '+ _(self.root +'/tmp') );
+
+        if ( !new _(self.root +'/tmp').existsSync() ) {
+            new _(self.root +'/tmp').mkdirSync()
+        }
         run(cmd, { cwd: _(self.path), tmp: _(self.root +'/tmp'), outToProcessSTD: true })
             .onData(function onData(data){
                 console.info(data)
             })
             .onComplete( function onDone(err, data){
                 if (!err) {
+                    console.info('completed: '+ cmd);
                     return done()
                 }
+                console.info('error found: '+ err + '\n=> '+ data);
                 done(err)
             })
     }
@@ -345,7 +384,8 @@ function PostInstall() {
         if ( new _(frameworkPath +'/node_modules/colors', true).existsSync() ) {
             var initialDir = process.cwd();
             process.chdir(frameworkPath);
-            var cmd = ( isWin32() ) ? 'npm.cmd rm colors' : 'npm rm colors';
+            var cmd = self.prefix +'/bin/';
+            cmd += ( isWin32() ) ? 'npm.cmd rm colors' : 'npm rm colors';
             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
     }
@@ -99,15 +103,21 @@ function PreInstall() {
             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;
 
         self.isWin32 = isWin32();//getEnvVar('GINA_IS_WIN32');
         self.path = getEnvVar('GINA_FRAMEWORK');
         self.gina = getEnvVar('GINA_DIR');
         self.root = self.gina; // by default
 
-        lib = require('./lib');
-        console = lib.logger;
-
         console.debug('framework path: ' + self.gina);
         console.debug('framework version path: ' + self.path);
         console.debug('cwd path: ' + self.root );
@@ -190,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