gina 0.1.1-alpha.22 → 0.1.1-alpha.220

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.220}/lib/cmd/scope/list.js

@@ -10,13 +10,14 @@ function List(opt, cmd){
     var init = function(){
 
         self.projects = require(_(GINA_HOMEDIR + '/projects.json'));
+        var err = null;
 
         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);
+                err = new Error('[ '+process.argv[3]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].');
+                end(err, 'log', true);
             }
         } else {
             // is current path == project path ?
@@ -32,8 +33,8 @@ function List(opt, cmd){
         } else if ( typeof(self.name) != 'undefined' && isDefined(self.name) ) {
             listProjectOnly()
         } else {
-            console.error('[ '+self.name+' ] is not a valid project name.');
-            process.exit(1)
+            err = new Error('[ '+self.name+' ] is not a valid project name.');
+            end(err, 'log', true);
         }
     }
 
@@ -62,7 +63,7 @@ function List(opt, cmd){
         }
         list.sort();
 
-        
+
         for (let p = 0; p<list.length; ++p) {
             projects[list[p]].scopes.sort();
             str += '------------------------------------\n\r';
@@ -82,7 +83,8 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     }
 
     var listProjectOnly = function (){
@@ -98,7 +100,7 @@ function List(opt, cmd){
         str += '------------------------------------\n\r';
         for (let e = 0; e<projects[p].scopes.length; e++) {
             if (!projects[p].def_scope) continue;
-            
+
             if (projects[p].scopes[e] === projects[p].def_scope) {
                 str += '[ * ] ' + projects[p].scopes[e]
             } else {
@@ -107,9 +109,26 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        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)
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
     init()
 };
 

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.220}/lib/cmd/scope/remove.js

@@ -14,7 +14,7 @@ function Remove(opt, cmd) {
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
+
         self.target = _(GINA_HOMEDIR + '/projects.json');
         self.projects   = require(self.target);
         var env = local.env = process.argv[3];
@@ -22,11 +22,11 @@ function Remove(opt, cmd) {
             end( new Error('Missing argument in [ gina env:rm <environment> @<project> ]') )
         }
         else if ( typeof(env) != 'undefined' ) {
-            if ( !self.projects[self.projectName].envs.inArray(env) ) { 
+            if ( !self.projects[self.projectName].envs.inArray(env) ) {
                 end( new Error('Environment [ '+env+' ] not found') )
             }// else, continue
         }
-        
+
         if ( typeof(process.argv[4]) != 'undefined') {
             if ( !isValidName(process.argv[4]) ) {
                 end( new Error('[ '+process.argv[4]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].') );
@@ -39,16 +39,16 @@ function Remove(opt, cmd) {
                 self.projectName = name
             }
         }
-        
+
         if ( typeof(self.projectName) == 'undefined' ) {
             end( new Error('Project name is required: @<project_name>') )
         } else if ( typeof(self.projectName) != 'undefined' && isDefined('project', self.projectName) ) {
             removeEnv(self.projects, self.target)
         } else {
             end( new Error('[ '+self.projectName+' ] is not a valid project name.') )
-        }        
+        }
     }
-    
+
     var removeEnv = function(projects, target) {
         var err = null, env = local.env;
         // default `dev env` cannot be removed
@@ -58,7 +58,7 @@ function Remove(opt, cmd) {
             } else {
                 err = new Error('Environment [ '+env+' ] is linked as "development environment"')
             }
-            
+
             return end(err);
         }
 
@@ -84,9 +84,9 @@ function Remove(opt, cmd) {
                         delete ports[protocol][scheme][p]
                     }
                 }
-            }                    
+            }
         }
-        
+
         patt = new RegExp("\@"+ self.projectName +"$");
         for (let bundle in portsReverse) {
             if ( patt.test(bundle) ) {
@@ -95,7 +95,7 @@ function Remove(opt, cmd) {
                         delete portsReverse[bundle][e]
                     }
                 }
-            }            
+            }
         }
 
         for (let bundle in envs) {
@@ -112,35 +112,35 @@ function Remove(opt, cmd) {
 
         updateManifest();
     };
-    
+
     var updateManifest = function() {
         var env = local.env;
         var projectData    = JSON.clone(self.projectData);
         for (let bundle in projectData.bundles) {
-            if ( typeof(projectData.bundles[bundle].releases[env].target) != 'undefined' ) {                
+            if ( typeof(projectData.bundles[bundle].releases[env].target) != 'undefined' ) {
                 delete projectData.bundles[bundle].releases[env].target
             }
         }
-        
-        lib.generator.createFileFromDataSync(projectData, self.projectPath);
-        
+
+        lib.generator.createFileFromDataSync(projectData, self.projectManifestPath);
+
         end()
     }
-    
+
     var end = function(err) {
-        console.debug('GINA_ENV_IS_DEV ', GINA_ENV_IS_DEV);        
+        console.debug('GINA_ENV_IS_DEV ', GINA_ENV_IS_DEV);
         if (err) {
             if (GINA_ENV_IS_DEV) {
                 console.error(err.stack);
             } else {
                 console.error(err.message);
             }
-            
+
             return process.exit(1);
         }
         var env = local.env;
         console.log('Environment [ '+env+' ] removed with success');
-        
+
         return process.exit(0)
     }
 

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.220}/lib/cmd/view/add.js

@@ -18,13 +18,13 @@ function Add(opt, cmd) {
     ;
 
     var init = function() {
-        
+
         // 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) && self.bundles.length > 0) {
 
             addViews(0)
@@ -57,8 +57,8 @@ function Add(opt, cmd) {
             , f = 0;
 
         if (source == local.source && typeof(list) == 'undefined') {//root
-            var list = [];// root list
-            for (var l=0; l<files.length; ++l) {
+            list = [];// root list
+            for (let l=0; l<files.length; ++l) {
                 list[l] = _(local.source +'/'+ files[l])
             }
         }
@@ -132,6 +132,28 @@ function Add(opt, cmd) {
         }
     }
 
+    // var checkForNamespaces = function(src) {
+    //     var routingObj = null
+    //         , namespaces = {}
+    //     ;
+    //     try {
+    //         routingObj = require(_(src + '/config/routing.json', true));
+    //         // Looking for namespaces
+    //         for (let r in routing) {
+    //             if ( typeof(routing[r].namespace) != 'undefined' ) {
+    //                 namespaces[r] = {
+    //                     namespace : routing[r].namespace
+    //                 }
+    //             }
+    //         }
+    //     } catch (err) {
+    //         console.error(err.stack);
+    //         process.exit(1);
+    //     }
+
+    //     return (namespaces.count() > 0) ? namespaces : null
+    // }
+
     /**
      * Add bundles
      *
@@ -157,10 +179,13 @@ function Add(opt, cmd) {
             local.b         = b;
             local.env       = self.projects[self.projectName]['def_env'];
             local.root      = self.projects[self.projectName].path;
+            local.src       = _(self.bundlesLocation +'/'+ bundle, true);
 
             console.info('Adding view folder for: '+ local.bundle +'@'+ self.projectName);
-            
-            local.src = _(self.bundlesLocation +'/'+ bundle, true);
+
+            // local.namespaces = checkForNamespaces(local.src);
+
+
             addConfFile()
 
         } else {
@@ -182,7 +207,7 @@ function Add(opt, cmd) {
         var folder  = _(local.src + '/templates');
 
         if ( fs.existsSync(target) || fs.existsSync(folder) ) {
-            rl.setPrompt('Found templates for [ '+ local.bundle +'@'+ self.projectName +' ]. Do you want to override ? (yes|no) > ');
+            rl.setPrompt('Found templates for [ '+ local.bundle +'@'+ self.projectName +' ]. Do you want to override ? (yes|no) > \n');
             rl.prompt();
 
             rl.on('line', function(line) {
@@ -245,7 +270,7 @@ function Add(opt, cmd) {
             local.source        = _(targetPath +'/handlers', true);
             local.isInstalled   = false;
             browse(local.source);
-            
+
             console.log('['+ local.bundle +'@'+ self.projectName +'] templates installed with success !');
             folderPublic.cp(target + '/public', function(err, targetPath){
                 if (err) {
@@ -256,7 +281,7 @@ function Add(opt, cmd) {
                 ++local.b;
                 addViews(local.b)
             });
-            
+
         });
     }
 
@@ -275,7 +300,7 @@ function Add(opt, cmd) {
                 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

package/framework/{v0.1.1-alpha.22 → v0.1.1-alpha.220}/lib/collection/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"
   },