diff --git a/THANKS b/THANKS index 7405475..4032fd9 100644 --- a/THANKS +++ b/THANKS @@ -134,3 +134,4 @@ stwind Pavel Baturko Igor Savchuk Mark Anderson +Brian H. Ward diff --git a/inttest/cover/cover_rt.erl b/inttest/cover/cover_rt.erl new file mode 100644 index 0000000..34d65c5 --- /dev/null +++ b/inttest/cover/cover_rt.erl @@ -0,0 +1,76 @@ +%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- +%% ex: ts=4 sw=4 et +%% ------------------------------------------------------------------- +%% +%% rebar: Erlang Build Tools +%% +%% Copyright (c) 2014 Brian H. Ward +%% +%% Permission is hereby granted, free of charge, to any person obtaining a copy +%% of this software and associated documentation files (the "Software"), to deal +%% in the Software without restriction, including without limitation the rights +%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +%% copies of the Software, and to permit persons to whom the Software is +%% furnished to do so, subject to the following conditions: +%% +%% The above copyright notice and this permission notice shall be included in +%% all copies or substantial portions of the Software. +%% +%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +%% THE SOFTWARE. +%% ------------------------------------------------------------------- +-module(cover_rt). + +-export([files/0,run/1]). + +-include_lib("eunit/include/eunit.hrl"). + +files() -> + [{create, "ebin/foo.app", app(foo)}, + {copy, "../../rebar","rebar"}, + {copy, "src", "src"}, + {copy, + "rebar-cover_export_json.config", + "rebar-cover_export_json.config"}]. + +run(_Dir) -> + ifdef_test(), + cover_export_json_test(), + ok. + +ifdef_test() -> + {ok, Output} = retest:sh("./rebar -v eunit"), + io:format("output => ~p~n", [Output]), + ?assert(check_output(Output, "foo")), + {ok,Listing} = file:list_dir(".eunit"), + ?assert(check_output(Listing, "foo.beam")), + ?assertMatch({ok,_}, retest:sh("./rebar clean")). + +cover_export_json_test() -> + {ok,Output} = + retest:sh("./rebar -v -C rebar-cover_export_json.config eunit"), + ?assert(check_output(Output, "foo")), + ?assertEqual( + {ok, <<"{\"module\":\"foo\",\"covered\":2,\"not_covered\":1}">>}, + file:read_file(".eunit/foo.COVER.json")), + ?assertMatch( + {ok,_}, + retest:sh("./rebar -C rebar-cover_export_json.config clean")). + +check_output(Output,Target) -> + lists:any(fun(Line) -> + string:str(Line, Target) > 0 + end, Output). +app(Name) -> + App = {application, Name, + [{description, atom_to_list(Name)}, + {vsn, "1"}, + {modules, []}, + {registered, []}, + {applications, [kernel, stdlib]}]}, + io_lib:format("~p.\n", [App]). diff --git a/inttest/cover/rebar-cover_export_json.config b/inttest/cover/rebar-cover_export_json.config new file mode 100644 index 0000000..8109218 --- /dev/null +++ b/inttest/cover/rebar-cover_export_json.config @@ -0,0 +1,2 @@ +{cover_enabled, true}. +{cover_export_json, true}. diff --git a/inttest/cover/src/foo.erl b/inttest/cover/src/foo.erl new file mode 100644 index 0000000..0e7df8f --- /dev/null +++ b/inttest/cover/src/foo.erl @@ -0,0 +1,18 @@ +-module(foo). + +-ifdef(TEST). +-include_lib("eunit/include/eunit.hrl"). +-endif. + +covered_function() -> + "I am tested". + +uncovered_function() -> + "I am not tested". + +-ifdef(EUNIT). + +covered_function_test() -> + ?assertEqual("I am tested", covered_function()). + +-endif. diff --git a/src/rebar_cover_utils.erl b/src/rebar_cover_utils.erl index 11ee57e..a7514da 100644 --- a/src/rebar_cover_utils.erl +++ b/src/rebar_cover_utils.erl @@ -138,6 +138,14 @@ analyze(Config, FilteredModules, SrcModules, TargetDir) -> print_coverage(lists:sort(Coverage)); false -> ok + end, + + %% Generate JSON Coverage Data, if configured + case rebar_config:get(Config, cover_export_json, false) of + true -> + export_json_coverage(TargetDir, lists:sort(Coverage)); + false -> + ok end. analyze_mod(Module) -> @@ -243,6 +251,24 @@ print_coverage(Coverage) -> end, Coverage), ?CONSOLE("~n~*s : ~s~n", [Width, "Total", TotalCoverage]). +export_json_coverage(TargetDir,Coverage) -> + ?CONSOLE("~nCode Coverage export to json~n", []), + lists:foreach(fun(ModuleCoverage) -> + export_json_coverage_to_file( + TargetDir, + ModuleCoverage) + end, Coverage). + +export_json_coverage_to_file(TargetDir, {Module, Covered, NotCovered}) -> + {ok,JsonFile} = file:open(json_file(TargetDir, Module), [write]), + io:format(JsonFile, + "{\"module\":~p,\"covered\":~p,\"not_covered\":~p}", + [atom_to_list(Module), Covered, NotCovered]), + ok = file:close(JsonFile). + +json_file(TargetDir, Module) -> + filename:join([TargetDir, atom_to_list(Module) ++ ".COVER.json"]). + cover_file(Module, TargetDir) -> filename:join([TargetDir, atom_to_list(Module) ++ ".COVER.html"]).