gina 0.1.1-alpha.2 → 0.1.1-alpha.20

package/framework/{v0.1.1-alpha.2 → v0.1.1-alpha.20}/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.2",
+  "version": "0.1.1-alpha.20",
   "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.2/core/gna",
+  "main": "./framework/v0.1.1-alpha.20/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js -g",
     "preinstall": "node ./script/pre_install.js -g",

package/script/post_install.js

@@ -38,15 +38,23 @@ 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;
             }
         }
 
+        self.prefix = self.prefix.toString().replace(/\n/g, '');
+
         console.debug('Is this for Windows ? ' +  self.isWin32);
 
         if ( !self.isGlobalInstall ) { //global install
@@ -161,7 +169,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 +220,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 +240,16 @@ function PostInstall() {
                 })
             } else {
 
-                configureGina();
+                // configureGina();
                 callback(false)
             }
         } else {
             if ( !self.isGlobalInstall ) {
                 lib.generator.createFileFromTemplate(source, target)
-            } else {
-
-                configureGina();
             }
+            // else {
+            //     configureGina();
+            // }
         }
     }
 
@@ -322,7 +333,12 @@ 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 TMP: '+ _(self.root +'/tmp') );
 
         run(cmd, { cwd: _(self.path), tmp: _(self.root +'/tmp'), outToProcessSTD: true })
             .onData(function onData(data){
@@ -330,8 +346,10 @@ function PostInstall() {
             })
             .onComplete( function onDone(err, data){
                 if (!err) {
+                    console.info('completed: '+ cmd);
                     return done()
                 }
+                console.info('error found: '+ err + '\n=> '+ data);
                 done(err)
             })
     }
@@ -345,7 +363,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
 

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 !!!

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

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