From d201d7f4a6e6058c272fe75bb832dc78a418272f Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Fri, 18 Dec 2015 22:04:44 -0500
Subject: A bad template index does not crash; shows warning

This should fix #955

The test is implicit as a bad index previously silently crashed rebar3.
By adding the bad index to the `new` suite's files, we can show that
things keep running.
---
 src/rebar_prv_new.erl   | 20 ++++++++++++++++----
 src/rebar_templater.erl | 18 ++++++++++++------
 2 files changed, 28 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/rebar_prv_new.erl b/src/rebar_prv_new.erl
index 28572a9..71560d5 100644
--- a/src/rebar_prv_new.erl
+++ b/src/rebar_prv_new.erl
@@ -7,6 +7,7 @@
          format_error/1]).
 
 -include("rebar.hrl").
+-include_lib("providers/include/providers.hrl").
 
 -define(PROVIDER, new).
 -define(DEPS, []).
@@ -35,16 +36,16 @@ do(State) ->
     case strip_flags(rebar_state:command_args(State)) of
         ["help"] ->
             ?CONSOLE("Call `rebar3 new help <template>` for a detailed description~n", []),
-            show_short_templates(rebar_templater:list_templates(State)),
+            show_short_templates(list_templates(State)),
             {ok, State};
         ["help", TemplateName] ->
-            case lists:keyfind(TemplateName, 1, rebar_templater:list_templates(State)) of
+            case lists:keyfind(TemplateName, 1, list_templates(State)) of
                 false -> ?CONSOLE("template not found.", []);
                 Term -> show_template(Term)
             end,
             {ok, State};
         [TemplateName | Opts] ->
-            case lists:keyfind(TemplateName, 1, rebar_templater:list_templates(State)) of
+            case lists:keyfind(TemplateName, 1, list_templates(State)) of
                 false ->
                     ?CONSOLE("template not found.", []);
                 _ ->
@@ -53,11 +54,13 @@ do(State) ->
             end,
             {ok, State};
         [] ->
-            show_short_templates(rebar_templater:list_templates(State)),
+            show_short_templates(list_templates(State)),
             {ok, State}
     end.
 
 -spec format_error(any()) -> iolist().
+format_error({consult, File, Reason}) ->
+    io_lib:format("Error consulting file at ~s for reason ~p", [File, Reason]);
 format_error(Reason) ->
     io_lib:format("~p", [Reason]).
 
@@ -65,6 +68,15 @@ format_error(Reason) ->
 %% Internal functions
 %% ===================================================================
 
+list_templates(State) ->
+    lists:foldl(fun({error, {consult, File, Reason}}, Acc) ->
+                    ?WARN("Error consulting template file ~s for reason ~p",
+                          [File, Reason]),
+                    Acc
+                ;  (Tpl, Acc) ->
+                    [Tpl|Acc]
+                end, [], lists:reverse(rebar_templater:list_templates(State))).
+
 info() ->
     io_lib:format(
       "Create rebar3 project based on template and vars.~n"
diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl
index c7fb2af..f0b2ce8 100644
--- a/src/rebar_templater.erl
+++ b/src/rebar_templater.erl
@@ -59,10 +59,14 @@ list_templates(State) ->
 
 %% Expand a single template's value
 list_template(Files, {Name, Type, File}, State) ->
-    TemplateTerms = consult(load_file(Files, Type, File)),
-    {Name, Type, File,
-     get_template_description(TemplateTerms),
-     get_template_vars(TemplateTerms, State)}.
+    case consult(load_file(Files, Type, File)) of
+        {error, Reason} ->
+            {error, {consult, File, Reason}};
+        TemplateTerms ->
+            {Name, Type, File,
+             get_template_description(TemplateTerms),
+             get_template_vars(TemplateTerms, State)}
+    end.
 
 %% Load up the template description out from a list of attributes read in
 %% a .template file.
@@ -338,8 +342,10 @@ consult(Cont, Str, Acc) ->
         {done, Result, Remaining} ->
             case Result of
                 {ok, Tokens, _} ->
-                    {ok, Term} = erl_parse:parse_term(Tokens),
-                    consult([], Remaining, [Term | Acc]);
+                    case erl_parse:parse_term(Tokens) of
+                        {ok, Term} -> consult([], Remaining, [Term | Acc]);
+                        {error, Reason} -> {error, Reason}
+                    end;
                 {eof, _Other} ->
                     lists:reverse(Acc);
                 {error, Info, _} ->
-- 
cgit v1.1