Optional deps should be kept for the project that specifies them

Author: ericmj

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

@@ -8,12 +8,12 @@ defmodule Mix.Deps.Retriever do
   Gets all direct children of the current `Mix.Project`
   as a `Mix.Dep` record. Umbrella project dependencies
   are included as children.
-
-  Optional dependencies are filtered out as they only
-  matter as a dependency children.
   """
   def children do
-    mix_children |> Enum.reject(fn Mix.Dep[opts: opts] -> opts[:optional] end)
+    scms = Mix.SCM.available
+    from = Path.absname("mix.exs")
+    Enum.map(Mix.project[:deps] || [], &to_dep(&1, scms, from)) ++
+             Mix.Deps.Umbrella.unfetched
   end
 
   @doc """
@@ -96,7 +96,7 @@ defmodule Mix.Deps.Retriever do
       ]
     else
       raise Mix.Error, message: "#{inspect Mix.Project.get} did not specify a supported scm " <>
-                                "for app #{inspect app}, expected one of :git, :path, :in_umbrella or :optional"
+                                "for app #{inspect app}, expected one of :git, :path or :in_umbrella"
     end
   end
 
@@ -153,17 +153,10 @@ defmodule Mix.Deps.Retriever do
         true -> status
       end
 
-      { dep.manager(:mix).opts(opts).status(stat), mix_children }
+      { dep.manager(:mix).opts(opts).status(stat), children }
     end)
   end
 
-  defp mix_children do
-    scms = Mix.SCM.available
-    from = Path.absname("mix.exs")
-    Enum.map(Mix.project[:deps] || [], &to_dep(&1, scms, from)) ++
-             Mix.Deps.Umbrella.unfetched
-  end
-
   defp rebar_dep(Mix.Dep[opts: opts] = dep, _config) do
     File.cd!(opts[:dest], fn ->
       config = Mix.Rebar.load_config(".")

lib/mix/lib/mix/scm.ex

@@ -125,6 +125,5 @@ defmodule Mix.SCM do
   def register_builtin do
     register Mix.SCM.Git
     register Mix.SCM.Path
-    register Mix.SCM.Optional
   end
 end

lib/mix/lib/mix/scm/optional.ex

@@ -12,8 +12,7 @@ defmodule Mix.DepsTest do
           { :invalidapp, "0.1.0", path: "deps/invalidapp" },
           { :noappfile,  "0.1.0", path: "deps/noappfile" },
           { :uncloned,            git: "https://github.com/elixir-lang/uncloned.git" },
-          { :optional,            optional: true },
-          { :optional_git,        optional: true, git: "https://github.com/elixir-lang/optinal.git" }
+          { :optional,            git: "https://github.com/elixir-lang/optional.git", optional: true }
         ]
       ]
     end
@@ -36,12 +35,13 @@ defmodule Mix.DepsTest do
 
     in_fixture "deps_status", fn ->
       deps = Mix.Deps.fetched
-      assert length(deps) == 5
+      assert length(deps) == 6
       assert Enum.find deps, &match?(Mix.Dep[app: :ok, status: { :ok, _ }], &1)
       assert Enum.find deps, &match?(Mix.Dep[app: :invalidvsn, status: { :invalidvsn, :ok }], &1)
       assert Enum.find deps, &match?(Mix.Dep[app: :invalidapp, status: { :invalidapp, _ }], &1)
       assert Enum.find deps, &match?(Mix.Dep[app: :noappfile, status: { :noappfile, _ }], &1)
       assert Enum.find deps, &match?(Mix.Dep[app: :uncloned, status: { :unavailable, _ }], &1)
+      assert Enum.find deps, &match?(Mix.Dep[app: :optional, status: { :unavailable, _ }], &1)
     end
   after
     Mix.Project.pop
@@ -63,7 +63,7 @@ defmodule Mix.DepsTest do
 
     in_fixture "deps_status", fn ->
       msg = "Mix.DepsTest.NoSCMApp did not specify a supported scm for app :ok, " <>
-            "expected one of :git, :path, :in_umbrella or :optional"
+            "expected one of :git, :path or :in_umbrella"
       assert_raise Mix.Error, msg, fn -> Mix.Deps.fetched end
     end
   after
@@ -120,7 +120,7 @@ defmodule Mix.DepsTest do
             app: :deps_repo,
             version: "0.1.0",
             deps: [
-              { :git_repo, "0.2.0", optional: true }
+              { :git_repo, "0.2.0", git: MixTest.Case.fixture_path("git_repo"), optional: true }
             ]
           ]
         end
@@ -169,7 +169,7 @@ defmodule Mix.DepsTest do
             app: :deps_repo,
             version: "0.1.0",
             deps: [
-              { :git_repo, "0.2.0", optional: true }
+              { :git_repo, "0.2.0", git: MixTest.Case.fixture_path("git_repo"), optional: true }
             ]
           ]
         end