From 4ff52d991eb1240acbe82859d643295076f90727 Mon Sep 17 00:00:00 2001
From: Louis-Philippe Gauthier <lpgauth@gmail.com>
Date: Wed, 15 Jun 2016 08:05:21 -0400
Subject: Add support for cover_excl_mods

---
 src/rebar_prv_cover.erl | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/rebar_prv_cover.erl b/src/rebar_prv_cover.erl
index e555a9b..b04b1c1 100644
--- a/src/rebar_prv_cover.erl
+++ b/src/rebar_prv_cover.erl
@@ -302,18 +302,30 @@ cover_compile(State, Dirs) ->
     {ok, CoverPid} = start_cover(),
     %% redirect cover output
     true = redirect_cover_output(State, CoverPid),
+    ExclMods = rebar_state:get(State, cover_excl_mods, []),
+
     lists:foreach(fun(Dir) ->
-        ?DEBUG("cover compiling ~p", [Dir]),
-        case catch(cover:compile_beam_directory(Dir)) of
-            {error, eacces} ->
-                ?WARN("Directory ~p not readable, modules will not be included in coverage", [Dir]);
-            {error, enoent} ->
-                ?WARN("Directory ~p not found", [Dir]);
-            {'EXIT', {Reason, _}} ->
-                ?WARN("Cover compilation for directory ~p failed: ~p", [Dir, Reason]);
-            Results ->
-                %% print any warnings about modules that failed to cover compile
-                lists:foreach(fun print_cover_warnings/1, lists:flatten(Results))
+        case file:list_dir(Dir) of
+            {ok, Files} ->
+                Files2 = [F || F <- Files, filename:extension(F) == ".beam"],
+                lists:foreach(fun(File) ->
+                    case lists:any(fun (Excl) ->
+                        File =:= (atom_to_list(Excl) ++ ".beam")
+                    end, ExclMods) of
+                        true ->
+                            ?DEBUG("cover ignoring ~p ~p", [Dir, File]);
+                        _ ->
+                            ?DEBUG("cover compiling ~p ~p", [Dir, File]),
+                            case catch(cover:compile_beam(filename:join(Dir, File))) of
+                                {error, Reason} ->
+                                    ?WARN("Cover compilation failed: ~p", [Reason]);
+                                {ok, _} ->
+                                    ok
+                            end
+                    end
+                end, Files2);
+            {error, Reason} ->
+                ?WARN("Directory ~p error ~p", [Dir, Reason])
         end
     end, Dirs).
 
@@ -346,10 +358,6 @@ redirect_cover_output(State, CoverPid) ->
                         [append]),
     group_leader(F, CoverPid).
 
-print_cover_warnings({ok, _}) -> ok;
-print_cover_warnings({error, Error}) ->
-    ?WARN("Cover compilation failed: ~p", [Error]).
-
 write_coverdata(State, Task) ->
     DataDir = cover_dir(State),
     ok = filelib:ensure_dir(filename:join([DataDir, "dummy.log"])),
-- 
cgit v1.1


From 4b0a07221de5e338cd71d774deff249f0528fa36 Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Sat, 27 Aug 2016 07:48:06 -0400
Subject: Re-format cover exclusion code

- brings back former error handling and debug messages
- keeps the filtering of excluded mods and debug messages
- breaks up code into multiple functions and removes nesting
---
 src/rebar_prv_cover.erl | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/rebar_prv_cover.erl b/src/rebar_prv_cover.erl
index 9772e96..7c2597b 100644
--- a/src/rebar_prv_cover.erl
+++ b/src/rebar_prv_cover.erl
@@ -308,23 +308,16 @@ cover_compile(State, Dirs) ->
     lists:foreach(fun(Dir) ->
         case file:list_dir(Dir) of
             {ok, Files} ->
-                Files2 = [F || F <- Files, filename:extension(F) == ".beam"],
-                lists:foreach(fun(File) ->
-                    case lists:any(fun (Excl) ->
-                        File =:= (atom_to_list(Excl) ++ ".beam")
-                    end, ExclMods) of
-                        true ->
-                            ?DEBUG("cover ignoring ~p ~p", [Dir, File]);
-                        _ ->
-                            ?DEBUG("cover compiling ~p ~p", [Dir, File]),
-                            case catch(cover:compile_beam(filename:join(Dir, File))) of
-                                {error, Reason} ->
-                                    ?WARN("Cover compilation failed: ~p", [Reason]);
-                                {ok, _} ->
-                                    ok
-                            end
-                    end
-                end, Files2);
+                ?DEBUG("cover compiling ~p", [Dir]),
+                [cover_compile_file(filename:join(Dir, File))
+                 || File <- Files,
+                    filename:extension(File) == ".beam",
+                    not is_ignored(Dir, File, ExclMods)],
+                ok;
+            {error, eacces} ->
+                ?WARN("Directory ~p not readable, modules will not be included in coverage", [Dir]);
+            {error, enoent} ->
+                ?WARN("Directory ~p not found", [Dir]);
             {error, Reason} ->
                 ?WARN("Directory ~p error ~p", [Dir, Reason])
         end
@@ -332,6 +325,22 @@ cover_compile(State, Dirs) ->
     rebar_utils:cleanup_code_path(rebar_state:code_paths(State, default)),
     ok.
 
+is_ignored(Dir, File, ExclMods) ->
+    Ignored = lists:any(fun(Excl) ->
+                             File =:= atom_to_list(Excl) ++ ".beam"
+                        end,
+                        ExclMods),
+    Ignored andalso ?DEBUG("cover ignoring ~p ~p", [Dir, File]),
+    Ignored.
+
+cover_compile_file(FileName) ->
+    case catch(cover:compile_beam(FileName)) of
+        {error, Reason} ->
+            ?WARN("Cover compilation failed: ~p", [Reason]);
+        {ok, _} ->
+            ok
+    end.
+
 app_dirs(Apps) ->
     lists:foldl(fun app_ebin_dirs/2, [], Apps).
 
-- 
cgit v1.1