Selaa lähdekoodia

use PRV_ERROR for formattable errors

Also expose it in rebar_api
pull/270/head
Fred Hebert 10 vuotta sitten
vanhempi
commit
92245a138b
8 muutettua tiedostoa jossa 18 lisäystä ja 10 poistoa
  1. +1
    -0
      src/rebar_api.erl
  2. +2
    -1
      src/rebar_prv_app_discovery.erl
  3. +2
    -1
      src/rebar_prv_common_test.erl
  4. +3
    -2
      src/rebar_prv_dialyzer.erl
  5. +2
    -1
      src/rebar_prv_eunit.erl
  6. +2
    -1
      src/rebar_prv_update.erl
  7. +4
    -3
      src/rebar_prv_upgrade.erl
  8. +2
    -1
      src/rebar_prv_xref.erl

+ 1
- 0
src/rebar_api.erl Näytä tiedosto

@ -2,6 +2,7 @@
%%% that can be used by plugin builders.
-module(rebar_api).
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
-export([abort/0, abort/2,
console/2,
debug/2, info/2, warn/2, error/2]).

+ 2
- 1
src/rebar_prv_app_discovery.erl Näytä tiedosto

@ -10,6 +10,7 @@
format_error/1]).
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
-define(PROVIDER, app_discovery).
-define(DEPS, []).
@ -38,7 +39,7 @@ do(State) ->
{ok, State1}
catch
throw:{error, Error}->
{error, {?MODULE, Error}}
?PRV_ERROR(Error)
end.
-spec format_error(any()) -> iolist().

+ 2
- 1
src/rebar_prv_common_test.erl Näytä tiedosto

@ -10,6 +10,7 @@
format_error/1]).
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
-define(PROVIDER, ct).
-define(DEPS, [compile]).
@ -46,7 +47,7 @@ do(State) ->
{ok, CTOpts} ->
run_test(State, RawOpts, CTOpts);
{error, Reason} ->
{error, {?MODULE, Reason}}
?PRV_ERROR(Reason)
end.
run_test(State, RawOpts, CTOpts) ->

+ 3
- 2
src/rebar_prv_dialyzer.erl Näytä tiedosto

@ -10,6 +10,7 @@
format_error/1]).
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
-define(PROVIDER, dialyzer).
-define(DEPS, [compile]).
@ -70,9 +71,9 @@ do(State) ->
do(State, Plt, Apps)
catch
throw:{dialyzer_error, Error} ->
{error, {?MODULE, {error_processing_apps, Error}}};
?PRV_ERROR({error_processing_apps, Error});
throw:{dialyzer_warnings, Warnings} ->
{error, {?MODULE, {dialyzer_warnings, Warnings}}}
?PRV_ERROR({dialyzer_warnings, Warnings})
end.
-spec format_error(any()) -> iolist().

+ 2
- 1
src/rebar_prv_eunit.erl Näytä tiedosto

@ -10,6 +10,7 @@
format_error/1]).
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
-define(PROVIDER, eunit).
-define(DEPS, [compile]).
@ -46,7 +47,7 @@ do(State) ->
ok = rebar_prv_cover:maybe_write_coverdata(State, ?PROVIDER),
case handle_results(Result) of
{error, Reason} ->
{error, {?MODULE, Reason}};
?PRV_ERROR(Reason);
ok ->
{ok, State}
end.

+ 2
- 1
src/rebar_prv_update.erl Näytä tiedosto

@ -10,6 +10,7 @@
format_error/1]).
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
-define(PROVIDER, update).
-define(DEPS, []).
@ -48,7 +49,7 @@ do(State) ->
ok
catch
_E:_C ->
throw({error, {?MODULE, package_index_write}})
?PRV_ERROR(package_index_write)
end,
{ok, State}.

+ 4
- 3
src/rebar_prv_upgrade.erl Näytä tiedosto

@ -10,6 +10,7 @@
format_error/1]).
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
-define(PROVIDER, upgrade).
-define(DEPS, []).
@ -95,7 +96,7 @@ prepare_locks([Name|Names], Deps, Locks, Unlocks) ->
AtomName = binary_to_atom(Name, utf8),
case lists:keyfind(AtomName, 1, Deps) of
false ->
{error, {?MODULE, {unknown_dependency, Name}}};
?PRV_ERROR({unknown_dependency, Name});
Dep ->
Source = case Dep of
{_, Src} -> Src;
@ -108,9 +109,9 @@ prepare_locks([Name|Names], Deps, Locks, Unlocks) ->
[{Name, Source, 0} | NewUnlocks ++ Unlocks])
end;
{_, _, Level} when Level > 0 ->
{error, {?MODULE, {transitive_dependency,Name}}};
?PRV_ERROR({transitive_dependency, Name});
false ->
{error, {?MODULE, {unknown_dependency,Name}}}
?PRV_ERROR({unknown_dependency, Name})
end.
top_level_deps(Deps, Locks) ->

+ 2
- 1
src/rebar_prv_xref.erl Näytä tiedosto

@ -10,6 +10,7 @@
format_error/1]).
-include("rebar.hrl").
-include_lib("providers/include/providers.hrl").
-define(PROVIDER, xref).
-define(DEPS, [compile]).
@ -51,7 +52,7 @@ do(State) ->
true ->
{ok, State};
false ->
{error, {?MODULE, {xref_issues, XrefResults, QueryResults}}}
?PRV_ERROR({xref_issues, XrefResults, QueryResults})
end.
-spec format_error(any()) -> iolist().

Ladataan…
Peruuta
Tallenna