Merge branch 'fix-package-load' into v1.0.0

Author: estebanlopez

lib/packageTools.js

@@ -62,28 +62,35 @@ function downloadFile (inputUri, callback) {
 }
 
 // returns package information (package.json) given a package name 
-function getPackageInformation (packageName) {
+function getPackageInformation (packageName, parentPackagePath) {
 
   try {
-    var packagePath = path.dirname(require.main.filename);
-    var modulesPath = path.join(packagePath, node_modules);
-
-    try { fs.statSync(modulesPath).isDirectory(); }
-    catch (er) { 
-      modulesPath = path.resolve(packagePath, '..');  
+    if (!parentPackagePath) {
+      parentPackagePath = path.dirname(require.main.filename);
     }
 
+    var modulePath = parentPackagePath;
+    
     if (packageName) {
-      packagePath = path.join(modulesPath, packageName);      
+    modulePath = modulePath.endsWith(node_modules) ? modulePath : path.join(modulePath, node_modules);
+      modulePath = path.join(modulePath, packageName);      
     }
+    modulePath = path.join(modulePath, packageJson);
 
-    packagePath = path.join(packagePath, packageJson);
-
-    return require(packagePath);  
+    return require(modulePath);
   }
   catch (err) {
-    throw new Error('Error retrieving information for module: \'' + (packageName || 'main') + '\'.');    
+    if (err.code !== 'MODULE_NOT_FOUND') {
+      throw err;
+    }
+    
+    var next = path.resolve(parentPackagePath, '..');
+    if (parentPackagePath !== next) {
+      return getPackageInformation(packageName, next);      
+    }    
   }
+  
+  throw new Error('Error retrieving information for module: \'' + (packageName || 'main') + '\'.');
 }
 
 // returns package information (package.json) given a file or directory