Store Mix.Dep records in Mix.Dep.deps

Author: ericmj

lib/mix/lib/mix/deps.ex

@@ -9,7 +9,7 @@ defrecord Mix.Dep, [ scm: nil, app: nil, requirement: nil, status: nil, opts: ni
   * `requirement` - a binary or regex with the dependency's requirement
   * `status` - the current status of the dependency, check `Mix.Deps.format_status/1` for more info;
   * `opts` - the options given by the developer
-  * `deps` - the app names of the dependencies of this dependency
+  * `deps` - dependencies of this dependency
   * `manager` - the project management, possible values: `:rebar` | `:mix` | `:make` | `nil`
   * `from` - path to the file where the dependency was defined
   * `extra` - a slot for adding extra configuration based on the scm.

lib/mix/lib/mix/deps/converger.ex

@@ -15,8 +15,8 @@ defmodule Mix.Deps.Converger do
         :digraph.add_vertex(graph, app)
       end
 
-      Enum.each deps, fn Mix.Dep[app: app, deps: other_apps] ->
-        Enum.each other_apps, fn other_app ->
+      Enum.each deps, fn Mix.Dep[app: app, deps: other_deps] ->
+        Enum.each other_deps, fn Mix.Dep[app: other_app] ->
           :digraph.add_edge(graph, other_app, app)
         end
       end
@@ -37,7 +37,7 @@ defmodule Mix.Deps.Converger do
   Returns all dependencies from the current project,
   including nested dependencies. There is a callback
   that is invoked for each dependency and must return
-  an updated depedency in case some processing is done.
+  an updated dependency in case some processing is done.
   """
   def all(rest, callback) do
     main = Mix.Deps.Loader.children
@@ -94,12 +94,11 @@ defmodule Mix.Deps.Converger do
         # After we invoke the callback (which may actually check out the
         # dependency), we load the dependency including its latest info
         # and children information.
-        { dep, children } = Mix.Deps.Loader.load(dep)
-        children = reject_non_fullfilled_optional(children, current_breadths)
-        dep      = dep.deps(Enum.map(children, &(&1.app)))
+        dep = Mix.Deps.Loader.load(dep)
+        dep = dep.update_deps(&reject_non_fullfilled_optional(&1, current_breadths))
 
         { acc, rest } = all(t, [dep|acc], upper_breadths, current_breadths, callback, rest)
-        all(children, acc, current_breadths, dep.deps ++ current_breadths, callback, rest)
+        all(dep.deps, acc, current_breadths, Enum.map(dep.deps, &(&1.app)) ++ current_breadths, callback, rest)
     end
   end
 

lib/mix/lib/mix/deps/loader.ex

@@ -46,7 +46,7 @@ defmodule Mix.Deps.Loader do
           { dep, [] }
       end
 
-    { validate_path(validate_app(dep)), children }
+    validate_path(validate_app(dep)).deps(children)
   end
 
   @doc """

lib/mix/lib/mix/deps/umbrella.ex

@@ -28,12 +28,11 @@ defmodule Mix.Deps.Umbrella do
     deps = unloaded
     apps = Enum.map(deps, &(&1.app))
 
-    Enum.map(deps, fn(umbrella_dep) ->
-      { umbrella_dep, deps } = Mix.Deps.Loader.load(umbrella_dep)
-      deps = lc Mix.Dep[] = dep inlist deps,
-                Mix.Deps.available?(dep),
-                dep.app in apps,
-                do: dep.app
+    Enum.map(deps, fn umbrella_dep ->
+      umbrella_dep = Mix.Deps.Loader.load(umbrella_dep)
+      deps = Enum.filter(umbrella_dep.deps, fn Mix.Dep[] = dep ->
+        Mix.Deps.available?(dep) and dep.app in apps
+      end)
       umbrella_dep.deps(deps)
     end) |> Mix.Deps.Converger.topsort
   end