No longer clean or unlock deps unless --all is given

Author: José Valim

CHANGELOG.md

@@ -27,7 +27,7 @@
   * [Kernel] Fix a bug where warnings were not being generated when imported macros conflicted with local functions or macros
   * [Kernel] Document that `on_definition` can only be a function as it is evaluated inside the function context
   * [Kernel] Ensure `%w` sigils with no interpolation are fully expanded at compile time
-  * [Mix] `mix deps.update` no longer updates all dependencies unless `--all` is given
+  * [Mix] `mix deps.update`, `mix deps.clean` and `mix deps.unlock` no longer change all dependencies unless `--all` is given
   * [Mix] Always run ` mix loadpaths` on `mix app.start`, even if `--no-compile` is given
   * [OptionParser] Do not add boolean flags to the end result if they were not given
   * [OptionParser] Do not parse non-boolean flags as booleans when true or false are given

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

@@ -1,23 +1,31 @@
 defmodule Mix.Tasks.Deps.Clean do
   use Mix.Task
 
-  @shortdoc "Remove dependencies' files"
+  @shortdoc "Remove the given dependencies' files"
   @recursive :both
 
   @moduledoc """
-  Clean dependencies.
+  Remove the given dependencies' files.
 
-  By default, cleans all dependencies. A list of dependencies can
-  be given to clean specific ones. Clean does not unlock
-  the repositories, unless `--unlock` is given.
+  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.
   """
 
   import Mix.Deps, only: [all: 0, by_name: 1, format_dep: 1]
 
   def run(args) do
-    case OptionParser.parse(args, switches: [unlock: :boolean]) do
-      { opts, [] }   -> do_clean all, opts
-      { opts, args } -> do_clean by_name(args), opts
+    { opts, args } = OptionParser.parse(args, switches: [unlock: :boolean, all: :boolean])
+
+    cond do
+      opts[:all] ->
+        do_clean all, opts
+      args != [] ->
+        do_clean by_name(args), opts
+      true ->
+        raise Mix.Error, message: "mix deps.clean expects dependencies as arguments or " <>
+                                  "the --all option to clean all dependencies"
     end
   end
 

lib/mix/lib/mix/tasks/deps.unlock.ex

@@ -5,21 +5,29 @@ defmodule Mix.Tasks.Deps.Unlock do
   @recursive :both
 
   @moduledoc """
-  Unlock the given dependencies. If no dependencies
-  are given, unlock all.
-  """
+  Unlock the given dependencies.
 
-  def run([]) do
-    Mix.Deps.Lock.write([])
-  end
+  Since this is a destructive action, unlocking of all dependencies
+  can only happen by passing the `--all` command line option.
+  """
 
   def run(args) do
-    lock =
-      Enum.reduce args, Mix.Deps.Lock.read, fn(arg, lock) ->
-        if is_binary(arg), do: arg = binary_to_atom(arg)
-        Keyword.delete(lock, arg)
-      end
+    { opts, args } = OptionParser.parse(args, switches: [unlock: :boolean, all: :boolean])
+
+    cond do
+      opts[:all] ->
+        Mix.Deps.Lock.write([])
+      args != [] ->
+        lock =
+          Enum.reduce args, Mix.Deps.Lock.read, fn(arg, lock) ->
+            if is_binary(arg), do: arg = binary_to_atom(arg)
+            Keyword.delete(lock, arg)
+          end
 
-    Mix.Deps.Lock.write(lock)
+        Mix.Deps.Lock.write(lock)
+      true ->
+        raise Mix.Error, message: "mix deps.unlock expects dependencies as arguments or " <>
+                                  "the --all option to unlock all dependencies"
+    end
   end
 end

lib/mix/lib/mix/tasks/deps.update.ex

@@ -7,7 +7,7 @@ defmodule Mix.Tasks.Deps.Update do
   @moduledoc """
   Update the given dependencies.
 
-  Since this is a "dangerous" operation, update of all dependencies
+  Since this is a destructive action, update of all dependencies
   can only happen by passing the `--all` command line option.
 
   All dependencies are automatically recompiled after update.

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

@@ -64,7 +64,7 @@ defmodule Mix.Tasks.DepsGitTest do
       assert_received { :mix_shell, :info, ["* Compiling git_repo"] }
       assert_received { :mix_shell, :info, ["Compiled lib/git_repo.ex"] }
 
-      Mix.Tasks.Deps.Clean.run []
+      Mix.Tasks.Deps.Clean.run ["--all"]
       message = "* Cleaning git_repo (0.1.0) [git: #{inspect fixture_path("git_repo")}]"
       assert_received { :mix_shell, :info, [^message] }
       refute File.exists?("deps/git_repo/ebin/Elixir.Git.Repo.beam")
@@ -224,11 +224,11 @@ defmodule Mix.Tasks.DepsGitTest do
       assert File.exists?("deps/git_repo/lib/git_repo.ex")
       assert File.read!("mix.lock") =~ last
 
-      Mix.Tasks.Deps.Clean.run []
+      Mix.Tasks.Deps.Clean.run ["--all"]
       refute File.exists?("deps/git_repo/ebin/Elixir.Git.Repo.beam")
       assert File.read!("mix.lock") =~ last
 
-      Mix.Tasks.Deps.Clean.run ["--unlock"]
+      Mix.Tasks.Deps.Clean.run ["--unlock", "--all"]
       refute File.read!("mix.lock") =~ last
     end
   after

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

@@ -25,7 +25,7 @@ defmodule Mix.Tasks.DepsPathTest do
       assert_received { :mix_shell, :info, ["Generated raw_repo.app"] }
       assert File.exists?("custom/raw_repo/ebin/Elixir.RawRepo.beam")
 
-      Mix.Tasks.Deps.Clean.run []
+      Mix.Tasks.Deps.Clean.run ["--all"]
       assert_received { :mix_shell, :info, ["* Cleaning raw_repo (0.1.0) [path: \"custom/raw_repo\"]"] }
       assert_received { :mix_shell, :info, ["  custom/raw_repo is a path dependency, it was not cleaned"] }
     end

lib/mix/test/mix/tasks/deps_test.exs

@@ -140,7 +140,7 @@ defmodule Mix.Tasks.DepsTest do
     in_fixture "no_mixfile", fn ->
       Mix.Deps.Lock.write [git_repo: "abcdef"]
       assert Mix.Deps.Lock.read == [git_repo: "abcdef"]
-      Mix.Tasks.Deps.Unlock.run []
+      Mix.Tasks.Deps.Unlock.run ["--all"]
       assert Mix.Deps.Lock.read == []
     end
   end