Merge pull request #667 from tsloughter/clean_all

fix find of deps for clean all
erlang · Jul 29, 2015 · 593db01 · 593db01
2 parents b2311d9 + 3309fa8
commit 593db01
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl
@@ -39,7 +39,7 @@ do(State) ->
     case All of
         true ->
             DepsDir = rebar_dir:deps_dir(State),
-            DepApps = rebar_app_discover:find_apps([DepsDir], all);
+            DepApps = rebar_app_discover:find_apps([filename:join(DepsDir, "*")], all);
         false ->
             DepApps = []
     end,

diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
@@ -22,7 +22,8 @@
          parse_transform_test/1,
          erl_first_files_test/1,
          mib_test/1,
-         only_default_transitive_deps/1]).
+         only_default_transitive_deps/1,
+         clean_all/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -50,7 +51,8 @@ all() ->
      recompile_when_opts_change, dont_recompile_when_opts_dont_change,
      dont_recompile_yrl_or_xrl, delete_beam_if_source_deleted,
      deps_in_path, checkout_priority, highest_version_of_pkg_dep,
-     parse_transform_test, erl_first_files_test, mib_test, only_default_transitive_deps].
+     parse_transform_test, erl_first_files_test, mib_test, only_default_transitive_deps,
+     clean_all].
 
 build_basic_app(Config) ->
     AppDir = ?config(apps, Config),
@@ -556,3 +558,35 @@ only_default_transitive_deps(Config) ->
         Config, RConf, ["as", "test", "compile"],
         {ok, [{app, Name}, {dep, "a", <<"1.0.0">>}, {dep_not_exist, PkgName}]}
     ).
+
+clean_all(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name = rebar_test_utils:create_random_name("app1_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+    DepName = rebar_test_utils:create_random_name("dep1_"),
+    PkgName = rebar_test_utils:create_random_name("pkg1_"),
+    mock_git_resource:mock([]),
+    mock_pkg_resource:mock([
+        {pkgdeps, [{{iolist_to_binary(PkgName), iolist_to_binary(Vsn)}, []}]}
+    ]),
+
+    RConfFile = rebar_test_utils:create_config(AppDir, [{deps, [
+        {list_to_atom(DepName), {git, "http://site.com/user/"++DepName++".git", {tag, Vsn}}},
+        {list_to_atom(PkgName), Vsn}
+    ]}]),
+    {ok, RConf} = file:consult(RConfFile),
+
+    %% Build things
+    rebar_test_utils:run_and_check(
+        Config, RConf, ["compile"],
+        {ok, [{app, Name}, {app, DepName}, {app, PkgName}]}
+    ),
+
+    %% Clean all
+    rebar_test_utils:run_and_check(
+        Config, RConf, ["clean", "--all"],
+        {ok, [{app, Name, invalid}, {app, DepName, invalid}, {app, PkgName, invalid}]}
+    ).