gina 0.1.1-alpha.106 → 0.1.1-alpha.109

package/framework/{v0.1.1-alpha.106 → v0.1.1-alpha.109}/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)
     };

package/framework/{v0.1.1-alpha.106/lib/cmd/scope → v0.1.1-alpha.109/lib/cmd/env}/use.js

@@ -63,16 +63,36 @@ function Use(opt, cmd) {
     }
 
     var useEnv = function(env, projects, target) {
-        //console.log('proj.: ', self.name, projects[self.name]);
+        // console.debug('proj.: ', self.name, projects[self.name] , '\nEnv:' + env);
         if (env !== projects[self.name]['def_env']) {
+            console.log('Project [ '+ self.name+' ] env `'+ projects[self.name]['def_env'] +'` set to '+ env);
             projects[self.name]['def_env'] = env;
             lib.generator.createFileFromDataSync(
                 projects,
                 target
             )
         }
+
+
+        end();
     };
 
+    var end = function(err) {
+        if (err) {
+            if (GINA_ENV_IS_DEV) {
+                console.error(err.stack);
+            } else {
+                console.error(err.message);
+            }
+
+            return process.exit(1);
+        }
+
+
+
+        return process.exit(0)
+    }
+
     init()
 };
 

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

@@ -99,7 +99,7 @@ function Add(opt, cmd) {
                     self.projects[self.projectName ].path = self.projectLocation;
 
                     var target = _(GINA_HOMEDIR + '/projects.json')
-                        , projects = self.projects;
+                        , projects = JSON.clone(self.projects);
 
                     lib.generator.createFileFromDataSync(
                         projects,
@@ -197,7 +197,7 @@ function Add(opt, cmd) {
 
 
         var target = _(GINA_HOMEDIR + '/projects.json')
-            , projects = self.projects
+            , projects = JSON.clone(self.projects)
             , error = false;
 
 
@@ -214,7 +214,7 @@ function Add(opt, cmd) {
         };
 
         // create/update ports, protocols & schemes
-        if ( /^true$/.test(local.imported) || /^false$/.test(local.imported) && typeof(self.projects[self.projectName]) == 'undefined' ) {
+        if ( /^true$/.test(local.imported) ) {
             addBundlePorts(0);
         }
 
@@ -258,6 +258,8 @@ function Add(opt, cmd) {
                 linkGina(onError, onSuccess)
             }
 
+        } else {
+            onSuccess()
         }
     }
 

package/framework/{v0.1.1-alpha.106 → v0.1.1-alpha.109}/lib/cmd/project/remove.js

@@ -31,7 +31,7 @@ function Remove(opt, cmd) {
 
         if ( typeof(self.projects[self.projectName]) == 'undefined' ) {
             console.error('project [ '+ self.projectName + ' ] not found in `~/.gina/projects.json`');
-            
+
             process.exit(1)
         }
 
@@ -52,15 +52,15 @@ function Remove(opt, cmd) {
                     process.exit(1)
                 }
             }
-           
+
             end(true)
         })
     }
-    
+
 
     var prompt = function(force, cb) {
         if (!force) {
-            rl.setPrompt('Also remove project sources ? (Y/n):');
+            rl.setPrompt('Also remove project sources ? (Y/n):\n');
             rl.prompt();
         } else {
             cb(true)
@@ -89,7 +89,7 @@ function Remove(opt, cmd) {
 
 
     var end = function(removed) {
-        
+
         // removing ports
         var ports               = JSON.clone(self.portsData)
             , portsReverse      = JSON.clone(self.portsReverseData)
@@ -98,39 +98,39 @@ function Remove(opt, cmd) {
         ;
 
         for (var protocol in ports) {
-            
+
             for (var scheme in ports[protocol]) {
-                
+
                 for (var port in ports[protocol][scheme]) {
 
                     re = new RegExp("\@"+ self.projectName +"\/");
-                    
-                    if ( re.test(ports[protocol][scheme][port]) ) { 
+
+                    if ( re.test(ports[protocol][scheme][port]) ) {
                         // reverse ports
                         reversePortValue = ports[protocol][scheme][port].split('/')[0];
                         if ( typeof(portsReverse[reversePortValue]) != 'undefined' ) {
                             delete portsReverse[reversePortValue];
-                        } 
-                        
-                        // ports                                           
+                        }
+
+                        // ports
                         delete ports[protocol][scheme][port];
-                    }                    
+                    }
                 }
-            }                    
+            }
         }
 
         // now writing
         lib.generator.createFileFromDataSync(ports, self.portsPath);
         lib.generator.createFileFromDataSync(portsReverse, self.portsReversePath);
-        
-        
+
+
         var target = _(GINA_HOMEDIR + '/projects.json');
         delete self.projects[self.projectName];
         lib.generator.createFileFromDataSync(
             self.projects,
             target
         )
-        
+
 
         if (removed)
             console.log('Project [ '+ self.projectName +' ] removed');

package/framework/{v0.1.1-alpha.106 → v0.1.1-alpha.109}/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)
             });
-            
+
         });
     }