Fix dependency regression

ender-js · Aug 9, 2011 · 85c7794 · 85c7794
1 parent 0e84e0d
commit 85c7794
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/lib/ender.file.js b/lib/ender.file.js
@@ -252,16 +252,14 @@ ENDER.file = module.exports = {
     var tree = {}
       , x = 0
       , that = this
-      , packagePath
-      , isInstallingFromRoot
 
     packages.forEach(function (packageName) {
-      packageName = packageName.replace(/\@.*/, '')
-      packagePath = /^[\/.]/.test(packageName) ? path.join(packageName, 'package.json') :  path.join(dir, packageName, 'package.json')
-      isInstallingFromRoot = /^\.\/?$/.test(packageName)
+      var packageName = packageName.replace(/\@.*/, '')
+        , packagePath = /^[\/.]/.test(packageName) ? path.join(packageName, 'package.json') :  path.join(dir, packageName, 'package.json')
+        , isInstallingFromRoot = /^\.\/?$/.test(packageName)
 
       async.waterfall([
-        async.apply(fs.readFile, packagePath, 'utf-8')
+        function (cb) { fs.readFile(packagePath, 'utf-8', function (err, data) { if (err) { return ++x }cb(err, data) }) }
       , function (data, cb) { ENDER.file.findDependencies(data, tree, dir, isInstallingFromRoot, cb) }
       , function () { if (++x == packages.length) { callback(null, tree) } }
       ])

diff --git a/lib/ender.js b/lib/ender.js
@@ -89,7 +89,7 @@ var colors = require('colors')
             return console.log('Specified packages already installed.')
           }
 
-          uniqueActivePackageNames = uniqueActivePackageNames.concat(newPackages)
+          uniqueActivePackageNames = ENDER.util.unique(uniqueActivePackageNames.concat(newPackages))
           context = ENDER.cmd.getContext(type, uniqueActivePackageNames, options.context)
 
           async.waterfall([

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ender",
   "description": "next level JavaScript modules",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "authors": ["Dustin Diaz <@ded>", "Jacob Thornton <@fat>"],
   "keywords": ["ender", "modules", "builder", "framework", "packager"],
   "main": "./lib/ender.js",