Merge pull request #394 from umbec/master

Manage syntax error in app.src files.

2 files changed, 17 insertions, 4 deletions

diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 41f41f5..73401bc 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -159,7 +159,12 @@ find_app(AppDir, Validate) ->
                     case Validate of
                         V when V =:= invalid ; V =:= all ->
                             AppInfo = create_app_info(AppDir, File),
-                            {true, rebar_app_info:app_file_src(AppInfo, File)};
+                            case AppInfo of
+                              {error, Reason} ->
+                                  throw({error, {invalid_app_file, File, Reason}});
+                              _ ->
+                                  {true, rebar_app_info:app_file_src(AppInfo, File)}
+                            end;
                         valid ->
                             false
                     end;
@@ -175,7 +180,7 @@ find_app(AppDir, Validate) ->
 app_dir(AppFile) ->
     filename:join(rebar_utils:droplast(filename:split(filename:dirname(AppFile)))).
 
--spec create_app_info(file:name(), file:name()) -> rebar_app_info:t() | error.
+-spec create_app_info(file:name(), file:name()) -> rebar_app_info:t() | {error, term()}.
 create_app_info(AppDir, AppFile) ->
     case file:consult(AppFile) of
         {ok, [{application, AppName, AppDetails}]} ->
@@ -193,8 +198,8 @@ create_app_info(AppDir, AppFile) ->
                             false
                     end,
             rebar_app_info:dir(rebar_app_info:valid(AppInfo1, Valid), AppDir);
-        _ ->
-            error
+        {error, Reason} ->
+            {error, Reason}
     end.
 
 dedup([]) -> [];
diff --git a/src/rebar_prv_app_discovery.erl b/src/rebar_prv_app_discovery.erl
index 31c0f59..97862c1 100644
--- a/src/rebar_prv_app_discovery.erl
+++ b/src/rebar_prv_app_discovery.erl
@@ -45,5 +45,13 @@ do(State) ->
 -spec format_error(any()) -> iolist().
 format_error({multiple_app_files, Files}) ->
     io_lib:format("Multiple app files found in one app dir: ~s", [string:join(Files, " and ")]);
+format_error({invalid_app_file, File, Reason}) ->
+    case Reason of 
+        {Line, erl_parse, Description} ->
+            io_lib:format("Invalid app file ~s at line ~b: ~p", 
+                [File, Line, lists:flatten(Description)]);
+        _ ->
+            io_lib:format("Invalid app file ~s: ~p", [File, Reason])
+    end;
 format_error(Reason) ->
     io_lib:format("~p", [Reason]).