diff options
-rw-r--r-- | priv/templates/plugin.erl.dtl | 14 | ||||
-rw-r--r-- | src/rebar_prv_clean.erl | 2 | ||||
-rw-r--r-- | src/rebar_prv_cover.erl | 36 | ||||
-rw-r--r-- | src/rebar_prv_escriptize.erl | 2 | ||||
-rw-r--r-- | src/rebar_prv_help.erl | 4 | ||||
-rw-r--r-- | src/rebar_prv_new.erl | 2 | ||||
-rw-r--r-- | src/rebar_prv_wtf.erl | 4 | ||||
-rw-r--r-- | src/rebar_prv_xref.erl | 2 | ||||
-rw-r--r-- | test/rebar_cover_SUITE.erl | 22 |
9 files changed, 50 insertions, 38 deletions
diff --git a/priv/templates/plugin.erl.dtl b/priv/templates/plugin.erl.dtl index d3528c0..abf4648 100644 --- a/priv/templates/plugin.erl.dtl +++ b/priv/templates/plugin.erl.dtl @@ -12,14 +12,14 @@ -spec init(rebar_state:t()) -> {ok, rebar_state:t()}. init(State) -> Provider = providers:create([ - {name, ?PROVIDER}, % The 'user friendly' name of the task - {module, ?MODULE}, % The module implementation of the task - {bare, true}, % The task can be run by the user, always true - {deps, ?DEPS}, % The list of dependencies - {example, "rebar {{name}}"}, % How to use the plugin - {opts, []}, % list of options understood by the plugin + {name, ?PROVIDER}, % The 'user friendly' name of the task + {module, ?MODULE}, % The module implementation of the task + {bare, true}, % The task can be run by the user, always true + {deps, ?DEPS}, % The list of dependencies + {example, "rebar3 {{name}}"}, % How to use the plugin + {opts, []}, % list of options understood by the plugin {short_desc, "{{desc}}"}, - {desc, ""} + {desc, "{{desc}}"} ]), {ok, rebar_state:add_provider(State, Provider)}. diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl index 8fbc516..0da286b 100644 --- a/src/rebar_prv_clean.erl +++ b/src/rebar_prv_clean.erl @@ -37,7 +37,7 @@ do(State) -> case All of true -> - DepsDir = rebar_state:get(State, deps_dir, ?DEFAULT_DEPS_DIR), + DepsDir = rebar_dir:deps_dir(State), DepApps = rebar_app_discover:find_apps([DepsDir], all); false -> DepApps = [] diff --git a/src/rebar_prv_cover.erl b/src/rebar_prv_cover.erl index d6e18dc..13c12d1 100644 --- a/src/rebar_prv_cover.erl +++ b/src/rebar_prv_cover.erl @@ -14,7 +14,7 @@ -include("rebar.hrl"). -define(PROVIDER, cover). --define(DEPS, []). +-define(DEPS, [app_discovery]). %% =================================================================== %% Public API @@ -29,7 +29,8 @@ init(State) -> {example, "rebar3 cover"}, {short_desc, "Perform coverage analysis."}, {desc, ""}, - {opts, cover_opts(State)}])), + {opts, cover_opts(State)}, + {profiles, [test]}])), {ok, State1}. -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. @@ -135,14 +136,25 @@ import(CoverData) -> end. analysis(State, Task) -> + OldPath = code:get_path(), + ok = restore_cover_paths(State), Mods = cover:imported_modules(), - lists:map( - fun(Mod) -> - {ok, Answer} = cover:analyze(Mod, coverage, line), - {ok, File} = analyze_to_file(Mod, State, Task), - {Mod, process(Answer), File} - end, - Mods). + Analysis = lists:map(fun(Mod) -> + {ok, Answer} = cover:analyze(Mod, coverage, line), + {ok, File} = analyze_to_file(Mod, State, Task), + {Mod, process(Answer), File} + end, + Mods), + true = code:set_path(OldPath), + Analysis. + +restore_cover_paths(State) -> + lists:foreach(fun(App) -> + AppDir = rebar_app_info:out_dir(App), + _ = code:add_path(filename:join([AppDir, "ebin"])) + end, rebar_state:project_apps(State)), + _ = code:add_path(filename:join([rebar_dir:base_dir(State), "ebin"])), + ok. analyze_to_file(Mod, State, Task) -> CoverDir = cover_dir(State), @@ -319,8 +331,7 @@ write_coverdata(State, Task) -> ExportFile = filename:join([DataDir, atom_to_list(Task) ++ ".coverdata"]), case cover:export(ExportFile) of ok -> - ?DEBUG("Cover data written to ~p.", [ExportFile]), - ok; + ?DEBUG("Cover data written to ~p.", [ExportFile]); {error, Reason} -> ?WARN("Cover data export failed: ~p", [Reason]) end. @@ -333,7 +344,8 @@ verbose(State) -> end. cover_dir(State) -> - rebar_state:get(State, cover_data_dir, filename:join(["_build", "cover"])). + rebar_state:get(State, cover_data_dir, filename:join([rebar_dir:base_dir(State), + "cover"])). cover_opts(_State) -> [{reset, $r, "reset", boolean, help(reset)}, diff --git a/src/rebar_prv_escriptize.erl b/src/rebar_prv_escriptize.erl index 69ac7fe..d17699e 100644 --- a/src/rebar_prv_escriptize.erl +++ b/src/rebar_prv_escriptize.erl @@ -51,7 +51,7 @@ init(State) -> {deps, ?DEPS}, {example, "rebar3 escriptize"}, {opts, []}, - {short_desc, "Generate escript archive"}, + {short_desc, "Generate escript archive."}, {desc, desc()} ]), {ok, rebar_state:add_provider(State, Provider)}. diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl index 9e22530..b450023 100644 --- a/src/rebar_prv_help.erl +++ b/src/rebar_prv_help.erl @@ -58,11 +58,11 @@ format_error(Reason) -> %% print help/usage string %% help(State) -> - ?CONSOLE("Rebar is a tool for working with Erlang projects.~n~n", []), + ?CONSOLE("Rebar3 is a tool for working with Erlang projects.~n~n", []), OptSpecList = rebar3:global_option_spec_list(), getopt:usage(OptSpecList, "rebar", "", []), ?CONSOLE("~nSeveral tasks are available:~n", []), providers:help(rebar_state:providers(State)), - ?CONSOLE("~nRun 'rebar help <TASK>' for details.~n~n", []). + ?CONSOLE("~nRun 'rebar3 help <TASK>' for details.~n~n", []). diff --git a/src/rebar_prv_new.erl b/src/rebar_prv_new.erl index 58e27fd..6bc9f53 100644 --- a/src/rebar_prv_new.erl +++ b/src/rebar_prv_new.erl @@ -67,7 +67,7 @@ format_error(Reason) -> info() -> io_lib:format( - "Create rebar project based on template and vars.~n" + "Create rebar3 project based on template and vars.~n" "~n" "Valid command line options:~n" " template= [var=foo,...]~n", []). diff --git a/src/rebar_prv_wtf.erl b/src/rebar_prv_wtf.erl index f876760..9be9a4b 100644 --- a/src/rebar_prv_wtf.erl +++ b/src/rebar_prv_wtf.erl @@ -26,8 +26,8 @@ init(State) -> {bare, false}, {deps, ?DEPS}, {example, "rebar3 wtf \"<task>\""}, - {short_desc, "Provide a crash report to be sent to the rebar3 issues page"}, - {desc, "Provide a crash report to be sent to the rebar3 issues page"}, + {short_desc, "Provide a crash report to be sent to the rebar3 issues page."}, + {desc, "Provide a crash report to be sent to the rebar3 issues page."}, {opts, [ {task, undefined, undefined, string, "Task to print details for."} ]}])), diff --git a/src/rebar_prv_xref.erl b/src/rebar_prv_xref.erl index aa1075f..67cd554 100644 --- a/src/rebar_prv_xref.erl +++ b/src/rebar_prv_xref.erl @@ -66,7 +66,7 @@ format_error(Reason) -> %% =================================================================== short_desc() -> - "Run cross reference analysis". + "Run cross reference analysis.". desc() -> io_lib:format( diff --git a/test/rebar_cover_SUITE.erl b/test/rebar_cover_SUITE.erl index f3c3248..0bead99 100644 --- a/test/rebar_cover_SUITE.erl +++ b/test/rebar_cover_SUITE.erl @@ -39,7 +39,7 @@ flag_coverdata_written(Config) -> Name = rebar_test_utils:create_random_name("cover_"), Vsn = rebar_test_utils:create_random_vsn(), - rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), + rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]), RebarConfig = [{erl_opts, [{d, some_define}]}], rebar_test_utils:run_and_check(Config, @@ -47,14 +47,14 @@ flag_coverdata_written(Config) -> ["eunit", "--cover"], {ok, [{app, Name}]}), - true = filelib:is_file(filename:join(["_build", "cover", "eunit.coverdata"])). + true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "eunit.coverdata"])). config_coverdata_written(Config) -> AppDir = ?config(apps, Config), Name = rebar_test_utils:create_random_name("cover_"), Vsn = rebar_test_utils:create_random_vsn(), - rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), + rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]), RebarConfig = [{erl_opts, [{d, some_define}]}, {cover_enabled, true}], rebar_test_utils:run_and_check(Config, @@ -62,14 +62,14 @@ config_coverdata_written(Config) -> ["eunit"], {ok, [{app, Name}]}), - true = filelib:is_file(filename:join(["_build", "cover", "eunit.coverdata"])). + true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "eunit.coverdata"])). index_written(Config) -> AppDir = ?config(apps, Config), Name = rebar_test_utils:create_random_name("cover_"), Vsn = rebar_test_utils:create_random_vsn(), - rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), + rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]), RebarConfig = [{erl_opts, [{d, some_define}]}], rebar_test_utils:run_and_check(Config, @@ -77,14 +77,14 @@ index_written(Config) -> ["do", "eunit", "--cover", ",", "cover"], {ok, [{app, Name}]}), - true = filelib:is_file(filename:join(["_build", "cover", "index.html"])). + true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "index.html"])). config_alt_coverdir(Config) -> AppDir = ?config(apps, Config), Name = rebar_test_utils:create_random_name("cover_"), Vsn = rebar_test_utils:create_random_vsn(), - rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), + rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]), CoverDir = filename:join(["coverage", "goes", "here"]), @@ -101,7 +101,7 @@ flag_verbose(Config) -> Name = rebar_test_utils:create_random_name("cover_"), Vsn = rebar_test_utils:create_random_vsn(), - rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), + rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]), RebarConfig = [{erl_opts, [{d, some_define}]}], rebar_test_utils:run_and_check(Config, @@ -109,14 +109,14 @@ flag_verbose(Config) -> ["do", "eunit", "--cover", ",", "cover", "--verbose"], {ok, [{app, Name}]}), - true = filelib:is_file(filename:join(["_build", "cover", "index.html"])). + true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "index.html"])). config_verbose(Config) -> AppDir = ?config(apps, Config), Name = rebar_test_utils:create_random_name("cover_"), Vsn = rebar_test_utils:create_random_vsn(), - rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), + rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]), RebarConfig = [{erl_opts, [{d, some_define}]}, {cover_print_enabled, true}], rebar_test_utils:run_and_check(Config, @@ -124,4 +124,4 @@ config_verbose(Config) -> ["do", "eunit", "--cover", ",", "cover"], {ok, [{app, Name}]}), - true = filelib:is_file(filename:join(["_build", "cover", "index.html"])). + true = filelib:is_file(filename:join([AppDir, "_build", "test", "cover", "index.html"])). |