gina 0.1.1-alpha.23 → 0.1.1-alpha.230

package/framework/{v0.1.1-alpha.23 → v0.1.1-alpha.230}/lib/cmd/bundle/add.js

@@ -14,10 +14,15 @@ var scan        = require('../port/inc/scan');
  *
  * Usage:
  * $ gina bundle:add <bundle_name> @<project_name>
+ * or
+ * $ gina bundle:add <bundle_name> @<project_name> --start-port-from=<port_number>
  * */
 function Add(opt, cmd) {
 
-    var self    = {}
+    var self    = {
+            // --start-port-from
+            startFrom: null
+        }
         , local     = {
             // bundle index while searching or browsing
             b : 0,
@@ -33,7 +38,32 @@ function Add(opt, cmd) {
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
+
+        var portErr = null;
+        for (let i=3, len=process.argv.length; i<len; i++) {
+            if ( /^\-\-start\-port\-from\=/.test(process.argv[i]) ) {
+                let port = process.argv[i].split(/\=/)[1];
+                if ( /[^0-9]+/.test(port) ) {
+                    portErr = new Error('Port number must be an integer');
+                    break;
+                }
+                port = parseInt(port);
+                if (
+                    typeof(port) != 'number'
+                    || !Number.isInteger(port)
+                ) {
+                    portErr = new Error('Port number must be an integer');
+                    break;
+                }
+                self.startFrom = port
+            }
+        }
+
+        if (portErr) {
+            console.error(portErr.message||portErr);
+            return process.exit(1)
+        }
+
         // var i = 3, envs = [];
         // for (; i<process.argv.length; ++i) {
         //     if ( /^\@[a-z0-9_.]/.test(process.argv[i]) ) {
@@ -62,8 +92,8 @@ function Add(opt, cmd) {
             process.exit(1)
         }
     }
-    
-    
+
+
 
     /**
      * Add bundles
@@ -90,13 +120,14 @@ function Add(opt, cmd) {
 
             local.b             = b;
             local.bundle        = bundle;
-            
+
             local.envFileSaved  = false;
 
             // find available port
             options = {
-                ignore  : getPortsList(),
-                limit   : getBundleScanLimit(bundle)
+                ignore      : getPortsList(),
+                limit       : getBundleScanLimit(bundle),
+                startFrom   : self.startFrom
             };
             console.log('['+bundle+'] starting ports scan' );
 
@@ -111,7 +142,7 @@ function Add(opt, cmd) {
                     self.portsList.push(ports[p])
                 }
                 self.portsList.sort();
-                                
+
                 console.debug('available ports '+ JSON.stringify(ports, null, 2));
                 self.portsAvailable = ports;
                 try {
@@ -131,6 +162,32 @@ function Add(opt, cmd) {
 
         if ( typeof(self.projectData.bundles[local.bundle]) != 'undefined' ) {
 
+            if ( /\-\-(import|replace)/.test(opt.argv.join(',')) ) {
+                var pArr                = null
+                    , importModeEnabled = false
+                    , replaceModeEnabled = false
+                ;
+                for (let i = 0, len = opt.argv.length; i<len; i++) {
+                    if (  !/\-\-(import|replace)/.test(opt.argv[i]) )
+                        continue;
+
+                    pArr = opt.argv[i].replace(/\s+/g, '').split(/=/);
+                    importModeEnabled   = /\-import/.test(pArr[0]) ? true : false;
+                    replaceModeEnabled  = /\-replace/.test(pArr[0]) ? true : false;
+                    // only allowing one argument
+                    break;
+                }
+                if (importModeEnabled) {
+                    local.envFileSaved = true;
+                    makeBundle(local.bundle, false);
+                }
+
+                if (replaceModeEnabled) {
+                    makeBundle(local.bundle, true);
+                }
+                return;
+            }
+
             rl.setPrompt('Bundle [ '+ local.bundle +' ] already exists !\n(r) Replace - All existing files will be lost !\n(c) Cancel\n(i) Import\n> ');
 
             rl.prompt();
@@ -193,7 +250,7 @@ function Add(opt, cmd) {
     var makeBundle = async function(bundle, rewrite) {
 
         loadAssets();
-        
+
         // if ( /^true$/i.test(rewrite) ) {
         //     fixPorts
         //     return
@@ -204,7 +261,7 @@ function Add(opt, cmd) {
                 rollback(err);
                 return;
             }
-            
+
             if (!local.envFileSaved) {
                 saveEnvFile(function doneSavingEnv(err){
 
@@ -267,8 +324,8 @@ function Add(opt, cmd) {
         }
 
         try {
-            //var path = self.projectPath.replace(/\.json$/, env + '.json');
-            lib.generator.createFileFromDataSync(data, self.projectPath);
+            //var path = self.projectManifestPath.replace(/\.json$/, env + '.json');
+            lib.generator.createFileFromDataSync(data, self.projectManifestPath);
             local.projectDataWrote = true;
 
             callback(false, data)
@@ -333,7 +390,7 @@ function Add(opt, cmd) {
 
         loadAssets();
 
-        var projectData = require(self.projectPath)
+        var projectData = requireJSON(self.projectManifestPath)
             , target    = _( self.projects[self.projectName].path +'/'+ projectData.bundles[local.bundle].src, true )
             , sample    = new _( getPath('gina').core + '/template/boilerplate/bundle/' );
 
@@ -344,19 +401,19 @@ function Add(opt, cmd) {
                 rollback(err);
                 return;
             }
-            
+
             // Browse, parse and replace keys
             local.source        = target;
             local.isInstalled   = false;
-            
+
             // check installed bundle
-            browse(local.source);            
+            browse(local.source);
 
             if (local.isInstalled) {
-                
+
                 // remove files we don't want yet
                 new _(destination + '/config/templates.json', true).rmSync();
-                
+
                 // if first bundle of th project, modify webroot
                 if (self.bundlesByProject[self.projectName].count() == 1) {
                     var settingsServerPath = _(destination + '/config/settings.server.json', true);
@@ -364,15 +421,15 @@ function Add(opt, cmd) {
                     serverSettings = serverSettings.replace('"webroot": "/{bundle}"', '"webroot": "/"');
                     lib.generator.createFileFromDataSync(serverSettings, settingsServerPath);
                 }
-                    
-                
-                
+
+
+
                 console.log('Bundle [ '+ local.bundle +' ] has been added to your project with success ;)');
                 rl.clearLine();
                 ++local.b;
                 addBundles(local.b)
             }
-            
+
         })
     }
 
@@ -438,10 +495,10 @@ function Add(opt, cmd) {
             var f = null;
             f = (f=file.split(/\//))[f.length-1];
             var isJS = /\.js/.test(f.substring(f.length-3))
-                , isJSON = /\.js/.test(f.substring(f.length-5))
+                , isJSON = /\.json/.test(f.substring(f.length-5))
             ;
 
-            if ( isJS || isJSON && /config\/app\.json/.test(file) ) {
+            if ( isJS || isJSON /*&& /config\/app\.json/.test(file)*/ ) {
                 var contentFile = fs.readFileSync(file, 'utf8').toString();
                 var dic = {
                     "Bundle" : local.bundle.substring(0, 1).toUpperCase() + local.bundle.substring(1),
@@ -471,12 +528,12 @@ function Add(opt, cmd) {
         var writeFiles = function() {
             //restore env.json
             lib.generator.createFileFromDataSync(self.envData, self.envPath);
-            
-            //restore project.json
+
+            //restore manifest.json
             if ( typeof(self.projectData.bundles[local.bundle]) != 'undefined') {
                 delete self.projectData.bundles[local.bundle]
             }
-            lib.generator.createFileFromDataSync(self.projectData, self.projectPath);
+            lib.generator.createFileFromDataSync(self.projectData, self.projectManifestPath);
 
             //restore ports.json
             lib.generator.createFileFromDataSync(self.portsData, self.portsPath);

package/framework/v0.1.1-alpha.230/lib/cmd/bundle/arguments.json

@@ -0,0 +1,7 @@
+[
+  "--env",
+  "--force",
+  "--import",
+  "--replace",
+  "--start-port-from"
+]

package/framework/{v0.1.1-alpha.23 → v0.1.1-alpha.230}/lib/cmd/bundle/help.txt

@@ -11,6 +11,8 @@
     To add a new bundle or to import an existing one, use the following command line.
 
     $ gina bundle:add <bundle_name> @<project_name>
+    Or
+    $ gina bundle:add <bundle_name> @<project_name> --start-port-from<port_number>
 
 
     Adding multiple
@@ -44,8 +46,8 @@
 
     [ Starting a bundle in debug mode ]
 
-    $ gina bundle:start <bundle_name> @<project_name> --debug-brk=5656
-    
+    $ gina bundle:start <bundle_name> @<project_name> --debug-brk=5656 --max-old-space-size=2048
+
 
 [ Stopping a bundle ]
 

package/framework/v0.1.1-alpha.230/lib/cmd/bundle/list.js

@@ -0,0 +1,176 @@
+var fs = require('fs');
+var console = lib.logger;
+
+var CmdHelper = require('./../helper');
+
+/**
+ * List bundles for a given project
+ *
+ * e.g.
+ *  gina bundle:list [ @<project_name> ]
+ *  gina bundle:list --all
+ *
+ * */
+function List(opt, cmd) {
+    var self = { format: null};
+
+    var init = function() {
+
+        // import CMD helpers
+        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
+        // check CMD configuration
+        if (!isCmdConfigured()) return false;
+
+        self.projects = require(_(GINA_HOMEDIR + '/projects.json'));
+        for (let i=3, len=process.argv.length; i<len; i++) {
+            if ( /^\-\-format\=/.test(process.argv[i]) ) {
+                self.format = process.argv[i].split(/\=/)[1]
+            }
+            if ( /^\-\-all\=/.test(process.argv[i]) || !self.projectName ) {
+                return listAll()
+            }
+        }
+
+        // if ( typeof(process.argv[3]) != 'undefined') {
+        //     if (process.argv[3] === '--all') {
+        //         listAll()
+        //     } else if ( !isValidName(process.argv[3]) ) {
+        //         console.error('[ '+process.argv[3]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].');
+        //         process.exit(1);
+        //     }
+        // } else {
+        //     // is current path == project path ?
+        //     var root = process.cwd();
+        //     var name = new _(root).toArray().last();
+        //     if ( isDefined(name) ) {
+        //         self.projectName = name
+        //     }
+        // }
+
+        if ( typeof(self.projectName) == 'undefined' ) {
+            listAll()
+        } else if ( typeof(self.projectName) != 'undefined' && isDefined(self.projectName) ) {
+            listProjectOnly()
+        } else {
+            console.error('[ '+self.projectName+' ] is not a valid project name.');
+            process.exit(1)
+        }
+
+        process.exit(0)
+    }
+
+    var isDefined = function(name) {
+        if ( typeof(self.projects[name]) != 'undefined' ) {
+            return true
+        }
+        return false
+    }
+
+    var isValidName = function(name) {
+        if (name == undefined) return false;
+
+        self.projectName = name.replace(/\@/, '');
+        var patt = /^[a-z0-9_.]/;
+        return patt.test(self.projectName)
+    }
+
+
+    var listAll = function() {
+        var projects = self.projects
+            , list = []
+            , p = ''
+            , path
+            , bundles
+            , b
+            , str = ''
+            , json = []
+        ;
+
+        for (p in projects) {
+            list.push(p)
+        }
+        list.sort();
+
+        p = 0;
+        for (; p<list.length; ++p) {
+            let jsonProject  = { project: list[p], status: 'ok' }
+            try {
+                path = projects[list[p]].path;
+                bundles = require( _(path +'/manifest.json')).bundles;
+                bundles = orderBundles(bundles);
+
+                str += '------------------------------------\n\r';
+                if ( !fs.existsSync(projects[list[p]].path) ) {
+                    str += '?! ';
+                    jsonProject.status = '?!'
+                }
+                str += list[p] + '\n\r';
+                str += '------------------------------------\n\r';
+                jsonProject.bundles = [];
+                for (b in bundles) {
+                    let jsonBundle  = {bundle: b, project: list[p]}
+                    if ( fs.existsSync(_(path + '/'+ bundles[b].src)) ) {
+                        str += '[ ok ] ' + b;
+                        jsonBundle.status = 'ok'
+                    } else {
+                        str += '[ ?! ] ' + b;
+                        jsonBundle.status = '?!'
+                    }
+                    str += '\n\r'
+                    jsonProject.bundles.push(jsonBundle);
+                }
+                str += '\n\r';
+
+            } catch (err) {
+                str += '------------------------------------\n\r';
+                if ( !fs.existsSync(projects[list[p]].path) ) {
+                    str += '?! ';
+                    jsonProject.status = '?!'
+                }
+                str += list[p] + '\n\r';
+                str += '------------------------------------\n\r';
+            }
+
+            json.push(jsonProject);
+        }
+
+        // console.log( (/^json?/.test(self.format)) ? JSON.stringify(json) : str )
+        if ( /^json?/.test(self.format) ) {
+            return process.stdout.write(JSON.stringify(json));
+        }
+        console.log(str);
+    }
+
+    var listProjectOnly = function () {
+        var path = self.projects[self.projectName].path
+            , bundles = require( _(path +'/manifest.json')).bundles
+            , b
+            , str = ''
+            , json = []
+        ;
+
+        bundles = orderBundles(bundles);
+
+        for (b in bundles) {
+            let jsonBundle  = {bundle: b, project: self.projectName}
+            if ( fs.existsSync(_(path + '/'+ bundles[b].src)) ) {
+                str += '[ ok ] ' + b;
+                jsonBundle.status = 'ok'
+            } else {
+                str += '[ ?! ] ' + b;
+                jsonBundle.status = '?!'
+            }
+            str += '\n\r';
+            json.push(jsonBundle);
+        }
+
+        if ( /^json?/.test(self.format) ) {
+            return process.stdout.write(JSON.stringify(json));
+        }
+        console.log(str);
+    };
+
+    init()
+};
+
+module.exports = List

package/framework/{v0.1.1-alpha.23 → v0.1.1-alpha.230}/lib/cmd/bundle/remove.js

@@ -34,7 +34,7 @@ function Remove(opt, cmd) {
             console.error('project path not defined in ~/.gina/projects.json for [ '+ self.projectName + ' ]');
             process.exit(1)
         }
-        
+
         if (isDefined('project', self.projectName)) {
             removeBundle(0)
         } else {
@@ -52,8 +52,8 @@ function Remove(opt, cmd) {
 
         //var Proc = require( getPath('gina').lib + '/proc');
 
-        
-        
+
+
     }
 
     var removeBundle = function (b) {
@@ -69,7 +69,7 @@ function Remove(opt, cmd) {
 
 
         if (local.force) {
-            // remove without checking            
+            // remove without checking
             remove(local.bundle)
         } else {
             check()
@@ -80,7 +80,7 @@ function Remove(opt, cmd) {
     var check = function() {
 
 
-        rl.setPrompt('['+ local.bundle +'@'+ self.projectName +'] Also remove bundle files ? (Y/n):');
+        rl.setPrompt('['+ local.bundle +'@'+ self.projectName +'] Also remove bundle files ? (Y/n):\n');
 
         rl.prompt();
 
@@ -113,26 +113,26 @@ function Remove(opt, cmd) {
                 process.exit(0)
             })
     }
-    
+
     var remove = function (bundle) {
-        
+
         // reload assets context with changes
         loadAssets();
-                
+
         var hasFolder = true, folderPath = null, folder = null;
         console.debug('Removing bundle: ', bundle);
         try {
             folderPath = _(self.projects[self.projectName].path + '/' + self.projectData.bundles[bundle].src, true);
             folder = new _(folderPath);
-            
+
             if ( !folder.isValidPath() ) {
                 console.warn('`'+ folder.toString() +'` is not a valid path')
             } else {
-    
+
                 // removing mounting point: just in case
                 var coreEnv = getCoreEnv(bundle);
                 new _(coreEnv.mountPath +'/'+ bundle, true).rmSync();
-                
+
                 // removing folder
                 folder = folder.rmSync();
                 if (folder instanceof Error) {
@@ -143,8 +143,8 @@ function Remove(opt, cmd) {
         } catch(folderException) {
             hasFolder = false;
         }
-        
-        
+
+
 
         // updating project env
         if ( typeof(self.envData) != 'undefined' && typeof(self.envData[bundle]) != 'undefined' ) (
@@ -162,8 +162,8 @@ function Remove(opt, cmd) {
             , re                = null
         ;
 
-        for (let protocol in ports) {                
-            for (let scheme in ports[protocol]) {                    
+        for (let protocol in ports) {
+            for (let scheme in ports[protocol]) {
                 for (let port in ports[protocol][scheme]) {
                     re = new RegExp(bundle +"\@"+ self.projectName +"\/");
                     if ( re.test(ports[protocol][scheme][port]) ) {
@@ -172,7 +172,7 @@ function Remove(opt, cmd) {
                 }
             }
         }
-        
+
         for (let bundleAddress in portsReverse) {
             re = new RegExp(bundle +"\@"+ self.projectName);
             if ( re.test(bundleAddress) ) {
@@ -183,7 +183,7 @@ function Remove(opt, cmd) {
         // now writing
         lib.generator.createFileFromDataSync(ports, self.portsPath);
         lib.generator.createFileFromDataSync(portsReverse, self.portsReversePath);
-        
+
         // env
         // var envData = JSON.clone(self.envData);
         // if ( typeof(envData[bundle]) != 'undefined' ) {
@@ -192,8 +192,8 @@ function Remove(opt, cmd) {
                 self.envData,
                 self.envPath
             );
-        // }            
-        
+        // }
+
         // manifest
         // var projectData = JSON.clone(self.projectData);
         // if ( typeof(projectData.bundles) != 'undefined' && typeof(projectData.bundles[bundle]) != 'undefined' ) {
@@ -203,25 +203,34 @@ function Remove(opt, cmd) {
             // }
             lib.generator.createFileFromDataSync(
                 self.projectData,
-                self.projectPath
+                self.projectManifestPath
             );
         // }
-        
+
 
         console.log('Bundle [ '+ bundle+'@'+self.projectName+' ] removed');
-                
+
 
         ++local.b;
         removeBundle(local.b);
     }
 
 
-    var end = function() {
-
-        
+    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)
+            } else {
+                console.log(output);
+            }
+        }
 
-        process.exit(0)
-    };
+        process.exit( err ? 1:0 )
+    }
 
     init(opt)
 };