diff options
| -rw-r--r-- | rebar.config | 5 | ||||
| -rw-r--r-- | rebar.lock | 5 | ||||
| -rw-r--r-- | src/rebar_app_discover.erl | 3 | ||||
| -rw-r--r-- | src/rebar_app_info.erl | 4 | ||||
| -rw-r--r-- | src/rebar_config.erl | 19 | ||||
| -rw-r--r-- | src/rebar_dialyzer_format.erl | 406 | ||||
| -rw-r--r-- | src/rebar_git_resource.erl | 2 | ||||
| -rw-r--r-- | src/rebar_otp_app.erl | 19 | ||||
| -rw-r--r-- | src/rebar_prv_dialyzer.erl | 18 | ||||
| -rw-r--r-- | src/rebar_prv_install_deps.erl | 2 | ||||
| -rw-r--r-- | src/rebar_utils.erl | 2 | ||||
| -rw-r--r-- | test/rebar_deps_SUITE.erl | 34 |
12 files changed, 481 insertions, 38 deletions
diff --git a/rebar.config b/rebar.config index e2b7a43..d3d7c58 100644 --- a/rebar.config +++ b/rebar.config @@ -1,13 +1,14 @@ %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 ft=erlang et -{deps, [{erlware_commons, "0.15.0"}, +{deps, [{erlware_commons, "0.16.0"}, {ssl_verify_hostname, "1.0.5"}, {certifi, "0.1.1"}, {providers, "1.5.0"}, {getopt, "0.8.2"}, {bbmustache, "1.0.4"}, - {relx, "3.5.0"}]}. + {relx, "3.7.0"}, + {cf, "0.1.1"}]}. {escript_name, rebar3}. {escript_emu_args, "%%! +sbtu +A0\n"}. @@ -1,7 +1,8 @@ [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.4">>},0}, {<<"certifi">>,{pkg,<<"certifi">>,<<"0.1.1">>},0}, - {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.15.0">>},0}, + {<<"cf">>,{pkg,<<"cf">>,<<"0.1.1">>},0}, + {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.16.0">>},0}, {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0}, {<<"providers">>,{pkg,<<"providers">>,<<"1.5.0">>},0}, - {<<"relx">>,{pkg,<<"relx">>,<<"3.5.0">>},0}, + {<<"relx">>,{pkg,<<"relx">>,<<"3.7.0">>},0}, {<<"ssl_verify_hostname">>,{pkg,<<"ssl_verify_hostname">>,<<"1.0.5">>},0}]. diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl index 4f7442b..67acf54 100644 --- a/src/rebar_app_discover.erl +++ b/src/rebar_app_discover.erl @@ -229,7 +229,8 @@ try_handle_app_file(AppInfo0, [File], AppDir, AppSrcFile, _, Validate) -> [F] -> rebar_app_info:app_file_src(AppInfo1, F); [] -> - AppInfo1; + %% Set to undefined in case AppInfo previous had a .app.src + rebar_app_info:app_file_src(AppInfo1, undefined); Other when is_list(Other) -> throw({error, {multiple_app_files, Other}}) end, diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl index b41880e..bb9f7a4 100644 --- a/src/rebar_app_info.erl +++ b/src/rebar_app_info.erl @@ -232,6 +232,8 @@ app_file_src(#app_info_t{app_file_src=AppFileSrc}) -> ec_cnv:to_list(AppFileSrc). -spec app_file_src(t(), file:filename_all()) -> t(). +app_file_src(AppInfo=#app_info_t{}, undefined) -> + AppInfo#app_info_t{app_file_src=undefined}; app_file_src(AppInfo=#app_info_t{}, AppFileSrc) -> AppInfo#app_info_t{app_file_src=ec_cnv:to_list(AppFileSrc)}. @@ -248,6 +250,8 @@ app_file_src_script(#app_info_t{app_file_src_script=AppFileSrcScript}) -> ec_cnv:to_list(AppFileSrcScript). -spec app_file_src_script(t(), file:filename_all()) -> t(). +app_file_src_script(AppInfo=#app_info_t{}, undefined) -> + AppInfo#app_info_t{app_file_src_script=undefined}; app_file_src_script(AppInfo=#app_info_t{}, AppFileSrcScript) -> AppInfo#app_info_t{app_file_src_script=ec_cnv:to_list(AppFileSrcScript)}. diff --git a/src/rebar_config.erl b/src/rebar_config.erl index 44072e8..61301cb 100644 --- a/src/rebar_config.erl +++ b/src/rebar_config.erl @@ -86,9 +86,6 @@ verify_config_format([Term | _]) -> %% no lockfile merge_locks(Config, []) -> Config; -%% empty lockfile -merge_locks(Config, [[]]) -> - Config; %% lockfile with entries merge_locks(Config, [Locks]) -> ConfigDeps = proplists:get_value(deps, Config, []), @@ -109,10 +106,24 @@ format_error({bad_dep_name, Dep}) -> %% Internal functions %% =================================================================== +-spec consult_and_eval(File::file:name_all(), Script::file:name_all()) -> + {ok, Terms::[term()]} | + {error, Reason::term()}. consult_and_eval(File, Script) -> ?DEBUG("Evaluating config script ~p", [Script]), StateData = rebar_file_utils:try_consult(File), - file:script(Script, bs([{'CONFIG', StateData}, {'SCRIPT', Script}])). + %% file:consult/1 always returns the terms as a list, however file:script + %% can (and will) return any kind of term(), to make consult_and_eval + %% work the same way as eval we ensure that when no list is returned we + %% convert it in a list. + case file:script(Script, bs([{'CONFIG', StateData}, {'SCRIPT', Script}])) of + {ok, Terms} when is_list(Terms) -> + {ok, Terms}; + {ok, Term} -> + {ok, [Term]}; + Error -> + Error + end. remove_script_ext(F) -> filename:rootname(F, ".script"). diff --git a/src/rebar_dialyzer_format.erl b/src/rebar_dialyzer_format.erl new file mode 100644 index 0000000..fbda8d0 --- /dev/null +++ b/src/rebar_dialyzer_format.erl @@ -0,0 +1,406 @@ +-module(rebar_dialyzer_format). + +-include("rebar.hrl"). + +-export([format/1]). + + +format(Warning) -> + Str = try + format_warning(Warning, fullpath) + catch + Error:Reason -> + ?DEBUG("Failed to pretty format warning: ~p:~p", + [Error, Reason]), + dialyzer:format_warning(Warning, fullpath) + end, + case strip(Str) of + ":0: " ++ Unknown -> + Unknown; + Warning1 -> + Warning1 + end. + +strip(Warning) -> + string:strip(Warning, right, $\n). + +fmt(Fmt) -> + cf:format(Fmt, []). +fmt(Fmt, Args) -> + cf:format(Fmt, Args). + +format_warning({Tag, {File, Line, _MFA}, Msg}, FOpt) -> + format_warning({Tag, {File, Line}, Msg}, FOpt); +format_warning({_Tag, {File, Line}, Msg}, FOpt) when is_list(File), + is_integer(Line) -> + F = case FOpt of + fullpath -> re:replace(File, "^.*/_build/", "_build/"); + basename -> filename:basename(File) + end, + String = lists:flatten(message_to_string(Msg)), + lists:flatten(fmt("~s:~w~n~s", [F, Line, String])). + +%%----------------------------------------------------------------------------- +%% Message classification and pretty-printing below. Messages appear in +%% categories and in more or less alphabetical ordering within each category. +%%----------------------------------------------------------------------------- + +%%----- Warnings for general discrepancies ---------------- +message_to_string({apply, [Args, ArgNs, FailReason, + SigArgs, SigRet, Contract]}) -> + fmt("~!^Fun application with arguments ~!!~s ", + [bad_arg(ArgNs, Args)]) ++ + call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, Contract); +message_to_string({app_call, [M, F, Args, Culprit, ExpectedType, FoundType]}) -> + fmt("~!^The call~!! ~s:~s~s ~!^requires that" + "~!! ~s ~!^is of type ~!g~s~!^ not ~!r~s" + "~!!\n", + [M, F, Args, Culprit, ExpectedType, FoundType]); +message_to_string({bin_construction, [Culprit, Size, Seg, Type]}) -> + fmt("~!^Binary construction will fail since the ~!b~s~!^ field~!!" + " ~s~!^ in segment~!! ~s~!^ has type~!! ~s\n", + [Culprit, Size, Seg, Type]); +message_to_string({call, [M, F, Args, ArgNs, FailReason, + SigArgs, SigRet, Contract]}) -> + fmt("~!^The call~!! ~w:~w~s ", [M, F, bad_arg(ArgNs, Args)]) ++ + call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, Contract); +message_to_string({call_to_missing, [M, F, A]}) -> + fmt("~!^Call to missing or unexported function ~!!~w:~w/~w\n", + [M, F, A]); +message_to_string({exact_eq, [Type1, Op, Type2]}) -> + fmt("~!^The test ~!!~s ~s ~s~!^ can never evaluate to 'true'\n", + [Type1, Op, Type2]); +message_to_string({fun_app_args, [Args, Type]}) -> + fmt("~!^Fun application with arguments ~!!~s~!^ will fail" + " since the function has type ~!!~s\n", [Args, Type]); +message_to_string({fun_app_no_fun, [Op, Type, Arity]}) -> + fmt("~!^Fun application will fail since ~!!~s ~!^::~!! ~s" + " is not a function of arity ~!!~w\n", [Op, Type, Arity]); +message_to_string({guard_fail, []}) -> + "~!^Clause guard cannot succeed.\n~!!"; +message_to_string({guard_fail, [Arg1, Infix, Arg2]}) -> + fmt("~!^Guard test ~!!~s ~s ~s~!^ can never succeed\n", + [Arg1, Infix, Arg2]); +message_to_string({neg_guard_fail, [Arg1, Infix, Arg2]}) -> + fmt("~!^Guard test not(~!!~s ~s ~s~!^) can never succeed\n", + [Arg1, Infix, Arg2]); +message_to_string({guard_fail, [Guard, Args]}) -> + fmt("~!^Guard test ~!!~w~s~!^ can never succeed\n", + [Guard, Args]); +message_to_string({neg_guard_fail, [Guard, Args]}) -> + fmt("~!^Guard test not(~!!~w~s~!^) can never succeed\n", + [Guard, Args]); +message_to_string({guard_fail_pat, [Pat, Type]}) -> + fmt("~!^Clause guard cannot succeed. The ~!!~s~!^ was matched" + " against the type ~!!~s\n", [Pat, Type]); +message_to_string({improper_list_constr, [TlType]}) -> + fmt("~!^Cons will produce an improper list" + " since its ~!b2~!!nd~!^ argument is~!! ~s\n", [TlType]); +message_to_string({no_return, [Type|Name]}) -> + NameString = + case Name of + [] -> fmt("~!^The created fun "); + [F, A] -> fmt("~!^Function ~!r~w/~w ", [F, A]) + end, + case Type of + no_match -> fmt("~s~!^has no clauses that will ever match\n",[NameString]); + only_explicit -> fmt("~s~!^only terminates with explicit exception\n", [NameString]); + only_normal -> fmt("~s~!^has no local return\n", [NameString]); + both -> fmt("~s~!^has no local return\n", [NameString]) + end; +message_to_string({record_constr, [RecConstr, FieldDiffs]}) -> + fmt("~!^Record construction ~!!~s~!^ violates the" + " declared type of field ~!!~s\n", [RecConstr, FieldDiffs]); +message_to_string({record_constr, [Name, Field, Type]}) -> + fmt("~!^Record construction violates the declared type for ~!!#~w{}~!^" + " since ~!!~s~!^ cannot be of type ~!!~s\n", + [Name, Field, Type]); +message_to_string({record_matching, [String, Name]}) -> + fmt("~!^The ~!!~s~!^ violates the" + " declared type for ~!!#~w{}\n", [String, Name]); +message_to_string({record_match, [Pat, Type]}) -> + fmt("~!^Matching of ~!!~s~!^ tagged with a record name violates the" + " declared type of ~!!~s\n", [Pat, Type]); +message_to_string({pattern_match, [Pat, Type]}) -> + fmt("~!^The ~s~!^ can never match the type ~!g~s\n", + [bad_pat(Pat), Type]); +message_to_string({pattern_match_cov, [Pat, Type]}) -> + fmt("~!^The ~s~!^ can never match since previous" + " clauses completely covered the type ~!g~s\n", + [bad_pat(Pat), Type]); +message_to_string({unmatched_return, [Type]}) -> + fmt("~!^Expression produces a value of type ~!!~s~!^," + " but this value is unmatched\n", [Type]); +message_to_string({unused_fun, [F, A]}) -> + fmt("~!^Function ~!r~w/~w~!^ will never be called\n", [F, A]); +%%----- Warnings for specs and contracts ------------------- +message_to_string({contract_diff, [M, F, _A, Contract, Sig]}) -> + fmt("~!^Type specification ~!!~w:~w~s~!^" + " is not equal to the success typing: ~!!~w:~w~s\n", + [M, F, Contract, M, F, Sig]); +message_to_string({contract_subtype, [M, F, _A, Contract, Sig]}) -> + fmt("~!^Type specification ~!!~w:~w~s~!^" + " is a subtype of the success typing: ~!!~w:~w~s\n", + [M, F, Contract, M, F, Sig]); +message_to_string({contract_supertype, [M, F, _A, Contract, Sig]}) -> + fmt("~!^Type specification ~!!~w:~w~s~!^" + " is a supertype of the success typing: ~!!~w:~w~s\n", + [M, F, Contract, M, F, Sig]); +message_to_string({contract_range, [Contract, M, F, ArgStrings, Line, CRet]}) -> + fmt("~!^The contract ~!!~w:~w~s~!^ cannot be right because the" + " inferred return for ~!!~w~s~!^ on line ~!!~w~!^ is ~!!~s\n", + [M, F, Contract, F, ArgStrings, Line, CRet]); +message_to_string({invalid_contract, [M, F, A, Sig]}) -> + fmt("~!^Invalid type specification for function~!! ~w:~w/~w." + "~!^ The success typing is~!! ~s\n", [M, F, A, Sig]); +message_to_string({extra_range, [M, F, A, ExtraRanges, SigRange]}) -> + fmt("~!^The specification for ~!!~w:~w/~w~!^ states that the function" + " might also return ~!!~s~!^ but the inferred return is ~!!~s\n", + [M, F, A, ExtraRanges, SigRange]); +message_to_string({overlapping_contract, [M, F, A]}) -> + fmt("~!^Overloaded contract for ~!!~w:~w/~w~!^ has overlapping" + " domains; such contracts are currently unsupported and are simply " + "ignored\n", [M, F, A]); +message_to_string({spec_missing_fun, [M, F, A]}) -> + fmt("~!^Contract for function that does not exist: ~!!~w:~w/~w\n", + [M, F, A]); +%%----- Warnings for opaque type violations ------------------- +message_to_string({call_with_opaque, [M, F, Args, ArgNs, ExpArgs]}) -> + fmt("~!^The call ~!!~w:~w~s~!^ contains ~!!~s~!^ when ~!!~s\n", + [M, F, Args, form_positions(ArgNs), form_expected(ExpArgs)]); +message_to_string({call_without_opaque, [M, F, Args, [{N,_,_}|_] = ExpectedTriples]}) -> + fmt("~!^The call ~!!~w:~w~s ~!^does not have~!! ~s\n", + [M, F, bad_arg(N, Args), form_expected_without_opaque(ExpectedTriples)]); +message_to_string({opaque_eq, [Type, _Op, OpaqueType]}) -> + fmt("~!^Attempt to test for equality between a term of type ~!!~s~!^" + " and a term of opaque type ~!!~s\n", [Type, OpaqueType]); +message_to_string({opaque_guard, [Arg1, Infix, Arg2, ArgNs]}) -> + fmt("~!^Guard test ~!!~s ~s ~s~!^ contains ~!!~s\n", + [Arg1, Infix, Arg2, form_positions(ArgNs)]); +message_to_string({opaque_guard, [Guard, Args]}) -> + fmt("~!^Guard test ~!!~w~s~!^ breaks the opaqueness of its" + " argument\n", [Guard, Args]); +message_to_string({opaque_match, [Pat, OpaqueType, OpaqueTerm]}) -> + Term = if OpaqueType =:= OpaqueTerm -> "the term"; + true -> OpaqueTerm + end, + fmt("~!^The attempt to match a term of type ~!!~s~!^ against the" + "~!! ~s~!^ breaks the opaqueness of ~!!~s\n", + [OpaqueType, Pat, Term]); +message_to_string({opaque_neq, [Type, _Op, OpaqueType]}) -> + fmt("~!^Attempt to test for inequality between a term of type ~!!~s" + "~!^ and a term of opaque type ~!!~s\n", [Type, OpaqueType]); +message_to_string({opaque_type_test, [Fun, Args, Arg, ArgType]}) -> + fmt("~!^The type test ~!!~s~s~!^ breaks the opaqueness of the term " + "~!!~s~s\n", [Fun, Args, Arg, ArgType]); +message_to_string({opaque_size, [SizeType, Size]}) -> + fmt("~!^The size ~!!~s~!^ breaks the opaqueness of ~!!~s\n", + [SizeType, Size]); +message_to_string({opaque_call, [M, F, Args, Culprit, OpaqueType]}) -> + fmt("~!^The call ~!!~s:~s~s~!^ breaks the opaqueness of the term~!!" + " ~s :: ~s\n", [M, F, Args, Culprit, OpaqueType]); +%%----- Warnings for concurrency errors -------------------- +message_to_string({race_condition, [M, F, Args, Reason]}) -> + fmt("~!^The call ~!!~w:~w~s ~s\n", [M, F, Args, Reason]); +%%----- Warnings for behaviour errors -------------------- +message_to_string({callback_type_mismatch, [B, F, A, ST, CT]}) -> + fmt("~!^The inferred return type of~!! ~w/~w (~s) ~!^" + "has nothing in common with~!! ~s, ~!^which is the expected" + " return type for the callback of~!! ~w ~!^behaviour\n", + [F, A, ST, CT, B]); +message_to_string({callback_arg_type_mismatch, [B, F, A, N, ST, CT]}) -> + fmt("~!^The inferred type for the~!! ~s ~!^argument of~!!" + " ~w/~w (~s) ~!^is not a supertype of~!! ~s~!^, which is" + "expected type for this argument in the callback of the~!! ~w " + "~!^behaviour\n", + [ordinal(N), F, A, ST, CT, B]); +message_to_string({callback_spec_type_mismatch, [B, F, A, ST, CT]}) -> + fmt("~!^The return type ~!!~s~!^ in the specification of ~!!" + "~w/~w~!^ is not a subtype of ~!!~s~!^, which is the expected" + " return type for the callback of ~!!~w~!^ behaviour\n", + [ST, F, A, CT, B]); +message_to_string({callback_spec_arg_type_mismatch, [B, F, A, N, ST, CT]}) -> + fmt("~!^The specified type for the ~!!~s~!^ argument of ~!!" + "~w/~w (~s)~!^ is not a supertype of ~!!~s~!^, which is" + " expected type for this argument in the callback of the ~!!~w" + "~!^ behaviour\n", [ordinal(N), F, A, ST, CT, B]); +message_to_string({callback_missing, [B, F, A]}) -> + fmt("~!^Undefined callback function ~!!~w/~w~!^ (behaviour ~!!" + "'~w'~!^)\n",[F, A, B]); +message_to_string({callback_info_missing, [B]}) -> + fmt("~!^Callback info about the ~!r~w~!^" + " behaviour is not available\n", [B]); +%%----- Warnings for unknown functions, types, and behaviours ------------- +message_to_string({unknown_type, {M, F, A}}) -> + fmt("~!^Unknown type ~!r~w:~w/~w", [M, F, A]); +message_to_string({unknown_function, {M, F, A}}) -> + fmt("~!^Unknown function ~!r~w:~w/~w", [M, F, A]); +message_to_string({unknown_behaviour, B}) -> + fmt("~!^Unknown behaviour ~!r~w", [B]). + +%%----------------------------------------------------------------------------- +%% Auxiliary functions below +%%----------------------------------------------------------------------------- + +call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, + {IsOverloaded, Contract}) -> + PositionString = form_position_string(ArgNs), + case FailReason of + only_sig -> + case ArgNs =:= [] of + true -> + %% We do not know which argument(s) caused the failure + fmt("~!^will never return since the success typing arguments" + " are ~!!~s\n", [SigArgs]); + false -> + fmt("~!^will never return since it differs in the~!!" + " ~s ~!^argument from the success typing" + " arguments:~!! ~s\n", + [PositionString, good_arg(ArgNs, SigArgs)]) + end; + only_contract -> + case (ArgNs =:= []) orelse IsOverloaded of + true -> + %% We do not know which arguments caused the failure + fmt("~!^breaks the contract~!! ~s\n", [good_arg(ArgNs, Contract)]); + false -> + fmt("~!^breaks the contract~!! ~s ~!^in the~!!" + " ~s ~!^argument\n", + [good_arg(ArgNs, Contract), PositionString]) + end; + both -> + fmt("~!^will never return since the success typing is " + "~!!~s ~!^->~!! ~s ~!^and the contract is ~!!~s\n", + [good_arg(ArgNs, SigArgs), SigRet, + good_arg(ArgNs, Contract)]) + end. + +form_positions(ArgNs) -> + case ArgNs of + [_] -> "an opaque term as "; + [_,_|_] -> "opaque terms as " + end ++ form_position_string(ArgNs) ++ + case ArgNs of + [_] -> " argument"; + [_,_|_] -> " arguments" + end. + +%% We know which positions N are to blame; +%% the list of triples will never be empty. +form_expected_without_opaque([{N, T, TStr}]) -> + FStr = case erl_types:t_is_opaque(T) of + true -> + "~!^an opaque term of type~!g ~s ~!^as "; + false -> + "~!^a term of type ~!g~s ~!^(with opaque subterms) as " + end ++ form_position_string([N]) ++ "~!^ argument", + fmt(FStr, [TStr]); + +form_expected_without_opaque(ExpectedTriples) -> %% TODO: can do much better here + {ArgNs, _Ts, _TStrs} = lists:unzip3(ExpectedTriples), + "opaque terms as " ++ form_position_string(ArgNs) ++ " arguments". + +form_expected(ExpectedArgs) -> + case ExpectedArgs of + [T] -> + TS = erl_types:t_to_string(T), + case erl_types:t_is_opaque(T) of + true -> fmt("~!^an opaque term of type ~!!~s~!^ is" + " expected", [TS]); + false -> fmt("~!^a structured term of type ~!!~s~!^ is" + " expected", [TS]) + end; + [_,_|_] -> fmt("~!^terms of different types are expected in these" + " positions", []) + end. + +form_position_string(ArgNs) -> + case ArgNs of + [] -> ""; + [N1] -> ordinal(N1); + [_,_|_] -> + [Last|Prevs] = lists:reverse(ArgNs), + ", " ++ Head = lists:flatten([fmt(", ~s",[ordinal(N)]) || + N <- lists:reverse(Prevs)]), + Head ++ " and " ++ ordinal(Last) + end. + +ordinal(1) -> fmt("~!B1~!!st"); +ordinal(2) -> fmt("~!B2~!!nd"); +ordinal(3) -> fmt("~!B3~!!rd"); +ordinal(N) when is_integer(N) -> fmt("~!B~w~!!th", [N]). + + +bad_pat("pattern " ++ P) -> + fmt("pattern ~!r~s",[P]); +bad_pat("variable " ++ P) -> + fmt("variable ~!r~s",[P]); +bad_pat(P) -> + fmt("~!r~s",[P]). + + +bad_arg(N, Args) -> + color_arg(N, r, Args). + +good_arg(N, Args) -> + color_arg(N, g, Args). + +color_arg(N, C, Args) when is_integer(N) -> + color_arg([N], C, Args); +color_arg(Ns, C, Args) -> + {Args1, Rest} =seperate_args(Args), + Args2 = highlight(Ns, 1, C, Args1), + join_args(Args2) ++ Rest. + +highlight([], _N, _C, Rest) -> + Rest; + +highlight([N | Nr], N, g, [Arg | Rest]) -> + [fmt("~!g~s", [Arg]) | highlight(Nr, N+1, g, Rest)]; + +highlight([N | Nr], N, r, [Arg | Rest]) -> + [fmt("~!r~s", [Arg]) | highlight(Nr, N+1, r, Rest)]; + +highlight(Ns, N, C, [Arg | Rest]) -> + [Arg | highlight(Ns, N + 1, C, Rest)]. + +seperate_args([$( | S]) -> + seperate_args([], S, "", []). + + + +%% We strip this space since dialyzer is inconsistant in adding or not adding +%% it .... +seperate_args([], [$,, $\s | R], Arg, Args) -> + seperate_args([], R, [], [lists:reverse(Arg) | Args]); + +seperate_args([], [$, | R], Arg, Args) -> + seperate_args([], R, [], [lists:reverse(Arg) | Args]); + +seperate_args([], [$) | Rest], Arg, Args) -> + {lists:reverse([lists:reverse(Arg) | Args]), Rest}; +seperate_args([C | D], [C | R], Arg, Args) -> + seperate_args(D, R, [C | Arg], Args); +%% Brackets +seperate_args(D, [${ | R], Arg, Args) -> + seperate_args([$}|D], R, [${ | Arg], Args); + +seperate_args(D, [$( | R], Arg, Args) -> + seperate_args([$)|D], R, [$( | Arg], Args); + +seperate_args(D, [$[ | R], Arg, Args) -> + seperate_args([$]|D], R, [$[ | Arg], Args); + +seperate_args(D, [$< | R], Arg, Args) -> + seperate_args([$>|D], R, [$< | Arg], Args); +%% 'strings' +seperate_args(D, [$' | R], Arg, Args) -> + seperate_args([$'|D], R, [$' | Arg], Args); +seperate_args(D, [$" | R], Arg, Args) -> + seperate_args([$"|D], R, [$" | Arg], Args); + +seperate_args(D, [C | R], Arg, Args) -> + seperate_args(D, R, [C | Arg], Args). + +join_args(Args) -> + [$(, string:join(Args, ", "), $)]. diff --git a/src/rebar_git_resource.erl b/src/rebar_git_resource.erl index 6405e46..97e951e 100644 --- a/src/rebar_git_resource.erl +++ b/src/rebar_git_resource.erl @@ -198,7 +198,7 @@ parse_tags(Dir) -> {match,[Tag, Vsn]} -> {Tag, Vsn}; nomatch -> - case rebar_utils:sh("git describe --tags", + case rebar_utils:sh("git describe --tags --abbrev=0", [{use_stdout, false}, return_on_error, {cd, Dir}]) of {error, _} -> {undefined, "0.0.0"}; diff --git a/src/rebar_otp_app.erl b/src/rebar_otp_app.erl index c1d90bc..ddaa44b 100644 --- a/src/rebar_otp_app.erl +++ b/src/rebar_otp_app.erl @@ -60,7 +60,7 @@ compile(State, App) -> format_error({missing_app_file, Filename}) -> io_lib:format("App file is missing: ~s", [Filename]); format_error({file_read, File, Reason}) -> - io_lib:format("Failed to read app file ~s for processing: ~p", [File, file:format_error(Reason)]); + io_lib:format("Failed to read required file ~s for processing: ~s", [File, file:format_error(Reason)]); format_error({invalid_name, File, AppName}) -> io_lib:format("Invalid ~s: name of application (~p) must match filename.", [File, AppName]). @@ -110,7 +110,7 @@ preprocess(State, AppInfo, AppSrcFile) -> A1 = apply_app_vars(AppVars, AppData), %% AppSrcFile may contain instructions for generating a vsn number - Vsn = app_vsn(AppSrcFile, State), + Vsn = app_vsn(AppData, AppSrcFile, State), A2 = lists:keystore(vsn, 1, A1, {vsn, Vsn}), %% systools:make_relup/4 fails with {missing_param, registered} @@ -128,7 +128,7 @@ preprocess(State, AppInfo, AppSrcFile) -> AppFile; {error, Reason} -> - ?PRV_ERROR({file_read, AppSrcFile, Reason}) + throw(?PRV_ERROR({file_read, AppSrcFile, Reason})) end. load_app_vars(State) -> @@ -214,15 +214,10 @@ consult_app_file(Filename) -> end end. -app_vsn(AppFile, State) -> - case consult_app_file(AppFile) of - {ok, [{application, _AppName, AppData}]} -> - AppDir = filename:dirname(filename:dirname(AppFile)), - Resources = rebar_state:resources(State), - rebar_utils:vcs_vsn(get_value(vsn, AppData, AppFile), AppDir, Resources); - {error, Reason} -> - throw(?PRV_ERROR({file_read, AppFile, Reason})) - end. +app_vsn(AppData, AppFile, State) -> + AppDir = filename:dirname(filename:dirname(AppFile)), + Resources = rebar_state:resources(State), + rebar_utils:vcs_vsn(get_value(vsn, AppData, AppFile), AppDir, Resources). get_value(Key, AppInfo, AppFile) -> case proplists:get_value(Key, AppInfo) of diff --git a/src/rebar_prv_dialyzer.erl b/src/rebar_prv_dialyzer.erl index ef14b81..7cf7e28 100644 --- a/src/rebar_prv_dialyzer.erl +++ b/src/rebar_prv_dialyzer.erl @@ -404,19 +404,12 @@ run_dialyzer(State, Opts, Output) -> format_warnings(Output, Warnings) -> Warnings1 = format_warnings(Warnings), console_warnings(Warnings1), - file_warnings(Output, Warnings1), + file_warnings(Output, Warnings), length(Warnings1). format_warnings(Warnings) -> - [format_warning(Warning) || Warning <- Warnings]. - -format_warning(Warning) -> - case strip(dialyzer:format_warning(Warning, fullpath)) of - ":0: " ++ Unknown -> - Unknown; - Warning1 -> - Warning1 - end. + [rebar_dialyzer_format:format(Warning) || Warning <- Warnings]. + console_warnings(Warnings) -> _ = [?CONSOLE("~s", [Warning]) || Warning <- Warnings], @@ -425,7 +418,7 @@ console_warnings(Warnings) -> file_warnings(_, []) -> ok; file_warnings(Output, Warnings) -> - Warnings1 = [[Warning, $\n] || Warning <- Warnings], + Warnings1 = [[dialyzer:format_warning(Warning, fullpath), $\n] || Warning <- Warnings], case file:write_file(Output, Warnings1, [append]) of ok -> ok; @@ -433,9 +426,6 @@ file_warnings(Output, Warnings) -> throw({output_file_error, Output, Reason}) end. -strip(Warning) -> - string:strip(Warning, right, $\n). - no_warnings() -> [no_return, no_unused, diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl index b6b36e2..118d799 100644 --- a/src/rebar_prv_install_deps.erl +++ b/src/rebar_prv_install_deps.erl @@ -370,7 +370,7 @@ maybe_upgrade(AppInfo, AppDir, Upgrade, State) -> true -> case rebar_fetch:needs_update(AppDir, Source, State) of true -> - ?INFO("Upgrading ~s", [rebar_app_info:name(AppInfo)]), + ?INFO("Upgrading ~s (~p)", [rebar_app_info:name(AppInfo), rebar_app_info:source(AppInfo)]), true = rebar_fetch:download_source(AppDir, Source, State); false -> case Upgrade of diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index a90a18b..ccdf960 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -592,6 +592,8 @@ vcs_vsn(Vcs, Dir, Resources) -> end. %% Temp work around for repos like relx that use "semver" +vcs_vsn_cmd(Vsn, _, _) when is_binary(Vsn) -> + {plain, Vsn}; vcs_vsn_cmd(VCS, Dir, Resources) when VCS =:= semver ; VCS =:= "semver" -> vcs_vsn_cmd(git, Dir, Resources); vcs_vsn_cmd({cmd, _Cmd}=Custom, _, _) -> diff --git a/test/rebar_deps_SUITE.erl b/test/rebar_deps_SUITE.erl index fd86226..fcc46c3 100644 --- a/test/rebar_deps_SUITE.erl +++ b/test/rebar_deps_SUITE.erl @@ -3,7 +3,7 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -all() -> [sub_app_deps, newly_added_dep, http_proxy_settings, https_proxy_settings, {group, git}, {group, pkg}]. +all() -> [sub_app_deps, newly_added_dep, newly_added_after_empty_lock, http_proxy_settings, https_proxy_settings, {group, git}, {group, pkg}]. groups() -> [{all, [], [flat, pick_highest_left, pick_highest_right, @@ -29,6 +29,8 @@ init_per_group(_, Config) -> end_per_group(_, Config) -> Config. +init_per_testcase(newly_added_after_empty_lock, Config) -> + rebar_test_utils:init_rebar_state(Config); init_per_testcase(newly_added_dep, Config) -> rebar_test_utils:init_rebar_state(Config); init_per_testcase(sub_app_deps, Config) -> @@ -252,6 +254,36 @@ newly_added_dep(Config) -> Config, RebarConfig3, ["compile"], {ok, [{app, Name}, {dep, "a"}, {dep, "b", "1.0.0"}, {dep, "c", "1.0.0"}]}). +newly_added_after_empty_lock(Config) -> + AppDir = ?config(apps, Config), + Deps = rebar_test_utils:expand_deps(git, [{"a", "1.0.0", []}]), + {SrcDeps, _} = rebar_test_utils:flat_deps(Deps), + mock_git_resource:mock([{deps, SrcDeps}]), + + Name = rebar_test_utils:create_random_name("app_"), + Vsn = rebar_test_utils:create_random_vsn(), + + SubAppsDir = filename:join([AppDir, "apps", Name]), + rebar_test_utils:create_app(SubAppsDir, Name, Vsn, [kernel, stdlib]), + + TopDeps = rebar_test_utils:top_level_deps(rebar_test_utils:expand_deps(git, [])), + {ok, RebarConfig} = file:consult(rebar_test_utils:create_config(AppDir, [{deps, TopDeps}])), + rebar_test_utils:run_and_check( + Config, RebarConfig, ["compile"], + {ok, []}), + + %% Add a and c to top level + TopDeps2 = rebar_test_utils:top_level_deps(rebar_test_utils:expand_deps(git, [{"a", "1.0.0", []}])), + {ok, RebarConfig2} = file:consult(rebar_test_utils:create_config(AppDir, [{deps, TopDeps2}])), + LockFile = filename:join(AppDir, "rebar.lock"), + RebarConfig3 = rebar_config:merge_locks(RebarConfig2, + rebar_config:consult_lock_file(LockFile)), + + %% a should now be installed and c should not change + rebar_test_utils:run_and_check( + Config, RebarConfig3, ["compile"], + {ok, [{app, Name}, {dep, "a", "1.0.0"}]}). + http_proxy_settings(_Config) -> %% Load config |