Ensure we can clean deps that no longer exists

Author: José Valim

lib/mix/lib/mix/scm.ex

@@ -100,11 +100,6 @@ defmodule Mix.SCM do
   """
   defcallback equal?(opts1 :: opts, opts2 :: opts) :: boolean
 
-  @doc """
-  This behavior function should clean the given dependency.
-  """
-  defcallback clean(opts) :: any
-
   @doc """
   Returns all available SCM.
   """

lib/mix/lib/mix/scm/git.ex

@@ -68,10 +68,6 @@ defmodule Mix.SCM.Git do
     end
   end
 
-  def clean(opts) do
-    File.rm_rf opts[:dest]
-  end
-
   ## Helpers
 
   defp location("git://github.com/" <> rest) do

lib/mix/lib/mix/scm/path.ex

@@ -46,10 +46,4 @@ defmodule Mix.SCM.Path do
   def update(opts) do
     opts[:lock]
   end
-
-  def clean(opts) do
-    path = Path.relative_to_cwd opts[:dest]
-    Mix.shell.info "  #{path} is a path dependency, it was not cleaned"
-    :noop
-  end
-end
+end

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

@@ -9,7 +9,7 @@ defmodule Mix.Tasks.Clean do
 
   ## Command line options
 
-  * `--all` - Clean everything, including dependencies
+  * `--all` - Clean everything, including builds and dependencies
 
   """
 
@@ -23,7 +23,11 @@ defmodule Mix.Tasks.Clean do
       File.rm(manifest)
     end)
 
-    File.rm_rf(Mix.Project.app_path)
-    if opts[:all], do: Mix.Task.run("deps.clean", args)
+    if opts[:all] do
+      Mix.Task.run("deps.clean", args)
+      File.rm_rf(Path.dirname(Mix.Project.build_path))
+    else
+      File.rm_rf(Mix.Project.app_path)
+    end
   end
 end

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

@@ -11,31 +11,39 @@ defmodule Mix.Tasks.Deps.Clean do
 
   Clean does not unlock the dependencies, unless `--unlock` is given.
   """
-  import Mix.Deps, only: [loaded: 0, loaded_by_name: 1, format_dep: 1]
-
   def run(args) do
     Mix.Project.get! # Require the project to be available
+
     { opts, args, _ } = OptionParser.parse(args, switches: [unlock: :boolean, all: :boolean])
+    loaded = Mix.Deps.loaded
 
     cond do
       opts[:all] ->
-        do_clean loaded, opts
+        do_clean Enum.map(loaded, &(&1.app)), loaded, opts
       args != [] ->
-        do_clean loaded_by_name(args), opts
+        do_clean args, loaded, opts
       true ->
         raise Mix.Error, message: "mix deps.clean expects dependencies as arguments or " <>
                                   "the --all option to clean all dependencies"
     end
   end
 
-  defp do_clean(deps, opts) do
+  defp do_clean(apps, loaded, opts) do
     shell = Mix.shell
-
-    apps = Enum.map deps, fn(Mix.Dep[scm: scm, opts: opts] = dep) ->
-      shell.info "* Cleaning #{format_dep(dep)}"
-      File.rm_rf!(opts[:build])
-      scm.clean opts
-      dep.app
+    build = Mix.Project.build_path |> Path.join("lib")
+    deps  = Mix.Project.deps_path
+
+    Enum.each apps, fn(app) ->
+      shell.info "* Cleaning #{app}"
+      load_paths =
+        if dep = Enum.find(loaded, &(&1.app == app)) do
+          Mix.Deps.load_paths(dep)
+        else
+          [Path.join([build, app, "ebin"])]
+        end
+
+      Enum.each(load_paths, &(&1 |> Path.dirname |> File.rm_rf!))
+      File.rm_rf!(Path.join(deps, app))
     end
 
     if opts[:unlock] do

lib/mix/test/mix/tasks/clean_test.exs

@@ -26,7 +26,7 @@ defmodule Mix.Tasks.CleanTest do
     :ok
   end
 
-  test "removes the build configuration" do
+  test "removes the build application" do
     in_fixture "deps_status", fn ->
       Mix.Tasks.Compile.run ["--no-deps"]
       assert File.exists?("_build/shared/lib/sample")
@@ -36,14 +36,28 @@ defmodule Mix.Tasks.CleanTest do
     end
   end
 
-  test "cleans all repos" do
+  test "cleans deps" do
     in_fixture "deps_status", fn ->
       assert File.exists?("_build/shared/lib/ok")
-      Mix.Tasks.Clean.run ["--all"]
+      Mix.Tasks.Deps.Clean.run ["--all"]
 
+      assert File.exists?("_build/shared")
       refute File.exists?("_build/shared/lib/ok")
+      assert_received { :mix_shell, :info, ["* Cleaning ok"] }
+
       # Assert we don't choke on unfetched deps
-      assert_received { :mix_shell, :info, ["* Cleaning unknown (deps/unknown)"] }
+      assert_received { :mix_shell, :info, ["* Cleaning unknown"] }
+    end
+  end
+
+  test "cleans all deps and builds" do
+    in_fixture "deps_status", fn ->
+      assert File.exists?("_build/shared/lib/ok")
+      Mix.Tasks.Clean.run ["--all"]
+
+      refute File.exists?("_build")
+      assert_received { :mix_shell, :info, ["* Cleaning ok"] }
+      assert_received { :mix_shell, :info, ["* Cleaning unknown"] }
     end
   end
 end

lib/mix/test/mix/tasks/deps.git_test.exs

@@ -63,11 +63,6 @@ defmodule Mix.Tasks.DepsGitTest do
       assert_received { :mix_shell, :info, [^message] }
       assert_received { :mix_shell, :info, ["* Compiling git_repo"] }
       assert_received { :mix_shell, :info, ["Compiled lib/git_repo.ex"] }
-
-      Mix.Tasks.Deps.Clean.run ["--all"]
-      message = "* Cleaning git_repo 0.1.0 (#{fixture_path("git_repo")})"
-      assert_received { :mix_shell, :info, [^message] }
-      refute File.exists?("_build/shared/lib/git_repo/ebin/Elixir.Git.Repo.beam")
     end
   after
     Mix.Project.pop

lib/mix/test/mix/tasks/deps.path_test.exs

@@ -24,10 +24,6 @@ defmodule Mix.Tasks.DepsPathTest do
       assert_received { :mix_shell, :info, ["Compiled lib/raw_repo.ex"] }
       assert_received { :mix_shell, :info, ["Generated raw_repo.app"] }
       assert File.exists?("_build/shared/lib/raw_repo/ebin/Elixir.RawRepo.beam")
-
-      Mix.Tasks.Deps.Clean.run ["--all"]
-      assert_received { :mix_shell, :info, ["* Cleaning raw_repo 0.1.0 (custom/raw_repo)"] }
-      assert_received { :mix_shell, :info, ["  custom/raw_repo is a path dependency, it was not cleaned"] }
     end
   after
     Mix.Project.pop