Change project/rebar to manager/source in Mix.Dep

Author: ericmj

lib/mix/lib/mix/deps.ex

@@ -1,5 +1,5 @@
 defrecord Mix.Dep, [ scm: nil, app: nil, requirement: nil, status: nil, opts: nil,
-                     project: nil, deps: [], rebar: nil ] do
+                     deps: [], source: nil, manager: nil ] do
   @moduledoc """
   This is a record that keeps information about your project
   dependencies. It keeps:
@@ -9,7 +9,9 @@ defrecord Mix.Dep, [ scm: nil, app: nil, requirement: nil, status: nil, opts: ni
   * requirements - a binary or regexp with the deps requirement;
   * status - the current status of dependency, check `Mix.Deps.format_status/1` for more info;
   * opts - the options given by the developer
-  * project - the Mix.Project for the dependency
+  * source - any possible configuration associated with the manager field,
+             rebar.config for rebar or the Mix.Project for Mix
+  * manager - the project management, possible values: :rebar / :mix / nil
   """
 end
 
@@ -95,7 +97,18 @@ defmodule Mix.Deps do
   """
   def in_dependency(dep, post_config // [], fun)
 
-  def in_dependency(Mix.Dep[app: app, opts: opts, rebar: nil], post_config, fun) do
+  def in_dependency(Mix.Dep[manager: :rebar, opts: opts], post_config, fun) do
+    # Use post_config for rebar deps
+    Mix.Project.post_config(post_config)
+    Mix.Project.push(Mix.Rebar)
+    try do
+      File.cd!(opts[:dest], fn -> fun.(nil) end)
+    after
+      Mix.Project.pop
+    end
+  end
+
+  def in_dependency(Mix.Dep[app: app, opts: opts], post_config, fun) do
     env     = opts[:env] || :prod
     old_env = Mix.env
 
@@ -107,17 +120,6 @@ defmodule Mix.Deps do
     end
   end
 
-  def in_dependency(Mix.Dep[opts: opts], post_config, fun) do
-    # Use post_config for rebar deps
-    Mix.Project.post_config(post_config)
-    Mix.Project.push(Mix.Rebar)
-    try do
-      File.cd!(opts[:dest], fn -> fun.(nil) end)
-    after
-      Mix.Project.pop
-    end
-  end
-
   @doc """
   Formats the status of a dependency.
   """
@@ -220,8 +222,8 @@ defmodule Mix.Deps do
   @doc """
   Returns all compile paths for the dependency.
   """
-  def compile_paths(Mix.Dep[app: app, opts: opts] = dep) do
-    if mix?(dep) do
+  def compile_paths(Mix.Dep[app: app, opts: opts, manager: manager]) do
+    if manager == :mix do
       Mix.Project.in_project app, opts[:dest], fn _ ->
         Mix.Project.compile_paths
       end
@@ -233,37 +235,38 @@ defmodule Mix.Deps do
   @doc """
   Returns all load paths for the dependency.
   """
-  def load_paths(Mix.Dep[app: app, opts: opts] = dep) do
-    cond do
-      mix?(dep) ->
-        paths = Mix.Project.in_project app, opts[:dest], fn _ ->
-          Mix.Project.load_paths
-        end
-        Enum.uniq paths
-      rebar?(dep) ->
-        # Add root dir and all sub dirs with ebin/ directory
-        [ opts[:dest] | (dep.rebar[:sub_dirs] || []) ]
-          |> Enum.map(Path.wildcard(&1))
-          |> List.concat
-          |> Enum.map(fn path -> Path.join([opts[:dest], path, "ebin"]) end)
-          |> Enum.filter(File.dir?(&1))
-      true ->
-        [ Path.join(opts[:dest], "ebin") ]
+  def load_paths(Mix.Dep[manager: :mix, app: app, opts: opts]) do
+    paths = Mix.Project.in_project app, opts[:dest], fn _ ->
+      Mix.Project.load_paths
     end
+    Enum.uniq paths
+  end
+
+  def load_paths(Mix.Dep[manager: :rebar, opts: opts, source: source]) do
+    # Add root dir and all sub dirs with ebin/ directory
+    [ opts[:dest] | (source[:sub_dirs] || []) ]
+      |> Enum.map(Path.wildcard(&1))
+      |> List.concat
+      |> Enum.map(fn path -> Path.join([opts[:dest], path, "ebin"]) end)
+      |> Enum.filter(File.dir?(&1))
+  end
+
+  def load_paths(Mix.Dep[manager: nil, opts: opts]) do
+    [ Path.join(opts[:dest], "ebin") ]
   end
 
   @doc """
   Returns true if dependency is a mix project.
   """
-  def mix?(dep) do
-    dep.project != nil
+  def mix?(Mix.Dep[manager: manager]) do
+    manager == :mix
   end
 
   @doc """
   Returns true if dependency is a rebar project.
   """
-  def rebar?(dep) do
-    dep.rebar != nil
+  def rebar?(Mix.Dep[manager: manager]) do
+    manager == :rebar
   end
 
   @doc """

lib/mix/lib/mix/deps/retriever.ex

@@ -89,33 +89,34 @@ defmodule Mix.Deps.Retriever do
     Enum.map deps, fn dep ->
       dep = with_scm_and_status(dep, scms)
 
-      if Mix.Deps.available?(dep) and mixfile?(dep) do
-        dep = Mix.Deps.in_dependency(dep, fn project ->
-          with_mix_project(dep, project)
-        end)
-      end
+      cond do
+        Mix.Deps.available?(dep) and mixfile?(dep) ->
+          Mix.Deps.in_dependency(dep, fn project ->
+            with_mix_project(dep, project)
+          end)
 
-      if Mix.Deps.available?(dep) and rebarconfig?(dep) do
-        dep = rebar_dep(dep)
-      end
+        Mix.Deps.available?(dep) and rebarconfig?(dep) ->
+          rebar_dep(dep)
 
-      dep
+        true ->
+          dep
+      end
     end
   end
 
-  defp with_mix_project(Mix.Dep[project: nil] = dep, project) do
+  defp with_mix_project(Mix.Dep[manager: nil] = dep, project) do
     if match?({ :noappfile, _ }, dep.status) and Mix.Project.umbrella? do
       dep = dep.update_opts(Keyword.put(&1, :app, false))
                .status({ :ok, nil })
     end
-    dep.project(project)
+    dep.manager(:mix).source(project)
   end
 
   defp with_mix_project(dep, _project), do: dep
 
-  defp rebar_dep(Mix.Dep[rebar: nil, opts: opts] = dep) do
+  defp rebar_dep(Mix.Dep[manager: nil, opts: opts] = dep) do
     config = Mix.Rebar.load_config(opts[:dest])
-    dep.rebar(config)
+    dep.manager(:rebar).source(config)
   end
 
   defp rebar_dep(dep), do: dep