Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

give top level plugin providers precedence over default providers #1065

Merged
merged 1 commit into from
Feb 21, 2016
Merged

give top level plugin providers precedence over default providers #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/rebar3.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,18 @@ run_aux(State, RawArgs) ->
filename:join(filename:absname(rebar_state:dir(State3)), BaseDir)),

{ok, Providers} = application:get_env(rebar, providers),
%% Initializing project_plugins before providers allows top level plugins to take precedence
State5 = rebar_plugins:project_plugins_install(State4),
%% Providers can modify profiles stored in opts, so set default after initializing providers
State5 = rebar_state:create_logic_providers(Providers, State4),
State6 = rebar_plugins:top_level_install(State5),
State7 = rebar_state:default(State6, rebar_state:opts(State6)),
State6 = rebar_state:create_logic_providers(Providers, State5),
State7 = rebar_plugins:top_level_install(State6),
State8 = rebar_state:default(State7, rebar_state:opts(State7)),

{Task, Args} = parse_args(RawArgs),

State8 = rebar_state:code_paths(State7, default, code:get_path()),
State9 = rebar_state:code_paths(State8, default, code:get_path()),

rebar_core:init_command(rebar_state:command_args(State8, Args), Task).
rebar_core:init_command(rebar_state:command_args(State9, Args), Task).

init_config() ->
%% Initialize logging system
Expand Down
11 changes: 10 additions & 1 deletion src/rebar_plugins.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

-module(rebar_plugins).

-export([top_level_install/1
-export([project_plugins_install/1
,top_level_install/1
,project_apps_install/1
,install/2
,handle_plugins/3
Expand All @@ -15,6 +16,14 @@
%% Public API
%% ===================================================================

-spec project_plugins_install(rebar_state:t()) -> rebar_state:t().
project_plugins_install(State) ->
Profiles = rebar_state:current_profiles(State),
lists:foldl(fun(Profile, StateAcc) ->
Plugins = rebar_state:get(State, {project_plugins, Profile}, []),
handle_plugins(Profile, Plugins, StateAcc)
end, State, Profiles).

-spec top_level_install(rebar_state:t()) -> rebar_state:t().
top_level_install(State) ->
Profiles = rebar_state:current_profiles(State),
Expand Down
6 changes: 4 additions & 2 deletions src/rebar_state.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ new(ParentState, Config, Dir) ->
new(ParentState, Config, Deps, Dir) ->
Opts = ParentState#state_t.opts,
Plugins = proplists:get_value(plugins, Config, []),
Terms = Deps++[{{plugins, default}, Plugins} | Config],
ProjectPlugins = proplists:get_value(project_plugins, Config, []),
Terms = Deps++[{{project_plugins, default}, ProjectPlugins}, {{plugins, default}, Plugins} | Config],
true = rebar_config:verify_config_format(Terms),
LocalOpts = dict:from_list(Terms),

Expand Down Expand Up @@ -136,7 +137,8 @@ base_state() ->
base_opts(Config) ->
Deps = proplists:get_value(deps, Config, []),
Plugins = proplists:get_value(plugins, Config, []),
Terms = [{{deps, default}, Deps}, {{plugins, default}, Plugins} | Config],
ProjectPlugins = proplists:get_value(project_plugins, Config, []),
Terms = [{{deps, default}, Deps}, {{plugins, default}, Plugins}, {{project_plugins, default}, ProjectPlugins} | Config],
true = rebar_config:verify_config_format(Terms),
dict:from_list(Terms).

Expand Down