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

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

@@ -0,0 +1,116 @@
+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;
+
+
+        if ( !isDefined('project', self.projectName) ) {
+            err = new Error('Missing argument: `@<project-name>`');
+            return end(err, 'error')
+        }
+
+        var projectLocationObj = new _(self.projectLocation)
+        if ( !projectLocationObj.isValidPath() ) {
+            err = new Error('Project path not found. You should run project:add @'+ self.projectLocation + ' --path=<your-project-location>');
+            return end(err, 'error')
+        }
+
+        linkLocalNodeModules(opt, cmd);
+    }
+
+    var linkLocalNodeModules = function(opt, cmd) {
+        var projectObj  = self.projects[ self.projectName ]
+            err         = null
+        ;
+
+
+        if (!projectObj || typeof(projectObj) == 'undefined' ) {
+            err = new Error('Node modules not found for project '+ self.projectName);
+            return end(err, 'error')
+        }
+
+
+        var nodeModulesFromProjectHomeDir = _(projectObj.homedir + '/lib/node_modules', true)
+        var nodeModulesDirObj = new _(self.projectLocation + '/node_modules', true);
+        var hasNodeModules = ( nodeModulesDirObj.existsSync() ) ? true : false;
+        // Check if symlink
+        if (
+            hasNodeModules && nodeModulesDirObj.isSymlinkSync()
+        ) {
+
+            // same scope ? e.g: Shared code between docker & localhost
+            if ( nodeModulesDirObj.getSymlinkSourceSync() != nodeModulesFromProjectHomeDir ) {
+                // if not, remove symlink
+                nodeModulesDirObj.rmSync();
+                hasNodeModules = false;
+            }
+        }
+
+        var sourceObj = new _(nodeModulesFromProjectHomeDir, true);
+        if (!hasNodeModules) {
+            if ( !sourceObj.existsSync() ) {
+                sourceObj.mkdirSync()
+            }
+            // link from homdir to project path
+            var destination = _(self.projectLocation + '/node_modules', true);
+
+            err = sourceObj.symlinkSync(destination);
+            if (err instanceof Error) {
+                return end(err, 'error')
+            }
+
+            return end('Node modules link updated to '+ sourceObj.toString())
+        }
+
+        // nothing to do
+        end('Node modules linked to `'+ sourceObj.toString() +'`')
+    }
+
+    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(opt, cmd)
+ }
+
+ module.exports = LinkNodeModules;

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

@@ -1,8 +1,8 @@
-var fs          = require('fs');
+var fs              = require('fs');
 const {spawn}       = require('child_process');
 const {execSync}    = require('child_process');
-var CmdHelper   = require('./../helper');
-var console     = lib.logger;
+var CmdHelper       = require('./../helper');
+var console        = lib.logger;
 
 /**
  * Framework link
@@ -45,13 +45,15 @@ var console     = lib.logger;
                 continue
             }
         }
+        // console.log(' prefix: ', self.prefix);
 
         link(opt, cmd);
     }
 
+
     var link = function(opt, cmd) {
         console.debug('Linking framework');
-        var err = null, folder = new _(self.projectLocation);
+        var err = null, folder = new _(self.projectLocation, true);
 
         if ( folder.isValidPath() && isValidName(self.projectName) ) {
 
@@ -63,8 +65,8 @@ var console     = lib.logger;
                     return end(err, 'error')
                 }
             }
-            destination = new _(destination.toString() +'/gina');
-            var source = new _(GINA_PREFIX + '/lib/node_modules/gina');
+            destination = new _(destination.toString() +'/gina', true);
+            var source = new _(GINA_PREFIX + '/lib/node_modules/gina', true);
 
 
             console.debug('Link '+ source + ' -> '+destination + ' [ exists ] ? '+ destination.existsSync() );
@@ -90,13 +92,16 @@ var console     = lib.logger;
         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/framework/open.js

@@ -3,7 +3,10 @@ var Open;
 var fs = require('fs');
 var child = require('child_process');
 
-Open = function(){
+var CmdHelper       = require('./../helper');
+var console         = lib.logger;
+
+function Open(opt, cmd) {
 
     var init = function(){
         var openCmd = (GINA_IS_WIN32) ?  'start' : 'open';
@@ -46,13 +49,16 @@ Open = function(){
         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/framework/restart.js

@@ -136,13 +136,16 @@ function Restart(opt, cmd) {
     }
 
 
-    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/framework/set.js

@@ -255,13 +255,16 @@ function Set(opt){
         lib.generator.createFileFromDataSync(mainSettingsConf, mainSettingsPath);
     }
 
-    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/framework/start.js

@@ -100,13 +100,16 @@ function Start(opt){
         }
     }
 
-    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/framework/status.js

@@ -118,13 +118,16 @@ function Status(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/framework/stop.js

@@ -155,13 +155,16 @@ function Stop(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/framework/tail.js

@@ -279,17 +279,20 @@ function Tail(opt, cmd) {
         // setInterval(() => {}, 1 << 30);
     }
 
-    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.kill(process.pid, 'SIGINT')
+        process.exit( err ? 1:0 )
     }
 
 

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

@@ -34,13 +34,16 @@ function Version(opt){
         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/helper.js

@@ -46,12 +46,13 @@ function CmdHelper(cmd, client, debug) {
         projectArgvList: [],
         // global projects collection {collection}
         projects : null, // defined by filterArgs()
-        projectsPath : _(GINA_HOMEDIR + '/projects.json'), // ~/.gina/project.json
+        projectsPath : _(GINA_HOMEDIR + '/projects.json', true), // ~/.gina/project.json
         projectsList : [], // Array of project names, asc sorted
-        // current project path
-        projectPath : null, // local project/manifest.json - defined by filterArgs()
+        // current project paths
+        projectManifestPath : null, // local project/manifest.json - defined by filterArgs()
         projectConfigPath: null, // path to .gina/project.json
-        projectData: {},
+        projectHomedir: null, // path to ~/.<my-project> ( project $home)
+        projectData: {}, // Project manifest object
         // current project bundles list {array}
         bundles : [], // defined by filterArgs()
         // don't use this collection to store into files
@@ -368,10 +369,10 @@ function CmdHelper(cmd, client, debug) {
                 }
 
                 if ( typeof(cmd.projects[cmd.projectName]) == 'undefined') {
-                    cmd.projectPath = _(cmd.projectLocation + '/manifest.json', true)
+                    cmd.projectManifestPath = _(cmd.projectLocation + '/manifest.json', true)
                 }
 
-                cmd.projectPath = (!cmd.projectPath) ? _(cmd.projects[cmd.projectName].path + '/manifest.json', true) : cmd.projectPath;
+                cmd.projectManifestPath = (!cmd.projectManifestPath) ? _(cmd.projects[cmd.projectName].path + '/manifest.json', true) : cmd.projectManifestPath;
 
                 if (typeof (cmd.projects[cmd.projectName]) != 'undefined') // ignore when adding project
                     cmd.envPath = _(cmd.projects[cmd.projectName].path + '/env.json', true);
@@ -441,21 +442,39 @@ function CmdHelper(cmd, client, debug) {
             //&& !cmd.params['force']
         ) { // ignore when adding project
 
-            if (!cmd.projectPath) {
-                cmd.projectPath =  _(cmd.projects[cmd.projectName].path + '/manifest.json', true);
-
+            if (!cmd.projectManifestPath) {
+                cmd.projectManifestPath =  _(cmd.projects[cmd.projectName].path + '/manifest.json', true);
             }
 
-            if ( typeof(require.cache[cmd.projectPath]) != 'undefined') {
-                delete require.cache[require.resolve(cmd.projectPath)]
+            if ( typeof(require.cache[cmd.projectManifestPath]) != 'undefined') {
+                delete require.cache[require.resolve(cmd.projectManifestPath)]
             }
-            if ( ! new _(cmd.projectPath).existsSync() ) {
-                console.error('A project with this name is already added. If you want to override, you should try to add: `--force` at the end of your command line');
+            if ( ! new _(cmd.projectManifestPath).existsSync() ) {
+                console.error('Project manifest.json not found. If you want to fix this, you should try to project:add with `--force` argument at the end of your command line');
                 return process.exit(1);
             }
 
-            cmd.projectData         = requireJSON(cmd.projectPath);
-            cmd.projectLocation     = cmd.projects[cmd.projectName].path;
+            cmd.projectData         = requireJSON(cmd.projectManifestPath);
+            cmd.projectHomedir      = (
+                                        typeof(cmd.projects[cmd.projectName].homedir) != 'undefined'
+                                        && cmd.projects[cmd.projectName].homedir
+                                    ) ? _(cmd.projects[cmd.projectName].homedir, true)
+                                    : _(getUserHome() +'/.'+ cmd.projectName, true);
+            var projectHomedirObject = new _(cmd.projectHomedir, true);
+            console.debug('Creating project homedir');
+            if (projectHomedirObject.existsSync() && !projectHomedirObject.isDirectory() ) {
+                throw new Error('Found ' + projectHomedirObject.toString() + ': but it appears to be a symbolik link !');
+            } else if (!projectHomedirObject.existsSync() ) {
+                projectHomedirObject.mkdirSync();
+                cmd.projects[cmd.projectName].homedir = projectHomedirObject.toString();
+            }
+
+            if ( typeof(cmd.projects[cmd.projectName].homedir) == 'undefined' ) {
+                cmd.projects[cmd.projectName].homedir = cmd.projectHomedir
+            }
+
+
+            cmd.projectLocation     = _(cmd.projects[cmd.projectName].path, true);
             cmd.bundlesLocation     = _(cmd.projects[cmd.projectName].path +'/src', true);
             cmd.envPath             = _(cmd.projects[cmd.projectName].path + '/env.json', true);
 
@@ -565,7 +584,7 @@ function CmdHelper(cmd, client, debug) {
 
             cmd.configured = true;
 
-            // detect node_modules vs platform
+            // detect lib/node_modules
             // if (
             //     cmd.projectName != null
             //     && /^true$/i.test(GINA_GLOBAL_MODE)
@@ -588,6 +607,13 @@ function CmdHelper(cmd, client, debug) {
                 && !/\:(link|link-node-modules)$/.test(cmd.task)
                 && !/(project\:add)$/.test(cmd.task)
             ) {
+                console.debug('Running: gina link-node-modules @'+cmd.projectName);
+                err = execSync('gina link-node-modules @'+cmd.projectName);// +' --inspect-gina'
+                if (err instanceof Error) {
+                    console.error(err.message || err.stack);
+                    return exit(err.message || err.stack);
+                }
+
                 console.debug('Running: gina link @'+cmd.projectName);
                 err = execSync('gina link @'+cmd.projectName);// +' --inspect-gina'
                 if (err instanceof Error) {

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

@@ -440,13 +440,16 @@ function List(opt, cmd) {
         outputTo(str);
     };
 
-    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/port/reset.js

@@ -407,13 +407,16 @@ function Reset(opt, cmd) {
         }
     } // EO addBundlePorts(bundleIndex)
 
-    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/add.js

@@ -207,6 +207,7 @@ function Add(opt, cmd) {
 
         projects[self.projectName] = {
             "path": self.projectLocation,
+            "homedir": self.projectHomedir,
             "def_prefix": GINA_PREFIX,
             "framework": "v" + GINA_VERSION,
             "envs": self.envs,