Properly reset hooks for single-app project

3 files changed, 16 insertions, 5 deletions

diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 73401bc..4eda199 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -65,10 +65,10 @@ project_app_config(AppInfo, State) ->
 %% Here we check if the app is at the root of the project.
 %% If it is, then drop the hooks from the config so they aren't run twice
 maybe_reset_hooks(C, Dir, State) ->
-    case filename:dirname(rebar_dir:root_dir(State)) of
+    case ec_file:real_dir_path(rebar_dir:root_dir(State)) of
         Dir ->
             C1 = proplists:delete(provider_hooks, C),
-            proplists:delete(hooks, C1);
+            proplists:delete(post_hooks, proplists:delete(pre_hooks, C1));
         _ ->
             C
     end.
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index f70ca28..704a9f0 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -37,7 +37,7 @@ do(State) ->
     ProjectApps = rebar_state:project_apps(State),
     Providers = rebar_state:providers(State),
     Deps = rebar_state:deps_to_build(State),
-    Cwd = rebar_dir:get_cwd(),
+    Cwd = rebar_state:dir(State),
 
     %% Need to allow global config vars used on deps
     %% Right now no way to differeniate and just give deps a new state
diff --git a/test/rebar_hooks_SUITE.erl b/test/rebar_hooks_SUITE.erl
index 642798f..be3bdcb 100644
--- a/test/rebar_hooks_SUITE.erl
+++ b/test/rebar_hooks_SUITE.erl
@@ -5,7 +5,8 @@
          end_per_suite/1,
          init_per_testcase/2,
          all/0,
-         build_and_clean_app/1]).
+         build_and_clean_app/1,
+         run_hooks_once/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -24,7 +25,7 @@ init_per_testcase(_, Config) ->
     rebar_test_utils:init_rebar_state(Config).
 
 all() ->
-    [build_and_clean_app].
+    [build_and_clean_app, run_hooks_once].
 
 %% Test post provider hook cleans compiled project app, leaving it invalid
 build_and_clean_app(Config) ->
@@ -36,3 +37,13 @@ build_and_clean_app(Config) ->
     rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name, valid}]}),
     rebar_test_utils:run_and_check(Config, [{provider_hooks, [{post, [{compile, clean}]}]}],
                                   ["compile"], {ok, [{app, Name, invalid}]}).
+
+run_hooks_once(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name = rebar_test_utils:create_random_name("app1_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    RebarConfig = [{pre_hooks, [{compile, "mkdir blah"}]}],
+    rebar_test_utils:create_config(AppDir, RebarConfig),
+    rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
+    rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], {ok, [{app, Name, valid}]}).