Merge pull request bower#889 from bower/sync-up-dissected

svnlto · svnlto · commit 37425713ba94 · 2013-09-28T08:34:10.000-07:00
Sync up dependencies and dependants after dissection, fixes bower#879.
diff --git a/lib/core/Manager.js b/lib/core/Manager.js
@@ -166,6 +166,21 @@ Manager.prototype.install = function () {
         return Q.all(promises);
     })
     .then(function () {
+        // Sync up dissected dependencies and dependants
+        // See: https://github.com/bower/bower/issues/879
+        mout.object.forOwn(that._dissected, function (pkg) {
+            // Sync dependencies
+            mout.object.forOwn(pkg.dependencies, function (dependency, name) {
+                var dissected = this._dissected[name];
+                pkg.dependencies[name] = dissected || dependency;
+            }, this);
+
+            // Sync dependants
+            pkg.dependants = pkg.dependants.map(function (dependant) {
+                return this._dissected[dependant.name] || dependant;
+            }, this);
+        }, that);
+
         // Resolve with meaningful data
         return mout.object.map(that._dissected, function (decEndpoint) {
             return this.toData(decEndpoint);
@@ -448,7 +463,7 @@ Manager.prototype._dissect = function () {
         var semvers;
         var nonSemvers;
 
-        // Filter semver ones
+        // Filter out non-semver ones
         semvers = decEndpoints.filter(function (decEndpoint) {
             return !!decEndpoint.pkgMeta.version;
         });
@@ -535,11 +550,6 @@ Manager.prototype._dissect = function () {
 
             return true;
         }, this);
-
-        // Resolve with meaningful data
-        return mout.object.map(this._dissected, function (decEndpoint) {
-            return this.toData(decEndpoint);
-        }, this);
     }.bind(this))
     .then(this._deferred.resolve, this._deferred.reject);
 };
@@ -566,8 +576,8 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
         }
 
         picks.push.apply(picks, nonSemvers);
-    // If there are only semver ones, figure out the which one
-    // is compatible with every requirement
+    // If there are only semver ones, figure out which one is
+    // compatible with every requirement
     } else {
         suitable = mout.array.find(semvers, function (subject) {
             return semvers.every(function (decEndpoint) {
@@ -649,7 +659,7 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
             });
         }
 
-        // Exact match resolution
+        // Exact match resolution (e.g. branches/tags)
         if (suitable === -1) {
             suitable = mout.array.findIndex(picks, function (pick) {
                 return pick.target === resolution ||
