gina 0.1.1-alpha.7 → 0.1.1-alpha.70

package/framework/v0.1.1-alpha.70/package.json

@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "busboy": "^0.2.14",
+    "colors": "^1.4.0",
+    "engine.io": "^6.2.0",
+    "engine.io-client": "^6.2.2",
+    "requirejs": "^2.3.6",
+    "sanitize-html": "^2.7.0",
+    "ssl-checker": "^2.0.7",
+    "swig": "^1.4.2",
+    "uuid": "^7.0.3",
+    "zlib": "^1.0.5"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.7",
+  "version": "0.1.1-alpha.70",
   "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.7/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/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

@@ -8,10 +8,27 @@
 
 //Imports
 var fs          = require('fs');
+var os          = require("os");
 var util        = require('util');
 var promisify   = util.promisify;
 const { execSync } = require('child_process');
 
+var isWin32 = function() {
+    return (process.platform === 'win32') ? true : false;
+};
+// just in case `post_install` is called by hand
+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');
 var console     = lib.logger;
 
@@ -20,6 +37,7 @@ var ginaPath = (scriptPath.replace(/\\/g, '/')).replace('/script', '');
 var help        = require(ginaPath + '/utils/helper.js');
 var pack        = ginaPath + '/package.json';
 pack =  (isWin32()) ? pack.replace(/\//g, '\\') : pack;
+var helpers = null;
 
 
 /**
@@ -38,15 +56,50 @@ 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' ) {
+            if ( /^(\-g|\-\-global)$/.test(args[i]) ) {
                 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, '');
+        if (
+            process.env.npm_config_prefix
+            && self.prefix != process.env.npm_config_prefix.toString().replace(/\n/g, '')
+        ) {
+            self.prefix = process.env.npm_config_prefix.toString().replace(/\n/g, '');
+            self.isCustomPrefix = true;
+        }
+
+        // check for ~/.gina (first installation ?)
+        var ginaHomeDir = getUserHome() + ( isWin32() ? '\\.gina' : '/.gina' );
+        self.version = require( self.gina + ( isWin32() ? '\\' : '/' ) +'package.json' ).version;
+        self.shortVersion = self.version.split('.');
+        self.shortVersion.splice(2);
+        self.shortVersion = self.shortVersion.join('.');
+
+
+
+        var frameworkVersionPath   = __dirname +'/../framework/v'+ self.version;
+        helpers = require(frameworkVersionPath+ '/helpers');
+
+        // 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 +198,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 +214,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 +265,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 +285,16 @@ function PostInstall() {
                 })
             } else {
 
-                configureGina();
+                // configureGina();
                 callback(false)
             }
         } else {
             if ( !self.isGlobalInstall ) {
                 lib.generator.createFileFromTemplate(source, target)
-            } else {
-
-                configureGina();
             }
+            // else {
+            //     configureGina();
+            // }
         }
     }
 
@@ -321,19 +377,48 @@ function PostInstall() {
 
 
     var npmInstall = function(done) {
+
         console.info('now installing modules: please, wait ...');
+        console.info('Prefix ('+ self.isCustomPrefix +'): '+ self.prefix);
+        var initialDir = process.cwd();
+
+
         var cmd = ( isWin32() ) ? 'npm.cmd install' : 'npm install';
 
-        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) {
-                    return done()
-                }
-                done(err)
-            })
+        process.chdir( self.path );
+        console.info('running: `'+ cmd +'` from '+ process.cwd() );
+        console.info('running using TMPDIR: '+  _(getTmpDir(), true) );
+
+        process.env.npm_config_global=false;
+        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)
+        //     }
+        // }
+        process.chdir(initialDir);
+        process.env.npm_config_global=true;
+
+        done()
+
+
+        // run(cmd, { cwd: _(self.path), tmp: _(getTmpDir(), true), outToProcessSTD: true })
+        //     .onData(function onData(data){
+        //         console.info(data)
+        //     })
+        //     .onComplete( function onDone(err, data){
+        //         if (!err || /^false$/i.test(err) ) {
+        //             console.info('completed: '+ cmd);
+        //             return done()
+        //         }
+        //         console.debug('error found: '+ err + '\n=> '+ data);
+        //         done(err)
+        //     })
     }
 
     self.cleanupIfNeeded = function(done) {
@@ -345,7 +430,14 @@ function PostInstall() {
         if ( new _(frameworkPath +'/node_modules/colors', true).existsSync() ) {
             var initialDir = process.cwd();
             process.chdir(frameworkPath);
+            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 ;)');
@@ -354,6 +446,7 @@ function PostInstall() {
             }
 
             process.chdir(initialDir);
+            process.env.npm_config_global=oldConfigGlobal;
         }
 
         done()
@@ -571,6 +664,9 @@ function PostInstall() {
         }
     }
 
-    init()
+
+    // setTimeout(() => {
+        init()
+    // }, 1000);
 }
 new PostInstall()