Ensure rebar dependencies are stored in the proper directory

Author: José Valim

lib/mix/lib/mix/deps.ex

@@ -176,7 +176,6 @@ defmodule Mix.Deps do
   changing the current working directory and loading the given
   project onto the project stack.
 
-  This function only works for mix dependencies.
   It is expected a loaded dependency as argument.
   """
   def in_dependency(dep, post_config // [], fun)

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

@@ -156,11 +156,11 @@ defmodule Mix.Deps.Retriever do
     end)
   end
 
-  defp rebar_dep(Mix.Dep[opts: opts] = dep, _config) do
-    File.cd!(opts[:dest], fn ->
-      config = Mix.Rebar.load_config(".")
-      extra  = Dict.take(config, [:sub_dirs])
-      { dep.manager(:rebar).extra(extra), rebar_children(config) }
+  defp rebar_dep(Mix.Dep[] = dep, config) do
+    Mix.Deps.in_dependency(dep, config, fn _ ->
+      rebar = Mix.Rebar.load_config(".")
+      extra = Dict.take(rebar, [:sub_dirs])
+      { dep.manager(:rebar).extra(extra), rebar_children(rebar) }
     end)
   end
 

lib/mix/lib/mix/tasks/clean.ex

@@ -13,7 +13,6 @@ defmodule Mix.Tasks.Clean do
 
   """
 
-  # TODO: Needs to take build_path into account
   def run(args) do
     { opts, _, _ } = OptionParser.parse(args)
 

lib/mix/lib/mix/tasks/deps.clean.ex

@@ -9,12 +9,10 @@ defmodule Mix.Tasks.Deps.Clean do
   Since this is a destructive action, cleaning of all dependencies
   can only happen by passing the `--all` command line option.
 
-  Clean does not unlock the repositories, unless `--unlock` is given.
+  Clean does not unlock the dependencies, unless `--unlock` is given.
   """
-
   import Mix.Deps, only: [loaded: 0, loaded_by_name: 1, format_dep: 1]
 
-  # TODO: Needs to take build_path into account
   def run(args) do
     Mix.Project.get! # Require the project to be available
     { opts, args, _ } = OptionParser.parse(args, switches: [unlock: :boolean, all: :boolean])