Fix handling of raw rebar deps

Author: ericmj

lib/mix/lib/mix/rebar.ex

@@ -88,25 +88,30 @@ defmodule Mix.Rebar do
     { app, compile_req(req), [path: Path.join(deps_dir, app)] }
   end
 
-  defp parse_dep({ app, req, source }, _deps_dir) do
+  defp parse_dep({ app, req, source }, deps_dir) do
+    parse_dep({ app, req, source, [] }, deps_dir)
+  end
+
+  defp parse_dep({ app, req, source, opts }, _deps_dir) do
     [ scm, url | source ] = tuple_to_list(source)
+    mix_opts = [{ scm, to_string(url) }]
 
-    { ref, source } = case source do
-      [""|s]                  -> { [branch: "HEAD"], s }
-      [{ :branch, branch }|s] -> { [branch: to_string(branch)], s }
-      [{ :tag, tag }|s]       -> { [tag: to_string(tag)], s }
-      [ref|s]                 -> { [ref: to_string(ref)], s }
-      _                       -> { [], [] }
-    end
+    ref =
+      case source do
+        [""|_]                  -> [branch: "HEAD"]
+        [{ :branch, branch }|_] -> [branch: to_string(branch)]
+        [{ :tag, tag }|_]       -> [tag: to_string(tag)]
+        [ref|_]                 -> [ref: to_string(ref)]
+        _                       -> []
+      end
+
+    mix_opts = mix_opts ++ ref
 
-    raw = case source do
-      [[:raw]|_]      -> [app: false]
-      [[raw: true]|_] -> [app: false]
-      _               -> []
+    if :proplists.get_value(:raw, opts, false) do
+      mix_opts = mix_opts ++ [compile: false]
     end
 
-    opts = [{ scm, to_string(url) }] ++ ref ++ raw
-    { app, compile_req(req), opts }
+    { app, compile_req(req), mix_opts }
   end
 
   defp parse_dep(app, deps_dir) do

lib/mix/test/mix/rebar_test.exs

@@ -52,6 +52,24 @@ defmodule Mix.RebarTest do
   end
 
   test "parse rebar dependencies" do
+    config = [deps: [{ :git_rebar, '.*', }]]
+    assert [{ :git_rebar, ~r".*", [path: "deps/git_rebar"] }] ==
+           Mix.Rebar.deps(config)
+
+    config = [deps: [{ :git_rebar, '.*', }], deps_dir: "other_dir"]
+    assert [{ :git_rebar, ~r".*", [path: "other_dir/git_rebar"] }] ==
+           Mix.Rebar.deps(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(config)
+
+    config = [deps: [{ :git_rebar, '0.1..*', { :git, '../../test/fixtures/git_rebar' }, [:raw] }]]
+    assert [{ :git_rebar, ~r"0.1..*", [git: "../../test/fixtures/git_rebar", compile: false] }] ==
+           Mix.Rebar.deps(config)
+  end
+
+  test "parse rebar dependencies from rebar.config" do
     Mix.Project.push(RebarAsDep)
 
     deps = Mix.Deps.loaded