Merge pull request #2181 from ericmj/override-undef-scm

Allow overriding of undefined dependency SCM

Author: José Valim

lib/mix/lib/mix/dep.ex

@@ -159,6 +159,11 @@ defmodule Mix.Dep do
   def format_status(%Mix.Dep{status: { :nomatchvsn, vsn }, requirement: req}),
     do: "the dependency does not match the requirement #{inspect req}, got #{inspect vsn}"
 
+  def format_status(%Mix.Dep{status: :noscm, from: from}),
+    do: "the dependency defined in #{Path.relative_to_cwd(from)} did not specify a supported scm, " <>
+        "expected one of :git, :path, :in_umbrella or " <>
+        "the package manager Hex to be installed"
+
   def format_status(%Mix.Dep{status: { :lockmismatch, _ }}),
     do: "lock mismatch: the dependency is out of date"
 
@@ -215,7 +220,7 @@ defmodule Mix.Dep do
       opts = Keyword.put(opts, :lock, rev)
     end
 
-    if available?(dep) do
+    if scm && available?(dep) do
       case scm.lock_status(opts) do
         :mismatch ->
           status = if rev, do: { :lockmismatch, rev }, else: :nolock
@@ -257,11 +262,13 @@ defmodule Mix.Dep do
   def format_dep(%Mix.Dep{scm: scm, app: app, status: status, opts: opts}) do
     version =
       case status do
-        { :ok, vsn } when vsn != nil -> "#{vsn} "
+        { :ok, vsn } when vsn != nil -> " #{vsn}"
         _ -> ""
       end
 
-    "#{app} #{version}(#{scm.format(opts)})"
+    scm_format = if scm, do: " (#{scm.format(opts)})"
+
+    "#{app}#{version}#{scm_format}"
   end
 
   @doc """

lib/mix/lib/mix/dep/loader.ex

@@ -122,28 +122,26 @@ defmodule Mix.Dep.Loader do
       (new = scm.accepts_options(app, opts)) && { scm, new }
     end
 
-    if scm do
-      %Mix.Dep{
-        scm: scm,
-        app: app,
-        requirement: req,
-        status: scm_status(scm, opts),
-        opts: opts }
-    else
-      raise Mix.Error, message: "#{inspect Mix.Project.get} did not specify a supported scm " <>
-                                "for app #{inspect app}, expected one of :git, :path or :in_umbrella"
-    end
+    %Mix.Dep{
+      scm: scm,
+      app: app,
+      requirement: req,
+      status: scm_status(scm, opts),
+      opts: opts }
   end
 
   defp with_scm_and_app(other, _scms) do
     invalid_dep_format(other)
   end
 
   defp scm_status(scm, opts) do
-    if scm.checked_out?(opts) do
-      { :ok, nil }
-    else
-      { :unavailable, opts[:dest] }
+    cond do
+      nil?(scm) ->
+        :noscm
+      scm.checked_out?(opts) ->
+        { :ok, nil }
+      true ->
+        { :unavailable, opts[:dest] }
     end
   end
 

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

@@ -99,7 +99,7 @@ defmodule Mix.Tasks.Deps do
     Enum.each loaded(loaded_opts), fn %Mix.Dep{scm: scm} = dep ->
       dep = check_lock(dep, lock)
       shell.info "* #{format_dep(dep)}"
-      if formatted = scm.format_lock(dep.opts) do
+      if scm && (formatted = scm.format_lock(dep.opts)) do
         shell.info "  locked at #{formatted}"
       end
       shell.info "  #{format_status dep}"

lib/mix/test/fixtures/deps_status/custom/noscm_repo/mix.exs

@@ -0,0 +1,12 @@
+defmodule NoSCMRepo do
+  use Mix.Project
+
+  def project do
+    [ app: :noscm_repo,
+      version: "0.1.0",
+      deps: [
+        { :git_repo, "0.1.0" }
+      ]
+    ]
+  end
+end

lib/mix/test/mix/dep_test.exs

@@ -22,12 +22,6 @@ defmodule Mix.DepTest do
     end
   end
 
-  defmodule NoSCMApp do
-    def project do
-      [ deps: [ { :ok, "~> 0.1", not_really: :ok } ] ]
-    end
-  end
-
   defmodule InvalidDepsReq do
     def project do
       [ deps: [ { :ok, "+- 0.1.0", github: "elixir-lang/ok" } ] ]
@@ -58,16 +52,6 @@ defmodule Mix.DepTest do
     end
   end
 
-  test "raises when no SCM is specified" do
-    Mix.Project.push NoSCMApp
-
-    in_fixture "deps_status", fn ->
-      msg = "Mix.DepTest.NoSCMApp did not specify a supported scm for app :ok, " <>
-            "expected one of :git, :path or :in_umbrella"
-      assert_raise Mix.Error, msg, fn -> Mix.Dep.loaded([]) end
-    end
-  end
-
   test "does not set the manager before the dependency was loaded" do
     # It is important to not eagerly set the manager because the dependency
     # needs to be loaded (i.e. available in the filesystem) in order to get

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

@@ -39,6 +39,12 @@ defmodule Mix.Tasks.DepsTest do
     end
   end
 
+  defmodule NoSCMApp do
+    def project do
+      [ deps: [ { :ok, "~> 0.1", not_really: :ok } ] ]
+    end
+  end
+
   test "prints list of dependencies and their status" do
     Mix.Project.push DepsApp
 
@@ -116,6 +122,20 @@ defmodule Mix.Tasks.DepsTest do
     end
   end
 
+  test "raises when no SCM is specified" do
+    Mix.Project.push NoSCMApp
+
+    in_fixture "deps_status", fn ->
+      Mix.Tasks.Deps.run []
+
+      msg = "  the dependency defined in mix.exs did not specify a supported scm, " <>
+            "expected one of :git, :path, :in_umbrella " <>
+            "or the package manager Hex to be installed"
+      assert_received { :mix_shell, :info, ["* ok"] }
+      assert_received { :mix_shell, :info, [^msg] }
+    end
+  end
+
   test "checks list of dependencies and their status with success" do
     Mix.Project.push SuccessfulDepsApp
 
@@ -312,6 +332,19 @@ defmodule Mix.Tasks.DepsTest do
     end
   end
 
+  defmodule OverridenSCMApp do
+    def project do
+      [
+        app: :raw_sample,
+        version: "0.1.0",
+        deps: [
+          { :noscm_repo, path: "custom/noscm_repo" },
+          { :git_repo, "0.1.0", git: MixTest.Case.fixture_path("git_repo"), override: true }
+        ]
+      ]
+    end
+  end
+
   test "fails on missing dependencies" do
     Mix.Project.push SuccessfulDepsApp
 
@@ -477,6 +510,18 @@ defmodule Mix.Tasks.DepsTest do
     purge [GitRepo, GitRepo.Mix]
   end
 
+  test "overrides unspecified SCM" do
+    Mix.Project.push OverridenSCMApp
+
+    in_fixture "deps_status", fn ->
+      Mix.Tasks.Deps.Get.run []
+      message = "* Getting git_repo (#{fixture_path("git_repo")})"
+      assert_received { :mix_shell, :info, [^message] }
+    end
+  after
+    purge [GitRepo, GitRepo.Mix]
+  end
+
   test "updates parent dependencies" do
     Mix.Project.push NestedDepsApp