gina 0.1.1-alpha.105 → 0.1.1-alpha.108

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

@@ -71,10 +71,10 @@ function Add(opt, cmd) {
         // creating package file
         file = new _(self.projectLocation + '/package.json', true);
         if ( !file.existsSync() ) {
-            createPackageFile( file )
+            createPackageFile( file.toString() )
         } else {
-            console.warn('[ package.json ] already exists in this location: '+ file + '\Updating package.json...');
-            createPackageFile( file, true )
+            console.warn('[ package.json ] already exists in this location: '+ file + '\nUpdating package.json...');
+            createPackageFile( file.toString(), true )
         }
     }
 
@@ -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,
@@ -190,6 +190,13 @@ function Add(opt, cmd) {
             target
         );
 
+        if (
+            typeof(isCreatedFromExistingPackage) != 'undefined'
+            && /^true$/i.test(isCreatedFromExistingPackage)
+        ) {
+            return end()
+        }
+
         end(true)
     }
 
@@ -197,7 +204,7 @@ function Add(opt, cmd) {
 
 
         var target = _(GINA_HOMEDIR + '/projects.json')
-            , projects = self.projects
+            , projects = JSON.clone(self.projects)
             , error = false;
 
 

package/framework/{v0.1.1-alpha.105 → v0.1.1-alpha.108}/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.105 → v0.1.1-alpha.108}/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)
@@ -159,7 +159,7 @@ function Add(opt, cmd) {
             local.root      = self.projects[self.projectName].path;
 
             console.info('Adding view folder for: '+ local.bundle +'@'+ self.projectName);
-            
+
             local.src = _(self.bundlesLocation +'/'+ bundle, true);
             addConfFile()
 
@@ -182,7 +182,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 +245,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 +256,7 @@ function Add(opt, cmd) {
                 ++local.b;
                 addViews(local.b)
             });
-            
+
         });
     }
 

package/package.json

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

package/script/post_install.js

@@ -416,6 +416,9 @@ function PostInstall() {
         if ( callback && typeof(callback) != 'undefined') {
             console.info('linking to binaries dir: '+ source +' -> '+ target);
             try {
+                if ( fs.existsSync(target) ) {
+                    fs.unlinkSync(target)
+                }
                 new _(source).symlinkSync(target)
             } catch (err) {
                 return callback(err)

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

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