Support rebar3 dependency package declaration (#5678)

Currently only {app, “~> 1.0.0”, {pkg, hex_package}} is supported. This
change will also support {app, {pkg, hex_package}}.

Signed-off-by: José Valim <jose.valim@plataformatec.com.br>

Author: ericmj

lib/mix/lib/mix/rebar.ex

@@ -218,6 +218,8 @@ defmodule Mix.Rebar do
     [fun.(config) | subs]
   end
 
+  # Translate a rebar dependency declaration to a mix declaration
+  # From http://www.rebar3.org/docs/dependencies#section-declaring-dependencies
   defp parse_dep(app) when is_atom(app) do
     {app, ">= 0.0.0"}
   end
@@ -226,10 +228,6 @@ defmodule Mix.Rebar do
     {app, List.to_string(req)}
   end
 
-  defp parse_dep({app, req, {:pkg, package}}) when is_list(req) do
-    {app, List.to_string(req), hex: package}
-  end
-
   defp parse_dep({app, source}) when is_tuple(source) do
     parse_dep({app, nil, source, []})
   end
@@ -239,37 +237,52 @@ defmodule Mix.Rebar do
   end
 
   defp parse_dep({app, req, source, opts}) do
+    source = parse_source(source)
+
+    compile =
+      if :proplists.get_value(:raw, opts, false),
+        do: [compile: false],
+        else: []
+
+    {app, compile_req(req), source ++ compile}
+  end
+
+  defp parse_source({:pkg, pkg}) do
+    [hex: pkg]
+  end
+  defp parse_source(source) do
     [scm, url | source] = Tuple.to_list(source)
 
     ref =
       case source do
-        ["" | _]                -> [branch: "HEAD"]
+        ["" | _] -> [branch: "HEAD"]
         [{:branch, branch} | _] -> [branch: to_string(branch)]
-        [{:tag, tag} | _]       -> [tag: to_string(tag)]
-        [{:ref, ref} | _]       -> [ref: to_string(ref)]
-        [ref | _]               -> [ref: to_string(ref)]
-        _                       -> []
+        [{:tag, tag} | _] -> [tag: to_string(tag)]
+        [{:ref, ref} | _] -> [ref: to_string(ref)]
+        [ref | _] -> [ref: to_string(ref)]
+        _ -> []
       end
 
-    compile =
-      if :proplists.get_value(:raw, opts, false),
-        do: [compile: false],
-        else: []
-
-    mix_opts = [{scm, to_string(url)}] ++ ref ++ compile
-    {app, compile_req(req), mix_opts}
+    [{scm, to_string(url)}] ++ ref
   end
 
   defp compile_req(nil) do
     ">= 0.0.0"
   end
 
   defp compile_req(req) do
-    case Regex.compile(List.to_string(req)) do
-      {:ok, re} ->
-        re
-      {:error, reason} ->
-        Mix.raise "Unable to compile version regex: #{inspect req}, #{reason}"
+    req = List.to_string(req)
+
+    case Version.parse_requirement(req) do
+      {:ok, _} ->
+        req
+      :error ->
+        case Regex.compile(req) do
+          {:ok, re} ->
+            re
+          {:error, reason} ->
+            Mix.raise "Unable to compile version regex: #{inspect req}, #{reason}"
+        end
     end
   end
 

lib/mix/test/mix/rebar_test.exs

@@ -55,6 +55,10 @@ defmodule Mix.RebarTest do
     assert [{:git_rebar, "~> 1.0", hex: :rebar_fork}] ==
            Mix.Rebar.deps(:foo, config, [])
 
+    config = [deps: [{:git_rebar, {:pkg, :rebar_fork}}]]
+    assert [{:git_rebar, ">= 0.0.0", hex: :rebar_fork}] ==
+           Mix.Rebar.deps(:foo, config, [])
+
     config = [deps: [{:git_rebar, '0.1..*', {:git, '../../test/fixtures/git_rebar', :master}}]]
     assert [{:git_rebar, ~r"0.1..*", [git: "../../test/fixtures/git_rebar", ref: "master"]}] ==
            Mix.Rebar.deps(:foo, config, [])