gina 0.1.1-alpha.4 → 0.1.1-alpha.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.4",
+  "version": "0.1.1-alpha.42",
   "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.4/core/gna",
+  "main": "./framework/v0.1.1-alpha.42/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,6 +8,7 @@
 
 //Imports
 var fs          = require('fs');
+var os          = require("os");
 var util        = require('util');
 var promisify   = util.promisify;
 const { execSync } = require('child_process');
@@ -38,15 +39,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' ) {
+            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, '');
+
+        // 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 +169,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 +185,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 +236,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 +256,16 @@ function PostInstall() {
                 })
             } else {
 
-                configureGina();
+                // configureGina();
                 callback(false)
             }
         } else {
             if ( !self.isGlobalInstall ) {
                 lib.generator.createFileFromTemplate(source, target)
-            } else {
-
-                configureGina();
             }
+            // else {
+            //     configureGina();
+            // }
         }
     }
 
@@ -321,17 +348,25 @@ function PostInstall() {
 
 
     var npmInstall = function(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 using TMPDIR: '+  _(getTmpDir(), true) );
 
-        run(cmd, { cwd: _(self.path), tmp: _(self.root +'/tmp'), outToProcessSTD: true })
+        run(cmd, { cwd: _(self.path), tmp: _(getTmpDir(), true), outToProcessSTD: true })
             .onData(function onData(data){
                 console.info(data)
             })
             .onComplete( function onDone(err, data){
-                if (!err) {
+                if (!err || /^false$/i.test(err) ) {
+                    console.info('completed: '+ cmd);
                     return done()
                 }
+                console.debug('error found: '+ err + '\n=> '+ data);
                 done(err)
             })
     }
@@ -345,7 +380,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,7 +19,7 @@ var isWin32 = function() {
     return (process.platform === 'win32') ? true : false;
 };
 
-var helpers = require('./../utils/helpers');
+var helpers = null;
 
 /**
  * Pre install constructor
@@ -35,16 +35,26 @@ function PreInstall() {
     var init = function() {
 
         self.isGlobalInstall = false;
+        self.isGinaInstall = 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;
             }
+
+            if ( /^\-\-prefix\=/.test(args[i] ) ) {
+                self.isCustomPrefix = true;
+                self.prefix = args[i].split(/\=/)[1];
+                continue;
+            }
         }
 
+        self.prefix = self.prefix.toString().replace(/\n/g, '');
+
         if ( !self.isGlobalInstall ) { //global install
             self.root = process.cwd(); // project path
             self.tmpDir = os.tmpdir(); // default tmp path
@@ -53,6 +63,7 @@ function PreInstall() {
             process.exit(1);
         }
 
+
         begin(0);
         // TODO check old framework version to be archived
     }
@@ -85,6 +96,76 @@ function PreInstall() {
         }
     }
 
+    /**
+     * Get run\lock path
+     * @returns {string} rundir
+     * */
+     var getRunDir = function() {
+        // Trying to retrieve original value if already defined
+        var runDir = getEnvVar('GINA_RUNDIR') || null;
+        if ( runDir ) {
+            if ( !/gina$/.test(runDir) ) {
+                runDir += ( isWin32() ) ? '\\gina' : '/gina'
+            }
+            return runDir
+        }
+
+        if ( isWin32() ) {
+            console.debug('check /gina/utils/helper.js around on getRunDir()')
+        } else {
+
+            // Means `/usr/local/var/lock` or `/usr/local/var/run` by default.
+            runDirObj = new _('/usr/local/var/lock', true);
+            if ( runDirObj.existsSync() ) {
+                if ( !runDirObj.isWritableSync() ) {
+                    throw new Error('location '+ runDirObj.toUnixStyle() +' found but not writable !' )
+                }
+
+                runDirObj = new _( runDirObj.toUnixStyle() +'/gina', true );
+                if ( !runDirObj.existsSync() ) {
+                    runDirObj.mkdirSync()
+                }
+
+                return runDirObj.toUnixStyle();
+            }
+
+            runDirObj = new _('/usr/local/var/run', true);//by default.
+            if ( !runDirObj.isWritableSync() ) {
+                throw new Error('location '+ runDirObj.toUnixStyle() +' found but not writable !' )
+            }
+
+            runDirObj = new _( runDirObj.toUnixStyle() +'/gina', true );
+            if ( !runDirObj.existsSync() ) {
+                runDirObj.mkdirSync()
+            }
+            // by default
+            // return _( runDirObj.toUnixStyle() +'/gina', true );
+            return runDirObj.toUnixStyle();
+        }
+    }
+
+    var getTmpDir = function() {
+        // support for node 0.10.x & 0.11.x
+        var tmp = os.tmpdir || function() {
+            if ( isWin32() ) {
+                return process.env.TEMP ||
+                    process.env.TMP ||
+                    (process.env.SystemRoot || process.env.windir) + '\\Temp'
+            } else {
+                return process.env.TMPDIR ||
+                    process.env.TMP ||
+                    process.env.TEMP ||
+                    '/usr/local/var/tmp'
+            }
+        };
+
+        return ( typeof(tmp) == 'function') ?  tmp() : tmp
+    }
+
+    var getUserHome = function() {
+        return process.env[(isWin32()) ? 'USERPROFILE' : 'HOME']
+    }
+
     self.checkRequirements = async function(done) {
         // TODO - handle windows case
         if ( /true/i.test(self.isWin32) ) {
@@ -101,7 +182,12 @@ 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;
@@ -119,6 +205,36 @@ function PreInstall() {
         done();
     }
 
+    self.checkRequiredFolders = function(done) {
+
+        // check for `/usr/local/tmp`
+        var tmpDir = getTmpDir();
+        console.info('`tmp` dir -> '+ tmpDir);
+        var tmpDirObj = new _(tmpDir, true);
+        if ( !tmpDirObj.existsSync() ) {
+            tmpDirObj.mkdirSync()
+        }
+
+
+        // check for `/usr/local/run`
+        var runDir = getRunDir();
+        console.info('`run` dir -> '+ runDir);
+        var runDirObj = new _(runDir, true);
+        if ( !runDirObj.existsSync() ) {
+            runDirObj.mkdirSync()
+        }
+
+        // check for `/usr/local/log`
+        var logDir = getLogDir();
+        console.info('`log` dir -> '+ logDir);
+        var logDirObj = new _(logDir, true);
+        if ( !logDirObj.existsSync() ) {
+            logDirObj.mkdirSync()
+        }
+
+        done()
+    }
+
 
     /**
      * Setup global installation path
@@ -192,7 +308,10 @@ function PreInstall() {
 
     self.checkIfGinaIsAlreadyInstalled = async function(done) {
 
-        console.debug('Checking if Gina is already installed');
+        console.debug('Checking if Gina is already installed: '+ self.isGinaInstall);
+        if (!self.isGinaInstall) {
+            return done();
+        }
 
         // Backup current version
 
@@ -267,37 +386,6 @@ function PreInstall() {
             }
         }
         // It is not required to update `~/.gina/main.json` &&  `~/.gina/{shortVersion}/settings.json`
-
-        self.checkRequiredFolders = function(done) {
-
-            // check for `/usr/local/tmp`
-            var tmpDir = getTmpDir()
-            console.info('`tmp` dir -> '+ tmpDir);
-            var tmpDirObj = new _(tmpDir, true);
-            if ( !tmpDirObj.existsSync() ) {
-                tmpDirObj.mkdirSync()
-            }
-
-            // check for `/usr/local/run`
-            var runDir = getRunDir();
-            console.info('`run` dir -> '+ runDir);
-            var runDirObj = new _(runDir, true);
-            if ( !runDirObj.existsSync() ) {
-                runDirObj.mkdirSync()
-            }
-
-            // check for `/usr/local/log`
-            var logDir = getLogDir();
-            console.info('`log` dir -> '+ logDir);
-            var logDirObj = new _(logDir, true);
-            if ( !logDirObj.existsSync() ) {
-                logDirObj.mkdirSync()
-            }
-
-            done()
-        }
-
-
         done()
     }
 

package/script/prepare_version.js

@@ -296,107 +296,111 @@ function PrepareVersion() {
         done();
     }
 
-    self.pushChangesToGit = function(done) {
 
-        var cmd = null;
-        var version = self.selectedVersion.replace(/^[a-z]+/ig, '');
+    // self.pushChangesToGit = function(done) {
+
+    //     var cmd = null;
+    //     var version = self.selectedVersion.replace(/^[a-z]+/ig, '');
+
+    //     // getting current branch
+    //     // git rev-parse --abbrev-ref HEAD
+    //     // => 010
+    //     var currentBranch = null;
+    //     try {
+    //         currentBranch = execSync("git rev-parse --abbrev-ref HEAD")
+    //                         .toString()
+    //                         .replace(/(\n|\r|\t)/g, '');
+    //     } catch (err) {
+    //         // nothing to do
+    //         return done( new Error('[GIT] No branch selected') )
+    //     }
 
-        // getting current branch
-        // git rev-parse --abbrev-ref HEAD
-        // => 010
-        var currentBranch = null;
-        try {
-            currentBranch = execSync("git rev-parse --abbrev-ref HEAD")
-                            .toString()
-                            .replace(/(\n|\r|\t)/g, '');
-        } catch (err) {
-            // nothing to do
-            return done( new Error('[GIT] No branch selected') )
-        }
 
+    //     // create new branch if needed
+    //     // e.g: 0.1.0-alpha.1 -> 010-alpha1
+    //     var targetedBranch = version.replace(/\./g, '');
+    //     self.targetedBranch = targetedBranch;
 
-        // create new branch if needed
-        // e.g: 0.1.0-alpha.1 -> 010-alpha1
-        var targetedBranch = version.replace(/\./g, '');
-        self.targetedBranch = targetedBranch;
+    //     console.debug('[GIT] Current branch: '+ currentBranch);
+    //     console.debug('[GIT] Targeted branch: '+ targetedBranch);
 
-        console.debug('[GIT] Current branch: '+ currentBranch);
-        console.debug('[GIT] Targeted branch: '+ targetedBranch);
 
+    //     // check if targeted branch exists
+    //     // git rev-parse --verify 011
+    //     var branchExists = null;
+    //     try {
+    //         branchExists = execSync("git rev-parse --verify "+ targetedBranch)
+    //                         .toString()
+    //                         .replace(/(\n|\r|\t)/g, '');
+    //     } catch (err) {
+    //         // nothing to do
+    //     }
 
-        // check if targeted branch exists
-        // git rev-parse --verify 011
-        var branchExists = null;
-        try {
-            branchExists = execSync("git rev-parse --verify "+ targetedBranch)
-                            .toString()
-                            .replace(/(\n|\r|\t)/g, '');
-        } catch (err) {
-            // nothing to do
-        }
+    //     if (!branchExists) {
+    //         console.debug('No existing branch found, creating a new one !');
+    //         try {
+    //             execSync("git checkout -b "+ targetedBranch);
+    //             // pushing to new branch
+    //             console.debug('setting up remote branch `'+ targetedBranch +'` to git ...');
+    //             execSync("git push --set-upstream origin "+ targetedBranch);
+    //         } catch (err) {
+    //             console.error(err.stack||err.message||err);
+    //             return done(err);
+    //         }
+    //     }
+    //     // use existing to push updates
+    //     else {
+
+    //         if (currentBranch != targetedBranch) {
+    //             console.debug('Switching from branch `'+ currentBranch +'` to branch `'+ targetedBranch +'`');
+    //             // git checkout 010
+    //             try {
+    //                 cmd = execSync("git checkout "+ targetedBranch);
+    //             } catch (err) {
+    //                 console.error(err.stack||err.message||err);
+    //                 return done(err);
+    //             }
+    //         } else {
+    //             console.debug('Reusing branch `'+ targetedBranch +'`');
+    //         }
+    //     }
 
-        if (!branchExists) {
-            console.debug('No existing branch found, creating a new one !');
-            try {
-                execSync("git checkout -b "+ targetedBranch);
-                // pushing to new branch
-                console.debug('setting up remote branch `'+ targetedBranch +'` to git ...');
-                execSync("git push --set-upstream origin "+ targetedBranch);
-            } catch (err) {
-                console.error(err.stack||err.message||err);
-                return done(err);
-            }
-        }
-        // use existing to push updates
-        else {
-
-            if (currentBranch != targetedBranch) {
-                console.debug('Switching from branch `'+ currentBranch +'` to branch `'+ targetedBranch +'`');
-                // git checkout 010
-                try {
-                    cmd = execSync("git checkout "+ targetedBranch);
-                } catch (err) {
-                    console.error(err.stack||err.message||err);
-                    return done(err);
-                }
-            } else {
-                console.debug('Reusing branch `'+ targetedBranch +'`');
-            }
-        }
 
+    //     // git add --all
+    //     try {
+    //         cmd = execSync("git add --all ");
+    //     } catch (err) {
+    //         //console.debug('`git add --all`failed ');
+    //         console.error(err.stack||err.message||err);
+    //         return done(err);
+    //     }
+    //     // git commit -m'Packaging version v'+ version
+    //     try {
+    //         var msg = (!branchExists) ? 'New version' : 'Prerelease update - '+ new Date().format("isoDateTime");
+    //         cmd = execSync("git commit -am'"+ msg +"'");
+    //     } catch (err) {
+    //         if (!/Your branch is up to date/i.test( err.output.toString() )) {
+    //             console.error(err.stack||err.message||err);
+    //             return done(err);
+    //         }
+    //     }
+
+    //     console.debug('Pushing changes made on branch `'+ targetedBranch +'` to git `origin/'+ targetedBranch +'`');
+    //     // git push origin 010
+    //     try {
+    //         cmd = execSync("git push origin "+ targetedBranch );
+    //     } catch (err) {
+    //         if (!/Everything up-to-date/i.test( err.output.toString() )) {
+    //             console.error(err.stack||err.message||err);
+    //             return done(err);
+    //         }
+    //     }
+
+    //     done()
+    // }
 
-        // git add --all
-        try {
-            cmd = execSync("git add --all ");
-        } catch (err) {
-            //console.debug('`git add --all`failed ');
-            console.error(err.stack||err.message||err);
-            return done(err);
-        }
-        // git commit -m'Packaging version v'+ version
-        try {
-            var msg = (!branchExists) ? 'New version' : 'Prerelease update - '+ new Date().format("isoDateTime");
-            cmd = execSync("git commit -am'"+ msg +"'");
-        } catch (err) {
-            if (!/Your branch is up to date/i.test( err.output.toString() )) {
-                console.error(err.stack||err.message||err);
-                return done(err);
-            }
-        }
 
-        console.debug('Pushing changes made on branch `'+ targetedBranch +'` to git `origin/'+ targetedBranch +'`');
-        // git push origin 010
-        try {
-            cmd = execSync("git push origin "+ targetedBranch );
-        } catch (err) {
-            if (!/Everything up-to-date/i.test( err.output.toString() )) {
-                console.error(err.stack||err.message||err);
-                return done(err);
-            }
-        }
 
-        done()
-    }
 
     // self.tagVersionIfNeeded = function(done) {
     //     // check if script is on Dry Run !!!