added trailing slash to cwd(), fixed missing calipso requires

Author: dtan

app.js

@@ -8,7 +8,7 @@
  *
  */
 
-var rootpath = process.cwd(), 
+var rootpath = process.cwd() + '/', 
   path = require('path'), 
   fs = require('fs'),
   express = require('express'),

i18n/translate.js

@@ -1,4 +1,4 @@
-var rootpath = process.cwd(),
+var rootpath = process.cwd() + '/',
   path = require('path');
 /**
  * Translation function, will be exposed through a connect middleware function

lib/Event.js

@@ -15,7 +15,7 @@
 /**
  * Includes
  */
-var rootpath = process.cwd(),
+var rootpath = process.cwd() + '/',
   path = require('path'),
   sys = require('sys'),
   util = require('util'),
@@ -221,7 +221,7 @@ function ModuleEventEmitter(moduleName) {
  */
 function addModuleEventListener(module) {
 
-  var calipso = require('lib/calipso');
+  var calipso = require(path.join(rootpath, 'lib/calipso'));
   var moduleEventEmitter = module.event = new ModuleEventEmitter(module.name);
 
   // Link events
@@ -245,7 +245,7 @@ function RequestEventListener() {
 
   // Register a module, listen to its events
   var self = this;
-  var calipso = require('lib/calipso');
+  var calipso = require(path.join(rootpath, 'lib/calipso'));
 
   // Local hash of module event emitters, used to track routing status
   this.modules = {};

lib/Form.js

@@ -17,7 +17,7 @@
  *
  */
 
-var rootpath = process.cwd(),
+var rootpath = process.cwd() + '/',
   path = require('path'),
   calipso = require(path.join(rootpath, 'lib/calipso')),
     qs = require('qs'),

lib/Link.js

@@ -9,7 +9,7 @@
  * 
  */
 
-var rootpath = process.cwd(),
+var rootpath = process.cwd() + '/',
   path = require('path'),
   calipso = require(path.join(rootpath, 'lib/calipso')),
   qs = require('qs');

lib/Menu.js

@@ -12,9 +12,11 @@
 /**
  * Includes
  */
-var sys = require('sys'),
-    utils = require('connect').utils,
-    merge = utils.merge;
+var rootpath = process.cwd(),
+  path = require('path'),
+  sys = require('sys'),
+  utils = require('connect').utils,
+  merge = utils.merge;
 
 /**
  * Exports
@@ -73,7 +75,7 @@ CalipsoMenu.prototype.addMenuItem = function(options) {
   var self = this;
 
   // Refresh the reference, as it is initially loaded at startup
-  calipso = require('lib/calipso');
+  calipso = require(path.join(rootpath, 'lib/calipso'));
 
   // Split the path, traverse items and add menuItems.
   // If you add a child prior to parent, then create the parent.      

lib/Router.js

@@ -14,12 +14,12 @@
 /**
  * Includes
  */
-var rootpath = process.cwd(),
+var rootpath = process.cwd() + '/',
   path = require('path'),
   calipso = require(path.join(rootpath, 'lib/calipso')),
   url = require('url'),
   fs = require('fs'),
-  blocks = require('lib/Blocks');
+  blocks = require(path.join(rootpath, 'lib/Blocks'));
 
 /**
  * Normalize the given path string,

lib/Table.js

@@ -11,7 +11,7 @@
  *
  */
 
-var rootpath = process.cwd(),
+var rootpath = process.cwd() + '/',
   path = require('path'),
   calipso = require(path.join(rootpath, 'lib/calipso')),
   qs = require('qs'),

lib/Theme.js

@@ -23,7 +23,8 @@
 /**
  * Includes
  */
-var rootpath = process.cwd(),
+
+var rootpath = process.cwd() + '/',
   path = require('path'),
   calipso = require(path.join(rootpath, 'lib/calipso')),
   fs = require('fs'),

lib/calipso.js

@@ -806,7 +806,7 @@ function checkRouted(req,res,moduleName,notifyModuleName) {
 function requireModule(module, modulePath, reload) {
 
   var fs = calipso.lib.fs;
-  var moduleFile = modulePath + '/' + module.name;
+  var moduleFile = path.join(rootpath, modulePath + '/' + module.name);
 
   try {