build fix for ignore and files, version order, auto .js main check

teohhanhui · Mar 21, 2014 · 3bc6d7f · 3bc6d7f
1 parent 9351f1a
commit 3bc6d7f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/build.js b/lib/build.js
@@ -110,15 +110,15 @@ function inDir(fileName, dir) {
 
 exports.filterIgnoreAndFiles = function(dir, ignore, files) {
 
-  if (!ignore || !files)
+  if (!ignore && !files)
     return Promise.resolve();
 
   return asp(glob)(dir + path.sep + '**' + path.sep + '*')
   .then(function(allFiles) {
     var removeFiles = [];
 
     allFiles.forEach(function(file) {
-      var fileName = path.resolve(dir, file);
+      var fileName = path.relative(dir, file);
 
       // if files, remove all files except those in the files list
       if (files && !files.some(function(keepFile) {
@@ -143,7 +143,11 @@ exports.filterIgnoreAndFiles = function(dir, ignore, files) {
 
     // do removal
     return Promise.all(removeFiles.map(function(removeFile) {
-      return asp(fs.unlink)(path.resolve(dir, removeFile));
+      return asp(fs.unlink)(path.resolve(dir, removeFile)).catch(function(e) {
+        if (e.code == 'EPERM')
+          return;
+        throw e;
+      });
     }));
   });
 }

diff --git a/lib/package.js b/lib/package.js
@@ -216,14 +216,17 @@ exports.lookup = function(pkg) {
     for (var v in versionMap)
       versionList.push(v);
 
+    versionList = versionList.filter(function(v) {
+      return versionMap[v].stable;
+    });
+
     versionList.sort(semver.compare);
 
     // find highest stable match
     // latest is empty string
     for (var i = versionList.length - 1; i >=0; i--) {
       if (!pkg.version || semver.match(pkg.version, versionList[i])) {
-        if (versionMap[versionList[i]].stable)
-          return { version: versionList[i], hash: versionMap[versionList[i]] };
+        return { version: versionList[i], hash: versionMap[versionList[i]] };
       }
     }
 
@@ -421,7 +424,7 @@ exports.download = function(pkg, jspmPackages, override, force) {
       // don't build in dependencies
       var pjsonObj = extend({}, pjson);
       delete pjsonObj.dependencies;
-      return build.buildPackage(downloadDir, pjsonObj, path.relative(__dirname, downloadDir))
+      return build.buildPackage(downloadDir, pjsonObj, path.relative(process.cwd(), downloadDir))
       .then(function() {
         return pjson;
       });
@@ -454,7 +457,7 @@ exports.download = function(pkg, jspmPackages, override, force) {
 
       // try the package.json main
       return new Promise(function(resolve, reject) {
-        fs.exists(path.resolve(downloadDir, main + '.js'), resolve);
+        fs.exists(path.resolve(downloadDir, main.substr(main.length - 3, 3) != '.js' ? main + '.js' : main), resolve);
       })
       .then(function(exists) {
         if (!exists && hasMain)