Correctly add load_paths for rebar dependencies

Signed-off-by: José Valim <[email protected]>

Author: ericmj

lib/mix/lib/mix/deps.ex

@@ -243,12 +243,16 @@ defmodule Mix.Deps do
   end
 
   def load_paths(Mix.Dep[manager: :rebar, opts: opts, source: source]) do
-    subdirs = (source[:sub_dirs] || [])
+    # Add root dir and all sub dirs with ebin/ directory
+    sub_dirs = Enum.map(source[:sub_dirs] || [], fn path ->
+      Path.join(opts[:dest], path)
+    end)
+
+    [ opts[:dest] | sub_dirs ]
       |> Enum.map(Path.wildcard(&1))
       |> List.concat
-      |> Enum.map(fn path -> Path.join([opts[:dest], path, "ebin"]) end)
-
-    [Path.join(opts[:dest], "ebin")|subdirs] |> Enum.filter(File.dir?(&1))
+      |> Enum.map(Path.join(&1, "ebin"))
+      |> Enum.filter(File.dir?(&1))
   end
 
   def load_paths(Mix.Dep[manager: nil, opts: opts]) do

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

@@ -20,7 +20,7 @@ defmodule Mix.Deps.Converger do
   def all(rest, callback) do
     config = [ deps_path: Path.expand(Mix.project[:deps_path]),
                root_lockfile: Path.expand(Mix.project[:lockfile]) ]
-    main = Mix.Deps.Retriever.children(config)
+    main = Mix.Deps.Retriever.children(config) |> Enum.reverse
     all(main, [], [], main, config, callback, rest)
   end
 

lib/mix/test/fixtures/rebar_dep/ebin/.gitkeep

@@ -1,5 +1,5 @@
 { sub_dirs, ["apps/*"] }.
 
 { deps, [
-    { git_rebar, "0.1..*", { git, "../git_rebar", master } }
+    { git_rebar, "0.1..*", { git, "../../test/fixtures/git_rebar", master } }
 ] }.

lib/mix/test/fixtures/rebar_dep/rebar.config

@@ -36,7 +36,7 @@ defmodule Mix.RebarTest do
     assert Enum.find(deps, fn dep ->
       Mix.Dep[app: app, opts: opts] = dep
       if app == :git_rebar do
-        assert Enum.find(opts, match?({:git, "../git_rebar"}, &1))
+        assert Enum.find(opts, match?({:git, "../../test/fixtures/git_rebar"}, &1))
         assert Enum.find(opts, match?({:ref, "master"}, &1))
         true
       end
@@ -51,14 +51,21 @@ defmodule Mix.RebarTest do
 
     Mix.Project.push(RebarAsDep)
 
-    in_tmp "dependencies for rebar", fn ->
+    in_tmp "get and compile dependencies for rebar", fn ->
       Mix.Tasks.Deps.Get.run ["--no-compile"]
-      assert_received { :mix_shell, :info, ["* Getting git_rebar [git: \"../git_rebar\"]"] }
+      assert_received { :mix_shell, :info, ["* Getting git_rebar [git: \"../../test/fixtures/git_rebar\"]"] }
 
       Mix.Tasks.Deps.Compile.run []
       assert_received { :mix_shell, :info, ["* Compiling git_rebar"] }
       assert_received { :mix_shell, :info, ["* Compiling rebar_dep"] }
       assert :git_rebar.any_function == :ok
+
+      load_paths = Mix.Deps.all
+        |> Enum.map(Mix.Deps.load_paths(&1))
+        |> List.concat
+
+      assert Enum.any?(load_paths, String.ends_with?(&1, "git_rebar/ebin"))
+      assert Enum.any?(load_paths, String.ends_with?(&1, "rebar_dep/ebin"))
     end
   after
     Mix.Project.pop

lib/mix/test/mix/rebar_test.exs

@@ -288,6 +288,9 @@ defmodule Mix.Tasks.DepsTest do
       assert_received { :mix_shell, :info, [^message] }
       assert_received { :mix_shell, :info, ["Generated git_repo.app"] }
 
+      # Make sure retriever uses converger
+      refute_received { :mix_shell, :info, [^message] }
+
       Mix.Task.clear
       Mix.Tasks.Deps.Update.run []