gina 0.1.1-alpha.20 → 0.1.1-alpha.201

package/script/prepare_version.js

@@ -1,6 +1,8 @@
+#!/usr/bin/env node
+
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -39,11 +41,48 @@ 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);
     };
@@ -70,7 +109,7 @@ function PrepareVersion() {
 
         // to handle sync vs async to allow execution in order of declaration
         if (funct) {
-            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(-1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
+            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
         } else {
             process.exit(0);
         }
@@ -98,8 +137,10 @@ function PrepareVersion() {
         var targetedVersion = package.version.replace(/^v/, '');
         self.targetedVersion = targetedVersion;
 
-        console.debug('selected version : ', selectedVersion);
-        console.debug('targeted version : ', targetedVersion);
+        console.debug('Selected version : ', selectedVersion);
+        console.debug('Targeted version : ', targetedVersion);
+
+
 
         // setting up requirements
         var shortVersion = selectedVersion.split('.');
@@ -115,6 +156,19 @@ function PrepareVersion() {
         helpers     = require(frameworkPath +'/helpers');
         lib         = require(frameworkPath +'/lib');
 
+        // In case of downdrade
+        // target already exist as a symlink ?
+        var versionDestination = _(ginaPath +'/framework/v'+targetedVersion, true);
+        var versionDestinationObj = new _(versionDestination);
+        if ( selectedVersion != targetedVersion && versionDestinationObj.existsSync() ) {
+            var versionDestinationIsSymlink = fs.lstatSync( versionDestination ).isSymbolicLink();
+            console.debug('versionDestination ??? ', versionDestination, versionDestinationObj.existsSync(), versionDestinationIsSymlink );
+            if (versionDestinationIsSymlink) {
+                // await versionDestinationObj.rmSync();
+                fs.unlinkSync(versionDestination);
+            }
+        }
+
         // update selected version & requirements
         shortVersion = targetedVersion.split('.');
         shortVersion.splice(2);
@@ -174,11 +228,25 @@ function PrepareVersion() {
             throw err;
         }
 
+        if (selectedVersion != targetedVersion) {
+            console.debug('Stopping gina');
+            // var ginaBin = execSync("which gina").toString().replace(/(\n|\r|\t)/g, '');
+            // if (ginaBin) {
+            //     try {
+            //         cmd = execSync(ginaBin +' stop @'+selectedVersion);
+            //         // cmd = execSync(ginaBin +' stop')
+            //         // TODO - stop all running bundles
+            //     } catch (err) {
+            //         console.error(err.stack||err.message||err);
+            //         return done(err);
+            //     }
+            // }
+        }
+
         // rename folder version
         destination = _(ginaPath +'/framework/v'+targetedVersion, true);
         frameworkPathObj.renameSync(destination);
 
-
         // updating requirements
         self.selectedVersion = targetedVersion;
         self.frameworkPath = frameworkPath = ginaPath +'/framework/v'+targetedVersion;
@@ -267,7 +335,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();
             }
@@ -296,108 +364,141 @@ function PrepareVersion() {
         done();
     }
 
+    self.buildPlugins = function(done) {
 
-    // self.pushChangesToGit = function(done) {
+        var frameworkPath = _(self.gina +'/framework', true);
+        // get current framework version
+        var package = require(pack);
+        var currentVersion = 'v'+ package.version.replace(/^v/, '');
+        var pluginPath = _(frameworkPath +'/'+ currentVersion + '/core/asset/plugin', true);
+        var buildCmd = _(pluginPath +'/build', true);
 
-    //     var cmd = null;
-    //     var version = self.selectedVersion.replace(/^[a-z]+/ig, '');
+        console.debug('Building Frontend plugins ['+ self.selectedVersion +']', pluginPath);
+        var initialDir = process.cwd();
+        process.chdir( pluginPath );
+        console.info('Please, wait ...');
+        console.info('running: `'+ buildCmd +'` from '+ process.cwd() );
+        execSync(buildCmd);
 
-    //     // 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') )
-    //     }
+        process.chdir(initialDir);
 
 
-    //     // create new branch if needed
-    //     // e.g: 0.1.0-alpha.1 -> 010-alpha1
-    //     var targetedBranch = version.replace(/\./g, '');
-    //     self.targetedBranch = targetedBranch;
+        return done()
+    }
 
-    //     console.debug('[GIT] Current branch: '+ currentBranch);
-    //     console.debug('[GIT] Targeted branch: '+ targetedBranch);
 
+    self.pushChangesToGitIfNeeded = function(done) {
 
-    //     // 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
-    //     }
+        var cmd = null;
+        var version = self.selectedVersion.replace(/^[a-z]+/ig, '');
 
-    //     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 +'`');
-    //         }
-    //     }
+        // 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') )
+        }
 
 
-    //     // 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);
-    //         }
-    //     }
+        // create new branch if needed
+        // e.g: 0.1.0-alpha.1 -> 010-alpha1
+        var targetedBranch = version.replace(/\./g, ''); // by default
+        if (!self.isGitPushNeeded) {
+            targetedBranch = 'develop'; // for none production versions
+        }
+        self.targetedBranch = targetedBranch;
 
-    //     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);
-    //         }
-    //     }
+        console.debug('[GIT] Current branch: '+ currentBranch);
+        console.debug('[GIT] Targeted branch: '+ targetedBranch);
 
-    //     done()
-    // }
+
+        // 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);
+                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 +'`');
+            }
+        }
+
+        // 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|nothing to commit, working tree clean/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 );
+                // set tag version & tag ?
+            } catch (err) {
+                if (!/Everything up-to-date/i.test( err.output.toString() )) {
+                    console.error(err.stack||err.message||err);
+                    return done(err);
+                }
+            }
+        }
+
+        done()
+    }
 
 
 
@@ -422,6 +523,84 @@ function PrepareVersion() {
     // }
 
 
+    var restoreSymlinks = function(done) {
+
+        if ( typeof(process.env.npm_config_dry_run) == 'undefined' || !process.env.npm_config_dry_run ) {
+            // ignoring for now, after publishing completion
+            return
+        }
+        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) {
+
+        // restoreSymlinks(done);
+
+        done()
+    }
+
+
 
     init()
 }

package/services/.gna/arch

@@ -0,0 +1 @@
+arm64

package/services/.gna/locals.json

@@ -0,0 +1,14 @@
+{
+	"project": null,
+	"paths": {
+		"project": "gina",
+		"gina": "/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.162/core",
+		"utils": "/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.162",
+		"root": "/usr/local/lib/node_modules/gina/services",
+		"env": "/usr/local/lib/node_modules/gina/services/env.json",
+		"tmp": "/usr/local/lib/node_modules/gina/services/tmp"
+	},
+	"bundles": [
+		"proxy"
+	]
+}

package/services/.gna/platform

@@ -0,0 +1 @@
+darwin

package/services/configure

@@ -0,0 +1,6 @@
+
+gina project:add @gina
+
+gina bundle:add proxy @gina
+
+gina port:reset @gina --start-from=4100 >/dev/null

package/services/env.json

@@ -0,0 +1,18 @@
+{
+    "proxy": {
+        "dev": {
+            "host": "localhost"
+        },
+        "prod": {
+            "host": "localhost"
+        }
+    },
+    "toolbar": {
+        "dev": {
+            "host": "localhost"
+        },
+        "prod": {
+            "host": "localhost"
+        }
+    }
+}

package/services/manifest.json

@@ -0,0 +1,30 @@
+{
+    "name": "gina",
+    "version": "1.0.0",
+    "bundles": {
+        "proxy": {
+            "_comment": "Your comment goes here.",
+            "version": "0.0.1",
+            "tag": "001",
+            "src": "src/proxy",
+            "link": "bundles/proxy",
+            "releases": {
+                "prod": {
+                    "target": "releases/proxy/prod/0.0.1"
+                }
+            }
+        },
+        "toolbar": {
+            "_comment": "Your comment goes here.",
+            "version": "0.0.1",
+            "tag": "001",
+            "src": "src/toolbar",
+            "link": "bundles/toolbar",
+            "releases": {
+                "prod": {
+                    "target": "releases/toolbar/prod/0.0.1"
+                }
+            }
+        }
+    }
+}

package/services/package.json

@@ -0,0 +1,11 @@
+{
+    "name": "gina-services",
+    "version": "0.0.1",
+    "description": "services bundle",
+    "dependencies": {
+        "request": "~2.36.0"
+    },
+    "engine": [
+        "node >=18.13.0"
+    ]
+}

package/services/src/proxy/config/app.json

@@ -0,0 +1,6 @@
+// bundle needs to be restarted on changes !!
+{
+  "name": "proxy",
+  "version": "0.0.1",
+  "greeting": "Hello World !"
+}

package/services/src/proxy/config/routing.json

@@ -0,0 +1,11 @@
+// bundle needs to be restarted on changes !!
+{  
+  "homepage": {
+    "namespace": "content",
+    "url": "/",
+    "method": "GET",
+    "param": {
+      "control": "home"
+    }
+  }
+}

package/services/src/proxy/config/settings.json

@@ -0,0 +1,9 @@
+// bundle needs to be restarted on changes !!
+{
+    "region": {
+        "culture": "en_CM",
+        "isoShort": "en",
+        "date": "yyyy/mm/dd",
+        "timeZone": "Africa/Douala"
+    }
+}

package/services/src/proxy/config/settings.server.json

@@ -0,0 +1,31 @@
+// bundle needs to be restarted on changes !!
+{
+    "webroot": "/proxy", // do not forget to add a coma here if you add other options ;)
+    /**
+    * `webrootAutoredirect` settings
+    * Default is `true`: set to false if you have described a redirection rule from your `routing.json`
+    */
+    // "webrootAutoredirect": false,
+
+    /**
+    * `template` settings
+    * Default is `false`: will automatically be set to `true` when you add a view/template (`false` is right for APIs only)
+    */
+    "template": false,
+
+    /**
+    * `response` settings
+    * This section is mostly used to setup CORS,
+    * and customize your responses
+    */
+    "response": {
+           // CORS settings sample
+        "header": {
+            "access-control-allow-origin": "*",
+            "access-control-allow-headers": "X-Requested-With", // To allow AJAX request
+            "access-control-allow-methods": "POST, PUT, GET, DELETE, OPTIONS, HEAD, PATCH",
+            "access-control-allow-credentials": true,
+            "vary": "Origin"
+        }
+    }
+}

package/services/src/proxy/config/statics.json

@@ -0,0 +1,3 @@
+{
+  "config/domain": "{gina}/framework/v{version}/helpers/domain/dist"
+}