gina 0.1.1-alpha.187 → 0.1.1-alpha.188

package/framework/{v0.1.1-alpha.187 → v0.1.1-alpha.188}/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.187 → v0.1.1-alpha.188}/lib/cmd/project/list.js

@@ -50,13 +50,16 @@ function List(opt, cmd){
         end();
     }
 
-    var end = function (err, type, messageOnly) {
-        if ( typeof(err) != 'undefined') {
-            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
+    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](out)
+                console[type](output)
             } else {
-                console.error(out);
+                console.log(output);
             }
         }
 

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

package/framework/{v0.1.1-alpha.187 → v0.1.1-alpha.188}/lib/cmd/protocol/set.js

@@ -457,8 +457,9 @@ function Set(opt, cmd) {
         lib.generator.createFileFromDataSync(portsReverse, self.portsReversePath);
 
         self.mainConfigUpdated = true;
-        end()
 
+        console.log('Protocol updated with success ;)');
+        end('You need to restart your ' + self.actionType);
     };
 
     var setBundleOnly = function(protocol, scheme) {
@@ -607,17 +608,9 @@ function Set(opt, cmd) {
 
         self.bundleConfigUpdated = true;
 
-        end()
-    };
-
-    var end = function () {
-
         console.log('Protocol updated with success ;)');
-        if ( self.mainConfigUpdated || self.portsUpdated || self.portsReverseUpdated || self.bundleConfigUpdated )
-            console.log('You need to restart your ' + self.actionType);
-
-        exit()
-    }
+        end('You need to restart your ' + self.actionType);
+    };
 
     var rollback = function(err) {
         console.error('[ CLI ] could not complete protocol creation: ', (err.stack||err.message));
@@ -664,6 +657,22 @@ function Set(opt, cmd) {
         // }
     };
 
+    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();
 }
 module.exports = Set;

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

@@ -113,17 +113,20 @@ function List(opt, cmd){
         end();
     };
 
-    var end = function (err, type, messageOnly) {
-        if ( typeof(err) != 'undefined') {
-            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
+    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](out)
+                console[type](output)
             } else {
-                console.error(out);
+                console.log(output);
             }
         }
 
-        process.exit( err ? 1:0 );
+        process.exit( err ? 1:0 )
     }
 
     init()

package/framework/{v0.1.1-alpha.187 → v0.1.1-alpha.188}/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.187 → v0.1.1-alpha.188}/lib/cmd/view/add.js

@@ -300,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.187",
+  "version": "0.1.1-alpha.188",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.187/core/gna",
+  "main": "./framework/v0.1.1-alpha.188/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
     "postpublish": "node ./script/post_publish.js",

package/framework/v0.1.1-alpha.187/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.187

package/framework/v0.1.1-alpha.187/lib/cmd/framework/link-node-modules.js

@@ -1,86 +0,0 @@
-var fs          = require('fs');
-var os              = require('os');
-const {spawn}       = require('child_process');
-const {execSync}    = require('child_process');
-var CmdHelper   = require('./../helper');
-var console     = lib.logger;
-
-/**
- * Framework link node_modules
- *
- * e.g.
- *  gina framework:link-node-modules @<project>
- *  or
- *  gina link-node-modules @<project>
- *
- * */
- function LinkNodeModules(opt, cmd) {
-
-    var self    = {};
-    var init = function(opt, cmd) {
-
-        var err = false;
-        if ( !/^true$/i.test(GINA_GLOBAL_MODE) ) {
-            err = new Error('Gina is not installed globally: cannot proceed with linking.');
-            return end(err, 'error', true);
-        }
-
-        // import CMD helpers
-        new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
-
-        // check CMD configuration
-        if (!isCmdConfigured()) return false;
-
-
-        linkNodeModules(opt, cmd);
-    }
-
-    var linkNodeModules = function(opt, cmd) {
-        console.debug('Linking link node_modules');
-
-        var err = null, folder = new _(self.projectLocation);
-        if ( folder.isValidPath() && isValidName(self.projectName) ) {
-            // destination = new _(destination.toString() +'/gina');
-            var source = new _(self.projectLocation +'/node_modules.'+ os.platform(), true);
-            if ( !source.existsSync() ) {
-                source.mkdirSync()
-            }
-
-            var destination = new _(self.projectLocation + '/node_modules');
-            console.debug('Link node_modules '+ source.toString() + ' -> '+destination.toString() + ' [ exists ] ? '+ destination.existsSync() );
-            if ( destination.existsSync() ) {
-                if ( destination.isSymlinkSync() && destination.getSymlinkSourceSync() == source.toString() ) {
-                    console.debug('Skipping symlink: same source, not overriding.');
-                    return end();
-                }
-                destination.rmSync()
-            }
-
-            err = source.symlinkSync(destination.toString());
-
-            if (err instanceof Error) {
-                return end(err, 'error')
-            }
-        }
-
-        end()
-    }
-
-    var end = function (err, type, messageOnly) {
-
-        if ( typeof(err) != 'undefined') {
-            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
-            if ( typeof(type) != 'undefined' ) {
-                console[type](out)
-            } else {
-                console.error(out);
-            }
-        }
-
-        process.exit( err ? 1:0 )
-    }
-
-    init(opt, cmd)
- }
-
- module.exports = LinkNodeModules;