gina 0.1.1-alpha.22 → 0.1.1-alpha.221

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.221}/helpers/plugins/src/api-error.js

@@ -3,46 +3,46 @@ var merge = require('./../../../lib/merge');
 var statusCodes = requireJSON(__dirname + '/../../../core/status.codes');
 //var statusCodes = requireJSON( _( getPath('gina').core + '/status.codes') );
 /**
- * 
+ *
  * Usage:
  *  var e = null;
  *  // Server errors
  *  e = new ApiError('This is a generic server error.'); // default error.status -> 500
  *  e = new ApiError('This a server specific server error.', 501);
- * 
+ *
  *  // Client errors
  *  e = new ApiError('This is client error.', 498);
  *  e = new ApiError('This is client error.', 'token', 498); // where `token` is the frontend field: <input type="hiden" name="token">
  *  or
  *  e = new ApiError('This is client error.', 'token');
  *  e.status = 498;
- * 
+ *
  *  // Client bundled error
  *  e = new ApiError(['This is preconditioned #1 client error.', 'This is preconditioned #2 client error.'], ['firstName', 'lastName']);
- * 
+ *
  * @param {string|array} errorMessage
  * @param {string} [fieldName]
  * @param {number} [errorStatus] - 500 by default for the server and 412 for the client
- * 
+ *
  * @returns {object} errorObject
  */
 function ApiError(errorMessage, fieldName, errorStatus) {
     var e = null;
-    
+
     if ( typeof(merge) != 'function' ) {
         merge = require('./../../../lib/merge');
-    }    
-    if ( typeof(statusCodes) == 'undefined' ) {
-        var statusCodes = requireJSON(__dirname + '/../../../core/status.codes');
     }
-    
+    // if ( typeof(statusCodes) == 'undefined' ) {
+        var statusCodes = requireJSON(__dirname + '/../../../core/status.codes');
+    // }
+
     if ( typeof(errorMessage) == 'object' && errorMessage instanceof Error ) {
         e = JSON.clone(errorMessage);
         errorMessage = e.message || e.stack;
     } else {
-        e = new Error(errorMessage);   
+        e = new Error(errorMessage);
     }
-     
+
     var isClientError = (arguments.length == 3) ? true : false;
     if ( arguments.length == 2 ) {
         // server error
@@ -53,7 +53,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
             }
             fieldName = null;
         }
-        // client error 
+        // client error
         else if ( Array.isArray(arguments[1]) || typeof(arguments[1]) == 'string' ) {
             isClientError = true;
             errorStatus = 412; // by default
@@ -70,7 +70,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
         // TODO - Reformat stack to remove the first lines
         if (!e.status)
             e.status    = errorStatus || 500;
-            
+
         if ( typeof(statusCodes[e.status]) != 'undefined' ) {
             e.error = statusCodes[e.status];
         } else {
@@ -78,7 +78,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
         }
         if (!e.message)
             e.message   = errorMessage;
-        
+
         return e;
     }
     // Client Error
@@ -98,8 +98,8 @@ function ApiError(errorMessage, fieldName, errorStatus) {
         fields  : {},
         path    : ''
     }, e);
-    
-    
+
+
     var formatClientError = function(ctx, error, errorMessage, fieldName) {
         error.fields[fieldName] = errorMessage;
         var bundleName      = ctx.bundle
@@ -117,7 +117,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
                         path = paths.models.substr(paths.models.lastIndexOf(bundleName)) +'/'+ filename.substr(filename.lastIndexOf(bundleName+'\/models'));
                         error.tag += 'model:'
                     }
-                    // controller 
+                    // controller
                     else {
                         path = paths.controllers.substr(paths.controllers.lastIndexOf(bundleName)) +'/'+ filename.substr(filename.lastIndexOf(bundleName+'\/controllers'));
                         error.tag += 'controller:';
@@ -132,15 +132,15 @@ function ApiError(errorMessage, fieldName, errorStatus) {
             } catch (err) {
                 error.tag   = 'N/A';
                 error.stack = err.stack;
-            }        
+            }
         } else {
             //error.fields[fieldName]['isApiError'] = errorMessage;
             error.tag   = 'N/A';
-        }     
-         
+        }
+
         return error;
     }
-    
+
     if ( Array.isArray(fieldName) ) {
         for (let i = 0, len = errorMessage.length; i < len; i++) {
             clientError = formatClientError(ctx, clientError, errorMessage[i], fieldName[i]);
@@ -148,7 +148,7 @@ function ApiError(errorMessage, fieldName, errorStatus) {
     } else {
         clientError = formatClientError(ctx, clientError, errorMessage, fieldName);
     }
-    
+
     return clientError;
 }
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.221}/helpers/plugins/src/main.js

@@ -1,6 +1,6 @@
 /*
  * 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.
@@ -10,7 +10,7 @@
 /**
  * PluginsHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
@@ -24,7 +24,7 @@ module.exports = function(loadedPlugins){
                 if ( typeof(ApiError) == 'undefined')
                     ApiError = require('./api-error');
                 break;
-        
+
             default:
                 break;
         }

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.221}/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,36 @@ function PrototypesHelper(instance) {
             value: function(){ return this.slice(0); }
         });
     }
-    
+
     if ( typeof(JSON.clone) == 'undefined' && !isGFFCtx ) {
-        if ( typeof(envVars) != 'undefined' ) {
+        if ( typeof(envVars) != 'undefined' && envVars != null ) {
             JSON.clone = require( envVars.GINA_DIR +'/utils/prototypes.json_clone');
         } else {
-            JSON.clone = require( GINA_DIR +'/utils/prototypes.json_clone');
-        }        
+            // For unit tests
+            if (!envVars) {
+                var ginaDir = process.cwd().match(/.*\/gina/)[0];
+                require(ginaDir +'/utils/helper');
+                setEnvVar('GINA_DIR', ginaDir, true);
+                envVars = getEnvVars();
+            }
+
+            // JSON.clone = require( GINA_DIR +'/utils/prototypes.json_clone');
+            JSON.clone = require( getEnvVar('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/vendor/gina/js/utils/polyfill.js
+         *
          * @param {object} jsonStr
-         * 
+         *
          * @returns {object} escaped JSON string
          **/
          var escape = function(jsonStr){
@@ -104,14 +113,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 +137,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 +163,7 @@ function PrototypesHelper(instance) {
             }
         });
     }
-    
+
     if ( typeof(Object.count) == 'undefined' ) {
         Object.defineProperty( Object.prototype, 'count', {
             writable:   true,
@@ -166,7 +175,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 +186,10 @@ function PrototypesHelper(instance) {
 
             }
         });
-    }        
+    }
+
+
 
-    
-        
     if ( typeof(global) != 'undefined' && typeof(global.__stack) == 'undefined' ) {
         /**
          * __stack Get current stack
@@ -204,8 +213,8 @@ function PrototypesHelper(instance) {
             }
         });
     }
-    
-    
+
+
 }
 
 if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
@@ -215,4 +224,3 @@ if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
     // Publish as AMD module
     define( function() { return PrototypesHelper })
 }
-    

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.221}/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.22 → v0.1.1-alpha.221}/helpers/text.js

@@ -1,6 +1,6 @@
 /*
  * 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.
@@ -9,7 +9,7 @@
 /**
  * TextHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.221}/lib/archiver/package.json

@@ -7,7 +7,7 @@
     "name": "Maritn-Luther ETOUMAN",
     "email": "contact@gina.io"
   },
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },