gina 0.1.1-alpha.171 → 0.1.1-alpha.173

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/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,
@@ -34,6 +39,31 @@ 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]) ) {
@@ -95,8 +125,9 @@ function Add(opt, cmd) {
 
             // find available port
             options = {
-                ignore  : getPortsList(),
-                limit   : getBundleScanLimit(bundle)
+                ignore      : getPortsList(),
+                limit       : getBundleScanLimit(bundle),
+                startFrom   : self.startFrom
             };
             console.log('['+bundle+'] starting ports scan' );
 
@@ -464,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),

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/lib/cmd/bundle/arguments.json

@@ -2,5 +2,6 @@
   "--env",
   "--force",
   "--import",
-  "--replace"
+  "--replace",
+  "--start-port-from"
 ]

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/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

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/lib/cmd/framework/set.js

@@ -75,6 +75,11 @@ function Set(opt){
                 setKeyVal('host_v4', v);
             break;
 
+            case '--iso_short':
+            case '--iso-short':
+                setKeyVal('iso_short', v);
+            break;
+
             case '--hostname':
                 setKeyVal('hostname', v);
             break;
@@ -83,6 +88,10 @@ function Set(opt){
                 setTimezone(v);
             break;
 
+            case '--date':
+                setKeyVal('date', v);
+            break;
+
             default:
                 return end(new Error('Setting environment variable `'+ k +'` is not supported'), 'error', true);
                 // err = new Error('Setting environment variable `'+ k +'` is not supported');

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/lib/cmd/port/inc/scan.js

@@ -15,6 +15,7 @@ module.exports = function Scanner(opt, cb){
         // default binding for localhost
         // remote scan can be added later if needed (e.g: for remote setup)
         host: 'localhost',
+        // --start-port-from
         startFrom: null,
         start: 3100,
         // max 65535, but user assigned == 49151 - see [RFC6335](https://www.rfc-editor.org/rfc/rfc6335.html)
@@ -62,7 +63,7 @@ module.exports = function Scanner(opt, cb){
         }
 
         // skip port present in the `ignore list`
-        if ( opt.ignore.length > 0 && opt.ignore.indexOf( port ) > -1 ) {
+        if ( opt.ignore.length > 0 && opt.ignore.indexOf( ''+port ) > -1 ) {
             port++;
             return find(port);
         }

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/lib/cmd/port/reset.js

@@ -11,7 +11,7 @@ const { setFips } = require('crypto');
  *
  * e.g.:
  *  gina port:reset @<project_name>
- *  gina port:reset @<project_name> --start-from=4100
+ *  gina port:reset @<project_name> --start-port-from=4100
  *
  * */
 function Reset(opt, cmd) {
@@ -36,7 +36,7 @@ function Reset(opt, cmd) {
         if (!isCmdConfigured()) return false;
 
         for (let i=3, len=process.argv.length; i<len; i++) {
-            if ( /^\-\-start\-from\=/.test(process.argv[i]) ) {
+            if ( /^\-\-start\-port\-from\=/.test(process.argv[i]) ) {
                 self.startFrom = process.argv[i].split(/\=/)[1]
             }
         }

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/lib/cmd/project/add.js

@@ -29,7 +29,7 @@ function Add(opt, cmd) {
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
         for (let i=3, len=process.argv.length; i<len; i++) {
-            if ( /^\-\-start\-from\=/.test(process.argv[i]) ) {
+            if ( /^\-\-start\-port\-from\=/.test(process.argv[i]) ) {
                 self.startFrom = process.argv[i].split(/\=/)[1]
             }
         }

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/lib/cmd/project/arguments.json

@@ -5,5 +5,6 @@
   "--more",
   "--with-bundles",
   "--with-envs",
-  "--scope"
+  "--scope",
+  "--start-port-from"
 ]

package/framework/{v0.1.1-alpha.171 → v0.1.1-alpha.173}/lib/routing/src/main.js

@@ -1003,7 +1003,7 @@ function Routing() {
                 if ( self.reservedParams.indexOf(r) > -1 || new RegExp(route.param[r]).test(maskedUrl) )
                     continue;
                 if (typeof(params[r]) != 'undefined' )
-                    queryParams += r +'='+ encodeURIComponent(params[r])+ '&';
+                    queryParams += r +'='+ encodeRFC5987ValueChars(params[r])+ '&';
             }
 
             if (queryParams.length > 1) {
@@ -1292,7 +1292,7 @@ function Routing() {
 
         pathname    = url.replace( new RegExp('^('+ hostname +'|'+hostname.replace(/\:\d+/, '') +')' ), '');
         if ( typeof(request.routing.path) == 'undefined' )
-            request.routing.path = unescape(pathname);
+            request.routing.path = decodeURI(pathname);
         method      = ( typeof(method) != 'undefined' ) ? method.toLowerCase() : 'get';
 
         if (isMethodProvidedByDefault) {
@@ -1300,7 +1300,7 @@ function Routing() {
             request.originalMethod = request.method;
 
             request.method = method;
-            request.routing.path = unescape(pathname)
+            request.routing.path = decodeURI(pathname)
         }
         // last method check
         if ( !request.method)
@@ -1335,7 +1335,7 @@ function Routing() {
                     method              : localMethod,
                     requirements        : routing[name].requirements,
                     namespace           : routing[name].namespace || undefined,
-                    url                 : unescape(pathname), /// avoid %20
+                    url                 : decodeURI(pathname), /// avoid %20
                     rule                : routing[name].originalRule || name,
                     param               : routing[name].param,
                     //middleware: routing[name].middleware,