gina 0.1.1-alpha.93 → 0.1.1-alpha.96

package/script/prepare_version.js

@@ -39,11 +39,49 @@ var lib         = null;
  * @constructor
  * */
 function PrepareVersion() {
-    var self    = {};
+    var self    = {
+        isWin32: isWin32(),
+        git : {
+            tag: 'latest',
+            msg: null
+        },
+        isGitPushNeeded : false
+
+    };
+
+    var configure = function() {
+        // TODO - handle windows case
+        if ( /^true$/i.test(isWin32()) ) {
+            throw new Error('Windows in not yet fully supported. Thank you for your patience');
+        }
+
+        // Overriding thru passed arguments
+        var args = process.argv, i = 0, len = args.length;
+        for (; i < len; ++i) {
+            if ( /^\-\-tag/.test(args[i]) ) {
+                var tag = args[i].split(/\=/)[1];
+                if ( tag != self.git.tag) {
+                    self.git.tag = tag;
+                    self.isGitPushNeeded = ( typeof(process.env.npm_config_dry_run) != 'undefined' ) ? false : true
+                }
+                continue;
+            }
+
+            if ( /^(\-m|\-\-message)$/.test(args[i]) ) {
+                var m = args[i];
+                if (/^(.*)\=/.test(m)) {
+                    m = m.split(/\=/)[1]
+                }
+                self.git.msg = m.replace(/^(\-m|\-\-message)/g, '').replace(/(\"|\')/g, '');
+                continue;
+            }
+        }
+
+        self.gina = __dirname +'/..';
+    }
 
     var init = function() {
-        self.isWin32    = isWin32();
-        self.prefix     = execSync('npm config get prefix');
+        configure();
 
         begin(0);
     };
@@ -267,7 +305,7 @@ function PrepareVersion() {
         var versionsFolders = null, frameworkPath = null;
         try {
             frameworkPath = _(self.ginaPath +'/framework', true);
-            console.info('frameworkPath: ', frameworkPath);
+            console.debug('frameworkPath: ', frameworkPath);
             if ( !new _(frameworkPath).existsSync() ) {
                 return done();
             }
@@ -297,107 +335,114 @@ function PrepareVersion() {
     }
 
 
-    // self.pushChangesToGit = function(done) {
+    self.pushChangesToGitIfNeeded = function(done) {
 
-    //     var cmd = null;
-    //     var version = self.selectedVersion.replace(/^[a-z]+/ig, '');
+        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);
+                if (self.isGitPushNeeded) {
+                    // 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);
-    //         }
-    //     }
+        // commit changes
+        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");
+            if (self.git.msg) {
+                msg += ' - '+ self.git.msg
+            }
+            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);
-    //         }
-    //     }
+        if (self.isGitPushNeeded) {
+            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()
-    // }
+        done()
+    }
 
 
 
@@ -422,6 +467,80 @@ function PrepareVersion() {
     // }
 
 
+    var restoreSymlinks = function(done) {
+        var archivesPath = _(getUserHome() + '/.gina/archives/framework', true);
+        var frameworkPath = _(self.gina +'/framework', true);
+
+        if ( !new _(archivesPath).existsSync() ) {
+            return;
+        }
+        // get current framework version
+        var package = require(pack);
+        var currentVersion = 'v'+ package.version.replace(/^v/, '');
+
+        // cleanup first
+        var versionsFolders = fs.readdirSync(frameworkPath);
+        for (let i = 0, len = versionsFolders.length; i < len; i++) {
+            let dir = versionsFolders[i];
+            // skip junk
+            if ( /^\./i.test(dir) || /(\s+copy|\.old)$/i.test(dir) ) {
+                continue;
+            }
+
+            // intercept & remove existing symlinks or old versions dir
+            try {
+                if ( fs.lstatSync( _(frameworkPath +'/'+ dir, true) ).isSymbolicLink() ) {
+                    console.debug('Removing Symlink: '+ _(frameworkPath +'/'+ dir, true) );
+                    // new _(frameworkPath +'/'+ dir, true).rmSync();
+                    fs.unlinkSync(_(frameworkPath +'/'+ dir, true));
+                    continue;
+                }
+
+                if (
+                    dir != currentVersion
+                    && fs.lstatSync( _(frameworkPath +'/'+ dir, true) ).isDirectory()
+                ) {
+                    console.debug('Removing old version: '+ _(frameworkPath +'/'+ dir, true));
+                    new _(frameworkPath +'/'+ dir, true).rmSync()
+                }
+            } catch (e) {
+                continue;
+            }
+        }
+
+        // restoring symlinks from archives
+        versionsFolders = fs.readdirSync(archivesPath);
+        for (let i = 0, len = versionsFolders.length; i < len; i++) {
+            let dir = versionsFolders[i];
+            // skip junk
+            if ( /^\./i.test(dir) || /(\s+copy|\.old)$/i.test(dir) ) {
+                continue;
+            }
+
+            // skip selected - for dev team only
+            if ( new _(frameworkPath +'/'+ dir, true).existsSync() ) {
+                continue;
+            }
+
+            // creating symlinks
+            try {
+                console.debug( 'Creating symlink: '+ _(archivesPath +'/'+ dir, true) +' -> '+ _(frameworkPath +'/'+ dir, true));
+                new _(archivesPath +'/'+ dir, true).symlinkSync(_(frameworkPath +'/'+ dir, true) );
+            } catch (e) {
+                return done(e)
+            }
+        }
+    }
+
+    self.end = function(done) {
+        if ( typeof(process.env.npm_config_dry_run) != 'undefined' ) {
+            restoreSymlinks(done);
+        }
+
+        done()
+    }
+
+
 
     init()
 }

package/utils/helper.js

@@ -26,11 +26,26 @@ function MainHelper(opt) {
         var packObj = require(pack);
         var version =  getEnvVar('GINA_VERSION') || packObj.version;
         var frameworkPath = ginaPath + '/framework/v' + version;
-
+        var pkg = null;
         try {
             lib         = require(frameworkPath + '/lib');
             console     = lib.logger;
             merge       = lib.merge;
+
+            try {
+                pkg = packObj;
+                self.defaultPrefix = pkg.config.prefix.replace(/^\~/, getUserHome());
+                self.optionalPrefix = pkg.config.optionalPrefix.replace(/^\~/, getUserHome());
+            } catch(err) {
+                try {
+                    self.defaultPrefix = execSync('npm config get prefix').toString().replace(/\n$/g, '');
+                    pkg = execSync('npm list -g gina --long --json').toString().replace(/\n$/g, '');
+                    self.optionalPrefix = JSON.parse(pkg).dependencies.gina.config.optionalPrefix.replace(/^\~/, getUserHome());
+                } catch (_err) {
+                    throw new Error(_err.stack +'\n'+ err.stack)
+                }
+            }
+
         } catch (err) {
             // this can happen in certain conditions
             // like scripts running out of the framework context
@@ -295,7 +310,7 @@ function MainHelper(opt) {
             return logDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         if ( isWin32() ) {
             logDir = process.env.LOG ||
@@ -341,7 +356,7 @@ function MainHelper(opt) {
                 logDirObj.mkdirSync();
             }
 
-            if ( !/gina$/.test(logDir) ) {
+            if ( !/gina$/.test(logDir) && self.optionalPrefix != prefix ) {
                 logDir += '/gina';
                 logDirObj = new _(logDir);
             }
@@ -371,7 +386,7 @@ function MainHelper(opt) {
             return runDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : prefix + '/var/lock';
 
@@ -414,10 +429,12 @@ function MainHelper(opt) {
             throw new Error('location error: `'+ runDir+'`\n'+ err.stack);
         }
 
-        runDir += ( isWin32() ) ? '\\gina' : '/gina';
-        runDirObj = new _( runDir, true );
-        if ( !runDirObj.existsSync() ) {
-            fs.mkdirSync(runDir)
+        if (self.optionalPrefix != prefix) {
+            runDir += ( isWin32() ) ? '\\gina' : '/gina';
+            runDirObj = new _( runDir, true );
+            if ( !runDirObj.existsSync() ) {
+                fs.mkdirSync(runDir)
+            }
         }
 
         return runDir;
@@ -434,7 +451,7 @@ function MainHelper(opt) {
             return dir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || execSync('npm config get prefix').toString().replace(/\n/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         // support for node 0.10.x & 0.11.x
         var tmp = (os.tmpdir) ? os.tmpdir : function() {

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

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