gina 0.1.1-alpha.14 → 0.1.1-alpha.140

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.140}/helpers/prototypes.js

@@ -1,14 +1,14 @@
 function PrototypesHelper(instance) {
-    
+
     var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
-    
+
     var local = instance || null;
     var envVars = null;
     // since for some cases we cannot use gina envVars directly
-    if (        
+    if (
         typeof(GINA_DIR) == 'undefined'
         && !isGFFCtx
-        && typeof(process) != 'undefined' 
+        && typeof(process) != 'undefined'
         && process.argv.length > 3
     ) {
         if ( /^\{/.test(process.argv[2]) ) {
@@ -20,27 +20,27 @@ function PrototypesHelper(instance) {
             var envVarFile = process.argv[2].split(/\-\-argv\-filename\=/)[1];
             envVars = JSON.parse(fs.readFileSync(envVarFile).toString()).envVars;
         }
-        
+
     }
     // else if (isGFFCtx) {
     //     envVars = window;
     // }
-     
-    
+
+
     // dateFormat proto
     if ( local && typeof(local) != 'undefined' && typeof(local.dateFormat) != 'undefined' ) {
         for (let method in local.dateFormat) {
-            
+
             if ( typeof(Date[method]) != 'undefined' )
                 continue;
-            
+
             Object.defineProperty( Date.prototype, method, {
                 writable:   false,
                 enumerable: false,
                 //If loaded several times, it can lead to an exception. That's why I put this.
                 configurable: true,
-                value: function() { 
-                    
+                value: function() {
+
                     var newArgs = { 0: this }, i = 1;
                     for (var a in arguments) {
                         newArgs[i] = arguments[a];
@@ -49,20 +49,20 @@ function PrototypesHelper(instance) {
                     newArgs.length = i;
                     // don't touch this, we need the name
                     const name = method;
-                    
+
                     return local.dateFormat[name].apply(this, newArgs );
                 }
             });
-            
+
         }
     }
-    
-    
+
+
 
     if ( typeof(Array.clone) == 'undefined' ) {
         /**
          * clone array
-         * 
+         *
          * @returns {array} Return cloned array
          * @supress {misplacedTypeAnnotation}
          **/
@@ -74,27 +74,27 @@ function PrototypesHelper(instance) {
             value: function(){ return this.slice(0); }
         });
     }
-    
+
     if ( typeof(JSON.clone) == 'undefined' && !isGFFCtx ) {
         if ( typeof(envVars) != 'undefined' ) {
             JSON.clone = require( envVars.GINA_DIR +'/utils/prototypes.json_clone');
         } else {
             JSON.clone = require( GINA_DIR +'/utils/prototypes.json_clone');
-        }        
+        }
     }
-    
+
     if ( typeof(JSON.escape) == 'undefined' ) {
         /**
          * JSON.escape
          * Escape special characters
-         * 
-         * Changes made here must be reflected in: 
+         *
+         * Changes made here must be reflected in:
          *  - gina/utils/prototypes.js
          *  - gina/framework/version/helpers/prototypes.js
-         *  - gina/framework/version/core/asset/js/plugin/src/gina/utils/polyfill.js
-         * 
+         *  - gina/framework/version/core/asset/plugin/src/gina/utils/polyfill.js
+         *
          * @param {object} jsonStr
-         * 
+         *
          * @returns {object} escaped JSON string
          **/
          var escape = function(jsonStr){
@@ -104,14 +104,14 @@ function PrototypesHelper(instance) {
                            .replace(/\r/g, "\\r")
                            .replace(/\t/g, "\\t")
                        ;
-            } catch (err) {         
+            } catch (err) {
                throw err;
             }
         };
-        
+
         JSON.escape = escape;
     }
-        
+
 
     if ( typeof(Array.toString) == 'undefined' ) {
         Array.prototype.toString = function(){
@@ -128,7 +128,7 @@ function PrototypesHelper(instance) {
             value: function(o){ return this.indexOf(o)!=-1 }
         });
     }
-        
+
     if ( typeof(Array.from) == 'undefined' ) { // if not under ES6
 
         Object.defineProperty( Array.prototype, 'from', {
@@ -154,7 +154,7 @@ function PrototypesHelper(instance) {
             }
         });
     }
-    
+
     if ( typeof(Object.count) == 'undefined' ) {
         Object.defineProperty( Object.prototype, 'count', {
             writable:   true,
@@ -166,7 +166,7 @@ function PrototypesHelper(instance) {
                 try {
                     var self = this;
                     if (this instanceof String) self = JSON.parse(this);
-                    
+
                     for (var prop in this)
                         if (this.hasOwnProperty(prop)) ++i;
 
@@ -177,10 +177,10 @@ function PrototypesHelper(instance) {
 
             }
         });
-    }        
+    }
+
+
 
-    
-        
     if ( typeof(global) != 'undefined' && typeof(global.__stack) == 'undefined' ) {
         /**
          * __stack Get current stack
@@ -204,8 +204,8 @@ function PrototypesHelper(instance) {
             }
         });
     }
-    
-    
+
+
 }
 
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
@@ -215,4 +215,3 @@ if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     // Publish as AMD module
     define( function() { return PrototypesHelper })
 }
-    

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.140}/helpers/task.js

@@ -1,4 +1,5 @@
 var fs              = require('fs');
+var os              = require("os");
 var EventEmitter    = require('events').EventEmitter;
 var spawn           = require('child_process').spawn;
 
@@ -8,7 +9,7 @@ module.exports = function () {
 
 	 /**
      * Run commande on local cli
-     * 
+     *
      * Could also be used to open an url but need some tweaking
      * // sample of a cross platform `open` command
      *  e.g.: var openCmd = (process.platform == 'darwin'? 'open': process.platform == 'win32'? 'start': 'xdg-open');
@@ -19,15 +20,18 @@ module.exports = function () {
      *
      * */
 	run = function(cmdline, opt, cb) {
-        
+
 		var pathArr = (new _(__dirname).toUnixStyle().split(/\//g));
 		var root =  pathArr.splice(0, pathArr.length-6).join('/');
 
-        var opt = opt || {};
-        if (!opt.cwd)
+        opt = opt || {};
+        if (!opt.cwd) {
             opt.cwd = root;
+        }
+        process.chdir(opt.cwd);
+
 
-        var tmp = opt.tmp || process.cwd();
+        var tmp = opt.tmp || os.tmpdir() || process.cwd();
 
         if ( !fs.existsSync(tmp) ) {
             fs.mkdirSync(tmp)
@@ -41,7 +45,7 @@ module.exports = function () {
         var result, error = false;
         var hasCalledBack = false;
         var e = new EventEmitter();
-        
+
         e.onData = function(callback) {
             e.once('run#data', callback);
 
@@ -66,20 +70,20 @@ module.exports = function () {
         if (typeof(cmdline) == 'string') {
             cmdline = cmdline.split(' ')
         }
-        
+
         console.debug('opt.outToProcessSTD => ', opt.outToProcessSTD);
         if ( typeof(opt) != 'undefined' && typeof(opt.outToProcessSTD) != 'undefined' && /^true$/i.test(opt.outToProcessSTD) ) {
             // mainly used for task like `npm install`. This is not the default setup
             cmd = spawn(cmdline.splice(0,1).toString(), cmdline, { cwd: opt.cwd, stdio: [ process.stdin, process.stdout, process.stderr ] });
         } else {
             cmd = spawn(cmdline.splice(0,1).toString(), cmdline, { cwd: opt.cwd, stdio: [ 'ignore', out, err ] });
-        }   
+        }
         cmd.on('stdout', function(data) {
             var str = data.toString();
             var lines = str.split(/(\r?\n)/g);
             result = lines.join('');
             console.log('out: ', result);
-            
+
             e.emit('run#data', result)
         });
 
@@ -88,10 +92,10 @@ module.exports = function () {
             var str = err.toString();
             error = str || false;
             console.log('err: ', error);
-            
+
             e.emit('run#err', error)
         });
-        
+
         // cmd.on('exit', function (code){
         //     console.debug('exiting with code '+ code +' ....');
         // });
@@ -130,11 +134,14 @@ module.exports = function () {
                     }
                     e.emit('run#complete', error, result)
                 } else {
+                    if (error) {
+                        console.debug('task::run encountered an error: ' + error);
+                    }
                     if (cb) {
-                        cb('task::run encountered an error: ' + error, result);
+                        cb(error, result);
                         return;
                     }
-                    e.emit('run#complete', 'task::run encountered an error: ' + error, result)
+                    e.emit('run#complete', error, result)
                 }
 
 
@@ -143,7 +150,7 @@ module.exports = function () {
             }
         });
 
-        
+
 
         return e
 	};

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.140}/lib/cmd/aliases.json

@@ -8,6 +8,9 @@
         "-r" : "restart",
         "--restart" : "restart",
         "-v" : "version",
-        "--version" : "version"
+        "--version" : "version",
+        "-ln" : "link",
+        "--link" : "link",
+        "--link-node-modules": "link-node-modules"
     }
 }

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

@@ -33,7 +33,7 @@ function Add(opt, cmd) {
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
+
         // var i = 3, envs = [];
         // for (; i<process.argv.length; ++i) {
         //     if ( /^\@[a-z0-9_.]/.test(process.argv[i]) ) {
@@ -62,8 +62,8 @@ function Add(opt, cmd) {
             process.exit(1)
         }
     }
-    
-    
+
+
 
     /**
      * Add bundles
@@ -90,7 +90,7 @@ function Add(opt, cmd) {
 
             local.b             = b;
             local.bundle        = bundle;
-            
+
             local.envFileSaved  = false;
 
             // find available port
@@ -111,7 +111,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 +131,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 +219,7 @@ function Add(opt, cmd) {
     var makeBundle = async function(bundle, rewrite) {
 
         loadAssets();
-        
+
         // if ( /^true$/i.test(rewrite) ) {
         //     fixPorts
         //     return
@@ -204,7 +230,7 @@ function Add(opt, cmd) {
                 rollback(err);
                 return;
             }
-            
+
             if (!local.envFileSaved) {
                 saveEnvFile(function doneSavingEnv(err){
 
@@ -344,19 +370,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 +390,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)
             }
-            
+
         })
     }
 
@@ -471,7 +497,7 @@ function Add(opt, cmd) {
         var writeFiles = function() {
             //restore env.json
             lib.generator.createFileFromDataSync(self.envData, self.envPath);
-            
+
             //restore project.json
             if ( typeof(self.projectData.bundles[local.bundle]) != 'undefined') {
                 delete self.projectData.bundles[local.bundle]

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

@@ -0,0 +1,6 @@
+[
+  "--env",
+  "--force",
+  "--import",
+  "--replace"
+]

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.140}/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' ) {
@@ -206,10 +206,10 @@ function Remove(opt, cmd) {
                 self.projectPath
             );
         // }
-        
+
 
         console.log('Bundle [ '+ bundle+'@'+self.projectName+' ] removed');
-                
+
 
         ++local.b;
         removeBundle(local.b);
@@ -218,7 +218,7 @@ function Remove(opt, cmd) {
 
     var end = function() {
 
-        
+
 
         process.exit(0)
     };