gina 0.1.1-alpha.98 → 0.1.2-alpha.1

package/framework/v0.1.2-alpha.1/lib/cmd/framework/link-node-modules.js

@@ -0,0 +1,123 @@
+var fs              = require('fs');
+var os              = require('os');
+const {spawn}       = require('child_process');
+const {execSync}    = require('child_process');
+var CmdHelper       = require('./../helper');
+var console         = lib.logger;
+
+/**
+ * Framework link node_modules
+ *
+ * e.g.
+ *  gina framework:link-node-modules @<project>
+ *  or
+ *  gina link-node-modules @<project>
+ *
+ * */
+ function LinkNodeModules(opt, cmd) {
+
+    var self    = {};
+    var init = function(opt, cmd) {
+
+        var err = false;
+        if ( !/^true$/i.test(GINA_GLOBAL_MODE) ) {
+            err = new Error('Gina is not installed globally: cannot proceed with linking.');
+            return end(err, 'error', true);
+        }
+
+        // import CMD helpers
+        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
+
+        // check CMD configuration
+        if (!isCmdConfigured()) return false;
+
+
+        if ( !isDefined('project', self.projectName) ) {
+            err = new Error('Missing argument: `@<project-name>`');
+            return end(err, 'error')
+        }
+
+        var projectLocationObj = new _(self.projectLocation)
+        if ( !projectLocationObj.isValidPath() ) {
+            err = new Error('Project path not found. You should run project:add @'+ self.projectLocation + ' --path=<your-project-location>');
+            return end(err, 'error')
+        }
+
+        linkLocalNodeModules(opt, cmd);
+    }
+
+    var linkLocalNodeModules = function(opt, cmd) {
+        var projectObj  = self.projects[ self.projectName ]
+            err         = null
+        ;
+
+
+        if (!projectObj || typeof(projectObj) == 'undefined' ) {
+            err = new Error('Node modules not found for project '+ self.projectName);
+            return end(err, 'error')
+        }
+
+        if ( typeof(projectObj.homedir) == 'undefined' || projectObj.homedir == '' || !projectObj.homedir) {
+            projectObj.homedir = self.projectHomedir || _(getUserHome() +'/.'+ self.projectName, true);
+        }
+
+        var nodeModulesFromProjectHomeDir = _(projectObj.homedir + '/lib/node_modules', true)
+        var nodeModulesDirObj = new _(self.projectLocation + '/node_modules', true);
+        var hasNodeModules = ( nodeModulesDirObj.existsSync() ) ? true : false;
+        // Check if symlink
+        if (
+            hasNodeModules && nodeModulesDirObj.isSymlinkSync()
+        ) {
+
+            // same scope ? e.g: Shared code between docker & localhost
+            if ( nodeModulesDirObj.getSymlinkSourceSync() != nodeModulesFromProjectHomeDir ) {
+                // if not, remove symlink
+                nodeModulesDirObj.rmSync();
+                hasNodeModules = false;
+            }
+        }
+
+        var sourceObj = new _(nodeModulesFromProjectHomeDir, true);
+        if (!hasNodeModules) {
+            if ( !sourceObj.existsSync() ) {
+                sourceObj.mkdirSync()
+            }
+            // link from homdir to project path
+
+            var destination = _(self.projectLocation + '/node_modules', true);
+
+            err = sourceObj.symlinkSync(destination);
+            if (err instanceof Error) {
+                return end(err, 'error')
+            }
+
+            return end('Node modules link updated to '+ sourceObj.toString())
+        }
+
+        // nothing to do
+        end('Node modules linked to `'+ sourceObj.toString() +'`')
+    }
+
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
+    init(opt, cmd)
+ }
+
+ module.exports = LinkNodeModules;

package/framework/v0.1.2-alpha.1/lib/cmd/framework/link.js

@@ -0,0 +1,132 @@
+var fs              = require('fs');
+const {spawn}       = require('child_process');
+const {execSync}    = require('child_process');
+var CmdHelper       = require('./../helper');
+var console        = lib.logger;
+
+/**
+ * Framework link
+ *
+ * e.g.
+ *  gina framework:link @<project>
+ *  or
+ *  gina link @<project>
+ *
+ * */
+ function Link(opt, cmd) {
+
+    var self    = {
+        // destination prefix - usaually the project location
+        prefix: null
+    };
+
+    var init = function(opt, cmd) {
+        var err = false;
+        if ( !/^true$/i.test(GINA_GLOBAL_MODE) ) {
+            err = new Error('Gina is not installed globally: cannot proceed with linking.');
+            return end(err, 'error', true);
+        }
+
+        // import CMD helpers
+        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
+
+        // check CMD configuration
+        if (!isCmdConfigured()) return false;
+
+        self.prefix = self.projectLocation;
+        var a = [], k = null, v = null;
+        for (let i=3; i<process.argv.length; ++i) {
+            a = process.argv[i].split(/=/);
+            k = a[0];
+            v = a[1];
+            // console.log('Preprocessing `framework:link '+ process.argv[i] +'` ['+k+'] -> ['+ v +']');
+            if ( /^\-\-prefix$/.test(k) ) {
+                self.prefix = _(v, true);
+                continue
+            }
+        }
+        // console.log(' prefix: ', self.prefix);
+
+        link(opt, cmd);
+    }
+
+
+    var link = function(opt, cmd) {
+        console.debug('Linking framework');
+        var err = null, folder = new _(self.projectLocation, true);
+
+        if ( folder.isValidPath() && isValidName(self.projectName) ) {
+
+            var destination = new _(self.prefix + '/node_modules', true);
+
+            if ( !destination.existsSync() ) {
+                err = destination.mkdirSync();
+                if (err instanceof Error) {
+                    return end(err, 'error')
+                }
+            }
+            // Safety check for node_modules
+            else if ( destination.isSymlinkSync() && !new _(destination.getSymlinkSourceSync()).existsSync() ) {
+                // Means that the symlink is not up to date
+                err = destination.mkdirSync();
+                if (err instanceof Error) {
+                    return end(err, 'error')
+                }
+
+                console.debug('Running: gina link-node-modules @'+self.projectName);
+                err = execSync('gina link-node-modules @'+self.projectName);// +' --inspect-gina'
+                if (err instanceof Error) {
+                    return end(err, 'error')
+                }
+            }
+            destination = new _(destination.toString() +'/gina', true);
+            var source = new _(GINA_PREFIX + '/lib/node_modules/gina', true);
+
+
+
+            console.debug('Link '+ source + ' -> '+destination + ' [ exists ] ? '+ destination.existsSync() );
+            if ( destination.existsSync() ) {
+                if ( destination.isSymlinkSync() && destination.getSymlinkSourceSync() == source.toString() ) {
+                    console.debug('Skipping symlink: same source, not overriding.');
+                    return end();
+                }
+                destination.rmSync();
+                var ginaFileObj = new _(self.prefix + '/gina');
+                if ( ginaFileObj.existsSync() ) {
+                    ginaFileObj.rmSync()
+                }
+            }
+
+            err = source.symlinkSync(destination.toString());
+
+            if (err instanceof Error) {
+                return end(err, 'error')
+            }
+        }
+
+        end()
+    }
+
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
+    init(opt, cmd)
+ }
+
+ module.exports = Link;

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/lib/cmd/framework/open.js

@@ -3,7 +3,10 @@ var Open;
 var fs = require('fs');
 var child = require('child_process');
 
-Open = function(){
+var CmdHelper       = require('./../helper');
+var console         = lib.logger;
+
+function Open(opt, cmd) {
 
     var init = function(){
         var openCmd = (GINA_IS_WIN32) ?  'start' : 'open';
@@ -42,8 +45,29 @@ Open = function(){
             default:
                 console.log('gina: shortcut not indexed [' + process.argv[3] + ']' );
         }
+
+        end()
     };
 
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
     init()
 };
 

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/lib/cmd/framework/restart.js

@@ -14,19 +14,19 @@ var console     = lib.logger;
  *  or
  *  gina restart
  *  or
- *  gina restart @1.0.0 
+ *  gina restart @1.0.0
  *
  * */
 function Restart(opt, cmd) {
     var self    = {
-        // Current version of the framework by default 
+        // Current version of the framework by default
         // But can be overriden with argument: @{version_number}
         // eg.: gina stop @1.0.0
         version: GINA_VERSION
     };
-    
 
-    var init = function(opt, cmd) {        
+
+    var init = function(opt, cmd) {
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
         var err = null;
@@ -34,7 +34,7 @@ function Restart(opt, cmd) {
         //if (!isCmdConfigured()) return false;
         // checkcking version number
         if ( typeof(opt.argv[3]) != 'undefined' && /^@/.test(opt.argv[3]) ) {
-            var version = opt.argv[3].replace(/\@/, '');            
+            var version = opt.argv[3].replace(/\@/, '');
             var shortVersion = version.split('.').splice(0,2).join('.');
             if ( !/^\d\.\d/.test(shortVersion) ) {
                 err = new Error('Wrong version: '+ version);
@@ -47,76 +47,128 @@ function Restart(opt, cmd) {
                 console.log(err.message);
                 return;
             }
-            
+
             self.version = version;
         }
         console.debug('Restarting framework v'+ self.version);
-        
+
         // if (!self.name) {
         //     stop(opt, cmd, 0);
         // } else {
             restart(opt, cmd);
-        // }        
+        // }
     }
-    
+
     var restart = function(opt, cmd) {
         stop();
-        start();
+        // if previous debug session
+        setTimeout(() => {
+
+            // METHOD #1
+            // start(opt);
+
+
+            // METHOD #2
+            // TODO - retrieve & add `opt`
+            var out = null;
+            try {
+                out = execSync('gina start @'+self.version).toString();
+                console.debug('out => ', out);
+                // TODO - retrieve running bundles with its options & restart
+            } catch (err) {
+                throw err;
+            }
+        }, 100);
+
     }
-    
+
     var stop = function() {
         var out = null;
         try {
             out = execSync('gina stop @'+self.version).toString();
-            console.debug(out);
+            console.debug('out => ', out);
         } catch (err) {
             throw err;
         }
     }
-    
+
     /**
      * start
-     * 
+     *
      * We need to spawn this one as detached
-     * because of the `process.kill(..., 'SIGSTOP')` used inside the orginal `start` script
+     * because of the `process.kill(..., 'SIGABRT')` used inside the orginal `start` script
      * or else, the restart script will be pending forever.
      */
-    var start = async function() {        
-        try {            
+    var start = async function(opt) {
+        console.debug('continue with start now');
+        try {
+            // var child = spawn('gina', ['start', '@'+self.version],
             var child = spawn('gina', ['start', '@'+self.version, '--restart-pid='+ process.pid],
                 {
                     detached: true
                 }
             );
-            
+
             var frameworkPid = null;
             child.stdout.setEncoding('utf8');
             child.stdout.on('data', function(data) {
                 //process.stdout.write(data);
                 if ( new RegExp('Gina server started with PID','gi').test(data) ) {
+                    restartRunningBunldes();
                     frameworkPid = data.match(/\`\d+\`/)[0];
                     process.stdout.write('Gina server started with PID '+ frameworkPid + '\r\n');
                 }
-                
+
                 if ( /\[ quit \]/.test(data) ) {
                     // TODO - restart all running bundles
-                    
-                    process.exit(0)
+                    end()
                 }
             });
-            
+
             child.stderr.setEncoding('utf8');
             var error = null;
             child.stderr.on('data', function(err) {
                 error = err.toString();
                 console.error(error);
-            });            
-            
+            });
+
         } catch (err) {
             throw err;
-        }        
+        }
+    }
+
+    var restartRunningBunldes = function() {
+        var list = fs.readdirSync(_(GINA_RUNDIR, true));
+        for (let i=0, len=list.length; i<len; i++ ) {
+            let file = list[i];
+            if (/^\./.test(file) || !/\.pid$/.test(file) || /^gina\-/.test(file) || /(minion)/.test(file) ) {
+                continue;
+            }
+            // process.stdout.write('\ngina bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @') + '\n');
+            execSync('gina bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @'));
+        }
     }
-    
+
+
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
 
     init(opt, cmd)
 }