summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rebar.config4
-rw-r--r--src/rebar3.erl6
-rw-r--r--src/rebar_core.erl44
-rw-r--r--src/rebar_prv_release.erl2
-rw-r--r--src/rebar_prv_tar.erl2
-rw-r--r--src/rebar_state.erl8
-rw-r--r--test/rebar_compile_SUITE.erl2
-rw-r--r--test/rebar_deps_SUITE.erl2
-rw-r--r--test/rebar_namespace_SUITE.erl93
9 files changed, 148 insertions, 15 deletions
diff --git a/rebar.config b/rebar.config
index 296713a..fd3e53f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -22,8 +22,8 @@
{git, "https://github.com/erlware/erlware_commons.git",
{branch, "master"}}},
{providers, "",
- {git, "https://github.com/tsloughter/providers.git",
- {tag, "v1.0.0"}}},
+ {git, "https://github.com/ferd/providers.git",
+ {branch, "namespaces"}}},
{erlydtl, ".*",
{git, "https://github.com/erlydtl/erlydtl.git",
{tag, "0.9.4"}}},
diff --git a/src/rebar3.erl b/src/rebar3.erl
index b325dc8..d4307f7 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -71,10 +71,10 @@ main(Args) ->
end.
%% Erlang-API entry point
-run(BaseState, Command) ->
+run(BaseState, Commands) ->
_ = application:load(rebar),
- BaseState1 = rebar_state:set(BaseState, task, Command),
- run_aux(BaseState1, [], [Command]).
+ BaseState1 = rebar_state:set(BaseState, task, Commands),
+ run_aux(BaseState1, [], Commands).
%% ====================================================================
%% Internal functions
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index eaa546a..c3a8951 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -35,14 +35,46 @@
process_command(State, Command) ->
%% ? rebar_prv_install_deps:setup_env(State),
Providers = rebar_state:providers(State),
- TargetProviders = providers:get_target_providers(Command, Providers),
- case providers:get_provider(Command, Providers) of
+ Namespace = rebar_state:namespace(State),
+ {TargetProviders, CommandProvider} =
+ case Namespace of
+ undefined ->
+ %% undefined namespace means 'default', but on the first run;
+ %% it is used as an implicit counter for the first vs. subsequent
+ %% runs.
+ {providers:get_target_providers(Command, Providers, default),
+ providers:get_provider(Command, Providers, default)};
+ _ ->
+ {providers:get_target_providers(Command, Providers, Namespace),
+ providers:get_provider(Command, Providers, Namespace)}
+ end,
+ case CommandProvider of
not_found ->
- {error, io_lib:format("Command ~p not found", [Command])};
+ case Namespace of
+ undefined ->
+ %% On the first run (Namespace = undefined), we use the
+ %% unfound command name to be a namespace.
+ case providers:get_providers_by_namespace(Command, Providers) of
+ [] ->
+ {error, io_lib:format("Command ~p not found", [Command])};
+ _ ->
+ do([{default, do} | TargetProviders],
+ rebar_state:namespace(State, Command))
+ end;
+ default ->
+ {error, io_lib:format("Command ~p not found", [Command])};
+ _ ->
+ {error, io_lib:format("Command ~p not found in namespace ~p",
+ [Command, Namespace])}
+ end;
CommandProvider ->
case Command of
- Command when Command =:= do
- ; Command =:= as ->
+ Command when Command =:= do, Namespace =:= undefined ->
+ %% We're definitely in the default namespace. 'do' doesn't
+ %% properly exist for non-default namespaces outside of
+ %% dynamic dispatch calls for namespaces.
+ do(TargetProviders, rebar_state:namespace(State, default));
+ Command when Command =:= do; Command =:= as ->
do(TargetProviders, State);
_ ->
Profile = providers:profile(CommandProvider),
@@ -62,7 +94,7 @@ process_command(State, Command) ->
-spec do([{atom(), atom()}], rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do([], State) ->
{ok, State};
-do([{ProviderName, _} | Rest], State) ->
+do([ProviderName | Rest], State) ->
Provider = providers:get_provider(ProviderName
,rebar_state:providers(State)),
case providers:do(Provider, State) of
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index 295d5b4..d82b428 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -12,7 +12,7 @@
-include("rebar.hrl").
-define(PROVIDER, release).
--define(DEPS, [{compile, default}, compile]).
+-define(DEPS, [compile]).
%% ===================================================================
%% Public API
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl
index f9c261f..01fa1ba 100644
--- a/src/rebar_prv_tar.erl
+++ b/src/rebar_prv_tar.erl
@@ -12,7 +12,7 @@
-include("rebar.hrl").
-define(PROVIDER, tar).
--define(DEPS, [{compile, default}, compile]).
+-define(DEPS, [compile]).
%% ===================================================================
%% Public API
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 09becca..657c7d2 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -23,6 +23,7 @@
project_apps/1, project_apps/2,
deps_to_build/1, deps_to_build/2,
all_deps/1, all_deps/2,
+ namespace/1, namespace/2,
deps_names/1,
@@ -39,6 +40,7 @@
lock = [],
current_profiles = [default] :: [atom()],
+ namespace = undefined :: [atom()],
command_args = [],
command_parsed_args = [],
@@ -220,6 +222,12 @@ all_deps(#state_t{all_deps=Apps}) ->
all_deps(State=#state_t{}, NewApps) ->
State#state_t{all_deps=NewApps}.
+namespace(#state_t{namespace=Namespace}) ->
+ Namespace.
+
+namespace(State=#state_t{}, Namespace) ->
+ State#state_t{namespace=Namespace}.
+
providers(#state_t{providers=Providers}) ->
Providers.
diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
index 83b868d..03f9c1f 100644
--- a/test/rebar_compile_SUITE.erl
+++ b/test/rebar_compile_SUITE.erl
@@ -33,5 +33,5 @@ build_basic_app(Config) ->
Vsn = rebar_test_utils:create_random_vsn(),
rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
- rebar_test_utils:run_and_check(Config, [], "compile", {ok, [{app, Name}]}).
+ rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name}]}).
diff --git a/test/rebar_deps_SUITE.erl b/test/rebar_deps_SUITE.erl
index c6f24c0..d67efe4 100644
--- a/test/rebar_deps_SUITE.erl
+++ b/test/rebar_deps_SUITE.erl
@@ -195,7 +195,7 @@ circular_skip(Config) -> run(Config).
run(Config) ->
{ok, RebarConfig} = file:consult(?config(rebarconfig, Config)),
rebar_test_utils:run_and_check(
- Config, RebarConfig, "install_deps", ?config(expect, Config)
+ Config, RebarConfig, ["install_deps"], ?config(expect, Config)
),
check_warnings(warning_calls(), ?config(warnings, Config), ?config(deps_type, Config)).
diff --git a/test/rebar_namespace_SUITE.erl b/test/rebar_namespace_SUITE.erl
new file mode 100644
index 0000000..40b7238
--- /dev/null
+++ b/test/rebar_namespace_SUITE.erl
@@ -0,0 +1,93 @@
+-module(rebar_namespace_SUITE).
+-compile(export_all).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("eunit/include/eunit.hrl").
+
+all() -> [implicit_compile, default_compile, do_compile,
+ as_default_compile, as_do_compile,
+ notfound, do_notfound, default_notfound, ns_notfound].
+
+init_per_testcase(Case, Config0) ->
+ Config = rebar_test_utils:init_rebar_state(Config0),
+ AppDir = ?config(apps, Config),
+ Name = rebar_test_utils:create_random_name("app1_"++atom_to_list(Case)),
+ Vsn = rebar_test_utils:create_random_vsn(),
+ rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
+ [{name, Name} | Config].
+
+end_per_testcase(_, Config) ->
+ Config.
+
+implicit_compile(Config) ->
+ Name = ?config(name, Config),
+ rebar_test_utils:run_and_check(Config, [],
+ ["compile"],
+ {ok, [{app, Name}]}).
+
+default_compile(Config) ->
+ Name = ?config(name, Config),
+ rebar_test_utils:run_and_check(Config, [],
+ ["default","compile"],
+ {ok, [{app, Name}]}).
+
+do_compile(Config) ->
+ Name = ?config(name, Config),
+ rebar_test_utils:run_and_check(Config, [],
+ ["do", "compile"],
+ {ok, [{app, Name}]}).
+
+as_default_compile(Config) ->
+ Name = ?config(name, Config),
+ rebar_test_utils:run_and_check(Config, [],
+ ["as", "prod", "default", "compile"],
+ {ok, [{app, Name}]}).
+
+as_do_compile(Config) ->
+ Name = ?config(name, Config),
+ rebar_test_utils:run_and_check(Config, [],
+ ["as", "prod", "do", "compile"],
+ {ok, [{app, Name}]}).
+
+notfound(Config) ->
+ Command = ["fakecommand"],
+ rebar_test_utils:run_and_check(
+ Config, [], Command,
+ {error, io_lib:format("Command ~p not found", [fakecommand])}
+ ).
+
+do_notfound(Config) ->
+ Command = ["do", "fakecommand"],
+ rebar_test_utils:run_and_check(
+ Config, [], Command,
+ {error, io_lib:format("Command ~p not found", [fakecommand])}
+ ).
+
+default_notfound(Config) ->
+ Command = ["default", "fakecommand"],
+ rebar_test_utils:run_and_check(
+ Config, [], Command,
+ {error, io_lib:format("Command ~p not found", [fakecommand])}
+ ).
+
+ns_notfound(Config) ->
+ Command = ["ns", "fakecommand"],
+ rebar_test_utils:run_and_check(
+ add_fake_ns_provider(Config), [], Command,
+ {error, io_lib:format("Command ~p not found in namespace ~p",
+ [fakecommand, ns])}
+ ).
+
+%%% Helpers %%%
+add_fake_ns_provider(Config) ->
+ State = ?config(state, Config),
+ State1 = rebar_state:add_provider(
+ State,
+ providers:create(
+ [{name, fake_provider},
+ {module, fake_provider},
+ {namespace, ns},
+ {deps, []},
+ {opts, []}]
+ )
+ ),
+ [{state, State1} | Config].
generated by cgit v1.1 at 2024-12-24 17:52:41 +0000