gina 0.1.1-alpha.98 → 0.1.2-alpha.1

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/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.98 → v0.1.2-alpha.1}/lib/cmd/project/build.js

@@ -15,61 +15,61 @@ var console     = lib.logger;
         bundle : null,
         bundlePath : null
     };
-    
+
     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 (!self.bundles.length) {
             return end( new Error('No bundle found in your project `'+ self.projectName +'`') );
         }
-        
+
         console.debug('Building project `'+ self.projectName +'`');
-        buildBundle(0);        
+        buildBundle(0);
     }
-    
-    var buildBundle = function(b, e) {                
+
+    var buildBundle = function(b, e) {
         if ( b > self.bundles.length-1 ) {
             return end()
         }
         if (!e) {
             e = 0;
         }
-        
-        
+
+
         var bundle = self.bundles[b];
         if (!local.envs) {
             try {
                 local.envs = [];
-                local.manifest = requireJSON(_(self.projectPath, true));            
-                var targets = local.manifest.bundles[bundle].releases;                
+                local.manifest = requireJSON(_(self.projectManifestPath, true));
+                var targets = local.manifest.bundles[bundle].releases;
                 for (let env in targets) {
                     local.envs.push(env);
                 }
                 if (!local.envs.length) {
                     return end( new Error('No environment found for your build !'));
-                }           
-                
-                
+                }
+
+
             } catch(err) {
                 end(err)
             }
         }
         console.debug('Building bundle `'+ bundle + '@'+ self.projectName + '`');
-        
+
         buildEnv(b, e);
-        
+
     }
-    
+
     var buildEnv = function(b, e) {
-        
+
         if ( e > local.envs.length-1 ) {
             return buildBundle(b+1);
         }
-        
+
         var bundle          = self.bundles[b]
             , env           = local.envs[e]
             , manifest      = local.manifest
@@ -77,9 +77,9 @@ var console     = lib.logger;
             , release       = new _(releasePath, true)
             , srcPath       = _(self.bundlesLocation +'/'+ bundle, true)
         ;
-        
+
         console.debug('Building bundle env `'+ env +'` for `'+ bundle + '@'+ self.projectName + '`');
-        
+
         // cleanup
         if (release.existsSync()) {
             release.rmSync()
@@ -88,28 +88,28 @@ var console     = lib.logger;
             if (err) {
                 return end(err)
             }
-            
+
             buildEnv(b, e+1);
         })
     }
-    
-    var end = function(err) {     
+
+    var end = function(err) {
         if (err) {
             if (GINA_ENV_IS_DEV) {
                 console.error(err.stack);
             } else {
                 console.error(err.message);
             }
-            
+
             return process.exit(1);
         }
-        
+
         console.log('Project [ '+ self.projectName+' ] built with success');
-        
+
         return process.exit(0)
     }
-    
+
     init()
-    
+
  }
  module.exports = Build;

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/lib/cmd/project/help.txt

@@ -14,7 +14,7 @@
     where `/var/www/<project_name>` is the destination path
     NB.: `--path` can also be a relative path like `--path=./` or `--path=./<project_name>`
     If you do not specifiy a `<project_name>` for the `--path` argument , gina will reuse the one you used with `@<project_name>`
-    
+
     This command line also supports relative path like `--path=./<project_name>`
 
     2nd method
@@ -23,6 +23,12 @@
     $ gina project:add
 
 
+[ Import an existing project ]
+    Works just like `project:add` task. It will also do some extra checking.
+
+    $ gina project:import @<project_name> [ —-path=/var/www/<project_name> ] (if no path given, will take the current)
+
+
 [ List projects ]
 
     $ gina project:list [ [ —-more ] | [-b | —-with-bundles] | [-e | -—with-envs] ]

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/lib/cmd/project/list.js

@@ -28,12 +28,12 @@ function List(opt, cmd){
             , str = ''
             , more = (process.argv[3] && /^(?:\-\-more$)/.test(process.argv[3])) ? true : false ;
 
-        for (var p in projects) {
+        for (let p in projects) {
             list.push(p)
         }
         list.sort();
 
-        for(var l=0; l<list.length; ++l) {
+        for(let l=0; l<list.length; ++l) {
             if ( fs.existsSync(projects[ list[l]].path) ) {
                 str += '[ ok ] '+ list[l];
                 if (more)
@@ -47,6 +47,26 @@ function List(opt, cmd){
             }
         }
         console.log(str.substr(0, str.length-2))
+        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);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
     }
 
     init()

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/lib/cmd/project/remove.js

@@ -19,6 +19,8 @@ function Remove(opt, cmd) {
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
 
+
+
         var err         = false
             , folder    = new _(self.projectLocation)
             , force     = ( typeof(self.params['force']) != 'undefined' ) ? self.params['force'] : false;
@@ -31,7 +33,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 +54,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 +91,7 @@ function Remove(opt, cmd) {
 
 
     var end = function(removed) {
-        
+
         // removing ports
         var ports               = JSON.clone(self.portsData)
             , portsReverse      = JSON.clone(self.portsReverseData)
@@ -98,39 +100,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.98 → v0.1.2-alpha.1}/lib/cmd/project/rename.js

@@ -32,7 +32,7 @@ function Rename(opt, cmd) {
         local.target = self.projectArgvList[1];
 
 
-        if ( !isDefined('project', local.target) ) {
+        if ( isDefined('project', local.target) ) {
             rename()
         } else {
             console.error('New project name [ '+local.target+' ] is already taken !');
@@ -57,8 +57,8 @@ function Rename(opt, cmd) {
             , project = {}// local manifest.json
             , pack = {};// local pakage.json
 
-            
-            
+
+
         folder.mv(target, function(err){
             console.debug('bundles => ', JSON.stringify(self.bundles, null, 4));
             console.debug('project => ', JSON.stringify(self.projects, null, 4));
@@ -67,8 +67,8 @@ function Rename(opt, cmd) {
                 process.exit(1)
             }
 
-            
-            
+
+
             // renaming project in config files
             self.projects[local.target].path = target;
 
@@ -94,9 +94,9 @@ function Rename(opt, cmd) {
 
             // updating projects
             delete self.projects[local.source];
-            
-            
-            
+
+
+
 
             // renaming & update ports
             var ports               = JSON.clone(self.portsData)
@@ -108,9 +108,9 @@ function Rename(opt, cmd) {
 
             portsReverseStr = JSON.stringify(portsReverse);
             for (var protocol in ports) {
-                
+
                 for (var scheme in ports[protocol]) {
-                    
+
                     for (var port in ports[protocol][scheme]) {
 
                         re = new RegExp("\@"+ local.source +"\/");
@@ -126,7 +126,7 @@ function Rename(opt, cmd) {
 
                         }
                     }
-                }                    
+                }
             }
             portsReverse = JSON.parse(portsReverseStr);