Add mad_utils:rebar_conf/1

src/mad.erl

@@ -14,7 +14,7 @@ main([]) ->
 main(Args) ->
     Cwd = mad_utils:cwd(),
     code:add_path(mad_utils:ebin(Cwd)),
-    Conf = mad_utils:consult(mad_utils:rebar_conf_file(Cwd)),
+    Conf = mad_utils:rebar_conf(Cwd),
     Conf1 = mad_utils:script(Cwd, Conf),
     Fun = fun(F) -> F1 = list_to_atom(F), ?MODULE:F1(Conf1) end,
     lists:foreach(Fun, Args).

src/mad_compile.erl

@@ -31,8 +31,7 @@ deps([H|T]) ->
 dep(DepName) ->
     %% check dependencies of the dependency
     DepPath = mad_deps:path(DepName),
-    RebarFile = mad_utils:rebar_conf_file(DepPath),
-    Conf = mad_utils:consult(RebarFile),
+    Conf = mad_utils:rebar_conf(DepPath),
     Conf1 = mad_utils:script(DepPath, Conf),
     deps(mad_utils:get_value(deps, Conf1, [])),
 
@@ -59,7 +58,7 @@ dep(DepName) ->
     end.
 
 app(Dir) ->
-    Conf = mad_utils:consult(mad_utils:rebar_conf_file(Dir)),
+    Conf = mad_utils:rebar_conf(Dir),
     Conf1 = mad_utils:script(Dir, Conf),
     SrcDir = mad_utils:src(Dir),
     Files = erl_files(SrcDir) ++ app_src_files(SrcDir),

src/mad_deps.erl

@@ -66,8 +66,7 @@ clone_dep(Dep) ->
 
     %% check dependencies of the dependency
     DepPath = path(DepName),
-    RebarFile = mad_utils:rebar_conf_file(DepPath),
-    Conf = mad_utils:consult(RebarFile),
+    Conf = mad_utils:rebar_conf(DepPath),
     Conf1 = mad_utils:script(DepPath, Conf),
     clone(mad_utils:get_value(deps, Conf1, [])).
 
@@ -89,8 +88,7 @@ paths([H|T], Acc) ->
     %% branch/tag it should checkout to
     Co1 = checkout_to(Co),
     Name1 = make_dep_name(Name, Co1),
-    RebarFile = mad_utils:rebar_conf_file(path(Name1)),
-    Conf = mad_utils:consult(RebarFile),
+    Conf = mad_utils:rebar_conf(path(Name1)),
     Deps = mad_utils:get_value(deps, Conf, []),
     Acc1 = paths(Deps, []),
     paths(T, [path(Name1)|Acc ++ Acc1]).

src/mad_utils.erl

@@ -4,7 +4,7 @@
 -export([exec/2]).
 -export([concat/1]).
 -export([home/0]).
--export([rebar_conf_file/1]).
+-export([rebar_conf/1]).
 -export([src/1]).
 -export([include/1]).
 -export([ebin/1]).
@@ -37,20 +37,21 @@ home() ->
     {ok, [[H|_]]} = init:get_argument(home),
     H.
 
-rebar_conf_file(X) ->
-    filename:absname(filename:join(X, "rebar.config")).
+rebar_conf(Dir) ->
+    Dir1 = filename:absname(Dir),
+    consult(filename:join(Dir1, "rebar.config")).
 
-src(X) ->
-    %% X/src
-    filename:join(X, "src").
+src(Dir) ->
+    %% Dir/src
+    filename:join(Dir, "src").
 
-include(X) ->
-    %% X/include
-    filename:join(X, "include").
+include(Dir) ->
+    %% Dir/include
+    filename:join(Dir, "include").
 
-ebin(X) ->
-    %% X/ebin
-    filename:join(X, "ebin").
+ebin(Dir) ->
+    %% Dir/ebin
+    filename:join(Dir, "ebin").
 
 consult(File) ->
     AbsFile = filename:absname(File),
@@ -87,7 +88,7 @@ sub_dirs(_, [], Acc) ->
     Acc;
 sub_dirs(Cwd, [Dir|T], Acc) ->
     SubDir = filename:join(Cwd, Dir),
-    Conf = consult(rebar_conf_file(SubDir)),
+    Conf = rebar_conf(SubDir),
     Conf1 = script(SubDir, Conf),
     Acc1 = sub_dirs(SubDir, get_value(sub_dirs, Conf1, []), Acc),
     sub_dirs(Cwd, T, [SubDir|Acc1]).