From da75d73b2fd1801826dbc2fc6173afe471059f0f Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 19 Oct 2014 19:41:27 -0500
Subject: code cleanup
---
src/rebar_prv_install_deps.erl | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index dacd4e1..2ff7f19 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -136,7 +136,6 @@ handle_deps(State, Deps, Update) ->
%% Internal functions
%% ===================================================================
-%-spec package_to_app(any(), ) -> []. % [rebar_app_info:t()].
package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)),
FmtVsn = iolist_to_binary(rlx_depsolver:format_version(Vsn)),
@@ -263,27 +262,23 @@ parse_deps(DepsDir, Deps) ->
(Name, {SrcDepsAcc, PkgDepsAcc}) when is_atom(Name) ->
{SrcDepsAcc, [ec_cnv:to_binary(Name) | PkgDepsAcc]};
({Name, Vsn, Source}, {SrcDepsAcc, PkgDepsAcc}) when is_tuple (Source) ->
- Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
- {ok, Dep} = case rebar_app_info:discover(Dir) of
- {ok, App} ->
- {ok, App};
- not_found ->
- rebar_app_info:new(Name, Vsn, Dir)
- end,
- Dep1 = rebar_app_info:source(Dep, Source),
- {[Dep1 | SrcDepsAcc], PkgDepsAcc};
+ Dep = new_dep(DepsDir, Name, Vsn, Source),
+ {[Dep | SrcDepsAcc], PkgDepsAcc};
({Name, Vsn, Source, _Level}, {SrcDepsAcc, PkgDepsAcc}) when is_tuple (Source) ->
- Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
- {ok, Dep} = case rebar_app_info:discover(Dir) of
- {ok, App} ->
- {ok, App};
- not_found ->
- rebar_app_info:new(Name, Vsn, Dir)
- end,
- Dep1 = rebar_app_info:source(Dep, Source),
- {[Dep1 | SrcDepsAcc], PkgDepsAcc}
+ Dep = new_dep(DepsDir, Name, Vsn, Source),
+ {[Dep | SrcDepsAcc], PkgDepsAcc}
end, {[], []}, Deps).
+new_dep(DepsDir, Name, Vsn, Source) ->
+ Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
+ {ok, Dep} = case rebar_app_info:discover(Dir) of
+ {ok, App} ->
+ {ok, App};
+ not_found ->
+ rebar_app_info:new(Name, Vsn, Dir)
+ end,
+ rebar_app_info:source(Dep, Source).
+
-spec parse_goal(binary(), binary()) -> pkg_dep().
parse_goal(Name, Constraint) ->
case re:run(Constraint, "([^\\d]*)(\\d.*)", [{capture, [1,2], binary}]) of
@@ -300,9 +295,7 @@ info(Description) ->
"~n"
"Valid rebar.config options:~n"
" ~p~n"
- " ~p~n"
- "Valid command line options:~n"
- " deps_dir=\"deps\" (override default or rebar.config deps_dir)~n",
+ " ~p~n",
[
Description,
{deps_dir, "deps"},
--
cgit v1.1