gina 0.1.1-alpha.7 → 0.1.1-alpha.72

package/framework/v0.1.1-alpha.72/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.72",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -19,6 +19,10 @@
     "type": "git",
     "url": "https://github.com/rhinostone/gina.git"
   },
+  "bugs": {
+    "url": "https://github.com/rhinostone/gina/issues",
+    "email": "bugs@gina.io"
+  },
   "author": {
     "name": "Rhinostone",
     "email": "contact@gina.io"
@@ -30,24 +34,15 @@
   "engine": [
     "node >=0.10.25"
   ],
-  "preferGlobal": true,
   "bin": {
-    "gina": "./bin/cli",
-    "gina-debug": "./bin/cli-debug"
+    "gina": "./bin/gina"
   },
-  "man": [
-    "./doc/man/gina.1",
-    "./doc/man/gina-framework.1",
-    "./doc/man/gina-project.1",
-    "./doc/man/gina-bundle.1",
-    "./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.72/core/gna",
+  "preferGlobal": true,
   "scripts": {
-    "prepare": "node ./script/prepare_version.js -g",
-    "preinstall": "node ./script/pre_install.js -g",
-    "postinstall": "node ./script/post_install.js -g"
+    "prepare": "node ./script/prepare_version.js",
+    "preinstall": "node ./script/pre_install.js -g --prefix=~/.npm-global",
+    "postinstall": "node ./script/post_install.js -g --prefix=~/.npm-global"
   },
   "license": "MIT",
   "readmeFilename": "README.md"

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/resources/package.json.template

@@ -19,6 +19,10 @@
     "type": "git",
     "url": "https://github.com/rhinostone/gina.git"
   },
+  "bugs": {
+    "url" : "https://github.com/rhinostone/gina/issues",
+    "email" : "bugs@gina.io"
+  },
   "author": {
     "name": "Rhinostone",
     "email": "contact@gina.io"
@@ -32,8 +36,7 @@
   ],
   "preferGlobal": true,
   "bin": {
-    "gina": "./bin/cli",
-    "gina-debug": "./bin/cli-debug"
+    "gina": "./bin/gina"
   },
   "man": [
     "./doc/man/gina.1",
@@ -43,8 +46,12 @@
     "./doc/man/gina-model.1",
     "./doc/man/gina-env.1"
   ],
-  "main": "./framework/v{version}/core/gna",
-  "scripts": {},
+  "main": "./framework/v0.1.1-alpha.70/core/gna",
+  "scripts": {
+    "prepare": "node ./script/prepare_version.js -g",
+    "preinstall": "node ./script/pre_install.js -g",
+    "postinstall": "node ./script/post_install.js -g"
+  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

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,13 +56,48 @@ 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);
@@ -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()
@@ -458,6 +551,78 @@ function PostInstall() {
         done()
     }
 
+    /**
+     * Link binary to profile
+     * Will edit ~/.profile, check and add if needed path to ~/.npm-global
+     *
+     */
+    // self.linkBinaryToProfile = async function(done) {
+
+    //     // create a directory for global installations
+    //     var npmGlobalPath = _(getUserHome() + '/.npm-global', true);
+
+    //     if (self.prefix != npmGlobalPath ) {
+    //         done()
+    //     }
+
+    //     console.info('Setting npm global path: '+ npmGlobalPath +' '+ new _(npmGlobalPath).existsSync() );
+    //     var npmGlobalPathObj = new _(npmGlobalPath);
+    //     if ( !npmGlobalPathObj.existsSync() ) {
+    //         npmGlobalPathObj.mkdirSync()
+    //     }
+    //     // from `/usr/local` -> `~/.npm-global`
+    //     var cmd = 'npm config set prefix '+ getUserHome() +'/.npm-global';
+    //     await promisify(run)(cmd, { cwd: _(self.path), tmp: _(self.root +'/tmp'), outToProcessSTD: true })
+    //         .catch(function onError(err){
+    //             if (err) {
+    //                 console.warn('try to run: sudo ' + cmd);
+    //                 return done(err);
+    //             }
+    //         });
+
+    //     var profilePath = getUserHome() + '/.profile';
+    //     var profilePathObj = new _(profilePath);
+    //     if ( !profilePathObj.existsSync() ) {
+    //         cmd = 'touch '+ profilePath;
+    //         await promisify(run)(cmd, { cwd: _(self.path), tmp: _(self.root +'/tmp'), outToProcessSTD: true })
+    //             .catch(function onError(err){
+    //                 if (err) {
+    //                     console.warn('try to run: sudo ' + cmd);
+    //                     return done(err);
+    //                 }
+    //             });
+    //     }
+
+    //     var inFile = null;
+    //     try {
+    //         inFile = execSync("cat ~/.profile | grep .npm-global/bin").toString();
+    //     } catch (err) {
+    //         // nothing to do
+    //     }
+
+    //     if (!inFile) {
+    //         inFile = "\n# set PATH so it includes user‘s private npm bin if exists"
+    //         inFile += '\nif [ -d "$HOME/.npm-global/bin" ]; then';
+    //         inFile += '\n    PATH="$HOME/.npm-global/bin:$PATH"';
+    //         inFile += '\nfi\n';
+    //         try {
+    //             fs.appendFileSync( getUserHome()+'/.profile', inFile );
+    //         } catch (err) {
+    //             return done(err);
+    //         }
+    //         inFile = null;
+
+    //         // we need to source/update ~/.profile
+    //         try {
+    //             execSync("source "+ profilePath);
+    //         } catch (err) {
+    //             return done(err)
+    //         }
+    //     }
+
+    //     done()
+    // }
+
     var restoreSymlinks = function() {
         var archivesPath = _(getUserHome() + '/.gina/archives/framework', true);
         var frameworkPath = _(self.gina +'/framework', true);
@@ -571,6 +736,9 @@ function PostInstall() {
         }
     }
 
-    init()
+
+    // setTimeout(() => {
+        init()
+    // }, 1000);
 }
 new PostInstall()