From 52fcf0278d0e603f04a6b6181a61c84af1eebe5e Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 19 Sep 2014 18:54:22 -0500
Subject: add rebar providers create and plugin inclusion with providers
---
src/rebar3.erl | 4 +++-
src/rebar_provider.erl | 16 ++++++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index dcd78f7..ec464fb 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -136,10 +136,12 @@ run_aux(State, Args) ->
State1 = init_config1(State),
+ code:add_pathsa([filename:join(rebar_utils:get_cwd(), "plugins")]),
%% Process each command, resetting any state between each one
State2 = rebar_state:set(State1, base_dir, filename:absname(rebar_state:dir(State1))),
{ok, Providers} = application:get_env(rebar, providers),
- State3 = rebar_state:create_logic_providers(Providers, State2),
+ Plugins = rebar_state:get(State2, plugins, []),
+ State3 = rebar_state:create_logic_providers(Providers++Plugins, State2),
Task = rebar_state:get(State3, task, "help"),
rebar_core:process_command(rebar_state:command_args(State3, Args), list_to_atom(Task)),
ok.
diff --git a/src/rebar_provider.erl b/src/rebar_provider.erl
index e5d7520..69ee22b 100644
--- a/src/rebar_provider.erl
+++ b/src/rebar_provider.erl
@@ -1,7 +1,8 @@
-module(rebar_provider).
%% API
--export([new/2,
+-export([create/1,
+ new/2,
do/2,
impl/1,
get_provider/2,
@@ -59,6 +60,17 @@ new(ModuleName, State0) when is_atom(ModuleName) ->
ModuleName:init(State0)
end.
+-spec create([{atom(), any()}]) -> t().
+create(Attrs) ->
+ #provider{name=proplists:get_value(name, Attrs, undefined)
+ ,provider_impl=proplists:get_value(provider_impl, Attrs, undefined)
+ ,bare=proplists:get_value(bare, Attrs, false)
+ ,deps=proplists:get_value(deps, Attrs, [])
+ ,desc=proplists:get_value(desc, Attrs, "")
+ ,short_desc=proplists:get_value(short_desc, Attrs, "")
+ ,example=proplists:get_value(example, Attrs, "")
+ ,opts=proplists:get_value(opts, Attrs, [])}.
+
%% @doc Manipulate the state of the system, that new state
%%
%% @param Provider the provider object
@@ -109,7 +121,7 @@ get_target_providers(Target, State) ->
Providers = rebar_state:providers(State),
TargetProviders = lists:filter(fun(#provider{name=T}) when T =:= Target->
true;
- (#provider{name=T}) ->
+ (_) ->
false
end, Providers),
process_deps(TargetProviders, Providers).
--
cgit v1.1
From f4f96a356fcefaa2ad388eb5469c7da901846f21 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 19 Sep 2014 22:05:40 -0500
Subject: install plugins to plugins/
---
src/rebar3.erl | 5 +++--
src/rebar_plugins.erl | 9 ++++++++-
src/rebar_prv_install_deps.erl | 36 +++++++++++++++++++++---------------
3 files changed, 32 insertions(+), 18 deletions(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index ec464fb..39babeb 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -140,8 +140,9 @@ run_aux(State, Args) ->
%% Process each command, resetting any state between each one
State2 = rebar_state:set(State1, base_dir, filename:absname(rebar_state:dir(State1))),
{ok, Providers} = application:get_env(rebar, providers),
- Plugins = rebar_state:get(State2, plugins, []),
- State3 = rebar_state:create_logic_providers(Providers++Plugins, State2),
+
+ rebar_plugins:install(State2),
+ State3 = rebar_state:create_logic_providers(Providers, State2),
Task = rebar_state:get(State3, task, "help"),
rebar_core:process_command(rebar_state:command_args(State3, Args), list_to_atom(Task)),
ok.
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index 0fdbc6d..e9ab0b2 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -3,10 +3,17 @@
-module(rebar_plugins).
--export([]).
+-export([install/1]).
-include("rebar.hrl").
%% ===================================================================
%% Public API
%% ===================================================================
+
+install(State) ->
+ BaseDir = rebar_state:get(State, base_dir, ""),
+ State1 = rebar_state:set(State, base_dir, "plugins"),
+ Plugins = rebar_state:get(State1, plugins, []),
+ {ok, State2} = rebar_prv_install_deps:handle_deps(State1, Plugins),
+ {ok, rebar_state:set(State2, base_dir, BaseDir)}.
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index d20f2b5..0752f0a 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -33,7 +33,8 @@
-include("rebar.hrl").
--export([setup_env/1]).
+-export([setup_env/1,
+ handle_deps/2]).
%% for internal use only
-export([get_deps_dir/1]).
@@ -65,12 +66,18 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(State) ->
- case rebar_state:get(State, locks, []) of
- [] ->
- handle_deps(State, ordsets:from_list(rebar_state:get(State, deps, [])));
- Locks ->
- handle_deps(State, ordsets:from_list(Locks))
- end.
+ ProjectApps = rebar_state:project_apps(State),
+ {ok, State1} = case rebar_state:get(State, locks, []) of
+ [] ->
+ handle_deps(State, ordsets:from_list(rebar_state:get(State, deps, [])));
+ Locks ->
+ handle_deps(State, ordsets:from_list(Locks))
+ end,
+
+ Source = ProjectApps ++ ordsets:to_list(rebar_state:src_deps(State1)),
+ {ok, Sort} = rebar_topo:sort_apps(ordsets:to_list(Source)),
+ {ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
+
%% set REBAR_DEPS_DIR and ERL_LIBS environment variables
setup_env(State) ->
@@ -99,17 +106,12 @@ get_deps_dir(State) ->
get_deps_dir(DepsDir, App) ->
filename:join(DepsDir, App).
-%% ===================================================================
-%% Internal functions
-%% ===================================================================
-
-spec handle_deps(rebar_state:t(), [dep()]) -> {ok, rebar_state:t()}.
handle_deps(State, []) ->
{ok, State};
handle_deps(State, Deps) ->
%% Read in package index and dep graph
{Packages, Graph} = rebar_packages:get_packages(State),
- ProjectApps = rebar_state:project_apps(State),
%% Split source deps form binary deps, needed to keep backwards compatibility
DepsDir = get_deps_dir(State),
@@ -136,14 +138,18 @@ handle_deps(State, Deps) ->
end, S)
end,
- Source = ProjectApps ++ ordsets:to_list(rebar_state:src_deps(State2)),
AllDeps = ordsets:union([ordsets:to_list(rebar_state:src_deps(State2))
,ordsets:from_list(Solved)]),
%% Sort all apps to build order
State3 = rebar_state:set(State2, all_deps, AllDeps),
- {ok, Sort} = rebar_topo:sort_apps(ordsets:to_list(Source)),
- {ok, rebar_state:set(State3, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
+
+ {ok, State3}.
+
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
-spec is_valid(rebar_app_info:t()) -> boolean().
is_valid(App) ->
--
cgit v1.1
From 989a1bfe8d991846f81331a94eb65ffc10883cf5 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 08:20:05 -0500
Subject: add plugin template
---
src/rebar_core.erl | 3 ++-
src/rebar_templater.erl | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index cb021e3..ce3816d 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -35,7 +35,8 @@ process_command(State, Command) ->
LibDirs = rebar_state:get(State, lib_dirs, ?DEFAULT_LIB_DIRS),
DepsDir = rebar_state:get(State, deps_dir, ?DEFAULT_DEPS_DIRS),
_UpdatedCodePaths = update_code_path([DepsDir | LibDirs]),
- rebar_prv_install_deps:setup_env(State),
+
+ %% ? rebar_prv_install_deps:setup_env(State),
TargetProviders = rebar_provider:get_target_providers(Command, State),
diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl
index a795b66..048991b 100644
--- a/src/rebar_templater.erl
+++ b/src/rebar_templater.erl
@@ -47,6 +47,8 @@ new(app, DirName, State) ->
create1(State, DirName, "otp_app");
new(lib, DirName, State) ->
create1(State, DirName, "otp_lib");
+new(plugin, DirName, State) ->
+ create1(State, DirName, "plugin");
new(rel, DirName, State) ->
create1(State, DirName, "otp_rel").
--
cgit v1.1
From 51f1cf4aae5a22fe8974edcdf10da4e8a7b05255 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 09:01:03 -0500
Subject: install plugins to plugins/
---
src/rebar3.erl | 10 ++++++----
src/rebar_core.erl | 20 ++++++++++++--------
src/rebar_plugins.erl | 24 +++++++++++++++++++++---
src/rebar_prv_install_deps.erl | 27 ++++-----------------------
4 files changed, 43 insertions(+), 38 deletions(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 39babeb..44d7d98 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -141,10 +141,12 @@ run_aux(State, Args) ->
State2 = rebar_state:set(State1, base_dir, filename:absname(rebar_state:dir(State1))),
{ok, Providers} = application:get_env(rebar, providers),
- rebar_plugins:install(State2),
- State3 = rebar_state:create_logic_providers(Providers, State2),
- Task = rebar_state:get(State3, task, "help"),
- rebar_core:process_command(rebar_state:command_args(State3, Args), list_to_atom(Task)),
+ {ok, PluginProviders, State3} = rebar_plugins:install(State2),
+ rebar_core:update_code_path(State),
+
+ State4 = rebar_state:create_logic_providers(Providers++PluginProviders, State3),
+ Task = rebar_state:get(State4, task, "help"),
+ rebar_core:process_command(rebar_state:command_args(State4, Args), list_to_atom(Task)),
ok.
%%
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index ce3816d..24b376f 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -26,16 +26,12 @@
%% -------------------------------------------------------------------
-module(rebar_core).
--export([process_command/2]).
+-export([process_command/2
+ ,update_code_path/1]).
-include("rebar.hrl").
process_command(State, Command) ->
- true = rebar_utils:expand_code_path(),
- LibDirs = rebar_state:get(State, lib_dirs, ?DEFAULT_LIB_DIRS),
- DepsDir = rebar_state:get(State, deps_dir, ?DEFAULT_DEPS_DIRS),
- _UpdatedCodePaths = update_code_path([DepsDir | LibDirs]),
-
%% ? rebar_prv_install_deps:setup_env(State),
TargetProviders = rebar_provider:get_target_providers(Command, State),
@@ -47,13 +43,21 @@ process_command(State, Command) ->
Conf1
end, State, TargetProviders).
+update_code_path(State) ->
+ true = rebar_utils:expand_code_path(),
+ LibDirs = rebar_state:get(State, lib_dirs, ?DEFAULT_LIB_DIRS),
+ DepsDir = rebar_state:get(State, deps_dir, ?DEFAULT_DEPS_DIR),
+ PluginsDir = rebar_state:get(State, plugins_dir, ?DEFAULT_PLUGINS_DIR),
+ _UpdatedCodePaths = update_code_path_([DepsDir, PluginsDir | LibDirs]).
+
+
%% ===================================================================
%% Internal functions
%% ===================================================================
-update_code_path([]) ->
+update_code_path_([]) ->
no_change;
-update_code_path(Paths) ->
+update_code_path_(Paths) ->
LibPaths = expand_lib_dirs(Paths, rebar_utils:get_cwd(), []),
ok = code:add_pathsa(LibPaths),
%% track just the paths we added, so we can remove them without
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index e9ab0b2..3e51f7f 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -12,8 +12,26 @@
%% ===================================================================
install(State) ->
- BaseDir = rebar_state:get(State, base_dir, ""),
- State1 = rebar_state:set(State, base_dir, "plugins"),
+ State1 = rebar_state:set(State, deps_dir, "plugins"),
+
Plugins = rebar_state:get(State1, plugins, []),
{ok, State2} = rebar_prv_install_deps:handle_deps(State1, Plugins),
- {ok, rebar_state:set(State2, base_dir, BaseDir)}.
+
+ Apps = rebar_state:get(State2, all_deps),
+ lists:foreach(fun(AppInfo) ->
+ C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
+ S = rebar_state:new(rebar_state:new(), C, rebar_app_info:dir(AppInfo)),
+ rebar_prv_compile:build(S, AppInfo)
+ end, Apps),
+
+ PluginProviders = plugin_providers(Plugins),
+ {ok, PluginProviders, rebar_state:set(State2, deps_dir, ?DEFAULT_DEPS_DIR)}.
+
+plugin_providers(Plugins) ->
+ lists:map(fun({Plugin, _, _}) when is_atom(Plugin) ->
+ Plugin;
+ ({Plugin, _}) when is_atom(Plugin) ->
+ Plugin;
+ (Plugin) when is_atom(Plugin) ->
+ Plugin
+ end, Plugins).
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 0752f0a..81acf22 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -33,8 +33,7 @@
-include("rebar.hrl").
--export([setup_env/1,
- handle_deps/2]).
+-export([handle_deps/2]).
%% for internal use only
-export([get_deps_dir/1]).
@@ -78,29 +77,11 @@ do(State) ->
{ok, Sort} = rebar_topo:sort_apps(ordsets:to_list(Source)),
{ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
-
-%% set REBAR_DEPS_DIR and ERL_LIBS environment variables
-setup_env(State) ->
- DepsDir = get_deps_dir(State),
- %% include rebar's DepsDir in ERL_LIBS
- Separator = case os:type() of
- {win32, nt} ->
- ";";
- _ ->
- ":"
- end,
- ERL_LIBS = case os:getenv("ERL_LIBS") of
- false ->
- {"ERL_LIBS", DepsDir};
- PrevValue ->
- {"ERL_LIBS", DepsDir ++ Separator ++ PrevValue}
- end,
- [{"REBAR_DEPS_DIR", DepsDir}, ERL_LIBS].
-
-spec get_deps_dir(rebar_state:t()) -> file:filename_all().
get_deps_dir(State) ->
BaseDir = rebar_state:get(State, base_dir, ""),
- get_deps_dir(BaseDir, "deps").
+ DepsDir = rebar_state:get(State, deps_dir, ?DEFAULT_DEPS_DIR),
+ get_deps_dir(BaseDir, DepsDir).
-spec get_deps_dir(file:filename_all(), rebar_state:t()) -> file:filename_all().
get_deps_dir(DepsDir, App) ->
@@ -113,7 +94,7 @@ handle_deps(State, Deps) ->
%% Read in package index and dep graph
{Packages, Graph} = rebar_packages:get_packages(State),
- %% Split source deps form binary deps, needed to keep backwards compatibility
+ %% Split source deps from binary deps, needed to keep backwards compatibility
DepsDir = get_deps_dir(State),
{SrcDeps, BinaryDeps} = parse_deps(DepsDir, Deps),
State1 = rebar_state:src_deps(rebar_state:binary_deps(State, BinaryDeps),
--
cgit v1.1
From 6f9ea13dd423d7ff0307265140496fb36c62d924 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 09:08:24 -0500
Subject: move deps and plugins to _ prefixed
---
src/rebar_plugins.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index 3e51f7f..d8422d8 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -12,7 +12,7 @@
%% ===================================================================
install(State) ->
- State1 = rebar_state:set(State, deps_dir, "plugins"),
+ State1 = rebar_state:set(State, deps_dir, ?DEFAULT_PLUGINS_DIR),
Plugins = rebar_state:get(State1, plugins, []),
{ok, State2} = rebar_prv_install_deps:handle_deps(State1, Plugins),
--
cgit v1.1
From 6c6480fa077065d1db77b78a49c79d9f6cf08035 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 09:12:36 -0500
Subject: only compile invalid plugins
---
src/rebar_plugins.erl | 3 ++-
src/rebar_prv_install_deps.erl | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index d8422d8..9fc0b23 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -18,11 +18,12 @@ install(State) ->
{ok, State2} = rebar_prv_install_deps:handle_deps(State1, Plugins),
Apps = rebar_state:get(State2, all_deps),
+ ToBuild = lists:dropwhile(fun rebar_app_info:valid/1, Apps),
lists:foreach(fun(AppInfo) ->
C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
S = rebar_state:new(rebar_state:new(), C, rebar_app_info:dir(AppInfo)),
rebar_prv_compile:build(S, AppInfo)
- end, Apps),
+ end, ToBuild),
PluginProviders = plugin_providers(Plugins),
{ok, PluginProviders, rebar_state:set(State2, deps_dir, ?DEFAULT_DEPS_DIR)}.
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 81acf22..c86d2d1 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -124,7 +124,6 @@ handle_deps(State, Deps) ->
%% Sort all apps to build order
State3 = rebar_state:set(State2, all_deps, AllDeps),
-
{ok, State3}.
--
cgit v1.1
From 1046f4c5d75965dec5e3155194e34540aadeddd0 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 09:58:35 -0500
Subject: handle no plugins as [] list of plugins
---
src/rebar_plugins.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index 9fc0b23..b180ede 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -17,7 +17,7 @@ install(State) ->
Plugins = rebar_state:get(State1, plugins, []),
{ok, State2} = rebar_prv_install_deps:handle_deps(State1, Plugins),
- Apps = rebar_state:get(State2, all_deps),
+ Apps = rebar_state:get(State2, all_deps, []),
ToBuild = lists:dropwhile(fun rebar_app_info:valid/1, Apps),
lists:foreach(fun(AppInfo) ->
C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
--
cgit v1.1
From 1dabd217dbfbebae2f5375160551c35cd1f2a972 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 13:51:14 -0500
Subject: inefficient way, but safer, of checking if an app is already
downloaded
---
src/rebar_app_discover.erl | 1 +
src/rebar_app_utils.erl | 14 +++++++++++++-
src/rebar_prv_install_deps.erl | 19 ++++++++++---------
src/rebar_prv_update.erl | 7 +++++--
4 files changed, 29 insertions(+), 12 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index c90a8df..7aaba21 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -55,6 +55,7 @@ find_apps(LibDirs, Validate) ->
find_app(AppDir, Validate)
end, all_app_dirs(LibDirs)).
+-spec find_app(list(), boolean()) -> rebar_app_info:t() | false.
find_app(AppDir, Validate) ->
AppFile = filelib:wildcard(filename:join([AppDir, "ebin", "*.app"])),
AppSrcFile = filelib:wildcard(filename:join([AppDir, "src", "*.app.src"])),
diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl
index 1c53743..8c78850 100644
--- a/src/rebar_app_utils.erl
+++ b/src/rebar_app_utils.erl
@@ -26,7 +26,8 @@
%% -------------------------------------------------------------------
-module(rebar_app_utils).
--export([is_app_dir/0, is_app_dir/1,
+-export([find/2,
+ is_app_dir/0, is_app_dir/1,
is_app_src/1,
app_src_to_app/1,
app_name/2,
@@ -42,6 +43,17 @@
%% Public API
%% ===================================================================
+-spec find(binary(), [rebar_app_info:t()]) -> {ok, rebar_app_info:t()} | error.
+find(Name, Apps) ->
+ ec_lists:find(fun(App) -> rebar_app_info:name(App) =:= Name end, Apps).
+
+-spec find(binary(), binary(), [rebar_app_info:t()]) -> {ok, rebar_app_info:t()} | error.
+find(Name, Vsn, Apps) ->
+ ec_lists:find(fun(App) ->
+ rebar_app_info:name(App) =:= Name
+ andalso rebar_app_info:original_vsn(App) =:= Vsn
+ end, Apps).
+
is_app_dir() ->
is_app_dir(rebar_utils:get_cwd()).
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index c86d2d1..607aeb7 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -114,7 +114,7 @@ handle_deps(State, Deps) ->
,Packages
,Name
,Vsn),
- ok = maybe_fetch(AppInfo),
+ ok = maybe_fetch(AppInfo, State2),
AppInfo
end, S)
end,
@@ -154,7 +154,7 @@ update_src_deps(State) ->
SrcDeps = rebar_state:src_deps(State),
DepsDir = get_deps_dir(State),
case lists:foldl(fun(AppInfo, {SrcDepsAcc, BinaryDepsAcc}) ->
- ok = maybe_fetch(AppInfo),
+ ok = maybe_fetch(AppInfo, State),
{AppInfo1, NewSrcDeps, NewBinaryDeps} = handle_dep(DepsDir, AppInfo),
{ordsets:union(ordsets:add_element(AppInfo1, SrcDepsAcc), NewSrcDeps)
,NewBinaryDeps++BinaryDepsAcc}
@@ -175,16 +175,17 @@ handle_dep(DepsDir, AppInfo) ->
{SrcDeps, BinaryDeps} = parse_deps(DepsDir, Deps),
{AppInfo1, SrcDeps, BinaryDeps}.
--spec maybe_fetch(rebar_app_info:t()) -> ok.
-maybe_fetch(AppInfo) ->
+-spec maybe_fetch(rebar_app_info:t(), rebar_state:t()) -> ok.
+maybe_fetch(AppInfo, State) ->
AppDir = rebar_app_info:dir(AppInfo),
- case filelib:is_dir(AppDir) of
- false ->
+ Apps = rebar_app_discover:find_apps([get_deps_dir(State)], all),
+ case rebar_app_utils:find(rebar_app_info:name(AppInfo), Apps) of
+ {ok, _} ->
+ ok;
+ _ ->
?INFO("Fetching ~s~n", [rebar_app_info:name(AppInfo)]),
Source = rebar_app_info:source(AppInfo),
- rebar_fetch:download_source(AppDir, Source);
- true ->
- ok
+ rebar_fetch:download_source(AppDir, Source)
end.
-spec parse_deps(binary(), [dep()]) -> {ordsets:ordset(rebar_app_info:t()), [binary_dep()]}.
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index e19041a..f4b25f0 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -11,7 +11,7 @@
-include("rebar.hrl").
-define(PROVIDER, update).
--define(DEPS, []).
+-define(DEPS, [install_deps]).
%% ===================================================================
%% Public API
@@ -29,11 +29,14 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | rebar:error().
do(State) ->
case rebar_state:command_args(State) of
[Name] ->
?ERROR("NOT IMPLEMENTED: Updating ~s~n", [Name]),
+ AllDeps = rebar_state:get(State, all_deps, []),
+ {ok, App} = rebar_app_utils:find(list_to_binary(Name), AllDeps),
+ rebar_prv_install_deps:handle_deps(State, [list_to_binary(Name)]),
{ok, State};
[] ->
?INFO("Updating package index...~n", []),
--
cgit v1.1
From 3924908f64dec6fdd9c8195b826453602f7b34f1 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 14:01:22 -0500
Subject: more efficient check for existing dep
---
src/rebar_app_utils.erl | 3 +++
src/rebar_prv_install_deps.erl | 22 ++++++++++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl
index 8c78850..d1487fb 100644
--- a/src/rebar_app_utils.erl
+++ b/src/rebar_app_utils.erl
@@ -27,6 +27,7 @@
-module(rebar_app_utils).
-export([find/2,
+ find/3,
is_app_dir/0, is_app_dir/1,
is_app_src/1,
app_src_to_app/1,
@@ -54,9 +55,11 @@ find(Name, Vsn, Apps) ->
andalso rebar_app_info:original_vsn(App) =:= Vsn
end, Apps).
+-spec is_app_dir() -> {true, file:name()} | false.
is_app_dir() ->
is_app_dir(rebar_utils:get_cwd()).
+-spec is_app_dir(file:name()) -> {true, file:name()} | false.
is_app_dir(Dir) ->
SrcDir = filename:join([Dir, "src"]),
AppSrc = filename:join([SrcDir, "*.app.src"]),
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 607aeb7..ef08754 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -176,16 +176,22 @@ handle_dep(DepsDir, AppInfo) ->
{AppInfo1, SrcDeps, BinaryDeps}.
-spec maybe_fetch(rebar_app_info:t(), rebar_state:t()) -> ok.
-maybe_fetch(AppInfo, State) ->
- AppDir = rebar_app_info:dir(AppInfo),
- Apps = rebar_app_discover:find_apps([get_deps_dir(State)], all),
- case rebar_app_utils:find(rebar_app_info:name(AppInfo), Apps) of
- {ok, _} ->
+maybe_fetch(AppInfo, _State) ->
+ AppDir = ec_cnv:to_list(rebar_app_info:dir(AppInfo)),
+ %Apps = rebar_app_discover:find_apps([get_deps_dir(State)], all),
+ %case rebar_app_utils:find(rebar_app_info:name(AppInfo), Apps) of
+ case rebar_app_utils:is_app_dir(filename:absname(AppDir)++"-*") of
+ {true, _} ->
ok;
_ ->
- ?INFO("Fetching ~s~n", [rebar_app_info:name(AppInfo)]),
- Source = rebar_app_info:source(AppInfo),
- rebar_fetch:download_source(AppDir, Source)
+ case rebar_app_utils:is_app_dir(filename:absname(AppDir)) of
+ {true, _} ->
+ ok;
+ _ ->
+ ?INFO("Fetching ~s~n", [rebar_app_info:name(AppInfo)]),
+ Source = rebar_app_info:source(AppInfo),
+ rebar_fetch:download_source(AppDir, Source)
+ end
end.
-spec parse_deps(binary(), [dep()]) -> {ordsets:ordset(rebar_app_info:t()), [binary_dep()]}.
--
cgit v1.1
From 0649be271bd8b2db2549dbc3228bd2d6b83e8954 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 14:19:02 -0500
Subject: wip: update dep
---
src/rebar_prv_install_deps.erl | 56 +++++++++++++++++++++++++-----------------
src/rebar_prv_update.erl | 2 +-
2 files changed, 35 insertions(+), 23 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index ef08754..3b78fd1 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -33,7 +33,8 @@
-include("rebar.hrl").
--export([handle_deps/2]).
+-export([handle_deps/2,
+ handle_deps/3]).
%% for internal use only
-export([get_deps_dir/1]).
@@ -88,9 +89,13 @@ get_deps_dir(DepsDir, App) ->
filename:join(DepsDir, App).
-spec handle_deps(rebar_state:t(), [dep()]) -> {ok, rebar_state:t()}.
-handle_deps(State, []) ->
- {ok, State};
handle_deps(State, Deps) ->
+ handle_deps(State, Deps, false).
+
+-spec handle_deps(rebar_state:t(), [dep()], boolean()) -> {ok, rebar_state:t()}.
+handle_deps(State, [], _) ->
+ {ok, State};
+handle_deps(State, Deps, Update) ->
%% Read in package index and dep graph
{Packages, Graph} = rebar_packages:get_packages(State),
@@ -101,7 +106,7 @@ handle_deps(State, Deps) ->
SrcDeps),
%% Fetch transitive src deps
- State2 = update_src_deps(State1),
+ State2 = update_src_deps(State1, Update),
Solved = case rebar_state:binary_deps(State2) of
[] -> %% No binary deps
[];
@@ -114,7 +119,7 @@ handle_deps(State, Deps) ->
,Packages
,Name
,Vsn),
- ok = maybe_fetch(AppInfo, State2),
+ ok = maybe_fetch(AppInfo, Update),
AppInfo
end, S)
end,
@@ -149,12 +154,12 @@ package_to_app(DepsDir, Packages, Name, Vsn) ->
rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, <<Name/binary, "-", FmtVsn/binary>>)),
rebar_app_info:source(AppInfo2, Link).
--spec update_src_deps(rebar_state:t()) -> rebat_state:t().
-update_src_deps(State) ->
+-spec update_src_deps(rebar_state:t(), boolean()) -> rebat_state:t().
+update_src_deps(State, Update) ->
SrcDeps = rebar_state:src_deps(State),
DepsDir = get_deps_dir(State),
case lists:foldl(fun(AppInfo, {SrcDepsAcc, BinaryDepsAcc}) ->
- ok = maybe_fetch(AppInfo, State),
+ ok = maybe_fetch(AppInfo, Update),
{AppInfo1, NewSrcDeps, NewBinaryDeps} = handle_dep(DepsDir, AppInfo),
{ordsets:union(ordsets:add_element(AppInfo1, SrcDepsAcc), NewSrcDeps)
,NewBinaryDeps++BinaryDepsAcc}
@@ -163,7 +168,7 @@ update_src_deps(State) ->
rebar_state:src_deps(rebar_state:binary_deps(State, NewBinaryDeps), NewSrcDeps);
{NewSrcDeps, NewBinaryDeps} ->
State1 = rebar_state:src_deps(rebar_state:binary_deps(State, NewBinaryDeps), NewSrcDeps),
- update_src_deps(State1)
+ update_src_deps(State1, Update)
end.
-spec handle_dep(binary(), rebar_state:t()) -> {[rebar_app_info:t()], [binary_dep()]}.
@@ -175,23 +180,30 @@ handle_dep(DepsDir, AppInfo) ->
{SrcDeps, BinaryDeps} = parse_deps(DepsDir, Deps),
{AppInfo1, SrcDeps, BinaryDeps}.
--spec maybe_fetch(rebar_app_info:t(), rebar_state:t()) -> ok.
-maybe_fetch(AppInfo, _State) ->
+-spec maybe_fetch(rebar_app_info:t(), boolean()) -> ok.
+maybe_fetch(AppInfo, Update) ->
AppDir = ec_cnv:to_list(rebar_app_info:dir(AppInfo)),
%Apps = rebar_app_discover:find_apps([get_deps_dir(State)], all),
%case rebar_app_utils:find(rebar_app_info:name(AppInfo), Apps) of
- case rebar_app_utils:is_app_dir(filename:absname(AppDir)++"-*") of
- {true, _} ->
- ok;
+ Exists = case rebar_app_utils:is_app_dir(filename:absname(AppDir)++"-*") of
+ {true, _} ->
+ true;
+ _ ->
+ case rebar_app_utils:is_app_dir(filename:absname(AppDir)) of
+ {true, _} ->
+ true;
+ _ ->
+ false
+ end
+ end,
+
+ case not Exists orelse Update of
+ true ->
+ ?INFO("Fetching ~s~n", [rebar_app_info:name(AppInfo)]),
+ Source = rebar_app_info:source(AppInfo),
+ rebar_fetch:download_source(AppDir, Source);
_ ->
- case rebar_app_utils:is_app_dir(filename:absname(AppDir)) of
- {true, _} ->
- ok;
- _ ->
- ?INFO("Fetching ~s~n", [rebar_app_info:name(AppInfo)]),
- Source = rebar_app_info:source(AppInfo),
- rebar_fetch:download_source(AppDir, Source)
- end
+ ok
end.
-spec parse_deps(binary(), [dep()]) -> {ordsets:ordset(rebar_app_info:t()), [binary_dep()]}.
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index f4b25f0..4a02664 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -36,7 +36,7 @@ do(State) ->
?ERROR("NOT IMPLEMENTED: Updating ~s~n", [Name]),
AllDeps = rebar_state:get(State, all_deps, []),
{ok, App} = rebar_app_utils:find(list_to_binary(Name), AllDeps),
- rebar_prv_install_deps:handle_deps(State, [list_to_binary(Name)]),
+ rebar_prv_install_deps:handle_deps(State, [list_to_atom(Name)], true),
{ok, State};
[] ->
?INFO("Updating package index...~n", []),
--
cgit v1.1
From f4ab647c95ea54b46623d6ada75104f2e71dea8a Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 14:19:27 -0500
Subject: fix for wrong function call to depsolver new for empty graph
---
src/rebar_packages.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl
index 103d3a3..9cfcebb 100644
--- a/src/rebar_packages.erl
+++ b/src/rebar_packages.erl
@@ -16,8 +16,8 @@ get_packages(State) ->
catch
_:_ ->
?ERROR("Bad packages index, try to fix with `rebar update`~n", []),
- {[], rlx_depsolver:new()}
+ {[], rlx_depsolver:new_graph()}
end;
false ->
- {[], rlx_depsolver:new()}
+ {[], rlx_depsolver:new_graph()}
end.
--
cgit v1.1
From c8772ff398e43a535d6c145ce3ed0d31952f907e Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 22:02:02 -0500
Subject: wip: updating handling of src deps to include level in lock
---
src/rebar_app_info.erl | 9 ++++++
src/rebar_prv_install_deps.erl | 63 ++++++++++++++++++++++++------------------
src/rebar_prv_lock.erl | 3 +-
src/rebar_state.erl | 14 ++++++++--
4 files changed, 59 insertions(+), 30 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index 008bfd2..44394b3 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -21,6 +21,8 @@
ebin_dir/1,
deps/1,
deps/2,
+ dep_level/1,
+ dep_level/2,
dir/1,
dir/2,
source/1,
@@ -37,6 +39,7 @@
original_vsn :: string(),
app_details=[] :: list(),
deps=[] :: list(),
+ dep_level :: integer(),
dir :: file:name(),
source :: string() | undefined,
valid :: boolean()}).
@@ -166,6 +169,12 @@ deps(#app_info_t{deps=Deps}) ->
deps(AppInfo=#app_info_t{}, Deps) ->
AppInfo#app_info_t{deps=Deps}.
+dep_level(AppInfo=#app_info_t{}, Level) ->
+ AppInfo#app_info_t{dep_level=Level}.
+
+dep_level(AppInfo=#app_info_t{dep_level=Level}) ->
+ Level.
+
-spec dir(t()) -> file:name().
dir(#app_info_t{dir=Dir}) ->
Dir.
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 3b78fd1..03dfce4 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -69,13 +69,13 @@ do(State) ->
ProjectApps = rebar_state:project_apps(State),
{ok, State1} = case rebar_state:get(State, locks, []) of
[] ->
- handle_deps(State, ordsets:from_list(rebar_state:get(State, deps, [])));
+ handle_deps(State, rebar_state:get(State, deps, []));
Locks ->
- handle_deps(State, ordsets:from_list(Locks))
+ handle_deps(State, Locks)
end,
- Source = ProjectApps ++ ordsets:to_list(rebar_state:src_deps(State1)),
- {ok, Sort} = rebar_topo:sort_apps(ordsets:to_list(Source)),
+ Source = ProjectApps ++ rebar_state:src_deps(State1),
+ {ok, Sort} = rebar_topo:sort_apps(Source),
{ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
-spec get_deps_dir(rebar_state:t()) -> file:filename_all().
@@ -106,7 +106,7 @@ handle_deps(State, Deps, Update) ->
SrcDeps),
%% Fetch transitive src deps
- State2 = update_src_deps(State1, Update),
+ State2 = update_src_deps(0, State1, Update),
Solved = case rebar_state:binary_deps(State2) of
[] -> %% No binary deps
[];
@@ -124,9 +124,10 @@ handle_deps(State, Deps, Update) ->
end, S)
end,
- AllDeps = ordsets:union([ordsets:to_list(rebar_state:src_deps(State2))
- ,ordsets:from_list(Solved)]),
-
+ AllDeps = lists:keymerge(2
+ ,rebar_state:src_apps(State2)
+ ,Solved),
+ io:format("All ~p~n", [AllDeps]),
%% Sort all apps to build order
State3 = rebar_state:set(State2, all_deps, AllDeps),
{ok, State3}.
@@ -154,21 +155,28 @@ package_to_app(DepsDir, Packages, Name, Vsn) ->
rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, <<Name/binary, "-", FmtVsn/binary>>)),
rebar_app_info:source(AppInfo2, Link).
--spec update_src_deps(rebar_state:t(), boolean()) -> rebat_state:t().
-update_src_deps(State, Update) ->
+-spec update_src_deps(integer(), rebar_state:t(), boolean()) -> rebat_state:t().
+update_src_deps(Level, State, Update) ->
SrcDeps = rebar_state:src_deps(State),
DepsDir = get_deps_dir(State),
- case lists:foldl(fun(AppInfo, {SrcDepsAcc, BinaryDepsAcc}) ->
- ok = maybe_fetch(AppInfo, Update),
- {AppInfo1, NewSrcDeps, NewBinaryDeps} = handle_dep(DepsDir, AppInfo),
- {ordsets:union(ordsets:add_element(AppInfo1, SrcDepsAcc), NewSrcDeps)
- ,NewBinaryDeps++BinaryDepsAcc}
- end, {ordsets:new(), rebar_state:binary_deps(State)}, SrcDeps) of
- {NewSrcDeps, NewBinaryDeps} when length(SrcDeps) =:= length(NewSrcDeps) ->
- rebar_state:src_deps(rebar_state:binary_deps(State, NewBinaryDeps), NewSrcDeps);
- {NewSrcDeps, NewBinaryDeps} ->
- State1 = rebar_state:src_deps(rebar_state:binary_deps(State, NewBinaryDeps), NewSrcDeps),
- update_src_deps(State1, Update)
+ case lists:foldl(fun(AppInfo, {SrcDepsAcc, BinaryDepsAcc, StateAcc}) ->
+ case maybe_fetch(AppInfo, Update) of
+ true ->
+ {AppInfo1, NewSrcDeps, NewBinaryDeps} =
+ handle_dep(DepsDir, AppInfo),
+ AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
+ {NewSrcDeps ++ SrcDepsAcc
+ ,NewBinaryDeps++BinaryDepsAcc
+ ,rebar_state:src_apps(StateAcc, AppInfo2)};
+ false ->
+ {SrcDepsAcc, BinaryDepsAcc, State}
+ end
+ end, {[], rebar_state:binary_deps(State), State}, SrcDeps) of
+ {NewSrcDeps, NewBinaryDeps, State1} when length(SrcDeps) =:= length(NewSrcDeps) ->
+ rebar_state:src_deps(rebar_state:binary_deps(State1, NewBinaryDeps), NewSrcDeps);
+ {NewSrcDeps, NewBinaryDeps, State1} ->
+ State2 = rebar_state:src_deps(rebar_state:binary_deps(State1, NewBinaryDeps), NewSrcDeps),
+ update_src_deps(Level+1, State2, Update)
end.
-spec handle_dep(binary(), rebar_state:t()) -> {[rebar_app_info:t()], [binary_dep()]}.
@@ -180,7 +188,7 @@ handle_dep(DepsDir, AppInfo) ->
{SrcDeps, BinaryDeps} = parse_deps(DepsDir, Deps),
{AppInfo1, SrcDeps, BinaryDeps}.
--spec maybe_fetch(rebar_app_info:t(), boolean()) -> ok.
+-spec maybe_fetch(rebar_app_info:t(), boolean()) -> boolean().
maybe_fetch(AppInfo, Update) ->
AppDir = ec_cnv:to_list(rebar_app_info:dir(AppInfo)),
%Apps = rebar_app_discover:find_apps([get_deps_dir(State)], all),
@@ -201,12 +209,13 @@ maybe_fetch(AppInfo, Update) ->
true ->
?INFO("Fetching ~s~n", [rebar_app_info:name(AppInfo)]),
Source = rebar_app_info:source(AppInfo),
- rebar_fetch:download_source(AppDir, Source);
+ rebar_fetch:download_source(AppDir, Source),
+ true;
_ ->
- ok
+ false
end.
--spec parse_deps(binary(), [dep()]) -> {ordsets:ordset(rebar_app_info:t()), [binary_dep()]}.
+-spec parse_deps(binary(), [dep()]) -> {[rebar_app_info:t()], [binary_dep()]}.
parse_deps(DepsDir, Deps) ->
lists:foldl(fun({Name, Vsn}, {SrcDepsAcc, BinaryDepsAcc}) ->
{SrcDepsAcc, [parse_goal(ec_cnv:to_binary(Name)
@@ -222,8 +231,8 @@ parse_deps(DepsDir, Deps) ->
rebar_app_info:new(Name, Vsn, Dir)
end,
Dep1 = rebar_app_info:source(Dep, Source),
- {ordsets:add_element(Dep1, SrcDepsAcc), BinaryDepsAcc}
- end, {ordsets:new(), []}, Deps).
+ {[Dep1 | SrcDepsAcc], BinaryDepsAcc}
+ end, {[], []}, Deps).
-spec parse_goal(binary(), binary()) -> binary_dep().
parse_goal(Name, Constraint) ->
diff --git a/src/rebar_prv_lock.erl b/src/rebar_prv_lock.erl
index b4a7d8d..441c46d 100644
--- a/src/rebar_prv_lock.erl
+++ b/src/rebar_prv_lock.erl
@@ -40,7 +40,8 @@ do(State) ->
Source when is_tuple(Source) ->
{rebar_app_info:name(Dep)
,rebar_app_info:original_vsn(Dep)
- ,rebar_fetch:lock_source(Dir, Source)};
+ ,rebar_fetch:lock_source(Dir, Source)
+ ,rebar_app_info:dep_level(Dep)};
_Source ->
{rebar_app_info:name(Dep)
,rebar_app_info:original_vsn(Dep)}
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 706c528..ac6684d 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -13,6 +13,7 @@
deps_names/1,
binary_deps/1, binary_deps/2,
src_deps/1, src_deps/2,
+ src_apps/1, src_apps/2,
prepend_hook/3, append_hook/3, hooks/2,
providers/1, providers/2, add_provider/2]).
@@ -35,9 +36,10 @@
envs = new_env() :: rebar_dict(),
command_args = [] :: list(),
- src_deps = ordsets:new() :: ordsets:ordset(rebar_app_info:t()),
+ src_deps = [] :: [rebar_app_info:t()],
+ src_apps = [] :: dict:dict(),
binary_deps = [],
- project_apps = ordsets:new() :: ordsets:ordset(rebar_app_info:t()),
+ project_apps = [] :: [rebar_app_info:t()],
providers = [],
hooks = [],
@@ -139,6 +141,14 @@ src_deps(State=#state_t{src_deps=SrcDeps}, NewSrcDeps) when is_list(SrcDeps) ->
src_deps(State=#state_t{src_deps=SrcDeps}, SrcDep) ->
State#state_t{src_deps=[SrcDep | SrcDeps]}.
+src_apps(#state_t{src_apps=SrcApps}) ->
+ SrcApps.
+
+src_apps(State=#state_t{src_apps=SrcApps}, NewSrcApps) when is_list(NewSrcApps) ->
+ State#state_t{src_apps=NewSrcApps};
+src_apps(State=#state_t{src_apps=SrcApps}, NewSrcApp) ->
+ State#state_t{src_apps=[NewSrcApp | SrcApps]}.
+
project_apps(#state_t{project_apps=Apps}) ->
Apps.
--
cgit v1.1
From e1b1152b219cf65c7f8cd3b77db5cf2156fcbab7 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 20 Sep 2014 22:36:54 -0500
Subject: slowly widdling away at dialyzer errors
---
src/rebar_app_discover.erl | 8 ++++---
src/rebar_app_info.erl | 9 ++++----
src/rebar_app_utils.erl | 51 +--------------------------------------------
src/rebar_config.erl | 4 ++--
src/rebar_core.erl | 2 --
src/rebar_prv_do.erl | 2 +-
src/rebar_prv_escripter.erl | 10 ++++-----
src/rebar_prv_help.erl | 2 +-
src/rebar_prv_new.erl | 32 ++++++----------------------
src/rebar_prv_release.erl | 2 +-
src/rebar_prv_tar.erl | 6 +++---
src/rebar_prv_update.erl | 4 ++--
src/rebar_state.erl | 7 ++++---
13 files changed, 35 insertions(+), 104 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 7aaba21..7713ee6 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -105,6 +105,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.
create_app_info(AppDir, AppFile) ->
case file:consult(AppFile) of
{ok, [{application, AppName, AppDetails}]} ->
@@ -122,7 +123,9 @@ create_app_info(AppDir, AppFile) ->
AppState1 = rebar_state:set(AppState, base_dir, AbsCwd),
AppInfo1 = rebar_app_info:config(
rebar_app_info:app_details(AppInfo, AppDetails), AppState1),
- rebar_app_info:dir(AppInfo1, AppDir)
+ rebar_app_info:dir(AppInfo1, AppDir);
+ _ ->
+ error
end.
-spec validate_application_info(rebar_app_info:t()) -> boolean().
@@ -149,8 +152,7 @@ get_modules_list(AppFile, AppDetail) ->
{ok, ModulesList}
end.
--spec has_all_beams(file:name(), list()) ->
- ok | {error, Reason::term()}.
+-spec has_all_beams(file:name(), list()) -> boolean().
has_all_beams(EbinDir, [Module | ModuleList]) ->
BeamFile = filename:join([EbinDir,
ec_cnv:to_list(Module) ++ ".beam"]),
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index 44394b3..403a5d1 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -87,13 +87,12 @@ new(AppName, Vsn, Dir, Deps) ->
deps=Deps}}.
%% @doc discover a complete version of the app info with all fields set.
--spec discover(file:name()) ->
- {ok, t()}.
+-spec discover(file:name()) -> {ok, t()} | not_found.
discover(Dir) ->
case rebar_app_discover:find_app(Dir, all) of
{true, AppInfo} ->
{ok, AppInfo};
- _ ->
+ false ->
not_found
end.
@@ -157,7 +156,7 @@ app_details(AppInfo=#app_info_t{}, AppDetails) ->
original_vsn(#app_info_t{original_vsn=Vsn}) ->
Vsn.
--spec original_vsn(t(), string()) -> string().
+-spec original_vsn(t(), string()) -> t().
original_vsn(AppInfo=#app_info_t{}, Vsn) ->
AppInfo#app_info_t{original_vsn=Vsn}.
@@ -172,7 +171,7 @@ deps(AppInfo=#app_info_t{}, Deps) ->
dep_level(AppInfo=#app_info_t{}, Level) ->
AppInfo#app_info_t{dep_level=Level}.
-dep_level(AppInfo=#app_info_t{dep_level=Level}) ->
+dep_level(#app_info_t{dep_level=Level}) ->
Level.
-spec dir(t()) -> file:name().
diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl
index d1487fb..8fc3df8 100644
--- a/src/rebar_app_utils.erl
+++ b/src/rebar_app_utils.erl
@@ -33,8 +33,7 @@
app_src_to_app/1,
app_name/2,
app_applications/2,
- app_vsn/2,
- is_skipped_app/2]).
+ app_vsn/2]).
-export([load_app_file/2]). % TEMPORARY
@@ -124,30 +123,6 @@ app_vsn(Config, AppFile) ->
[AppFile, Reason])
end.
-is_skipped_app(Config, AppFile) ->
- {Config1, ThisApp} = app_name(Config, AppFile),
- %% Check for apps global parameter; this is a comma-delimited list
- %% of apps on which we want to run commands
- Skipped =
- case get_apps(Config) of
- undefined ->
- %% No apps parameter specified, check the skip_apps list..
- case get_skip_apps(Config) of
- undefined ->
- %% No skip_apps list, run everything..
- false;
- SkipApps ->
- TargetApps = [list_to_atom(A) ||
- A <- string:tokens(SkipApps, ",")],
- is_skipped(ThisApp, TargetApps)
- end;
- Apps ->
- %% run only selected apps
- TargetApps = [list_to_atom(A) || A <- string:tokens(Apps, ",")],
- is_selected(ThisApp, TargetApps)
- end,
- {Config1, Skipped}.
-
%% ===================================================================
%% Internal functions
%% ===================================================================
@@ -191,27 +166,3 @@ get_value(Key, AppInfo, AppFile) ->
Value ->
Value
end.
-
-%% apps= for selecting apps
-is_selected(ThisApp, TargetApps) ->
- case lists:member(ThisApp, TargetApps) of
- false ->
- {true, ThisApp};
- true ->
- false
- end.
-
-%% skip_apps= for filtering apps
-is_skipped(ThisApp, TargetApps) ->
- case lists:member(ThisApp, TargetApps) of
- false ->
- false;
- true ->
- {true, ThisApp}
- end.
-
-get_apps(Config) ->
- rebar_config:get_global(Config, apps, undefined).
-
-get_skip_apps(Config) ->
- rebar_config:get_global(Config, skip_apps, undefined).
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index a45bef9..b3003d6 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -35,11 +35,11 @@
%% Public API
%% ===================================================================
--spec consult(file:name()) -> {ok, any()}.
+-spec consult(file:name()) -> [any()].
consult(Dir) ->
consult_file(filename:join(Dir, ?DEFAULT_CONFIG_FILE)).
--spec consult_file(file:name()) -> {ok, any()}.
+-spec consult_file(file:name()) -> [any()].
consult_file(File) when is_binary(File) ->
consult_file(binary_to_list(File));
consult_file(File) ->
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 24b376f..ba77dd8 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -55,8 +55,6 @@ update_code_path(State) ->
%% Internal functions
%% ===================================================================
-update_code_path_([]) ->
- no_change;
update_code_path_(Paths) ->
LibPaths = expand_lib_dirs(Paths, rebar_utils:get_cwd(), []),
ok = code:add_pathsa(LibPaths),
diff --git a/src/rebar_prv_do.erl b/src/rebar_prv_do.erl
index a2ac648..435db6f 100644
--- a/src/rebar_prv_do.erl
+++ b/src/rebar_prv_do.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(State) ->
Tasks = args_to_tasks(rebar_state:command_args(State)),
State1 = lists:foldl(fun(TaskArgs, StateAcc) ->
diff --git a/src/rebar_prv_escripter.erl b/src/rebar_prv_escripter.erl
index 418ac6c..9b5a812 100644
--- a/src/rebar_prv_escripter.erl
+++ b/src/rebar_prv_escripter.erl
@@ -61,7 +61,7 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
do(Config) ->
- AppName = rebar_state:get_local(Config, escript_top_level_app, undefined),
+ AppName = rebar_state:get(Config, escript_top_level_app, undefined),
App = rebar_state:get_app(Config, AppName),
{ok, Config1} = escriptize(Config, rebar_app_info:app_file(App)),
{ok, Config1}.
@@ -73,14 +73,14 @@ escriptize(Config0, AppFile) ->
AppNameStr = atom_to_list(AppName),
%% Get the output filename for the escript -- this may include dirs
- Filename = rebar_state:get_local(Config, escript_name, AppName),
+ Filename = rebar_state:get(Config, escript_name, AppName),
ok = filelib:ensure_dir(Filename),
%% Look for a list of other applications (dependencies) to include
%% in the output file. We then use the .app files for each of these
%% to pull in all the .beam files.
InclBeams = get_app_beams(
- rebar_state:get_local(Config, escript_incl_apps, []), []),
+ rebar_state:get(Config, escript_incl_apps, []), []),
%% Look for a list of extra files to include in the output file.
%% For internal rebar-private use only. Do not use outside rebar.
@@ -130,7 +130,7 @@ clean(Config0, AppFile) ->
{Config, AppName} = rebar_app_utils:app_name(Config0, AppFile),
%% Get the output filename for the escript -- this may include dirs
- Filename = rebar_state:get_local(Config, escript_name, AppName),
+ Filename = rebar_state:get(Config, escript_name, AppName),
rebar_file_utils:delete_each([Filename]),
{ok, Config}.
@@ -176,7 +176,7 @@ get_app_beams([App | Rest], Acc) ->
end.
get_extra(Config) ->
- Extra = rebar_state:get_local(Config, escript_incl_extra, []),
+ Extra = rebar_state:get(Config, escript_incl_extra, []),
lists:foldl(fun({Wildcard, Dir}, Files) ->
load_files(Wildcard, Dir) ++ Files
end, [], Extra).
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index a9949e7..e9d89ca 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(State) ->
help(State),
{ok, State}.
diff --git a/src/rebar_prv_new.erl b/src/rebar_prv_new.erl
index ed3c1b4..a3182fd 100644
--- a/src/rebar_prv_new.erl
+++ b/src/rebar_prv_new.erl
@@ -22,7 +22,7 @@ init(State) ->
deps = ?DEPS,
example = "rebar new <template>",
short_desc = "Create new project from templates.",
- desc = info(create),
+ desc = info(),
opts = []}),
{ok, State1}.
@@ -45,29 +45,9 @@ do(State) ->
%% Internal functions
%% ===================================================================
-info(create) ->
+info() ->
io_lib:format(
- "Create skel based on template and vars.~n"
- "~n"
- "Valid command line options:~n"
- " template= [var=foo,...]~n", []);
-info(create_app) ->
- io_lib:format(
- "Create simple app skel.~n"
- "~n"
- "Valid command line options:~n"
- " [appid=myapp]~n", []);
-info(create_lib) ->
- io_lib:format(
- "Create simple lib skel.~n"
- "~n"
- "Valid command line options:~n"
- " [libid=mylib]~n", []);
-info(create_node) ->
- io_lib:format(
- "Create simple node skel.~n"
- "~n"
- "Valid command line options:~n"
- " [nodeid=mynode]~n", []);
-info(list_templates) ->
- io_lib:format("List available templates.~n", []).
+ "Create rebar project based on template and vars.~n"
+ "~n"
+ "Valid command line options:~n"
+ " template= [var=foo,...]~n", []).
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index 4203c3a..66ad4b2 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(Config) ->
relx:main("release"),
{ok, Config}.
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl
index 7f5ab4f..6ef773c 100644
--- a/src/rebar_prv_tar.erl
+++ b/src/rebar_prv_tar.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
-do(Config) ->
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+do(State) ->
relx:main("release tar"),
- {ok, Config}.
+ {ok, State}.
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index 4a02664..b599266 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -29,13 +29,13 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | rebar:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(State) ->
case rebar_state:command_args(State) of
[Name] ->
?ERROR("NOT IMPLEMENTED: Updating ~s~n", [Name]),
AllDeps = rebar_state:get(State, all_deps, []),
- {ok, App} = rebar_app_utils:find(list_to_binary(Name), AllDeps),
+ {ok, _App} = rebar_app_utils:find(list_to_binary(Name), AllDeps),
rebar_prv_install_deps:handle_deps(State, [list_to_atom(Name)], true),
{ok, State};
[] ->
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index ac6684d..7ec4b97 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -37,7 +37,7 @@
command_args = [] :: list(),
src_deps = [] :: [rebar_app_info:t()],
- src_apps = [] :: dict:dict(),
+ src_apps = [] :: [rebar_app_info:t()],
binary_deps = [],
project_apps = [] :: [rebar_app_info:t()],
@@ -68,7 +68,7 @@ new(ParentState=#state_t{}, Config) ->
new(ParentState, Config, Dir) ->
_Opts = ParentState#state_t.opts,
LocalOpts = case rebar_config:consult_file(?LOCK_FILE) of
- {ok, [D]} ->
+ [D] ->
[{locks, D} | Config];
_ ->
Config
@@ -144,7 +144,7 @@ src_deps(State=#state_t{src_deps=SrcDeps}, SrcDep) ->
src_apps(#state_t{src_apps=SrcApps}) ->
SrcApps.
-src_apps(State=#state_t{src_apps=SrcApps}, NewSrcApps) when is_list(NewSrcApps) ->
+src_apps(State=#state_t{src_apps=_SrcApps}, NewSrcApps) when is_list(NewSrcApps) ->
State#state_t{src_apps=NewSrcApps};
src_apps(State=#state_t{src_apps=SrcApps}, NewSrcApp) ->
State#state_t{src_apps=[NewSrcApp | SrcApps]}.
@@ -163,6 +163,7 @@ providers(#state_t{providers=Providers}) ->
providers(State, NewProviders) ->
State#state_t{providers=NewProviders}.
+-spec add_provider(t(), rebar_provider:t()) -> t().
add_provider(State=#state_t{providers=Providers}, Provider) ->
State#state_t{providers=[Provider | Providers]}.
--
cgit v1.1
From 6356112cbbb32b09dd2f94ea856c3cbd32b1c085 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 21 Sep 2014 09:19:38 -0500
Subject: more dialyzer fun. no likey opaque types
---
src/rebar_app_info.erl | 4 +--
src/rebar_erlc_compiler.erl | 14 +++++------
src/rebar_packages.erl | 3 ++-
src/rebar_provider.erl | 36 ++++++++-------------------
src/rebar_prv_compile.erl | 2 +-
src/rebar_prv_escripter.erl | 2 +-
src/rebar_prv_install_deps.erl | 2 +-
src/rebar_prv_release.erl | 2 +-
src/rebar_prv_shell.erl | 16 ++++++------
src/rebar_prv_tar.erl | 2 +-
src/rebar_prv_version.erl | 2 +-
src/rebar_state.erl | 55 +++++++++---------------------------------
src/rebar_templater.erl | 2 +-
13 files changed, 47 insertions(+), 95 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index 403a5d1..5f44004 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -41,7 +41,7 @@
deps=[] :: list(),
dep_level :: integer(),
dir :: file:name(),
- source :: string() | undefined,
+ source :: string() | tuple() | undefined,
valid :: boolean()}).
%%============================================================================
@@ -190,7 +190,7 @@ ebin_dir(#app_info_t{dir=Dir}) ->
source(AppInfo=#app_info_t{}, Source) ->
AppInfo#app_info_t{source=Source}.
--spec source(t()) -> string().
+-spec source(t()) -> string() | tuple().
source(#app_info_t{source=Source}) ->
Source.
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index 6a16977..4076717 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -248,7 +248,7 @@ test_compile_config_and_opts(Config, ErlOpts, Cmd) ->
Config4 = rebar_state:set(Config3, erl_opts, Opts),
FirstFilesAtom = list_to_atom(Cmd ++ "_first_files"),
- FirstErls = rebar_state:get_list(Config4, FirstFilesAtom, []),
+ FirstErls = rebar_state:get(Config4, FirstFilesAtom, []),
Config5 = rebar_state:set(Config4, erl_first_files, FirstErls),
{Config5, Opts}.
@@ -274,7 +274,7 @@ define_if(Def, true) -> [{d, Def}];
define_if(_Def, false) -> [].
is_lib_avail(Config, DictKey, Mod, Hrl, Name) ->
- case rebar_state:get_xconf(Config, DictKey, undefined) of
+ case rebar_state:get(Config, DictKey, undefined) of
undefined ->
IsAvail = case code:lib_dir(Mod, include) of
{error, bad_name} ->
@@ -282,17 +282,17 @@ is_lib_avail(Config, DictKey, Mod, Hrl, Name) ->
Dir ->
filelib:is_regular(filename:join(Dir, Hrl))
end,
- NewConfig = rebar_state:set_xconf(Config, DictKey, IsAvail),
+ NewConfig = rebar_state:set(Config, DictKey, IsAvail),
?DEBUG("~s availability: ~p\n", [Name, IsAvail]),
{NewConfig, IsAvail};
IsAvail ->
{Config, IsAvail}
end.
--spec doterl_compile(rebar_state:t(), file:filename()) -> 'ok'.
-doterl_compile(Config, Dir) ->
- ErlOpts = rebar_utils:erl_opts(Config),
- doterl_compile(Config, Dir, [], ErlOpts).
+-spec doterl_compile(rebar_state:t(), file:filename()) -> ok.
+doterl_compile(State, Dir) ->
+ ErlOpts = rebar_utils:erl_opts(State),
+ doterl_compile(State, Dir, [], ErlOpts).
doterl_compile(Config, Dir, MoreSources, ErlOpts) ->
OutDir = filename:join(Dir, "ebin"),
diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl
index 9cfcebb..dd229d3 100644
--- a/src/rebar_packages.erl
+++ b/src/rebar_packages.erl
@@ -12,7 +12,8 @@ get_packages(State) ->
true ->
try
{ok, Binary} = file:read_file(PackagesFile),
- binary_to_term(Binary)
+ {List, Graph} = binary_to_term(Binary),
+ {List, Graph}
catch
_:_ ->
?ERROR("Bad packages index, try to fix with `rebar update`~n", []),
diff --git a/src/rebar_provider.erl b/src/rebar_provider.erl
index 69ee22b..8a3d610 100644
--- a/src/rebar_provider.erl
+++ b/src/rebar_provider.erl
@@ -22,24 +22,8 @@
-type provider_name() :: atom().
--ifdef(have_callback_support).
-
--callback init(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
--callback do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
-
--else.
-
-%% In the case where R14 or lower is being used to compile the system
-%% we need to export a behaviour info
--export([behaviour_info/1]).
--spec behaviour_info(atom()) -> [{atom(), arity()}] | undefined.
-behaviour_info(callbacks) ->
- [{init, 1},
- {do, 1}];
-behaviour_info(_) ->
- undefined.
-
--endif.
+-callback init(rebar_state:t()) -> {ok, rebar_state:t()}.
+-callback do(rebar_state:t()) -> {ok, rebar_state:t()}.
%%%===================================================================
%%% API
@@ -50,17 +34,17 @@ behaviour_info(_) ->
%%
%% @param ModuleName The module name.
%% @param State0 The current state of the system
--spec new(module(), rebar_state:t()) ->
- {ok, rebar_state:t()}.
-new(ModuleName, State0) when is_atom(ModuleName) ->
+-spec new(module(), rebar_state:t()) -> {ok, rebar_state:t()}.
+new(ModuleName, State) when is_atom(ModuleName) ->
case code:which(ModuleName) of
non_existing ->
- ?ERROR("Module ~p does not exist.", [ModuleName]);
+ ?ERROR("Module ~p does not exist.", [ModuleName]),
+ {ok, State};
_ ->
- ModuleName:init(State0)
+ ModuleName:init(State)
end.
--spec create([{atom(), any()}]) -> t().
+-spec create(list()) -> t().
create(Attrs) ->
#provider{name=proplists:get_value(name, Attrs, undefined)
,provider_impl=proplists:get_value(provider_impl, Attrs, undefined)
@@ -75,14 +59,14 @@ create(Attrs) ->
%%
%% @param Provider the provider object
%% @param State the current state of the system
--spec do(Provider::t(), rebar_state:t()) ->
- {ok, rebar_state:t()}.
+-spec do(Provider::t(), rebar_state:t()) -> {ok, rebar_state:t()}.
do(Provider, State) ->
{PreHooks, PostHooks} = rebar_state:hooks(State, Provider#provider.name),
{ok, State1} = run_hook_plugins(PreHooks, State),
{ok, State2} = (Provider#provider.provider_impl):do(State1),
run_hook_plugins(PostHooks, State2).
+-spec run_hook_plugins([t()], rebar_state:t()) -> {ok, rebar_state:t()}.
run_hook_plugins(Hooks, State) ->
State1 = lists:foldl(fun(Hook, StateAcc) ->
{ok, StateAcc1} = rebar_provider:do(Hook, StateAcc),
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index d89a4b0..11ee97a 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -27,7 +27,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(State) ->
ProjectApps = rebar_state:project_apps(State),
Deps = rebar_state:get(State, deps_to_build, []),
diff --git a/src/rebar_prv_escripter.erl b/src/rebar_prv_escripter.erl
index 9b5a812..bdaf1b8 100644
--- a/src/rebar_prv_escripter.erl
+++ b/src/rebar_prv_escripter.erl
@@ -59,7 +59,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(Config) ->
AppName = rebar_state:get(Config, escript_top_level_app, undefined),
App = rebar_state:get_app(Config, AppName),
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 03dfce4..06e02cc 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -179,7 +179,7 @@ update_src_deps(Level, State, Update) ->
update_src_deps(Level+1, State2, Update)
end.
--spec handle_dep(binary(), rebar_state:t()) -> {[rebar_app_info:t()], [binary_dep()]}.
+-spec handle_dep(binary(), rebar_state:t()) -> {rebar_app_info:t(), [rebar_app_info:t()], [binary_dep()]}.
handle_dep(DepsDir, AppInfo) ->
C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
S = rebar_state:new(rebar_state:new(), C, rebar_app_info:dir(AppInfo)),
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index 66ad4b2..d724490 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -31,5 +31,5 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(Config) ->
- relx:main("release"),
+ relx:main(["release"]),
{ok, Config}.
diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl
index 80f6bcf..bf37ddf 100644
--- a/src/rebar_prv_shell.erl
+++ b/src/rebar_prv_shell.erl
@@ -45,16 +45,16 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar shell",
- short_desc = "Run shell with project apps and deps in path.",
- desc = info(),
- opts = []}),
+ provider_impl = ?MODULE,
+ bare = false,
+ deps = ?DEPS,
+ example = "rebar shell",
+ short_desc = "Run shell with project apps and deps in path.",
+ desc = info(),
+ opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(Config) ->
shell(),
{ok, Config}.
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl
index 6ef773c..c40c8df 100644
--- a/src/rebar_prv_tar.erl
+++ b/src/rebar_prv_tar.erl
@@ -31,5 +31,5 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(State) ->
- relx:main("release tar"),
+ relx:main(["release tar"]),
{ok, State}.
diff --git a/src/rebar_prv_version.erl b/src/rebar_prv_version.erl
index 9197438..6969e62 100644
--- a/src/rebar_prv_version.erl
+++ b/src/rebar_prv_version.erl
@@ -30,7 +30,7 @@ init(State) ->
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()} | relx:error().
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
do(State) ->
rebar3:version(),
{ok, State}.
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 7ec4b97..58d535a 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -5,7 +5,6 @@
command_args/1, command_args/2,
dir/1, dir/2,
- set_skip_dir/2, is_skip_dir/2, reset_skip_dirs/1,
create_logic_providers/2,
project_apps/1, project_apps/2,
@@ -20,34 +19,23 @@
-include("rebar.hrl").
--ifdef(namespaced_types).
-%% dict:dict() exists starting from Erlang 17.
--type rebar_dict() :: dict:dict(term(), term()).
--else.
-%% dict() has been obsoleted in Erlang 17 and deprecated in 18.
--type rebar_dict() :: dict().
--endif.
+-record(state_t, {dir :: file:name(),
+ opts = [],
--record(state_t, {dir :: file:filename(),
- opts = [] :: list(),
- local_opts = [] :: list(),
- config = new_globals() :: rebar_dict(),
+ command_args = [],
- envs = new_env() :: rebar_dict(),
- command_args = [] :: list(),
-
- src_deps = [] :: [rebar_app_info:t()],
- src_apps = [] :: [rebar_app_info:t()],
+ src_deps = [],
+ src_apps = [],
binary_deps = [],
- project_apps = [] :: [rebar_app_info:t()],
+ project_apps = [],
providers = [],
- hooks = [],
- skip_dirs = new_skip_dirs() :: rebar_dict() }).
+ hooks = []}).
+
-export_type([t/0]).
--opaque t() :: #state_t{}.
+-type t() :: record(state_t).
-spec new() -> t().
new() ->
@@ -84,27 +72,11 @@ get(State, Key) ->
get(State, Key, Default) ->
proplists:get_value(Key, State#state_t.opts, Default).
+-spec set(t(), any(), any()) -> t().
set(State, Key, Value) ->
Opts = proplists:delete(Key, State#state_t.opts),
State#state_t { opts = [{Key, Value} | Opts] }.
-set_skip_dir(State, Dir) ->
- OldSkipDirs = State#state_t.skip_dirs,
- NewSkipDirs = case is_skip_dir(State, Dir) of
- false ->
- ?DEBUG("Adding skip dir: ~s\n", [Dir]),
- dict:store(Dir, true, OldSkipDirs);
- true ->
- OldSkipDirs
- end,
- State#state_t{skip_dirs = NewSkipDirs}.
-
-is_skip_dir(State, Dir) ->
- dict:is_key(Dir, State#state_t.skip_dirs).
-
-reset_skip_dirs(State) ->
- State#state_t{skip_dirs = new_skip_dirs()}.
-
command_args(#state_t{command_args=CmdArgs}) ->
CmdArgs.
@@ -181,15 +153,10 @@ append_hook(State=#state_t{hooks=Hooks}, Target, Hook) ->
{PreHooks, PostHooks} = proplists:get_value(Target, Hooks, {[], []}),
State#state_t{hooks=[{Target, {PreHooks, [Hook | PostHooks]}} | proplists:delete(Target, Hooks)]}.
+-spec hooks(t(), atom()) -> {[rebar_provider:t()], [rebar_provider:t()]}.
hooks(#state_t{hooks=Hooks}, Target) ->
proplists:get_value(Target, Hooks, {[], []}).
%% ===================================================================
%% Internal functions
%% ===================================================================
-
-new_globals() -> dict:new().
-
-new_env() -> dict:new().
-
-new_skip_dirs() -> dict:new().
diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl
index 048991b..99a67c3 100644
--- a/src/rebar_templater.erl
+++ b/src/rebar_templater.erl
@@ -378,7 +378,7 @@ execute_template(Files, [{'case', Variable, Values, Instructions} | Rest], Templ
ExistingFiles);
execute_template(Files, [{template, Input, Output} | Rest], TemplateType,
TemplateName, Context, Force, ExistingFiles) ->
- InputName = filename:join(filename:dirname(TemplateName), Input),
+ _InputName = filename:join(filename:dirname(TemplateName), Input),
%File = load_file(Files, TemplateType, InputName),
OutputTemplateName = make_template_name("rebar_output_template", Output),
{ok, OutputTemplateName1} = erlydtl:compile_template(Output, OutputTemplateName, ?ERLYDTL_COMPILE_OPTS),
--
cgit v1.1
From 1854276fb54b93654c0b2a300978f6e97973c857 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 21 Sep 2014 11:32:49 -0500
Subject: down to last 2 dialyzer errors
---
src/rebar.app.src | 3 +-
src/rebar3.erl | 4 +-
src/rebar_app_info.erl | 6 +-
src/rebar_erlc_compiler.erl | 2 +-
src/rebar_erlydtl_compiler.erl | 13 +--
src/rebar_packages.erl | 2 +-
src/rebar_provider.erl | 4 +-
src/rebar_prv_escripter.erl | 224 -----------------------------------------
src/rebar_prv_install_deps.erl | 18 ++--
src/rebar_templater.erl | 2 +-
src/rebar_topo.erl | 30 +++---
src/rebar_utils.erl | 16 +--
12 files changed, 41 insertions(+), 283 deletions(-)
delete mode 100644 src/rebar_prv_escripter.erl
(limited to 'src')
diff --git a/src/rebar.app.src b/src/rebar.app.src
index 2e21351..daeacc0 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -21,8 +21,7 @@
{log_level, warn},
%% any_dir processing modules
- {providers, [rebar_prv_escripter,
- rebar_prv_deps,
+ {providers, [rebar_prv_deps,
rebar_prv_do,
rebar_prv_lock,
rebar_prv_install_deps,
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 44d7d98..ba76f80 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -103,8 +103,8 @@ init_config({Options, _NonOptArgs}) ->
true ->
?DEBUG("Load global config file ~p~n",
[GlobalConfigFile]),
- rebar_config:consult_file(GlobalConfigFile),
- rebar_state:new(GlobalConfigFile, Config1);
+ GlobalConfig = rebar_state:new(rebar_config:consult_file(GlobalConfigFile)),
+ rebar_state:new(GlobalConfig, Config1);
false ->
rebar_state:new(Config1)
end,
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index 5f44004..be35f79 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -36,7 +36,7 @@
app_file_src :: file:name() | undefined,
app_file :: file:name(),
config :: rebar_config:config() | undefined,
- original_vsn :: string(),
+ original_vsn :: string() | undefined,
app_details=[] :: list(),
deps=[] :: list(),
dep_level :: integer(),
@@ -47,7 +47,7 @@
%%============================================================================
%% types
%%============================================================================
--opaque t() :: record(app_info_t).
+-type t() :: record(app_info_t).
%%============================================================================
%% API
@@ -186,7 +186,7 @@ dir(AppInfo=#app_info_t{}, Dir) ->
ebin_dir(#app_info_t{dir=Dir}) ->
filename:join(Dir, "ebin").
--spec source(t(), string()) -> t().
+-spec source(t(), string() | tuple()) -> t().
source(AppInfo=#app_info_t{}, Source) ->
AppInfo#app_info_t{source=Source}.
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index 4076717..4f70450 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -241,7 +241,7 @@ test_compile_config_and_opts(Config, ErlOpts, Cmd) ->
%% *_first_files is questionable as the file would need to exist
%% in all project directories for it to work.
OptsAtom = list_to_atom(Cmd ++ "_compile_opts"),
- TestOpts = rebar_state:get_list(Config3, OptsAtom, []),
+ TestOpts = rebar_state:get(Config3, OptsAtom, []),
Opts0 = [{d, 'TEST'}] ++
ErlOpts ++ TestOpts ++ TriqOpts ++ PropErOpts ++ EqcOpts,
Opts = [O || O <- Opts0, O =/= no_debug_info],
diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
index 88ee20f..7d90ada 100644
--- a/src/rebar_erlydtl_compiler.erl
+++ b/src/rebar_erlydtl_compiler.erl
@@ -230,24 +230,15 @@ do_compile(Config, Source, Target, DtlOpts) ->
Opts = lists:ukeymerge(1, DtlOpts, Sorted),
?INFO("Compiling \"~s\" -> \"~s\" with options:~n ~s~n",
[Source, Target, io_lib:format("~p", [Opts])]),
- case erlydtl:compile(Source,
- module_name(Target),
+ case erlydtl:compile(ec_cnv:to_binary(Source),
+ ec_cnv:to_atom(module_name(Target)),
Opts) of
- ok ->
- ok;
{ok, _Mod} ->
ok;
{ok, _Mod, Ws} ->
rebar_base_compiler:ok_tuple(Config, Source, Ws);
- {ok, _Mod, _Bin, Ws} ->
- rebar_base_compiler:ok_tuple(Config, Source, Ws);
error ->
rebar_base_compiler:error_tuple(Config, Source, [], [], Opts);
- {error, {_File, _Msgs} = Error} ->
- rebar_base_compiler:error_tuple(Config, Source, [Error], [], Opts);
- {error, Msg} ->
- Es = [{Source, [{erlydtl_parser, Msg}]}],
- rebar_base_compiler:error_tuple(Config, Source, Es, [], Opts);
{error, Es, Ws} ->
rebar_base_compiler:error_tuple(Config, Source, Es, Ws, Opts)
end.
diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl
index dd229d3..a87c388 100644
--- a/src/rebar_packages.erl
+++ b/src/rebar_packages.erl
@@ -4,7 +4,7 @@
-include("rebar.hrl").
--spec get_packages(rebar_state:t()) -> {list(), rlx_depsolver:t()}.
+-spec get_packages(rebar_state:t()) -> {dict:dict(), tuple()}.
get_packages(State) ->
RebarDir = rebar_state:get(State, global_rebar_dir, filename:join(os:getenv("HOME"), ".rebar")),
PackagesFile = filename:join(RebarDir, "packages"),
diff --git a/src/rebar_provider.erl b/src/rebar_provider.erl
index 8a3d610..872c2e1 100644
--- a/src/rebar_provider.erl
+++ b/src/rebar_provider.erl
@@ -18,7 +18,7 @@
%%% Types
%%%===================================================================
--opaque t() :: record(provider).
+-type t() :: record(provider).
-type provider_name() :: atom().
@@ -156,6 +156,6 @@ reorder_providers(OProviderList) ->
case rebar_topo:sort(OProviderList) of
{ok, ProviderList} ->
ProviderList;
- {cycle, _} ->
+ {error, {cycle, _}} ->
?ERROR("There was a cycle in the provider list. Unable to complete build!", [])
end.
diff --git a/src/rebar_prv_escripter.erl b/src/rebar_prv_escripter.erl
deleted file mode 100644
index bdaf1b8..0000000
--- a/src/rebar_prv_escripter.erl
+++ /dev/null
@@ -1,224 +0,0 @@
-%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
-%% ex: ts=4 sw=4 et
-%% -------------------------------------------------------------------
-%%
-%% rebar: Erlang Build Tools
-%%
-%% Copyright (c) 2009 Dave Smith (dizzyd@dizzyd.com)
-%%
-%% Permission is hereby granted, free of charge, to any person obtaining a copy
-%% of this software and associated documentation files (the "Software"), to deal
-%% in the Software without restriction, including without limitation the rights
-%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-%% copies of the Software, and to permit persons to whom the Software is
-%% furnished to do so, subject to the following conditions:
-%%
-%% The above copyright notice and this permission notice shall be included in
-%% all copies or substantial portions of the Software.
-%%
-%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-%% THE SOFTWARE.
-%% -------------------------------------------------------------------
--module(rebar_prv_escripter).
-
--behaviour(rebar_provider).
-
--export([init/1,
- do/1]).
-
--export([escriptize/2,
- clean/2]).
-
-%% for internal use only
--export([info/2]).
-
--include("rebar.hrl").
--include_lib("kernel/include/file.hrl").
-
--define(PROVIDER, escriptize).
--define(DEPS, [app_builder]).
-
-%% ===================================================================
-%% Public API
-%% ===================================================================
-
--spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
-init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar escriptize",
- short_desc = "Build escript from project.",
- desc = "",
- opts = []}),
- {ok, State1}.
-
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
-do(Config) ->
- AppName = rebar_state:get(Config, escript_top_level_app, undefined),
- App = rebar_state:get_app(Config, AppName),
- {ok, Config1} = escriptize(Config, rebar_app_info:app_file(App)),
- {ok, Config1}.
-
-escriptize(Config0, AppFile) ->
- %% Extract the application name from the archive -- this is the default
- %% name of the generated script
- {Config, AppName} = rebar_app_utils:app_name(Config0, AppFile),
- AppNameStr = atom_to_list(AppName),
-
- %% Get the output filename for the escript -- this may include dirs
- Filename = rebar_state:get(Config, escript_name, AppName),
- ok = filelib:ensure_dir(Filename),
-
- %% Look for a list of other applications (dependencies) to include
- %% in the output file. We then use the .app files for each of these
- %% to pull in all the .beam files.
- InclBeams = get_app_beams(
- rebar_state:get(Config, escript_incl_apps, []), []),
-
- %% Look for a list of extra files to include in the output file.
- %% For internal rebar-private use only. Do not use outside rebar.
- InclExtra = get_extra(Config),
-
- %% Construct the archive of everything in ebin/ dir -- put it on the
- %% top-level of the zip file so that code loading works properly.
- EbinPrefix = filename:join(AppNameStr, "ebin"),
- EbinFiles = usort(load_files(EbinPrefix, "*", "ebin")),
- ExtraFiles = usort(InclBeams ++ InclExtra),
- Files = EbinFiles ++ ExtraFiles,
-
- case zip:create("mem", Files, [memory]) of
- {ok, {"mem", ZipBin}} ->
- %% Archive was successfully created. Prefix that binary with our
- %% header and write to our escript file
- Shebang = rebar_state:get(Config, escript_shebang,
- "#!/usr/bin/env escript\n"),
- Comment = rebar_state:get(Config, escript_comment, "%%\n"),
- DefaultEmuArgs = ?FMT("%%! -pa ~s/~s/ebin\n",
- [AppNameStr, AppNameStr]),
- EmuArgs = rebar_state:get(Config, escript_emu_args,
- DefaultEmuArgs),
- Script = iolist_to_binary([Shebang, Comment, EmuArgs, ZipBin]),
- case file:write_file(Filename, Script) of
- ok ->
- ok;
- {error, WriteError} ->
- ?ERROR("Failed to write ~p script: ~p\n",
- [AppName, WriteError]),
- ?FAIL
- end;
- {error, ZipError} ->
- ?ERROR("Failed to construct ~p escript: ~p\n",
- [AppName, ZipError]),
- ?FAIL
- end,
-
- %% Finally, update executable perms for our script
- {ok, #file_info{mode = Mode}} = file:read_file_info(Filename),
- ok = file:change_mode(Filename, Mode bor 8#00111),
- {ok, Config}.
-
-clean(Config0, AppFile) ->
- %% Extract the application name from the archive -- this is the default
- %% name of the generated script
- {Config, AppName} = rebar_app_utils:app_name(Config0, AppFile),
-
- %% Get the output filename for the escript -- this may include dirs
- Filename = rebar_state:get(Config, escript_name, AppName),
- rebar_file_utils:delete_each([Filename]),
- {ok, Config}.
-
-%% ===================================================================
-%% Internal functions
-%% ===================================================================
-
-info(help, escriptize) ->
- info_help("Generate escript archive");
-info(help, clean) ->
- info_help("Delete generated escript archive").
-
-info_help(Description) ->
- ?CONSOLE(
- "~s.~n"
- "~n"
- "Valid rebar.config options:~n"
- " ~p~n"
- " ~p~n"
- " ~p~n"
- " ~p~n"
- " ~p~n",
- [
- Description,
- {escript_name, "application"},
- {escript_incl_apps, []},
- {escript_shebang, "#!/usr/bin/env escript\n"},
- {escript_comment, "%%\n"},
- {escript_emu_args, "%%! -pa application/application/ebin\n"}
- ]).
-
-get_app_beams([], Acc) ->
- Acc;
-get_app_beams([App | Rest], Acc) ->
- case code:lib_dir(App, ebin) of
- {error, bad_name} ->
- ?ABORT("Failed to get ebin/ directory for "
- "~p escript_incl_apps.", [App]);
- Path ->
- Prefix = filename:join(atom_to_list(App), "ebin"),
- Acc2 = load_files(Prefix, "*", Path),
- get_app_beams(Rest, Acc2 ++ Acc)
- end.
-
-get_extra(Config) ->
- Extra = rebar_state:get(Config, escript_incl_extra, []),
- lists:foldl(fun({Wildcard, Dir}, Files) ->
- load_files(Wildcard, Dir) ++ Files
- end, [], Extra).
-
-load_files(Wildcard, Dir) ->
- load_files("", Wildcard, Dir).
-
-load_files(Prefix, Wildcard, Dir) ->
- [read_file(Prefix, Filename, Dir)
- || Filename <- filelib:wildcard(Wildcard, Dir)].
-
-read_file(Prefix, Filename, Dir) ->
- Filename1 = case Prefix of
- "" ->
- Filename;
- _ ->
- filename:join([Prefix, Filename])
- end,
- [dir_entries(filename:dirname(Filename1)),
- {Filename1, file_contents(filename:join(Dir, Filename))}].
-
-file_contents(Filename) ->
- {ok, Bin} = file:read_file(Filename),
- Bin.
-
-%% Given a filename, return zip archive dir entries for each sub-dir.
-%% Required to work around issues fixed in OTP-10071.
-dir_entries(File) ->
- Dirs = dirs(File),
- [{Dir ++ "/", <<>>} || Dir <- Dirs].
-
-%% Given "foo/bar/baz", return ["foo", "foo/bar", "foo/bar/baz"].
-dirs(Dir) ->
- dirs1(filename:split(Dir), "", []).
-
-dirs1([], _, Acc) ->
- lists:reverse(Acc);
-dirs1([H|T], "", []) ->
- dirs1(T, H, [H]);
-dirs1([H|T], Last, Acc) ->
- Dir = filename:join(Last, H),
- dirs1(T, Dir, [Dir|Acc]).
-
-usort(List) ->
- lists:ukeysort(1, lists:flatten(List)).
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 06e02cc..daae204 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -84,7 +84,7 @@ get_deps_dir(State) ->
DepsDir = rebar_state:get(State, deps_dir, ?DEFAULT_DEPS_DIR),
get_deps_dir(BaseDir, DepsDir).
--spec get_deps_dir(file:filename_all(), rebar_state:t()) -> file:filename_all().
+-spec get_deps_dir(file:filename_all(), file:filename_all()) -> file:filename_all().
get_deps_dir(DepsDir, App) ->
filename:join(DepsDir, App).
@@ -119,7 +119,7 @@ handle_deps(State, Deps, Update) ->
,Packages
,Name
,Vsn),
- ok = maybe_fetch(AppInfo, Update),
+ maybe_fetch(AppInfo, Update),
AppInfo
end, S)
end,
@@ -141,9 +141,14 @@ handle_deps(State, Deps, Update) ->
is_valid(App) ->
rebar_app_info:valid(App).
--spec package_to_app(file:name(), rlx_depsolver:t(), binary(), binary()) -> rebar_app_info:t().
+-spec package_to_app(file:filename_all(), dict:dict(), rlx_depsolver:name(), rlx_depsolver:vsn()) -> rebar_app_info:t().
package_to_app(DepsDir, Packages, Name, Vsn) ->
- FmtVsn = ec_cnv:to_binary(rlx_depsolver:format_version(Vsn)),
+ FmtVsn = case Vsn of
+ 'NO_VSN' ->
+ <<"NO_VSN">>;
+ _ ->
+ iolist_to_binary(rlx_depsolver:format_version(Vsn))
+ end,
{ok, P} = dict:find({Name, FmtVsn}, Packages),
PkgDeps = proplists:get_value(<<"deps">>, P),
@@ -155,7 +160,7 @@ package_to_app(DepsDir, Packages, Name, Vsn) ->
rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, <<Name/binary, "-", FmtVsn/binary>>)),
rebar_app_info:source(AppInfo2, Link).
--spec update_src_deps(integer(), rebar_state:t(), boolean()) -> rebat_state:t().
+-spec update_src_deps(integer(), rebar_state:t(), boolean()) -> rebar_state:t().
update_src_deps(Level, State, Update) ->
SrcDeps = rebar_state:src_deps(State),
DepsDir = get_deps_dir(State),
@@ -179,7 +184,8 @@ update_src_deps(Level, State, Update) ->
update_src_deps(Level+1, State2, Update)
end.
--spec handle_dep(binary(), rebar_state:t()) -> {rebar_app_info:t(), [rebar_app_info:t()], [binary_dep()]}.
+-spec handle_dep(file:filename_all(), rebar_app_info:t()) ->
+ {rebar_app_info:t(), [rebar_app_info:t()], [binary_dep()]}.
handle_dep(DepsDir, AppInfo) ->
C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
S = rebar_state:new(rebar_state:new(), C, rebar_app_info:dir(AppInfo)),
diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl
index 99a67c3..b30c517 100644
--- a/src/rebar_templater.erl
+++ b/src/rebar_templater.erl
@@ -80,7 +80,7 @@ create(State) ->
resolve_variables([], Dict) ->
Dict;
resolve_variables([{Key, Value0} | Rest], Dict) when is_list(Value0) ->
- Value = render(list_to_binary(Value0), Dict),
+ Value = render(Value0, Dict),
resolve_variables(Rest, dict:store(Key, Value, Dict));
resolve_variables([{Key, {list, Dicts}} | Rest], Dict) when is_list(Dicts) ->
%% just un-tag it so erlydtl can use it
diff --git a/src/rebar_topo.erl b/src/rebar_topo.erl
index 87ee234..5f528af 100644
--- a/src/rebar_topo.erl
+++ b/src/rebar_topo.erl
@@ -54,20 +54,18 @@
%% applications. This implies that you have already done the
%% constraint solve before you pass the list of apps here to be
%% sorted.
--spec sort_apps([rebar_app_info:t()]) ->
- {ok, [rebar_app_info:t()]} |
- relx:error().
+-spec sort_apps([rebar_app_info:t()]) -> {ok, [rebar_app_info:t()]} | {error, any()}.
sort_apps(Apps) ->
Pairs = apps_to_pairs(Apps),
case sort(Pairs) of
{ok, Names} ->
{ok, names_to_apps(Names, Apps)};
E ->
- E
+ {error, E}
end.
%% @doc Do a topological sort on the list of pairs.
--spec sort([pair()]) -> {ok, [atom()]} | relx:error().
+-spec sort([pair()]) -> {ok, [atom()]} | {error, any()}.
sort(Pairs) ->
iterate(Pairs, [], all(Pairs)).
@@ -91,7 +89,7 @@ format_error({cycle, Pairs}) ->
%%====================================================================
-spec names_to_apps([atom()], [rebar_app_info:t()]) -> [rebar_app_info:t()].
names_to_apps(Names, Apps) ->
- [element(2, App) || App <- [find_app_by_name(Name, Apps) || Name <- Names], App =/= error].
+ [element(2, App) || App <- [find_app_by_name(Name, Apps) || Name <- Names], App =/= error].
-spec find_app_by_name(atom(), [rebar_app_info:t()]) -> {ok, rebar_app_info:t()} | error.
find_app_by_name(Name, Apps) ->
@@ -192,8 +190,8 @@ topo_pairs_cycle_test() ->
sort(Pairs)).
topo_apps_cycle_test() ->
- {ok, App1} = rebar_app_info:new(app1, "0.1", "/no-dir", [app2], [stdlib]),
- {ok, App2} = rebar_app_info:new(app2, "0.1", "/no-dir", [app1], []),
+ {ok, App1} = rebar_app_info:new(app1, "0.1", "/no-dir", [app2]),
+ {ok, App2} = rebar_app_info:new(app2, "0.1", "/no-dir", [app1]),
Apps = [App1, App2],
?assertMatch({error, {_, {cycle, [{app2,app1},{app1,app2}]}}},
sort_apps(Apps)).
@@ -201,16 +199,16 @@ topo_apps_cycle_test() ->
topo_apps_good_test() ->
Apps = [App ||
{ok, App} <-
- [rebar_app_info:new(app1, "0.1", "/no-dir", [app2, zapp1], [stdlib, kernel]),
- rebar_app_info:new(app2, "0.1", "/no-dir", [app3], []),
- rebar_app_info:new(app3, "0.1", "/no-dir", [kernel], []),
- rebar_app_info:new(zapp1, "0.1", "/no-dir", [app2,app3,zapp2], []),
- rebar_app_info:new(stdlib, "0.1", "/no-dir", [], []),
- rebar_app_info:new(kernel, "0.1", "/no-dir", [], []),
- rebar_app_info:new(zapp2, "0.1", "/no-dir", [], [])]],
+ [rebar_app_info:new(app1, "0.1", "/no-dir", [app2, zapp1]),
+ rebar_app_info:new(app2, "0.1", "/no-dir", [app3]),
+ rebar_app_info:new(app3, "0.1", "/no-dir", [kernel]),
+ rebar_app_info:new(zapp1, "0.1", "/no-dir", [app2,app3,zapp2]),
+ rebar_app_info:new(stdlib, "0.1", "/no-dir", []),
+ rebar_app_info:new(kernel, "0.1", "/no-dir", []),
+ rebar_app_info:new(zapp2, "0.1", "/no-dir", [])]],
{ok, Sorted} = sort_apps(Apps),
?assertMatch([stdlib, kernel, zapp2,
app3, app2, zapp1, app1],
- [rebar_app_info:name(App) || App <- Sorted]).
+ [ec_cnv:to_atom(rebar_app_info:name(App)) || App <- Sorted]).
-endif.
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index b83c03e..742cad2 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -34,6 +34,7 @@
wordsize/0,
sh/2,
sh_send/3,
+ escript_foldl/3,
find_files/2,
find_files/3,
now_str/0,
@@ -43,7 +44,6 @@
erl_to_mod/1,
abort/0,
abort/2,
- escript_foldl/3,
find_executable/1,
prop_check/3,
expand_code_path/0,
@@ -203,18 +203,6 @@ abort(String, Args) ->
?ERROR(String, Args),
abort().
-%% TODO: Rename emulate_escript_foldl to escript_foldl and remove
-%% this function when the time is right. escript:foldl/3 was an
-%% undocumented exported fun and has been removed in R14.
-escript_foldl(Fun, Acc, File) ->
- {module, zip} = code:ensure_loaded(zip),
- case erlang:function_exported(zip, foldl, 3) of
- true ->
- emulate_escript_foldl(Fun, Acc, File);
- false ->
- escript:foldl(Fun, Acc, File)
- end.
-
find_executable(Name) ->
case os:find_executable(Name) of
false -> false;
@@ -528,7 +516,7 @@ beams(Dir) ->
filelib:fold_files(Dir, ".*\.beam\$", true,
fun(F, Acc) -> [F | Acc] end, []).
-emulate_escript_foldl(Fun, Acc, File) ->
+escript_foldl(Fun, Acc, File) ->
case escript:extract(File, [compile_source]) of
{ok, [_Shebang, _Comment, _EmuArgs, Body]} ->
case Body of
--
cgit v1.1
From ffe8924f3b0f6fd68fec197e11a4229c0542b0b5 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 21 Sep 2014 12:01:30 -0500
Subject: fixed up a few unknown types
---
src/rebar_app_discover.erl | 6 +++---
src/rebar_app_info.erl | 22 +++++++++++-----------
src/rebar_prv_install_deps.erl | 21 ++++++++-------------
src/rebar_utils.erl | 4 ++--
4 files changed, 24 insertions(+), 29 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 7713ee6..a4cfe4c 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -55,7 +55,7 @@ find_apps(LibDirs, Validate) ->
find_app(AppDir, Validate)
end, all_app_dirs(LibDirs)).
--spec find_app(list(), boolean()) -> rebar_app_info:t() | false.
+-spec find_app(file:filename_all(), valid | invalid | all) -> {true, rebar_app_info:t()} | false.
find_app(AppDir, Validate) ->
AppFile = filelib:wildcard(filename:join([AppDir, "ebin", "*.app"])),
AppSrcFile = filelib:wildcard(filename:join([AppDir, "src", "*.app.src"])),
@@ -140,7 +140,7 @@ validate_application_info(AppInfo) ->
false
end.
--spec get_modules_list(file:name(), proplists:proplist()) ->
+-spec get_modules_list(file:filename_all(), proplists:proplist()) ->
{ok, list()} |
{warning, Reason::term()} |
{error, Reason::term()}.
@@ -152,7 +152,7 @@ get_modules_list(AppFile, AppDetail) ->
{ok, ModulesList}
end.
--spec has_all_beams(file:name(), list()) -> boolean().
+-spec has_all_beams(file:filename_all(), list()) -> boolean().
has_all_beams(EbinDir, [Module | ModuleList]) ->
BeamFile = filename:join([EbinDir,
ec_cnv:to_list(Module) ++ ".beam"]),
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index be35f79..ac668e2 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -33,9 +33,9 @@
-export_type([t/0]).
-record(app_info_t, {name :: binary(),
- app_file_src :: file:name() | undefined,
- app_file :: file:name(),
- config :: rebar_config:config() | undefined,
+ app_file_src :: file:filename_all() | undefined,
+ app_file :: file:filename_all() | undefined,
+ config :: rebar_state:t() | undefined,
original_vsn :: string() | undefined,
app_details=[] :: list(),
deps=[] :: list(),
@@ -87,7 +87,7 @@ new(AppName, Vsn, Dir, Deps) ->
deps=Deps}}.
%% @doc discover a complete version of the app info with all fields set.
--spec discover(file:name()) -> {ok, t()} | not_found.
+-spec discover(file:filename_all()) -> {ok, t()} | not_found.
discover(Dir) ->
case rebar_app_discover:find_app(Dir, all) of
{true, AppInfo} ->
@@ -104,15 +104,15 @@ name(#app_info_t{name=Name}) ->
name(AppInfo=#app_info_t{}, AppName) ->
AppInfo#app_info_t{name=ec_cnv:to_binary(AppName)}.
--spec config(t()) -> rebar_config:confg().
+-spec config(t()) -> rebar_state:t().
config(#app_info_t{config=Config}) ->
Config.
--spec config(t(), rebar_config:confg()) -> t().
+-spec config(t(), rebar_state:t()) -> t().
config(AppInfo=#app_info_t{}, Config) ->
AppInfo#app_info_t{config=Config}.
--spec app_file_src(t()) -> file:name().
+-spec app_file_src(t()) -> file:filename_all() | undefined.
app_file_src(#app_info_t{app_file_src=undefined, dir=Dir, name=Name}) ->
AppFileSrc = filename:join([ec_cnv:to_list(Dir), "src", ec_cnv:to_list(Name)++".app.src"]),
case filelib:is_file(AppFileSrc) of
@@ -124,11 +124,11 @@ app_file_src(#app_info_t{app_file_src=undefined, dir=Dir, name=Name}) ->
app_file_src(#app_info_t{app_file_src=AppFileSrc}) ->
ec_cnv:to_list(AppFileSrc).
--spec app_file_src(t(), file:name()) -> t().
+-spec app_file_src(t(), file:filename_all()) -> t().
app_file_src(AppInfo=#app_info_t{}, AppFileSrc) ->
AppInfo#app_info_t{app_file_src=ec_cnv:to_list(AppFileSrc)}.
--spec app_file(t()) -> file:name().
+-spec app_file(t()) -> file:filename_all() | undefined.
app_file(#app_info_t{app_file=undefined, dir=Dir, name=Name}) ->
AppFile = filename:join([ec_cnv:to_list(Dir), "ebin", ec_cnv:to_list(Name)++".app"]),
case filelib:is_file(AppFile) of
@@ -140,9 +140,9 @@ app_file(#app_info_t{app_file=undefined, dir=Dir, name=Name}) ->
app_file(#app_info_t{app_file=AppFile}) ->
AppFile.
--spec app_file(t(), file:name()) -> t().
+-spec app_file(t(), file:filename_all()) -> t().
app_file(AppInfo=#app_info_t{}, AppFile) ->
- AppInfo#app_info_t{app_file=ec_cnv:to_list(AppFile)}.
+ AppInfo#app_info_t{app_file=AppFile}.
-spec app_details(t()) -> list().
app_details(#app_info_t{app_details=AppDetails}) ->
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index daae204..9180cc4 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -114,11 +114,10 @@ handle_deps(State, Deps, Update) ->
%% Find binary deps needed
{ok, S} = rlx_depsolver:solve(Graph, BinaryDeps1),
%% Create app_info record for each binary dep
- lists:map(fun({Name, Vsn}) ->
+ lists:map(fun(Pkg) ->
AppInfo = package_to_app(DepsDir
,Packages
- ,Name
- ,Vsn),
+ ,Pkg),
maybe_fetch(AppInfo, Update),
AppInfo
end, S)
@@ -127,7 +126,7 @@ handle_deps(State, Deps, Update) ->
AllDeps = lists:keymerge(2
,rebar_state:src_apps(State2)
,Solved),
- io:format("All ~p~n", [AllDeps]),
+
%% Sort all apps to build order
State3 = rebar_state:set(State2, all_deps, AllDeps),
{ok, State3}.
@@ -141,15 +140,11 @@ handle_deps(State, Deps, Update) ->
is_valid(App) ->
rebar_app_info:valid(App).
--spec package_to_app(file:filename_all(), dict:dict(), rlx_depsolver:name(), rlx_depsolver:vsn()) -> rebar_app_info:t().
-package_to_app(DepsDir, Packages, Name, Vsn) ->
- FmtVsn = case Vsn of
- 'NO_VSN' ->
- <<"NO_VSN">>;
- _ ->
- iolist_to_binary(rlx_depsolver:format_version(Vsn))
- end,
-
+-spec package_to_app(file:filename_all(), dict:dict(),
+ rlx_depsolver:pkg()) -> rebar_app_info:t().
+package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
+ Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)),
+ FmtVsn = iolist_to_binary(rlx_depsolver:format_version(Vsn)),
{ok, P} = dict:find({Name, FmtVsn}, Packages),
PkgDeps = proplists:get_value(<<"deps">>, P),
Link = proplists:get_value(<<"link">>, P),
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 742cad2..5397aa8 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -325,7 +325,7 @@ delayed_halt(Code) ->
end.
%% @doc Return list of erl_opts
--spec erl_opts(rebar_state:config()) -> list().
+-spec erl_opts(rebar_state:t()) -> list().
erl_opts(Config) ->
RawErlOpts = filter_defines(rebar_state:get(Config, erl_opts, []), []),
Defines = [{d, list_to_atom(D)} ||
@@ -359,7 +359,7 @@ processing_base_dir(State, Dir) ->
%% points to the rebar executable used to execute the currently running
%% command. The environment is not modified if rebar was invoked
%% programmatically.
--spec patch_env(rebar_state:config(), [{string(), string()}])
+-spec patch_env(rebar_state:t(), [{string(), string()}])
-> [{string(), string()}].
patch_env(Config, []) ->
%% If we reached an empty list, the env did not contain the REBAR variable.
--
cgit v1.1
From 6efdd8cbfea393e8b9c2a8b9029b53f25aa0cef4 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Thu, 25 Sep 2014 13:38:33 -0500
Subject: fix namespaced types for pre-17 otp
---
src/rebar_packages.erl | 2 +-
src/rebar_prv_install_deps.erl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl
index a87c388..b3a7542 100644
--- a/src/rebar_packages.erl
+++ b/src/rebar_packages.erl
@@ -4,7 +4,7 @@
-include("rebar.hrl").
--spec get_packages(rebar_state:t()) -> {dict:dict(), tuple()}.
+-spec get_packages(rebar_state:t()) -> {rebar_dict(), tuple()}.
get_packages(State) ->
RebarDir = rebar_state:get(State, global_rebar_dir, filename:join(os:getenv("HOME"), ".rebar")),
PackagesFile = filename:join(RebarDir, "packages"),
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 9180cc4..1c3049c 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -140,7 +140,7 @@ handle_deps(State, Deps, Update) ->
is_valid(App) ->
rebar_app_info:valid(App).
--spec package_to_app(file:filename_all(), dict:dict(),
+-spec package_to_app(file:filename_all(), rebar_dict(),
rlx_depsolver:pkg()) -> rebar_app_info:t().
package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)),
--
cgit v1.1
From e392bfaec3942e63a88bb86a676fe4755ba84ce3 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 26 Sep 2014 08:22:24 -0500
Subject: update src dep works except for removed transitive deps
---
src/rebar_prv_install_deps.erl | 51 +++++++++++++++++++++++++++++++++---------
src/rebar_prv_update.erl | 12 +++++-----
2 files changed, 47 insertions(+), 16 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 1c3049c..2498215 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -92,7 +92,7 @@ get_deps_dir(DepsDir, App) ->
handle_deps(State, Deps) ->
handle_deps(State, Deps, false).
--spec handle_deps(rebar_state:t(), [dep()], boolean()) -> {ok, rebar_state:t()}.
+-spec handle_deps(rebar_state:t(), [dep()], false | {true, integer()}) -> {ok, rebar_state:t()}.
handle_deps(State, [], _) ->
{ok, State};
handle_deps(State, Deps, Update) ->
@@ -160,16 +160,35 @@ update_src_deps(Level, State, Update) ->
SrcDeps = rebar_state:src_deps(State),
DepsDir = get_deps_dir(State),
case lists:foldl(fun(AppInfo, {SrcDepsAcc, BinaryDepsAcc, StateAcc}) ->
- case maybe_fetch(AppInfo, Update) of
- true ->
- {AppInfo1, NewSrcDeps, NewBinaryDeps} =
- handle_dep(DepsDir, AppInfo),
- AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
- {NewSrcDeps ++ SrcDepsAcc
- ,NewBinaryDeps++BinaryDepsAcc
- ,rebar_state:src_apps(StateAcc, AppInfo2)};
- false ->
- {SrcDepsAcc, BinaryDepsAcc, State}
+ Name = rebar_app_info:name(AppInfo),
+ Locks = rebar_state:get(State, locks, []),
+ {_, _, _, DepLevel} = lists:keyfind(Name, 1, Locks),
+ case Update of
+ {true, UpdateName, UpdateLevel} when UpdateLevel < DepLevel
+ ; Name =:= UpdateName ->
+ case maybe_fetch(AppInfo, true) of
+ true ->
+ {AppInfo1, NewSrcDeps, NewBinaryDeps} =
+ handle_dep(DepsDir, AppInfo),
+ AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
+ {NewSrcDeps ++ SrcDepsAcc
+ ,NewBinaryDeps++BinaryDepsAcc
+ ,rebar_state:src_apps(StateAcc, AppInfo2)};
+ false ->
+ {SrcDepsAcc, BinaryDepsAcc, State}
+ end;
+ _ ->
+ case maybe_fetch(AppInfo, false) of
+ true ->
+ {AppInfo1, NewSrcDeps, NewBinaryDeps} =
+ handle_dep(DepsDir, AppInfo),
+ AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
+ {NewSrcDeps ++ SrcDepsAcc
+ ,NewBinaryDeps++BinaryDepsAcc
+ ,rebar_state:src_apps(StateAcc, AppInfo2)};
+ false ->
+ {SrcDepsAcc, BinaryDepsAcc, State}
+ end
end
end, {[], rebar_state:binary_deps(State), State}, SrcDeps) of
{NewSrcDeps, NewBinaryDeps, State1} when length(SrcDeps) =:= length(NewSrcDeps) ->
@@ -232,6 +251,16 @@ parse_deps(DepsDir, Deps) ->
rebar_app_info:new(Name, Vsn, Dir)
end,
Dep1 = rebar_app_info:source(Dep, Source),
+ {[Dep1 | SrcDepsAcc], BinaryDepsAcc};
+ ({Name, Vsn, Source, _Level}, {SrcDepsAcc, BinaryDepsAcc}) when is_tuple (Source) ->
+ Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
+ {ok, Dep} = case rebar_app_info:discover(Dir) of
+ {ok, App} ->
+ {ok, App};
+ not_found ->
+ rebar_app_info:new(Name, Vsn, Dir)
+ end,
+ Dep1 = rebar_app_info:source(Dep, Source),
{[Dep1 | SrcDepsAcc], BinaryDepsAcc}
end, {[], []}, Deps).
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index b599266..5180d4a 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -11,7 +11,7 @@
-include("rebar.hrl").
-define(PROVIDER, update).
--define(DEPS, [install_deps]).
+-define(DEPS, [lock]).
%% ===================================================================
%% Public API
@@ -33,10 +33,12 @@ init(State) ->
do(State) ->
case rebar_state:command_args(State) of
[Name] ->
- ?ERROR("NOT IMPLEMENTED: Updating ~s~n", [Name]),
- AllDeps = rebar_state:get(State, all_deps, []),
- {ok, _App} = rebar_app_utils:find(list_to_binary(Name), AllDeps),
- rebar_prv_install_deps:handle_deps(State, [list_to_atom(Name)], true),
+ ?ERROR("Updating ~s~n", [Name]),
+ Locks = rebar_state:get(State, locks, []),
+ {_, _, _, Level} = lists:keyfind(ec_cnv:to_binary(Name), 1, Locks),
+ Deps = rebar_state:get(State, deps),
+ Dep = lists:keyfind(list_to_atom(Name), 1, Deps),
+ rebar_prv_install_deps:handle_deps(State, [Dep], {true, ec_cnv:to_binary(Name), Level}),
{ok, State};
[] ->
?INFO("Updating package index...~n", []),
--
cgit v1.1
From 3f9ff5a30221919b1ce4f65bbefcebe360c09ecb Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 26 Sep 2014 09:22:25 -0500
Subject: fix compilation order
---
src/rebar_app_discover.erl | 21 +++++++++++++--------
src/rebar_prv_install_deps.erl | 9 ++++-----
src/rebar_topo.erl | 2 +-
3 files changed, 18 insertions(+), 14 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index a4cfe4c..9fa7b4a 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -110,8 +110,9 @@ create_app_info(AppDir, AppFile) ->
case file:consult(AppFile) of
{ok, [{application, AppName, AppDetails}]} ->
AppVsn = proplists:get_value(vsn, AppDetails),
+ AppDeps = proplists:get_value(applications, AppDetails, []),
AbsCwd = filename:absname(rebar_utils:get_cwd()),
- {ok, AppInfo} = rebar_app_info:new(AppName, AppVsn, AppDir),
+ {ok, AppInfo} = rebar_app_info:new(AppName, AppVsn, AppDir, AppDeps),
RebarConfig = filename:join(AppDir, "rebar.config"),
AppState = case filelib:is_file(RebarConfig) of
true ->
@@ -131,13 +132,17 @@ create_app_info(AppDir, AppFile) ->
-spec validate_application_info(rebar_app_info:t()) -> boolean().
validate_application_info(AppInfo) ->
EbinDir = rebar_app_info:ebin_dir(AppInfo),
- AppFile = rebar_app_info:app_file(AppInfo),
- AppDetail = rebar_app_info:app_details(AppInfo),
- case get_modules_list(AppFile, AppDetail) of
- {ok, List} ->
- has_all_beams(EbinDir, List);
- _Error ->
- false
+ case rebar_app_info:app_file(AppInfo) of
+ undefined ->
+ false;
+ AppFile ->
+ AppDetail = rebar_app_info:app_details(AppInfo),
+ case get_modules_list(AppFile, AppDetail) of
+ {ok, List} ->
+ has_all_beams(EbinDir, List);
+ _Error ->
+ false
+ end
end.
-spec get_modules_list(file:filename_all(), proplists:proplist()) ->
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 2498215..de4be27 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -74,7 +74,7 @@ do(State) ->
handle_deps(State, Locks)
end,
- Source = ProjectApps ++ rebar_state:src_deps(State1),
+ Source = ProjectApps ++ rebar_state:get(State1, all_deps),
{ok, Sort} = rebar_topo:sort_apps(Source),
{ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
@@ -123,15 +123,14 @@ handle_deps(State, Deps, Update) ->
end, S)
end,
- AllDeps = lists:keymerge(2
- ,rebar_state:src_apps(State2)
- ,Solved),
+ AllDeps = lists:keymerge(2, lists:keymerge(2
+ ,rebar_state:src_apps(State2)
+ ,Solved), SrcDeps),
%% Sort all apps to build order
State3 = rebar_state:set(State2, all_deps, AllDeps),
{ok, State3}.
-
%% ===================================================================
%% Internal functions
%% ===================================================================
diff --git a/src/rebar_topo.erl b/src/rebar_topo.erl
index 5f528af..9ab4c28 100644
--- a/src/rebar_topo.erl
+++ b/src/rebar_topo.erl
@@ -103,7 +103,7 @@ apps_to_pairs(Apps) ->
-spec app_to_pairs(rebar_app_info:t()) -> [pair()].
app_to_pairs(App) ->
- [{DepApp, rebar_app_info:name(App)} ||
+ [{ec_cnv:to_binary(DepApp), rebar_app_info:name(App)} ||
DepApp <-
rebar_app_info:deps(App)].
--
cgit v1.1
From 1549b11b88dca340a1e471775d8387ca94e377e5 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 26 Sep 2014 19:51:45 -0500
Subject: getting closer
---
src/rebar_fetch.erl | 10 ++++++----
src/rebar_prv_install_deps.erl | 37 +++++++++++++++++++++----------------
2 files changed, 27 insertions(+), 20 deletions(-)
(limited to 'src')
diff --git a/src/rebar_fetch.erl b/src/rebar_fetch.erl
index 6b31f6c..0a90848 100644
--- a/src/rebar_fetch.erl
+++ b/src/rebar_fetch.erl
@@ -49,14 +49,16 @@ lock_source(_AppDir, Source) ->
download_source(AppDir, Source) ->
TmpDir = ec_file:insecure_mkdtemp(),
AppDir1 = ec_cnv:to_list(AppDir),
+ ec_file:mkdir_p(AppDir1),
case download_source_tmp(TmpDir, Source) of
{ok, _} ->
- ec_file:mkdir_p(AppDir1),
ok = ec_file:copy(TmpDir, filename:absname(AppDir1), [recursive]);
{tarball, File} ->
- ok = erl_tar:extract(File, [{cwd,
- (filename:dirname(filename:absname(AppDir1)))}
- ,compressed])
+ ok = erl_tar:extract(File, [{cwd, TmpDir}
+ ,compressed]),
+ BaseName = filename:basename(AppDir1),
+ [FromDir] = filelib:wildcard(filename:join(TmpDir, BaseName++"-*")),
+ ec_file:copy(FromDir, AppDir1, [recursive])
end.
download_source_tmp(TmpDir, {p4, Url}) ->
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index de4be27..8071382 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -74,7 +74,7 @@ do(State) ->
handle_deps(State, Locks)
end,
- Source = ProjectApps ++ rebar_state:get(State1, all_deps),
+ Source = ProjectApps ++ rebar_state:src_deps(State1),
{ok, Sort} = rebar_topo:sort_apps(Source),
{ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
@@ -151,7 +151,7 @@ package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
{ok, AppInfo} = rebar_app_info:new(Name, FmtVsn),
AppInfo1 = rebar_app_info:deps(AppInfo, PkgDeps),
AppInfo2 =
- rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, <<Name/binary, "-", FmtVsn/binary>>)),
+ rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, Name)),
rebar_app_info:source(AppInfo2, Link).
-spec update_src_deps(integer(), rebar_state:t(), boolean()) -> rebar_state:t().
@@ -161,18 +161,23 @@ update_src_deps(Level, State, Update) ->
case lists:foldl(fun(AppInfo, {SrcDepsAcc, BinaryDepsAcc, StateAcc}) ->
Name = rebar_app_info:name(AppInfo),
Locks = rebar_state:get(State, locks, []),
- {_, _, _, DepLevel} = lists:keyfind(Name, 1, Locks),
case Update of
- {true, UpdateName, UpdateLevel} when UpdateLevel < DepLevel
- ; Name =:= UpdateName ->
- case maybe_fetch(AppInfo, true) of
+ {true, UpdateName, UpdateLevel} ->
+ {_, _, _, DepLevel} = lists:keyfind(Name, 1, Locks),
+ case UpdateLevel < DepLevel
+ orelse Name =:= UpdateName of
true ->
- {AppInfo1, NewSrcDeps, NewBinaryDeps} =
- handle_dep(DepsDir, AppInfo),
- AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
- {NewSrcDeps ++ SrcDepsAcc
- ,NewBinaryDeps++BinaryDepsAcc
- ,rebar_state:src_apps(StateAcc, AppInfo2)};
+ case maybe_fetch(AppInfo, true) of
+ true ->
+ {AppInfo1, NewSrcDeps, NewBinaryDeps} =
+ handle_dep(DepsDir, AppInfo),
+ AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
+ {NewSrcDeps ++ SrcDepsAcc
+ ,NewBinaryDeps++BinaryDepsAcc
+ ,rebar_state:src_apps(StateAcc, AppInfo2)};
+ false ->
+ {SrcDepsAcc, BinaryDepsAcc, State}
+ end;
false ->
{SrcDepsAcc, BinaryDepsAcc, State}
end;
@@ -190,10 +195,10 @@ update_src_deps(Level, State, Update) ->
end
end
end, {[], rebar_state:binary_deps(State), State}, SrcDeps) of
- {NewSrcDeps, NewBinaryDeps, State1} when length(SrcDeps) =:= length(NewSrcDeps) ->
- rebar_state:src_deps(rebar_state:binary_deps(State1, NewBinaryDeps), NewSrcDeps);
- {NewSrcDeps, NewBinaryDeps, State1} ->
- State2 = rebar_state:src_deps(rebar_state:binary_deps(State1, NewBinaryDeps), NewSrcDeps),
+ {[], NewBinaryDeps, State1} ->
+ rebar_state:binary_deps(State1, NewBinaryDeps);
+ {_NewSrcDeps, NewBinaryDeps, State1} ->
+ State2 = rebar_state:binary_deps(State1, NewBinaryDeps),
update_src_deps(Level+1, State2, Update)
end.
--
cgit v1.1
From e9a3396e56679a11ac1caa3b47f1f196f0307d72 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 27 Sep 2014 14:12:11 -0500
Subject: return error messages from providers
---
src/rebar3.erl | 6 ++++--
src/rebar_core.erl | 20 ++++++++++++++------
src/rebar_provider.erl | 27 ++++++++++++++-------------
src/rebar_prv_app_discovery.erl | 2 +-
src/rebar_prv_compile.erl | 2 +-
src/rebar_prv_deps.erl | 2 +-
src/rebar_prv_do.erl | 2 +-
src/rebar_prv_help.erl | 2 +-
src/rebar_prv_install_deps.erl | 11 ++++++-----
src/rebar_prv_lock.erl | 2 +-
src/rebar_prv_new.erl | 2 +-
src/rebar_prv_packages.erl | 2 +-
src/rebar_prv_release.erl | 2 +-
src/rebar_prv_shell.erl | 2 +-
src/rebar_prv_tar.erl | 2 +-
src/rebar_prv_update.erl | 18 +++++++++++-------
src/rebar_prv_version.erl | 2 +-
src/rebar_state.erl | 8 ++++++--
18 files changed, 67 insertions(+), 47 deletions(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index ba76f80..7c85f26 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -48,6 +48,9 @@ main(Args) ->
ok;
rebar_abort ->
rebar_utils:delayed_halt(1);
+ {error, Error} ->
+ ?ERROR(Error, []),
+ rebar_utils:delayed_halt(1);
Error ->
%% Nothing should percolate up from rebar_core;
%% Dump this error to console
@@ -146,8 +149,7 @@ run_aux(State, Args) ->
State4 = rebar_state:create_logic_providers(Providers++PluginProviders, State3),
Task = rebar_state:get(State4, task, "help"),
- rebar_core:process_command(rebar_state:command_args(State4, Args), list_to_atom(Task)),
- ok.
+ rebar_core:process_command(rebar_state:command_args(State4, Args), list_to_atom(Task)).
%%
%% Parse command line arguments using getopt and also filtering out any
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index ba77dd8..9f2b168 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -31,17 +31,25 @@
-include("rebar.hrl").
+-spec process_command(rebar_state:t(), atom()) -> {ok, rebar_state:t()} | {error, string()}.
process_command(State, Command) ->
%% ? rebar_prv_install_deps:setup_env(State),
TargetProviders = rebar_provider:get_target_providers(Command, State),
+ do(TargetProviders, State).
- lists:foldl(fun(TargetProvider, Conf) ->
- Provider = rebar_provider:get_provider(TargetProvider
- ,rebar_state:providers(Conf)),
- {ok, Conf1} = rebar_provider:do(Provider, Conf),
- Conf1
- end, State, TargetProviders).
+-spec do([atom()], rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do([], State) ->
+ {ok, State};
+do([ProviderName | Rest], State) ->
+ Provider = rebar_provider:get_provider(ProviderName
+ ,rebar_state:providers(State)),
+ case rebar_provider:do(Provider, State) of
+ {ok, State1} ->
+ do(Rest, State1);
+ {error, Error} ->
+ {error, Error}
+ end.
update_code_path(State) ->
true = rebar_utils:expand_code_path(),
diff --git a/src/rebar_provider.erl b/src/rebar_provider.erl
index 872c2e1..7d78e3b 100644
--- a/src/rebar_provider.erl
+++ b/src/rebar_provider.erl
@@ -23,7 +23,7 @@
-type provider_name() :: atom().
-callback init(rebar_state:t()) -> {ok, rebar_state:t()}.
--callback do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-callback do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
%%%===================================================================
%%% API
@@ -59,20 +59,21 @@ create(Attrs) ->
%%
%% @param Provider the provider object
%% @param State the current state of the system
--spec do(Provider::t(), rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(Provider::t(), rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(Provider, State) ->
{PreHooks, PostHooks} = rebar_state:hooks(State, Provider#provider.name),
- {ok, State1} = run_hook_plugins(PreHooks, State),
- {ok, State2} = (Provider#provider.provider_impl):do(State1),
- run_hook_plugins(PostHooks, State2).
-
--spec run_hook_plugins([t()], rebar_state:t()) -> {ok, rebar_state:t()}.
-run_hook_plugins(Hooks, State) ->
- State1 = lists:foldl(fun(Hook, StateAcc) ->
- {ok, StateAcc1} = rebar_provider:do(Hook, StateAcc),
- StateAcc1
- end, State, Hooks),
- {ok, State1}.
+ run_all([PreHooks++Provider | PostHooks], State).
+
+-spec run_all([t()], rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+run_all([], State) ->
+ {ok, State};
+run_all([Provider | Rest], State) ->
+ case (Provider#provider.provider_impl):do(State) of
+ {ok, State1} ->
+ run_all(Rest, State1);
+ {error, Error} ->
+ {error, Error}
+ end.
%%% @doc get the name of the module that implements the provider
%%% @param Provider the provider object
diff --git a/src/rebar_prv_app_discovery.erl b/src/rebar_prv_app_discovery.erl
index 897a38d..630f232 100644
--- a/src/rebar_prv_app_discovery.erl
+++ b/src/rebar_prv_app_discovery.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
LibDirs = rebar_state:get(State, lib_dirs, ?DEFAULT_LIB_DIRS),
State1 = rebar_app_discover:do(State, LibDirs),
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index 11ee97a..8ec0560 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -27,7 +27,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
ProjectApps = rebar_state:project_apps(State),
Deps = rebar_state:get(State, deps_to_build, []),
diff --git a/src/rebar_prv_deps.erl b/src/rebar_prv_deps.erl
index 111f32f..4612c52 100644
--- a/src/rebar_prv_deps.erl
+++ b/src/rebar_prv_deps.erl
@@ -22,7 +22,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
{ok, State}.
diff --git a/src/rebar_prv_do.erl b/src/rebar_prv_do.erl
index 435db6f..7216813 100644
--- a/src/rebar_prv_do.erl
+++ b/src/rebar_prv_do.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
Tasks = args_to_tasks(rebar_state:command_args(State)),
State1 = lists:foldl(fun(TaskArgs, StateAcc) ->
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index e9d89ca..efc9c3f 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
help(State),
{ok, State}.
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 8071382..0092eaa 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -64,7 +64,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
ProjectApps = rebar_state:project_apps(State),
{ok, State1} = case rebar_state:get(State, locks, []) of
@@ -123,9 +123,9 @@ handle_deps(State, Deps, Update) ->
end, S)
end,
- AllDeps = lists:keymerge(2, lists:keymerge(2
- ,rebar_state:src_apps(State2)
- ,Solved), SrcDeps),
+ AllDeps = lists:ukeymerge(2
+ ,lists:ukeysort(2, rebar_state:src_apps(State2))
+ ,lists:ukeysort(2, Solved)),
%% Sort all apps to build order
State3 = rebar_state:set(State2, all_deps, AllDeps),
@@ -191,7 +191,8 @@ update_src_deps(Level, State, Update) ->
,NewBinaryDeps++BinaryDepsAcc
,rebar_state:src_apps(StateAcc, AppInfo2)};
false ->
- {SrcDepsAcc, BinaryDepsAcc, State}
+ AppInfo1 = rebar_app_info:dep_level(AppInfo, Level),
+ {SrcDepsAcc, BinaryDepsAcc, rebar_state:src_apps(StateAcc, AppInfo1)}
end
end
end, {[], rebar_state:binary_deps(State), State}, SrcDeps) of
diff --git a/src/rebar_prv_lock.erl b/src/rebar_prv_lock.erl
index 441c46d..2265265 100644
--- a/src/rebar_prv_lock.erl
+++ b/src/rebar_prv_lock.erl
@@ -26,7 +26,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
case rebar_state:get(State, locks, []) of
[] ->
diff --git a/src/rebar_prv_new.erl b/src/rebar_prv_new.erl
index a3182fd..1c796b6 100644
--- a/src/rebar_prv_new.erl
+++ b/src/rebar_prv_new.erl
@@ -26,7 +26,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
case rebar_state:command_args(State) of
[TemplateName] ->
diff --git a/src/rebar_prv_packages.erl b/src/rebar_prv_packages.erl
index 79c1cd2..3349287 100644
--- a/src/rebar_prv_packages.erl
+++ b/src/rebar_prv_packages.erl
@@ -22,7 +22,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
{Packages, _Graph} = rebar_packages:get_packages(State),
print_packages(Packages),
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index d724490..61c4990 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(Config) ->
relx:main(["release"]),
{ok, Config}.
diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl
index bf37ddf..4bd0886 100644
--- a/src/rebar_prv_shell.erl
+++ b/src/rebar_prv_shell.erl
@@ -54,7 +54,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(Config) ->
shell(),
{ok, Config}.
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl
index c40c8df..8e7fb69 100644
--- a/src/rebar_prv_tar.erl
+++ b/src/rebar_prv_tar.erl
@@ -29,7 +29,7 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
relx:main(["release tar"]),
{ok, State}.
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index 5180d4a..c885167 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -29,17 +29,21 @@ init(State) ->
opts = []}),
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
case rebar_state:command_args(State) of
[Name] ->
- ?ERROR("Updating ~s~n", [Name]),
+ ?INFO("Updating ~s~n", [Name]),
Locks = rebar_state:get(State, locks, []),
- {_, _, _, Level} = lists:keyfind(ec_cnv:to_binary(Name), 1, Locks),
- Deps = rebar_state:get(State, deps),
- Dep = lists:keyfind(list_to_atom(Name), 1, Deps),
- rebar_prv_install_deps:handle_deps(State, [Dep], {true, ec_cnv:to_binary(Name), Level}),
- {ok, State};
+ case lists:keyfind(ec_cnv:to_binary(Name), 1, Locks) of
+ {_, _, _, Level} ->
+ Deps = rebar_state:get(State, deps),
+ Dep = lists:keyfind(list_to_atom(Name), 1, Deps),
+ rebar_prv_install_deps:handle_deps(State, [Dep], {true, ec_cnv:to_binary(Name), Level}),
+ {ok, State};
+ false ->
+ {error, io_lib:format("No such dependency ~s~n", [Name])}
+ end;
[] ->
?INFO("Updating package index...~n", []),
Url = url(State),
diff --git a/src/rebar_prv_version.erl b/src/rebar_prv_version.erl
index 6969e62..e88bf39 100644
--- a/src/rebar_prv_version.erl
+++ b/src/rebar_prv_version.erl
@@ -30,7 +30,7 @@ init(State) ->
{ok, State1}.
--spec do(rebar_state:t()) -> {ok, rebar_state:t()}.
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
rebar3:version(),
{ok, State}.
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 58d535a..b9ebd70 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -111,7 +111,9 @@ src_deps(#state_t{src_deps=SrcDeps}) ->
src_deps(State=#state_t{src_deps=SrcDeps}, NewSrcDeps) when is_list(SrcDeps) ->
State#state_t{src_deps=NewSrcDeps};
src_deps(State=#state_t{src_deps=SrcDeps}, SrcDep) ->
- State#state_t{src_deps=[SrcDep | SrcDeps]}.
+ Name = rebar_app_info:name(SrcDep),
+ NewSrcDeps = lists:keystore(Name, 2, SrcDeps, SrcDep),
+ State#state_t{src_deps=NewSrcDeps}.
src_apps(#state_t{src_apps=SrcApps}) ->
SrcApps.
@@ -119,7 +121,9 @@ src_apps(#state_t{src_apps=SrcApps}) ->
src_apps(State=#state_t{src_apps=_SrcApps}, NewSrcApps) when is_list(NewSrcApps) ->
State#state_t{src_apps=NewSrcApps};
src_apps(State=#state_t{src_apps=SrcApps}, NewSrcApp) ->
- State#state_t{src_apps=[NewSrcApp | SrcApps]}.
+ Name = rebar_app_info:name(NewSrcApp),
+ NewSrcApps = lists:keystore(Name, 2, SrcApps, NewSrcApp),
+ State#state_t{src_apps=NewSrcApps}.
project_apps(#state_t{project_apps=Apps}) ->
Apps.
--
cgit v1.1
From b4ad8a8eb400a08bb95c7a86daa89f0b3a9c5f89 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 27 Sep 2014 14:16:25 -0500
Subject: Print error saying to use verbose mode to see stacktrace on uncaught
error
---
src/rebar3.erl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 7c85f26..5ab268f 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -54,7 +54,8 @@ main(Args) ->
Error ->
%% Nothing should percolate up from rebar_core;
%% Dump this error to console
- io:format("Uncaught error in rebar_core: ~p\n", [Error]),
+ ?ERROR("Uncaught error in rebar_core. Run with -vvv to see stacktrace~n", []),
+ ?DEBUG("Uncaught error: ~p~n", [Error]),
rebar_utils:delayed_halt(1)
end.
--
cgit v1.1
From db9ba68f801ec961313d0cdf9ceb03d79cc84d09 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 27 Sep 2014 14:49:53 -0500
Subject: erorr message on failed package update
---
src/rebar_prv_update.erl | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index c885167..bfe3ab6 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -11,7 +11,7 @@
-include("rebar.hrl").
-define(PROVIDER, update).
--define(DEPS, [lock]).
+-define(DEPS, []).
%% ===================================================================
%% Public API
@@ -46,22 +46,17 @@ do(State) ->
end;
[] ->
?INFO("Updating package index...~n", []),
- Url = url(State),
- %{ok, [Home]} = init:get_argument(home),
- ec_file:mkdir_p(filename:join([os:getenv("HOME"), ".rebar"])),
- PackagesFile = filename:join([os:getenv("HOME"), ".rebar", "packages"]),
- {ok, RequestId} = httpc:request(get, {Url, []}, [], [{stream, PackagesFile}, {sync, false}]),
- wait(RequestId, State)
- end.
-
-wait(RequestId, State) ->
- receive
- {http, {RequestId, saved_to_file}} ->
- {ok, State}
- after
- 500 ->
- io:format("."),
- wait(RequestId, State)
+ try
+ Url = url(State),
+ %{ok, [Home]} = init:get_argument(home),
+ ec_file:mkdir_p(filename:join([os:getenv("HOME"), ".rebar"])),
+ PackagesFile = filename:join([os:getenv("HOME"), ".rebar", "packages"]),
+ {ok, RequestId} = httpc:request(get, {Url, []}, [], [{stream, PackagesFile}
+ ,{sync, true}])
+ catch
+ _:_ ->
+ {error, io_lib:format("Failed to write package index.~n", [])}
+ end
end.
url(State) ->
--
cgit v1.1
From 955f582a3ea6bb89b7b5df8ccdcbf48ab5fc815c Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 28 Sep 2014 17:27:31 -0500
Subject: fix for downloading transitive source deps
---
src/rebar.app.src | 1 +
src/rebar3.erl | 2 +-
src/rebar_prv_install_deps.erl | 15 ++++++++++-----
src/rebar_prv_update.erl | 39 ++++++++++++---------------------------
4 files changed, 24 insertions(+), 33 deletions(-)
(limited to 'src')
diff --git a/src/rebar.app.src b/src/rebar.app.src
index daeacc0..ef6d8de 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -33,6 +33,7 @@
rebar_prv_tar,
rebar_prv_new,
rebar_prv_update,
+ rebar_prv_upgrade,
rebar_prv_release,
rebar_prv_version,
rebar_prv_help]}
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 5ab268f..20edfa6 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -44,7 +44,7 @@
%% escript Entry point
main(Args) ->
case catch(run(Args)) of
- ok ->
+ {ok, _State} ->
ok;
rebar_abort ->
rebar_utils:delayed_halt(1);
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 0092eaa..26d1712 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -74,7 +74,7 @@ do(State) ->
handle_deps(State, Locks)
end,
- Source = ProjectApps ++ rebar_state:src_deps(State1),
+ Source = ProjectApps ++ rebar_state:src_apps(State1),
{ok, Sort} = rebar_topo:sort_apps(Source),
{ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
@@ -191,16 +191,21 @@ update_src_deps(Level, State, Update) ->
,NewBinaryDeps++BinaryDepsAcc
,rebar_state:src_apps(StateAcc, AppInfo2)};
false ->
- AppInfo1 = rebar_app_info:dep_level(AppInfo, Level),
- {SrcDepsAcc, BinaryDepsAcc, rebar_state:src_apps(StateAcc, AppInfo1)}
+ {AppInfo1, NewSrcDeps, NewBinaryDeps} =
+ handle_dep(DepsDir, AppInfo),
+ AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
+ {NewSrcDeps ++ SrcDepsAcc
+ ,NewBinaryDeps++BinaryDepsAcc
+ ,rebar_state:src_apps(StateAcc, AppInfo2)}
end
end
end, {[], rebar_state:binary_deps(State), State}, SrcDeps) of
{[], NewBinaryDeps, State1} ->
rebar_state:binary_deps(State1, NewBinaryDeps);
- {_NewSrcDeps, NewBinaryDeps, State1} ->
+ {NewSrcDeps, NewBinaryDeps, State1} ->
State2 = rebar_state:binary_deps(State1, NewBinaryDeps),
- update_src_deps(Level+1, State2, Update)
+ State3 = rebar_state:src_deps(State2, NewSrcDeps),
+ update_src_deps(Level+1, State3, Update)
end.
-spec handle_dep(file:filename_all(), rebar_app_info:t()) ->
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index bfe3ab6..e1648e2 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -23,40 +23,25 @@ init(State) ->
provider_impl = ?MODULE,
bare = false,
deps = ?DEPS,
- example = "rebar update cowboy",
- short_desc = "Update package index or individual dependency.",
+ example = "rebar update",
+ short_desc = "Update package index.",
desc = "",
opts = []}),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
- case rebar_state:command_args(State) of
- [Name] ->
- ?INFO("Updating ~s~n", [Name]),
- Locks = rebar_state:get(State, locks, []),
- case lists:keyfind(ec_cnv:to_binary(Name), 1, Locks) of
- {_, _, _, Level} ->
- Deps = rebar_state:get(State, deps),
- Dep = lists:keyfind(list_to_atom(Name), 1, Deps),
- rebar_prv_install_deps:handle_deps(State, [Dep], {true, ec_cnv:to_binary(Name), Level}),
- {ok, State};
- false ->
- {error, io_lib:format("No such dependency ~s~n", [Name])}
- end;
- [] ->
- ?INFO("Updating package index...~n", []),
- try
- Url = url(State),
+ ?INFO("Updating package index...~n", []),
+ try
+ Url = url(State),
%{ok, [Home]} = init:get_argument(home),
- ec_file:mkdir_p(filename:join([os:getenv("HOME"), ".rebar"])),
- PackagesFile = filename:join([os:getenv("HOME"), ".rebar", "packages"]),
- {ok, RequestId} = httpc:request(get, {Url, []}, [], [{stream, PackagesFile}
- ,{sync, true}])
- catch
- _:_ ->
- {error, io_lib:format("Failed to write package index.~n", [])}
- end
+ ec_file:mkdir_p(filename:join([os:getenv("HOME"), ".rebar"])),
+ PackagesFile = filename:join([os:getenv("HOME"), ".rebar", "packages"]),
+ {ok, RequestId} = httpc:request(get, {Url, []}, [], [{stream, PackagesFile}
+ ,{sync, true}])
+ catch
+ _:_ ->
+ {error, io_lib:format("Failed to write package index.~n", [])}
end.
url(State) ->
--
cgit v1.1
From 6cadb335be5b4446db7933a2f5e05a72ccaefdcf Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 28 Sep 2014 19:17:07 -0500
Subject: add upgrade provider
---
src/rebar_prv_upgrade.erl | 49 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
create mode 100644 src/rebar_prv_upgrade.erl
(limited to 'src')
diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl
new file mode 100644
index 0000000..6722948
--- /dev/null
+++ b/src/rebar_prv_upgrade.erl
@@ -0,0 +1,49 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+
+-module(rebar_prv_upgrade).
+
+-behaviour(rebar_provider).
+
+-export([init/1,
+ do/1]).
+
+-include("rebar.hrl").
+
+-define(PROVIDER, upgrade).
+-define(DEPS, [lock]).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+ State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
+ provider_impl = ?MODULE,
+ bare = false,
+ deps = ?DEPS,
+ example = "rebar upgrade cowboy",
+ short_desc = "Upgrade dependency.",
+ desc = "",
+ opts = []}),
+ {ok, State1}.
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+ case rebar_state:command_args(State) of
+ [Name] ->
+ ?INFO("Updating ~s~n", [Name]),
+ Locks = rebar_state:get(State, locks, []),
+ case lists:keyfind(ec_cnv:to_binary(Name), 1, Locks) of
+ {_, _, _, Level} ->
+ Deps = rebar_state:get(State, deps),
+ Dep = lists:keyfind(list_to_atom(Name), 1, Deps),
+ rebar_prv_install_deps:handle_deps(State, [Dep], {true, ec_cnv:to_binary(Name), Level}),
+ {ok, State};
+ false ->
+ {error, io_lib:format("No such dependency ~s~n", [Name])}
+ end;
+ [] ->
+ {error, "No package given to upgrade."}
+ end.
--
cgit v1.1
From f8feb56bb5d9faf6bdc1af8c411aadc8c727ada4 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Tue, 30 Sep 2014 22:14:07 -0500
Subject: refactor bc supporting source deps from central repo now
---
src/rebar_prv_install_deps.erl | 76 +++++++++++++++++++++---------------------
src/rebar_state.erl | 16 ++++-----
2 files changed, 46 insertions(+), 46 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 26d1712..7d0d751 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -44,9 +44,9 @@
-define(DEPS, [app_discovery]).
-type src_dep() :: {atom(), string(), {atom(), string(), string()}}.
--type binary_dep() :: {atom(), binary()} | atom().
+-type pkg_dep() :: {atom(), binary()} | atom().
--type dep() :: src_dep() | binary_dep().
+-type dep() :: src_dep() | pkg_dep().
%% ===================================================================
%% Public API
@@ -99,21 +99,21 @@ handle_deps(State, Deps, Update) ->
%% Read in package index and dep graph
{Packages, Graph} = rebar_packages:get_packages(State),
- %% Split source deps from binary deps, needed to keep backwards compatibility
+ %% Split source deps from pkg deps, needed to keep backwards compatibility
DepsDir = get_deps_dir(State),
- {SrcDeps, BinaryDeps} = parse_deps(DepsDir, Deps),
- State1 = rebar_state:src_deps(rebar_state:binary_deps(State, BinaryDeps),
+ {SrcDeps, PkgDeps} = parse_deps(DepsDir, Deps),
+ State1 = rebar_state:src_deps(rebar_state:pkg_deps(State, PkgDeps),
SrcDeps),
%% Fetch transitive src deps
State2 = update_src_deps(0, State1, Update),
- Solved = case rebar_state:binary_deps(State2) of
- [] -> %% No binary deps
+ Solved = case rebar_state:pkg_deps(State2) of
+ [] -> %% No pkg deps
[];
- BinaryDeps1 ->
- %% Find binary deps needed
- {ok, S} = rlx_depsolver:solve(Graph, BinaryDeps1),
- %% Create app_info record for each binary dep
+ PkgDeps1 ->
+ %% Find pkg deps needed
+ {ok, S} = rlx_depsolver:solve(Graph, PkgDeps1),
+ %% Create app_info record for each pkg dep
lists:map(fun(Pkg) ->
AppInfo = package_to_app(DepsDir
,Packages
@@ -158,7 +158,7 @@ package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
update_src_deps(Level, State, Update) ->
SrcDeps = rebar_state:src_deps(State),
DepsDir = get_deps_dir(State),
- case lists:foldl(fun(AppInfo, {SrcDepsAcc, BinaryDepsAcc, StateAcc}) ->
+ case lists:foldl(fun(AppInfo, {SrcDepsAcc, PkgDepsAcc, StateAcc}) ->
Name = rebar_app_info:name(AppInfo),
Locks = rebar_state:get(State, locks, []),
case Update of
@@ -169,54 +169,54 @@ update_src_deps(Level, State, Update) ->
true ->
case maybe_fetch(AppInfo, true) of
true ->
- {AppInfo1, NewSrcDeps, NewBinaryDeps} =
+ {AppInfo1, NewSrcDeps, NewPkgDeps} =
handle_dep(DepsDir, AppInfo),
AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
{NewSrcDeps ++ SrcDepsAcc
- ,NewBinaryDeps++BinaryDepsAcc
+ ,NewPkgDeps++PkgDepsAcc
,rebar_state:src_apps(StateAcc, AppInfo2)};
false ->
- {SrcDepsAcc, BinaryDepsAcc, State}
+ {SrcDepsAcc, PkgDepsAcc, State}
end;
false ->
- {SrcDepsAcc, BinaryDepsAcc, State}
+ {SrcDepsAcc, PkgDepsAcc, State}
end;
_ ->
case maybe_fetch(AppInfo, false) of
true ->
- {AppInfo1, NewSrcDeps, NewBinaryDeps} =
+ {AppInfo1, NewSrcDeps, NewPkgDeps} =
handle_dep(DepsDir, AppInfo),
AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
{NewSrcDeps ++ SrcDepsAcc
- ,NewBinaryDeps++BinaryDepsAcc
+ ,NewPkgDeps++PkgDepsAcc
,rebar_state:src_apps(StateAcc, AppInfo2)};
false ->
- {AppInfo1, NewSrcDeps, NewBinaryDeps} =
+ {AppInfo1, NewSrcDeps, NewPkgDeps} =
handle_dep(DepsDir, AppInfo),
AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
{NewSrcDeps ++ SrcDepsAcc
- ,NewBinaryDeps++BinaryDepsAcc
+ ,NewPkgDeps++PkgDepsAcc
,rebar_state:src_apps(StateAcc, AppInfo2)}
end
end
- end, {[], rebar_state:binary_deps(State), State}, SrcDeps) of
- {[], NewBinaryDeps, State1} ->
- rebar_state:binary_deps(State1, NewBinaryDeps);
- {NewSrcDeps, NewBinaryDeps, State1} ->
- State2 = rebar_state:binary_deps(State1, NewBinaryDeps),
+ end, {[], rebar_state:pkg_deps(State), State}, SrcDeps) of
+ {[], NewPkgDeps, State1} ->
+ rebar_state:pkg_deps(State1, NewPkgDeps);
+ {NewSrcDeps, NewPkgDeps, State1} ->
+ State2 = rebar_state:pkg_deps(State1, NewPkgDeps),
State3 = rebar_state:src_deps(State2, NewSrcDeps),
update_src_deps(Level+1, State3, Update)
end.
-spec handle_dep(file:filename_all(), rebar_app_info:t()) ->
- {rebar_app_info:t(), [rebar_app_info:t()], [binary_dep()]}.
+ {rebar_app_info:t(), [rebar_app_info:t()], [pkg_dep()]}.
handle_dep(DepsDir, AppInfo) ->
C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
S = rebar_state:new(rebar_state:new(), C, rebar_app_info:dir(AppInfo)),
Deps = rebar_state:get(S, deps, []),
AppInfo1 = rebar_app_info:deps(AppInfo, rebar_state:deps_names(S)),
- {SrcDeps, BinaryDeps} = parse_deps(DepsDir, Deps),
- {AppInfo1, SrcDeps, BinaryDeps}.
+ {SrcDeps, PkgDeps} = parse_deps(DepsDir, Deps),
+ {AppInfo1, SrcDeps, PkgDeps}.
-spec maybe_fetch(rebar_app_info:t(), boolean()) -> boolean().
maybe_fetch(AppInfo, Update) ->
@@ -245,14 +245,14 @@ maybe_fetch(AppInfo, Update) ->
false
end.
--spec parse_deps(binary(), [dep()]) -> {[rebar_app_info:t()], [binary_dep()]}.
+-spec parse_deps(binary(), [dep()]) -> {[rebar_app_info:t()], [pkg_dep()]}.
parse_deps(DepsDir, Deps) ->
- lists:foldl(fun({Name, Vsn}, {SrcDepsAcc, BinaryDepsAcc}) ->
+ lists:foldl(fun({Name, Vsn}, {SrcDepsAcc, PkgDepsAcc}) ->
{SrcDepsAcc, [parse_goal(ec_cnv:to_binary(Name)
- ,ec_cnv:to_binary(Vsn)) | BinaryDepsAcc]};
- (Name, {SrcDepsAcc, BinaryDepsAcc}) when is_atom(Name) ->
- {SrcDepsAcc, [ec_cnv:to_binary(Name) | BinaryDepsAcc]};
- ({Name, Vsn, Source}, {SrcDepsAcc, BinaryDepsAcc}) when is_tuple (Source) ->
+ ,ec_cnv:to_binary(Vsn)) | PkgDepsAcc]};
+ (Name, {SrcDepsAcc, PkgDepsAcc}) when is_atom(Name) ->
+ {SrcDepsAcc, [ec_cnv:to_binary(Name) | PkgDepsAcc]};
+ ({Name, Vsn, Source}, {SrcDepsAcc, PkgDepsAcc}) when is_tuple (Source) ->
Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
{ok, Dep} = case rebar_app_info:discover(Dir) of
{ok, App} ->
@@ -261,8 +261,8 @@ parse_deps(DepsDir, Deps) ->
rebar_app_info:new(Name, Vsn, Dir)
end,
Dep1 = rebar_app_info:source(Dep, Source),
- {[Dep1 | SrcDepsAcc], BinaryDepsAcc};
- ({Name, Vsn, Source, _Level}, {SrcDepsAcc, BinaryDepsAcc}) when is_tuple (Source) ->
+ {[Dep1 | SrcDepsAcc], PkgDepsAcc};
+ ({Name, Vsn, Source, _Level}, {SrcDepsAcc, PkgDepsAcc}) when is_tuple (Source) ->
Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
{ok, Dep} = case rebar_app_info:discover(Dir) of
{ok, App} ->
@@ -271,10 +271,10 @@ parse_deps(DepsDir, Deps) ->
rebar_app_info:new(Name, Vsn, Dir)
end,
Dep1 = rebar_app_info:source(Dep, Source),
- {[Dep1 | SrcDepsAcc], BinaryDepsAcc}
+ {[Dep1 | SrcDepsAcc], PkgDepsAcc}
end, {[], []}, Deps).
--spec parse_goal(binary(), binary()) -> binary_dep().
+-spec parse_goal(binary(), binary()) -> pkg_dep().
parse_goal(Name, Constraint) ->
case re:run(Constraint, "([^\\d]*)(\\d.*)", [{capture, [1,2], binary}]) of
{match, [<<>>, Vsn]} ->
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index b9ebd70..6f9b3d3 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -10,7 +10,7 @@
project_apps/1, project_apps/2,
deps_names/1,
- binary_deps/1, binary_deps/2,
+ pkg_deps/1, pkg_deps/2,
src_deps/1, src_deps/2,
src_apps/1, src_apps/2,
@@ -26,7 +26,7 @@
src_deps = [],
src_apps = [],
- binary_deps = [],
+ pkg_deps = [],
project_apps = [],
providers = [],
@@ -97,13 +97,13 @@ deps_names(State) ->
ec_cnv:to_binary(Dep)
end, Deps).
-binary_deps(#state_t{binary_deps=BinaryDeps}) ->
- BinaryDeps.
+pkg_deps(#state_t{pkg_deps=PkgDeps}) ->
+ PkgDeps.
-binary_deps(State=#state_t{binary_deps=BinaryDeps}, NewBinaryDeps) when is_list(BinaryDeps) ->
- State#state_t{binary_deps=NewBinaryDeps};
-binary_deps(State=#state_t{binary_deps=BinaryDeps}, BinaryDep) ->
- State#state_t{binary_deps=[BinaryDep | BinaryDeps]}.
+pkg_deps(State=#state_t{pkg_deps=PkgDeps}, NewPkgDeps) when is_list(PkgDeps) ->
+ State#state_t{pkg_deps=NewPkgDeps};
+pkg_deps(State=#state_t{pkg_deps=PkgDeps}, PkgDep) ->
+ State#state_t{pkg_deps=[PkgDep | PkgDeps]}.
src_deps(#state_t{src_deps=SrcDeps}) ->
SrcDeps.
--
cgit v1.1
From f84c358ad85b9fbf615adc21c8213e03d1b86690 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 1 Oct 2014 07:15:48 -0500
Subject: add clean provider
---
src/rebar.app.src | 3 ++-
src/rebar_prv_clean.erl | 39 +++++++++++++++++++++++++++++++++++++++
src/rebar_prv_release.erl | 4 ++--
3 files changed, 43 insertions(+), 3 deletions(-)
create mode 100644 src/rebar_prv_clean.erl
(limited to 'src')
diff --git a/src/rebar.app.src b/src/rebar.app.src
index ef6d8de..2ede1db 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -21,7 +21,8 @@
{log_level, warn},
%% any_dir processing modules
- {providers, [rebar_prv_deps,
+ {providers, [rebar_prv_clean,
+ rebar_prv_deps,
rebar_prv_do,
rebar_prv_lock,
rebar_prv_install_deps,
diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl
new file mode 100644
index 0000000..1ed6241
--- /dev/null
+++ b/src/rebar_prv_clean.erl
@@ -0,0 +1,39 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+
+-module(rebar_prv_clean).
+
+-behaviour(rebar_provider).
+
+-export([init/1,
+ do/1]).
+
+-include("rebar.hrl").
+
+-define(PROVIDER, clean).
+-define(DEPS, [app_discovery]).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+ State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
+ provider_impl = ?MODULE,
+ bare = false,
+ deps = ?DEPS,
+ example = "rebar clean",
+ short_desc = "Remove compiled beam files from apps.",
+ desc = "",
+ opts = []}),
+ {ok, State1}.
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+ ProjectApps = rebar_state:project_apps(State),
+ lists:foreach(fun(AppInfo) ->
+ ?INFO("Cleaning out ~s...~n", [rebar_app_info:name(AppInfo)]),
+ rebar_erlc_compiler:clean(State, ec_cnv:to_list(rebar_app_info:dir(AppInfo)))
+ end, ProjectApps),
+ {ok, State}.
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index 61c4990..2eee367 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -30,6 +30,6 @@ init(State) ->
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
-do(Config) ->
+do(State) ->
relx:main(["release"]),
- {ok, Config}.
+ {ok, State}.
--
cgit v1.1
From b37a5ae611aaf6b84a046fbe716f40c2aa8c75d8 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 3 Oct 2014 06:33:33 -0500
Subject: move providers to separate app
---
src/rebar_core.erl | 8 +-
src/rebar_erlydtl_compiler.erl | 18 ++---
src/rebar_provider.erl | 162 ----------------------------------------
src/rebar_prv_app_discovery.erl | 18 ++---
src/rebar_prv_clean.erl | 18 ++---
src/rebar_prv_compile.erl | 18 ++---
src/rebar_prv_deps.erl | 18 ++---
src/rebar_prv_do.erl | 18 ++---
src/rebar_prv_help.erl | 20 ++---
src/rebar_prv_install_deps.erl | 18 ++---
src/rebar_prv_lock.erl | 18 ++---
src/rebar_prv_new.erl | 18 ++---
src/rebar_prv_packages.erl | 18 ++---
src/rebar_prv_release.erl | 27 ++++---
src/rebar_prv_shell.erl | 18 ++---
src/rebar_prv_tar.erl | 25 ++++---
src/rebar_prv_update.erl | 18 ++---
src/rebar_prv_upgrade.erl | 18 ++---
src/rebar_prv_version.erl | 18 ++---
src/rebar_state.erl | 33 +++++---
20 files changed, 194 insertions(+), 333 deletions(-)
delete mode 100644 src/rebar_provider.erl
(limited to 'src')
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 9f2b168..17fc0e2 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -34,17 +34,17 @@
-spec process_command(rebar_state:t(), atom()) -> {ok, rebar_state:t()} | {error, string()}.
process_command(State, Command) ->
%% ? rebar_prv_install_deps:setup_env(State),
-
- TargetProviders = rebar_provider:get_target_providers(Command, State),
+ Providers = rebar_state:providers(State),
+ TargetProviders = providers:get_target_providers(Command, Providers),
do(TargetProviders, State).
-spec do([atom()], rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do([], State) ->
{ok, State};
do([ProviderName | Rest], State) ->
- Provider = rebar_provider:get_provider(ProviderName
+ Provider = providers:get_provider(ProviderName
,rebar_state:providers(State)),
- case rebar_provider:do(Provider, State) of
+ case providers:do(Provider, State) of
{ok, State1} ->
do(Rest, State1);
{error, Error} ->
diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
index 7d90ada..88ffb96 100644
--- a/src/rebar_erlydtl_compiler.erl
+++ b/src/rebar_erlydtl_compiler.erl
@@ -94,7 +94,7 @@
%% ]}.
-module(rebar_erlydtl_compiler).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -113,14 +113,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar erlydtl compile",
- short_desc = "Compile erlydtl templates.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar erlydtl compile"},
+ {short_desc, "Compile erlydtl templates."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
do(Config) ->
diff --git a/src/rebar_provider.erl b/src/rebar_provider.erl
deleted file mode 100644
index 7d78e3b..0000000
--- a/src/rebar_provider.erl
+++ /dev/null
@@ -1,162 +0,0 @@
--module(rebar_provider).
-
-%% API
--export([create/1,
- new/2,
- do/2,
- impl/1,
- get_provider/2,
- get_target_providers/2,
- help/1,
- format/1]).
-
--export_type([t/0]).
-
--include("rebar.hrl").
-
-%%%===================================================================
-%%% Types
-%%%===================================================================
-
--type t() :: record(provider).
-
--type provider_name() :: atom().
-
--callback init(rebar_state:t()) -> {ok, rebar_state:t()}.
--callback do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
-
-%%%===================================================================
-%%% API
-%%%===================================================================
-
-%% @doc create a new provider object from the specified module. The
-%% module should implement the provider behaviour.
-%%
-%% @param ModuleName The module name.
-%% @param State0 The current state of the system
--spec new(module(), rebar_state:t()) -> {ok, rebar_state:t()}.
-new(ModuleName, State) when is_atom(ModuleName) ->
- case code:which(ModuleName) of
- non_existing ->
- ?ERROR("Module ~p does not exist.", [ModuleName]),
- {ok, State};
- _ ->
- ModuleName:init(State)
- end.
-
--spec create(list()) -> t().
-create(Attrs) ->
- #provider{name=proplists:get_value(name, Attrs, undefined)
- ,provider_impl=proplists:get_value(provider_impl, Attrs, undefined)
- ,bare=proplists:get_value(bare, Attrs, false)
- ,deps=proplists:get_value(deps, Attrs, [])
- ,desc=proplists:get_value(desc, Attrs, "")
- ,short_desc=proplists:get_value(short_desc, Attrs, "")
- ,example=proplists:get_value(example, Attrs, "")
- ,opts=proplists:get_value(opts, Attrs, [])}.
-
-%% @doc Manipulate the state of the system, that new state
-%%
-%% @param Provider the provider object
-%% @param State the current state of the system
--spec do(Provider::t(), rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
-do(Provider, State) ->
- {PreHooks, PostHooks} = rebar_state:hooks(State, Provider#provider.name),
- run_all([PreHooks++Provider | PostHooks], State).
-
--spec run_all([t()], rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
-run_all([], State) ->
- {ok, State};
-run_all([Provider | Rest], State) ->
- case (Provider#provider.provider_impl):do(State) of
- {ok, State1} ->
- run_all(Rest, State1);
- {error, Error} ->
- {error, Error}
- end.
-
-%%% @doc get the name of the module that implements the provider
-%%% @param Provider the provider object
--spec impl(Provider::t()) -> module().
-impl(Provider) ->
- Provider#provider.name.
-
-help(State) ->
- Providers = rebar_state:providers(State),
- Help = lists:sort([{ec_cnv:to_list(P#provider.name), P#provider.short_desc} || P <- Providers,
- P#provider.bare =/= true]),
- Longest = lists:max([length(X) || {X, _} <- Help]),
-
- lists:foreach(fun({Name, ShortDesc}) ->
- Length = length(Name),
- Spacing = lists:duplicate(Longest - Length + 8, " "),
- io:format("~s~s~s~n", [Name, Spacing, ShortDesc])
- end, Help).
-
-
-%% @doc print the provider module name
-%%
-%% @param T - The provider
-%% @return An iolist describing the provider
--spec format(t()) -> iolist().
-format(#provider{name=Name}) ->
- atom_to_list(Name).
-
-get_target_providers(Target, State) ->
- Providers = rebar_state:providers(State),
- TargetProviders = lists:filter(fun(#provider{name=T}) when T =:= Target->
- true;
- (_) ->
- false
- end, Providers),
- process_deps(TargetProviders, Providers).
-
--spec get_provider(provider_name(), [t()]) -> t().
-get_provider(ProviderName, [Provider = #provider{name = ProviderName} | _]) ->
- Provider;
-get_provider(ProviderName, [_ | Rest]) ->
- get_provider(ProviderName, Rest);
-get_provider(_ProviderName, _) ->
- [].
-
-process_deps([], _Providers) ->
- [];
-process_deps(TargetProviders, Providers) ->
- DepChain = lists:flatmap(fun(Provider) ->
- {DC, _, _} = process_deps(Provider, Providers, []),
- DC
- end, TargetProviders),
- ['NONE' | Rest] =
- reorder_providers(lists:flatten([{'NONE', P#provider.name} || P <- TargetProviders] ++ DepChain)),
- Rest.
-
-process_deps(Provider, Providers, Seen) ->
- case lists:member(Provider, Seen) of
- true ->
- {[], Providers, Seen};
- false ->
- Deps = Provider#provider.deps,
- DepList = lists:map(fun(Dep) ->
- {Dep, Provider#provider.name}
- end, Deps),
- {NewDeps, _, NewSeen} =
- lists:foldl(fun(Arg, Acc) ->
- process_dep(Arg, Acc)
- end,
- {[], Providers, Seen}, Deps),
- {[DepList | NewDeps], Providers, NewSeen}
- end.
-
-process_dep(ProviderName, {Deps, Providers, Seen}) ->
- Provider = get_provider(ProviderName, Providers),
- {NewDeps, _, NewSeen} = process_deps(Provider, Providers, [ProviderName | Seen]),
- {[Deps | NewDeps], Providers, NewSeen}.
-
-%% @doc Reorder the providers according to thier dependency set.
-reorder_providers(OProviderList) ->
- case rebar_topo:sort(OProviderList) of
- {ok, ProviderList} ->
- ProviderList;
- {error, {cycle, _}} ->
- ?ERROR("There was a cycle in the provider list. Unable to complete build!", [])
- end.
diff --git a/src/rebar_prv_app_discovery.erl b/src/rebar_prv_app_discovery.erl
index 630f232..775aa3d 100644
--- a/src/rebar_prv_app_discovery.erl
+++ b/src/rebar_prv_app_discovery.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_app_discovery).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,14 +19,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = true,
- deps = ?DEPS,
- example = "",
- short_desc = "",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, true},
+ {deps, ?DEPS},
+ {example, ""},
+ {short_desc, ""},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl
index 1ed6241..2f983f3 100644
--- a/src/rebar_prv_clean.erl
+++ b/src/rebar_prv_clean.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_clean).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,14 +19,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar clean",
- short_desc = "Remove compiled beam files from apps.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar clean"},
+ {short_desc, "Remove compiled beam files from apps."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index 8ec0560..fdeafdd 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -1,6 +1,6 @@
-module(rebar_prv_compile).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1,
@@ -17,14 +17,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar compile",
- short_desc = "Compile apps .app.src and .erl files.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar compile"},
+ {short_desc, "Compile apps .app.src and .erl files."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_deps.erl b/src/rebar_prv_deps.erl
index 4612c52..6ba0d3a 100644
--- a/src/rebar_prv_deps.erl
+++ b/src/rebar_prv_deps.erl
@@ -1,6 +1,6 @@
-module(rebar_prv_deps).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -12,14 +12,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = true,
- deps = ?DEPS,
- example = "rebar deps",
- short_desc = "List dependencies",
- desc = info("List dependencies"),
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, true},
+ {deps, ?DEPS},
+ {example, "rebar deps"},
+ {short_desc, "List dependencies"},
+ {desc, info("List dependencies")},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_do.erl b/src/rebar_prv_do.erl
index 7216813..4bffd04 100644
--- a/src/rebar_prv_do.erl
+++ b/src/rebar_prv_do.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_do).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,14 +19,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar3 do <task1>, <task2>, ...",
- short_desc = "Higher order provider for running multiple tasks in a sequence.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar3 do <task1>, <task2>, ..."},
+ {short_desc, "Higher order provider for running multiple tasks in a sequence."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index efc9c3f..9c9bbde 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_help).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,14 +19,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar help <task>",
- short_desc = "Display a list of tasks or help for a given task or subtask.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar help <task>"},
+ {short_desc, "Display a list of tasks or help for a given task or subtask."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
@@ -43,6 +43,6 @@ help(State) ->
getopt:usage(OptSpecList, "rebar", "", []),
?CONSOLE("~nSeveral tasks are available:~n", []),
- rebar_provider:help(State),
+ providers:help(State),
?CONSOLE("~nRun 'rebar help <TASK>' for details.~n~n", []).
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 7d0d751..8b56ac3 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -26,7 +26,7 @@
%% -------------------------------------------------------------------
-module(rebar_prv_install_deps).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -54,14 +54,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = true,
- deps = ?DEPS,
- example = undefined,
- short_desc = "Install dependencies",
- desc = info("Install dependencies"),
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, true},
+ {deps, ?DEPS},
+ {example, undefined},
+ {short_desc, "Install dependencies"},
+ {desc, info("Install dependencies")},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_lock.erl b/src/rebar_prv_lock.erl
index 2265265..dfe04cd 100644
--- a/src/rebar_prv_lock.erl
+++ b/src/rebar_prv_lock.erl
@@ -1,6 +1,6 @@
-module(rebar_prv_lock).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -16,14 +16,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = true,
- deps = ?DEPS,
- example = "",
- short_desc = "Locks dependencies.",
- desc = info("Locks dependencies"),
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, true},
+ {deps, ?DEPS},
+ {example, ""},
+ {short_desc, "Locks dependencies."},
+ {desc, info("Locks dependencies")},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_new.erl b/src/rebar_prv_new.erl
index 1c796b6..3535061 100644
--- a/src/rebar_prv_new.erl
+++ b/src/rebar_prv_new.erl
@@ -1,6 +1,6 @@
-module(rebar_prv_new).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -16,14 +16,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar new <template>",
- short_desc = "Create new project from templates.",
- desc = info(),
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar new <template>"},
+ {short_desc, "Create new project from templates."},
+ {desc, info()},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_packages.erl b/src/rebar_prv_packages.erl
index 3349287..6c0dd3f 100644
--- a/src/rebar_prv_packages.erl
+++ b/src/rebar_prv_packages.erl
@@ -1,6 +1,6 @@
-module(rebar_prv_packages).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -12,14 +12,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar pkgs",
- short_desc = "List available packages.",
- desc = info("List available packages"),
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar pkgs"},
+ {short_desc, "List available packages."},
+ {desc, info("List available packages")},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index 2eee367..b151bb5 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_release).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,17 +19,24 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar release",
- short_desc = "Build release of project.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar release"},
+ {short_desc, "Build release of project."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
- relx:main(["release"]),
+ Options = rebar_state:command_args(State),
+ AllOptions = string:join(["release" | Options], " "),
+ case rebar_state:get(State, relx, []) of
+ [] ->
+ relx:main(AllOptions);
+ Config ->
+ relx:main([{config, Config}], AllOptions)
+ end,
{ok, State}.
diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl
index 4bd0886..e74486d 100644
--- a/src/rebar_prv_shell.erl
+++ b/src/rebar_prv_shell.erl
@@ -28,7 +28,7 @@
-module(rebar_prv_shell).
-author("Kresten Krab Thorup <krab@trifork.com>").
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -44,14 +44,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar shell",
- short_desc = "Run shell with project apps and deps in path.",
- desc = info(),
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar shell"},
+ {short_desc, "Run shell with project apps and deps in path."},
+ {desc, info()},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl
index 8e7fb69..06a4014 100644
--- a/src/rebar_prv_tar.erl
+++ b/src/rebar_prv_tar.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_tar).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,17 +19,22 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar tar",
- short_desc = "Tar archive of release built of project.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar tar"},
+ {short_desc, "Tar archive of release built of project."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
- relx:main(["release tar"]),
+ case rebar_state:get(State, relx, []) of
+ [] ->
+ relx:main(["release tar"]);
+ Config ->
+ relx:main([{config, Config}], ["release tar"])
+ end,
{ok, State}.
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index e1648e2..53402db 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_update).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,14 +19,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar update",
- short_desc = "Update package index.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar update"},
+ {short_desc, "Update package index."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl
index 6722948..1c6abf7 100644
--- a/src/rebar_prv_upgrade.erl
+++ b/src/rebar_prv_upgrade.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_upgrade).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,14 +19,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar upgrade cowboy",
- short_desc = "Upgrade dependency.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar upgrade cowboy"},
+ {short_desc, "Upgrade dependency."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_version.erl b/src/rebar_prv_version.erl
index e88bf39..f158b6d 100644
--- a/src/rebar_prv_version.erl
+++ b/src/rebar_prv_version.erl
@@ -3,7 +3,7 @@
-module(rebar_prv_version).
--behaviour(rebar_provider).
+-behaviour(provider).
-export([init/1,
do/1]).
@@ -19,14 +19,14 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, #provider{name = ?PROVIDER,
- provider_impl = ?MODULE,
- bare = false,
- deps = ?DEPS,
- example = "rebar version",
- short_desc = "Print version for rebar and current Erlang.",
- desc = "",
- opts = []}),
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar version"},
+ {short_desc, "Print version for rebar and current Erlang."},
+ {desc, ""},
+ {opts, []}])),
{ok, State1}.
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 6f9b3d3..14b55d2 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -139,28 +139,39 @@ providers(#state_t{providers=Providers}) ->
providers(State, NewProviders) ->
State#state_t{providers=NewProviders}.
--spec add_provider(t(), rebar_provider:t()) -> t().
+-spec add_provider(t(), providers:t()) -> t().
add_provider(State=#state_t{providers=Providers}, Provider) ->
State#state_t{providers=[Provider | Providers]}.
create_logic_providers(ProviderModules, State0) ->
lists:foldl(fun(ProviderMod, Acc) ->
- {ok, State1} = rebar_provider:new(ProviderMod, Acc),
+ {ok, State1} = providers:new(ProviderMod, Acc),
State1
end, State0, ProviderModules).
-prepend_hook(State=#state_t{hooks=Hooks}, Target, Hook) ->
- {PreHooks, PostHooks} = proplists:get_value(Target, Hooks, {[], []}),
- State#state_t{hooks=[{Target, {[Hook | PreHooks], PostHooks}} | proplists:delete(Target, Hooks)]}.
+prepend_hook(State=#state_t{providers=Providers}, Target, Hook) ->
+ State#state_t{providers=add_hook(pre, Providers, Target, Hook)}.
-append_hook(State=#state_t{hooks=Hooks}, Target, Hook) ->
- {PreHooks, PostHooks} = proplists:get_value(Target, Hooks, {[], []}),
- State#state_t{hooks=[{Target, {PreHooks, [Hook | PostHooks]}} | proplists:delete(Target, Hooks)]}.
+append_hook(State=#state_t{providers=Providers}, Target, Hook) ->
+ State#state_t{providers=add_hook(post, Providers, Target, Hook)}.
--spec hooks(t(), atom()) -> {[rebar_provider:t()], [rebar_provider:t()]}.
-hooks(#state_t{hooks=Hooks}, Target) ->
- proplists:get_value(Target, Hooks, {[], []}).
+-spec hooks(t(), atom()) -> {[providers:t()], [providers:t()]}.
+hooks(_State=#state_t{providers=Providers}, Target) ->
+ Provider = providers:get_provider(Target, Providers),
+ providers:hooks(Provider).
%% ===================================================================
%% Internal functions
%% ===================================================================
+
+add_hook(Which, Providers, Target, Hook) ->
+ Provider = providers:get_provider(Target, Providers),
+ Hooks = providers:hooks(Provider),
+ NewHooks = add_hook(Which, Hooks, Hook),
+ NewProvider = providers:hooks(Provider, NewHooks),
+ [NewProvider | lists:delete(Provider, Providers)].
+
+add_hook(pre, {PreHooks, PostHooks}, Hook) ->
+ {[Hook | PreHooks], PostHooks};
+add_hook(post, {PreHooks, PostHooks}, Hook) ->
+ {PreHooks, [Hook | PostHooks]}.
--
cgit v1.1
From b20680304d02a10babff15ff69a78a816077fa3c Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Oct 2014 11:47:41 -0500
Subject: split options up by task
---
src/rebar3.erl | 98 +++++++++++++++++++++--------------------------
src/rebar_config.erl | 1 -
src/rebar_core.erl | 13 ++++++-
src/rebar_prv_compile.erl | 10 ++++-
src/rebar_prv_upgrade.erl | 47 ++++++++++++-----------
src/rebar_prv_version.erl | 1 +
src/rebar_state.erl | 12 ++++--
7 files changed, 97 insertions(+), 85 deletions(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 20edfa6..0a07c90 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -28,15 +28,16 @@
-export([main/1,
run/2,
- option_spec_list/0,
+ global_option_spec_list/0,
+ init_config/0,
+ init_config1/1,
+ set_options/2,
parse_args/1,
version/0,
- log_level/1]).
+ log_level/0]).
-include("rebar.hrl").
--define(DEFAULT_JOBS, 3).
-
%% ====================================================================
%% Public API
%% ====================================================================
@@ -49,7 +50,7 @@ main(Args) ->
rebar_abort ->
rebar_utils:delayed_halt(1);
{error, Error} ->
- ?ERROR(Error, []),
+ ?ERROR(Error++"~n", []),
rebar_utils:delayed_halt(1);
Error ->
%% Nothing should percolate up from rebar_core;
@@ -71,24 +72,21 @@ run(BaseState, Command) ->
run(RawArgs) ->
ok = load_rebar_app(),
- %% Parse out command line arguments -- what's left is a list of commands to
- %% run -- and start running commands
- Args = parse_args(RawArgs),
- BaseConfig = init_config(Args),
- {BaseConfig1, Args1} = set_options(BaseConfig, Args),
- run_aux(BaseConfig1, Args1).
+ BaseConfig = init_config(),
+ {BaseConfig1, _Args1} = set_options(BaseConfig, {[], []}),
+ run_aux(BaseConfig1, RawArgs).
load_rebar_app() ->
%% Pre-load the rebar app so that we get default configuration
ok = application:load(rebar).
-init_config({Options, _NonOptArgs}) ->
+init_config() ->
%% Initialize logging system
- Verbosity = log_level(Options),
+ Verbosity = log_level(),
ok = rebar_log:init(command_line, Verbosity),
- Config = case proplists:get_value(config, Options) of
- undefined ->
+ Config = case os:getenv("REBAR_CONFIG") of
+ false ->
rebar_config:consult_file(?DEFAULT_CONFIG_FILE);
ConfigFile ->
rebar_config:consult_file(ConfigFile)
@@ -127,7 +125,7 @@ init_config1(BaseConfig) ->
BaseConfig
end.
-run_aux(State, Args) ->
+run_aux(State, RawArgs) ->
%% Make sure crypto is running
case crypto:start() of
ok -> ok;
@@ -149,23 +147,24 @@ run_aux(State, Args) ->
rebar_core:update_code_path(State),
State4 = rebar_state:create_logic_providers(Providers++PluginProviders, State3),
- Task = rebar_state:get(State4, task, "help"),
+ {Task, Args} = parse_args(RawArgs),
+
rebar_core:process_command(rebar_state:command_args(State4, Args), list_to_atom(Task)).
%%
%% Parse command line arguments using getopt and also filtering out any
%% key=value pairs. What's left is the list of commands to run
%%
-parse_args(RawArgs) ->
- %% Parse getopt options
- OptSpecList = option_spec_list(),
- case getopt:parse(OptSpecList, RawArgs) of
- {ok, Args} ->
- Args;
- {error, {Reason, Data}} ->
- ?ERROR("~s ~p~n~n", [Reason, Data]),
- rebar_utils:delayed_halt(1)
- end.
+parse_args([]) ->
+ parse_args(["help"]);
+parse_args([H | Rest]) when H =:= "-h"
+ ; H =:= "--help" ->
+ parse_args(["help" | Rest]);
+parse_args([H | Rest]) when H =:= "-v"
+ ; H =:= "--version" ->
+ parse_args(["version" | Rest]);
+parse_args([RawTask | RawRest]) ->
+ {RawTask, RawRest}.
set_options(State, {Options, NonOptArgs}) ->
GlobalDefines = proplists:get_all_values(defines, Options),
@@ -174,32 +173,26 @@ set_options(State, {Options, NonOptArgs}) ->
%% Set global variables based on getopt options
State2 = set_global_flag(State1, Options, force),
- State3 = case proplists:get_value(jobs, Options, ?DEFAULT_JOBS) of
- ?DEFAULT_JOBS ->
- State2;
- Jobs ->
- rebar_state:set(State2, jobs, Jobs)
- end,
Task = proplists:get_value(task, Options, "help"),
- {rebar_state:set(State3, task, Task), NonOptArgs}.
+ {rebar_state:set(State2, task, Task), NonOptArgs}.
%%
%% get log level based on getopt option
%%
-log_level(Options) ->
- case proplists:get_bool(quiet, Options) of
- true ->
- rebar_log:error_level();
+log_level() ->
+ case os:getenv("QUIET") of
false ->
DefaultLevel = rebar_log:default_level(),
- case proplists:get_all_values(verbose, Options) of
- [] ->
+ case os:getenv("DEBUG") of
+ false ->
DefaultLevel;
- Verbosities ->
- DefaultLevel + lists:last(Verbosities)
- end
+ _ ->
+ DefaultLevel + 3
+ end;
+ _ ->
+ rebar_log:error_level()
end.
%%
@@ -226,17 +219,12 @@ set_global_flag(State, Options, Flag) ->
%%
%% options accepted via getopt
%%
-option_spec_list() ->
- Jobs = ?DEFAULT_JOBS,
- JobsHelp = io_lib:format(
- "Number of concurrent workers a command may use. Default: ~B",
- [Jobs]),
+global_option_spec_list() ->
[
- %% {Name, ShortOpt, LongOpt, ArgSpec, HelpMsg}
- {help, $h, "help", undefined, "Print this help."},
- {verbose, $v, "verbose", integer, "Verbosity level (-v, -vv)."},
- {version, $V, "version", undefined, "Show version information."},
- {jobs, $j, "jobs", integer, JobsHelp},
- {config, $C, "config", string, "Rebar config file to use."},
- {task, undefined, undefined, string, "Task to run."}
+ %% {Name, ShortOpt, LongOpt, ArgSpec, HelpMsg}
+ {help, $h, "help", undefined, "Print this help."},
+ %{verbose, $v, "verbose", integer, "Verbosity level (-v, -vv)."},
+ {version, $V, "version", undefined, "Show version information."},
+ %{config, $C, "config", string, "Rebar config file to use."},
+ {task, undefined, undefined, string, "Task to run."}
].
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index b3003d6..7ef2488 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -73,7 +73,6 @@ remove_script_ext(F) ->
try_consult(File) ->
case file:consult(File) of
{ok, Terms} ->
- ?DEBUG("Consult config file ~p~n", [File]),
Terms;
{error, enoent} ->
[];
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 17fc0e2..340f2ae 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -36,14 +36,23 @@ process_command(State, Command) ->
%% ? rebar_prv_install_deps:setup_env(State),
Providers = rebar_state:providers(State),
TargetProviders = providers:get_target_providers(Command, Providers),
- do(TargetProviders, State).
+ CommandProvider = providers:get_provider(Command
+ ,Providers),
+ Opts = providers:opts(CommandProvider)++rebar3:global_option_spec_list(),
+ case getopt:parse(Opts, rebar_state:command_args(State)) of
+ {ok, Args} ->
+ State2 = rebar_state:command_parsed_args(State, Args),
+ do(TargetProviders, State2);
+ {error, {invalid_option, Option}} ->
+ {error, io_lib:format("Invalid option ~s on task ~p", [Option, Command])}
+ end.
-spec do([atom()], rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do([], State) ->
{ok, State};
do([ProviderName | Rest], State) ->
Provider = providers:get_provider(ProviderName
- ,rebar_state:providers(State)),
+ ,rebar_state:providers(State)),
case providers:do(Provider, State) of
{ok, State1} ->
do(Rest, State1);
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index fdeafdd..773e8a9 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -11,12 +11,18 @@
-define(PROVIDER, compile).
-define(DEPS, [lock]).
+-define(DEFAULT_JOBS, 3).
+
%% ===================================================================
%% Public API
%% ===================================================================
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
+ Jobs = ?DEFAULT_JOBS,
+ JobsHelp = io_lib:format(
+ "Number of concurrent workers a command may use. Default: ~B",
+ [Jobs]),
State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
{module, ?MODULE},
{bare, false},
@@ -24,7 +30,9 @@ init(State) ->
{example, "rebar compile"},
{short_desc, "Compile apps .app.src and .erl files."},
{desc, ""},
- {opts, []}])),
+ {opts, [
+ {jobs, $j, "jobs", integer, JobsHelp}
+ ]}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl
index 1c6abf7..cbeec98 100644
--- a/src/rebar_prv_upgrade.erl
+++ b/src/rebar_prv_upgrade.erl
@@ -19,31 +19,32 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
- {module, ?MODULE},
- {bare, false},
- {deps, ?DEPS},
- {example, "rebar upgrade cowboy"},
- {short_desc, "Upgrade dependency."},
- {desc, ""},
- {opts, []}])),
+ State1 =
+ rebar_state:add_provider(State,
+ providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar upgrade cowboy"},
+ {short_desc, "Upgrade dependency."},
+ {desc, ""},
+ {opts, [
+ {package, undefined, undefined, string, "Package to upgrade."}
+ ]}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
- case rebar_state:command_args(State) of
- [Name] ->
- ?INFO("Updating ~s~n", [Name]),
- Locks = rebar_state:get(State, locks, []),
- case lists:keyfind(ec_cnv:to_binary(Name), 1, Locks) of
- {_, _, _, Level} ->
- Deps = rebar_state:get(State, deps),
- Dep = lists:keyfind(list_to_atom(Name), 1, Deps),
- rebar_prv_install_deps:handle_deps(State, [Dep], {true, ec_cnv:to_binary(Name), Level}),
- {ok, State};
- false ->
- {error, io_lib:format("No such dependency ~s~n", [Name])}
- end;
- [] ->
- {error, "No package given to upgrade."}
+ {Args, _} = rebar_state:command_parsed_args(State),
+ Name = proplists:get_value(package, Args),
+ ?INFO("Updating ~s~n", [Name]),
+ Locks = rebar_state:get(State, locks, []),
+ case lists:keyfind(ec_cnv:to_binary(Name), 1, Locks) of
+ {_, _, _, Level} ->
+ Deps = rebar_state:get(State, deps),
+ Dep = lists:keyfind(list_to_atom(Name), 1, Deps),
+ rebar_prv_install_deps:handle_deps(State, [Dep], {true, ec_cnv:to_binary(Name), Level}),
+ {ok, State};
+ _ ->
+ {error, io_lib:format("No such dependency ~s~n", [Name])}
end.
diff --git a/src/rebar_prv_version.erl b/src/rebar_prv_version.erl
index f158b6d..c02f851 100644
--- a/src/rebar_prv_version.erl
+++ b/src/rebar_prv_version.erl
@@ -32,5 +32,6 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
+ io:format("REST ~p~n", [rebar_state:command_args(State)]),
rebar3:version(),
{ok, State}.
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 14b55d2..20ec4a0 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -3,6 +3,7 @@
-export([new/0, new/1, new/2, new/3,
get/2, get/3, set/3,
command_args/1, command_args/2,
+ command_parsed_args/1, command_parsed_args/2,
dir/1, dir/2,
create_logic_providers/2,
@@ -23,15 +24,14 @@
opts = [],
command_args = [],
+ command_parsed_args = [],
src_deps = [],
src_apps = [],
pkg_deps = [],
project_apps = [],
- providers = [],
- hooks = []}).
-
+ providers = []}).
-export_type([t/0]).
@@ -83,6 +83,12 @@ command_args(#state_t{command_args=CmdArgs}) ->
command_args(State, CmdArgs) ->
State#state_t{command_args=CmdArgs}.
+command_parsed_args(#state_t{command_parsed_args=CmdArgs}) ->
+ CmdArgs.
+
+command_parsed_args(State, CmdArgs) ->
+ State#state_t{command_parsed_args=CmdArgs}.
+
dir(#state_t{dir=Dir}) ->
Dir.
--
cgit v1.1
From 587e57c03c21531dbffc0932a0a8bf9e46fa413c Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Oct 2014 11:52:58 -0500
Subject: fix help task
---
src/rebar_prv_help.erl | 4 ++--
src/rebar_prv_version.erl | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index 9c9bbde..4b843ca 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -39,10 +39,10 @@ do(State) ->
%%
help(State) ->
?CONSOLE("Rebar is a tool for working with Erlang projects.~n~n", []),
- OptSpecList = rebar3:option_spec_list(),
+ OptSpecList = rebar3:global_option_spec_list(),
getopt:usage(OptSpecList, "rebar", "", []),
?CONSOLE("~nSeveral tasks are available:~n", []),
- providers:help(State),
+ providers:help(rebar_state:providers(State)),
?CONSOLE("~nRun 'rebar help <TASK>' for details.~n~n", []).
diff --git a/src/rebar_prv_version.erl b/src/rebar_prv_version.erl
index c02f851..f158b6d 100644
--- a/src/rebar_prv_version.erl
+++ b/src/rebar_prv_version.erl
@@ -32,6 +32,5 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
- io:format("REST ~p~n", [rebar_state:command_args(State)]),
rebar3:version(),
{ok, State}.
--
cgit v1.1
From 90cfb2a794e16dbf583a3591f448ced4a32f579f Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Oct 2014 17:31:25 -0500
Subject: support compile jobs option
---
src/rebar_core.erl | 17 +++++++++++------
src/rebar_prv_compile.erl | 18 ++++++++++++------
src/rebar_prv_do.erl | 4 ++--
src/rebar_state.erl | 4 ++--
4 files changed, 27 insertions(+), 16 deletions(-)
(limited to 'src')
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 340f2ae..147f64f 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -39,12 +39,17 @@ process_command(State, Command) ->
CommandProvider = providers:get_provider(Command
,Providers),
Opts = providers:opts(CommandProvider)++rebar3:global_option_spec_list(),
- case getopt:parse(Opts, rebar_state:command_args(State)) of
- {ok, Args} ->
- State2 = rebar_state:command_parsed_args(State, Args),
- do(TargetProviders, State2);
- {error, {invalid_option, Option}} ->
- {error, io_lib:format("Invalid option ~s on task ~p", [Option, Command])}
+ case Command of
+ do ->
+ do(TargetProviders, State);
+ _ ->
+ case getopt:parse(Opts, rebar_state:command_args(State)) of
+ {ok, Args} ->
+ State2 = rebar_state:command_parsed_args(State, Args),
+ do(TargetProviders, State2);
+ {error, {invalid_option, Option}} ->
+ {error, io_lib:format("Invalid option ~s on task ~p", [Option, Command])}
+ end
end.
-spec do([atom()], rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index 773e8a9..60314b3 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -19,10 +19,9 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
- Jobs = ?DEFAULT_JOBS,
JobsHelp = io_lib:format(
"Number of concurrent workers a command may use. Default: ~B",
- [Jobs]),
+ [?DEFAULT_JOBS]),
State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
{module, ?MODULE},
{bare, false},
@@ -37,16 +36,18 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
- ProjectApps = rebar_state:project_apps(State),
- Deps = rebar_state:get(State, deps_to_build, []),
+ {ok, State1} = handle_args(State),
+
+ ProjectApps = rebar_state:project_apps(State1),
+ Deps = rebar_state:get(State1, deps_to_build, []),
lists:foreach(fun(AppInfo) ->
C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
- S = rebar_state:new(rebar_state:new(), C, rebar_app_info:dir(AppInfo)),
+ S = rebar_state:new(State1, C, rebar_app_info:dir(AppInfo)),
build(S, AppInfo)
end, Deps++ProjectApps),
- {ok, State}.
+ {ok, State1}.
build(State, AppInfo) ->
?INFO("Compiling ~s~n", [rebar_app_info:name(AppInfo)]),
@@ -57,3 +58,8 @@ build(State, AppInfo) ->
%% ===================================================================
%% Internal functions
%% ===================================================================
+
+handle_args(State) ->
+ {Args, _} = rebar_state:command_parsed_args(State),
+ Jobs = proplists:get_value(jobs, Args, ?DEFAULT_JOBS),
+ {ok, rebar_state:set(State, jobs, Jobs)}.
diff --git a/src/rebar_prv_do.erl b/src/rebar_prv_do.erl
index 4bffd04..c8f383d 100644
--- a/src/rebar_prv_do.erl
+++ b/src/rebar_prv_do.erl
@@ -32,13 +32,13 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
Tasks = args_to_tasks(rebar_state:command_args(State)),
- State1 = lists:foldl(fun(TaskArgs, StateAcc) ->
+ State1 = lists:foldl(fun(TaskArgs, {ok, StateAcc}) ->
[TaskStr | Args] = string:tokens(TaskArgs, " "),
Task = list_to_atom(TaskStr),
StateAcc1 = rebar_state:set(StateAcc, task, Task),
StateAcc2 = rebar_state:command_args(StateAcc1, Args),
rebar_core:process_command(StateAcc2, Task)
- end, State, Tasks),
+ end, {ok, State}, Tasks),
{ok, State1}.
args_to_tasks(Args) ->
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 20ec4a0..2d9266a 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -54,7 +54,7 @@ new(ParentState=#state_t{}, Config) ->
-spec new(t(), list(), file:name()) -> t().
new(ParentState, Config, Dir) ->
- _Opts = ParentState#state_t.opts,
+ Opts = ParentState#state_t.opts,
LocalOpts = case rebar_config:consult_file(?LOCK_FILE) of
[D] ->
[{locks, D} | Config];
@@ -64,7 +64,7 @@ new(ParentState, Config, Dir) ->
ProviderModules = [],
create_logic_providers(ProviderModules, ParentState#state_t{dir=Dir
- ,opts=LocalOpts}).
+ ,opts=lists:umerge(LocalOpts, Opts)}).
get(State, Key) ->
proplists:get_value(Key, State#state_t.opts).
--
cgit v1.1
From 26a53f323b2238f5d0b4988db6bae5c5ba384eab Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Oct 2014 18:25:15 -0500
Subject: print usage and desc of task for 'help task'
---
src/rebar_prv_help.erl | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index 4b843ca..5b9b8ca 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -25,13 +25,30 @@ init(State) ->
{deps, ?DEPS},
{example, "rebar help <task>"},
{short_desc, "Display a list of tasks or help for a given task or subtask."},
- {desc, ""},
- {opts, []}])),
+ {desc, "Display a list of tasks or help for a given task or subtask."},
+ {opts, [
+ {help_task, undefined, undefined, string, "Task to print help for."}
+ ]}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
- help(State),
+ {Args, _} = rebar_state:command_parsed_args(State),
+ case proplists:get_value(help_task, Args, undefined) of
+ undefined ->
+ help(State);
+ Name ->
+ Providers = rebar_state:providers(State),
+ Provider = providers:get_provider(list_to_atom(Name), Providers),
+ Opts = providers:opts(Provider),
+ case providers:desc(Provider) of
+ Desc when length(Desc) > 0 ->
+ io:format(Desc++"~n~n");
+ _ ->
+ ok
+ end,
+ getopt:usage(Opts, "rebar "++Name, "", [])
+ end,
{ok, State}.
%%
--
cgit v1.1
From f77e5659625eedb919f0c5d477da79b3ecaa32f0 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Oct 2014 18:34:59 -0500
Subject: use providers help/2
---
src/rebar_prv_help.erl | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index 5b9b8ca..f3302c3 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -39,15 +39,7 @@ do(State) ->
help(State);
Name ->
Providers = rebar_state:providers(State),
- Provider = providers:get_provider(list_to_atom(Name), Providers),
- Opts = providers:opts(Provider),
- case providers:desc(Provider) of
- Desc when length(Desc) > 0 ->
- io:format(Desc++"~n~n");
- _ ->
- ok
- end,
- getopt:usage(Opts, "rebar "++Name, "", [])
+ providers:help(Name, Providers)
end,
{ok, State}.
--
cgit v1.1
From ae40b253c00362907f275f01f53a39f6b0c600eb Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Oct 2014 18:40:08 -0500
Subject: handle unknown provider asked for help
---
src/rebar_prv_help.erl | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index f3302c3..33bfa2c 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -39,9 +39,14 @@ do(State) ->
help(State);
Name ->
Providers = rebar_state:providers(State),
- providers:help(Name, Providers)
- end,
- {ok, State}.
+ case providers:get_provider(Name, Providers) of
+ [] ->
+ {error, io_lib:format("Unknown task ~s", [Name])};
+ Provider ->
+ providers:help(Provider),
+ {ok, State}
+ end
+ end.
%%
%% print help/usage string
--
cgit v1.1
From 6e4b68e28eacefcf42d96dd1492e12b96c1bfdda Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 10 Oct 2014 19:34:10 -0500
Subject: fix compile task help msg
---
src/rebar_prv_compile.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index 60314b3..e8a7154 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -20,7 +20,7 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
JobsHelp = io_lib:format(
- "Number of concurrent workers a command may use. Default: ~B",
+ "Number of concurrent workers the compiler may use. Default: ~B",
[?DEFAULT_JOBS]),
State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
{module, ?MODULE},
--
cgit v1.1
From 3b5f22f0663c545117692dfa88d0a6fc66235ed6 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 11 Oct 2014 09:21:01 -0500
Subject: formatting
---
src/rebar3.erl | 2 +-
src/rebar_core.erl | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 0a07c90..3b89c73 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -144,7 +144,7 @@ run_aux(State, RawArgs) ->
{ok, Providers} = application:get_env(rebar, providers),
{ok, PluginProviders, State3} = rebar_plugins:install(State2),
- rebar_core:update_code_path(State),
+ rebar_core:update_code_path(State3),
State4 = rebar_state:create_logic_providers(Providers++PluginProviders, State3),
{Task, Args} = parse_args(RawArgs),
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 147f64f..155e14f 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -36,8 +36,7 @@ process_command(State, Command) ->
%% ? rebar_prv_install_deps:setup_env(State),
Providers = rebar_state:providers(State),
TargetProviders = providers:get_target_providers(Command, Providers),
- CommandProvider = providers:get_provider(Command
- ,Providers),
+ CommandProvider = providers:get_provider(Command, Providers),
Opts = providers:opts(CommandProvider)++rebar3:global_option_spec_list(),
case Command of
do ->
--
cgit v1.1
From 390bdbcc6d93e741cfc7afd67caf6c1bf7163aa6 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 11 Oct 2014 19:38:49 -0500
Subject: fix print help for task
---
src/rebar_prv_help.erl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index 33bfa2c..690ca7d 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -36,10 +36,11 @@ do(State) ->
{Args, _} = rebar_state:command_parsed_args(State),
case proplists:get_value(help_task, Args, undefined) of
undefined ->
- help(State);
+ help(State),
+ {ok, State};
Name ->
Providers = rebar_state:providers(State),
- case providers:get_provider(Name, Providers) of
+ case providers:get_provider(list_to_atom(Name), Providers) of
[] ->
{error, io_lib:format("Unknown task ~s", [Name])};
Provider ->
--
cgit v1.1
From 5483aba28830d8f903930ce7d786ea94254f6f4f Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 11 Oct 2014 19:46:19 -0500
Subject: update release provider to support relx opts
---
src/rebar_prv_release.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index b151bb5..6be639c 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -26,7 +26,7 @@ init(State) ->
{example, "rebar release"},
{short_desc, "Build release of project."},
{desc, ""},
- {opts, []}])),
+ {opts, relx:opt_spec_list()}])),
{ok, State1}.
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
--
cgit v1.1
From be9eb679d4eecf1d319b655e610b74f03ee15a99 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 12 Oct 2014 09:11:42 -0500
Subject: fix error message with new debug syntax
---
src/rebar3.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 3b89c73..64eed39 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -55,7 +55,7 @@ main(Args) ->
Error ->
%% Nothing should percolate up from rebar_core;
%% Dump this error to console
- ?ERROR("Uncaught error in rebar_core. Run with -vvv to see stacktrace~n", []),
+ ?ERROR("Uncaught error in rebar_core. Run with DEBUG=1 to see stacktrace~n", []),
?DEBUG("Uncaught error: ~p~n", [Error]),
rebar_utils:delayed_halt(1)
end.
--
cgit v1.1
From 99bdc8786b363648eb9cfdb293a1692e3ad79894 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 12 Oct 2014 10:51:25 -0500
Subject: fix clean provider for multi app projects
---
src/rebar_erlc_compiler.erl | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'src')
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index 4f70450..d1eac8c 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -111,15 +111,15 @@ compile(Config, Dir) ->
doterl_compile(Config, Dir).
-spec clean(rebar_state:t(), file:filename()) -> 'ok'.
-clean(Config, _AppFile) ->
- MibFiles = rebar_utils:find_files("mibs", ?RE_PREFIX".*\\.mib\$"),
+clean(Config, AppDir) ->
+ MibFiles = rebar_utils:find_files(filename:join(AppDir, "mibs"), ?RE_PREFIX".*\\.mib\$"),
MIBs = [filename:rootname(filename:basename(MIB)) || MIB <- MibFiles],
rebar_file_utils:delete_each(
- [filename:join(["include",MIB++".hrl"]) || MIB <- MIBs]),
+ [filename:join([AppDir, "include",MIB++".hrl"]) || MIB <- MIBs]),
lists:foreach(fun(F) -> ok = rebar_file_utils:rm_rf(F) end,
- ["ebin/*.beam", "priv/mibs/*.bin"]),
+ [filename:join(AppDir, "ebin/*.beam"), filename:join(AppDir, "priv/mibs/*.bin")]),
- YrlFiles = rebar_utils:find_files("src", ?RE_PREFIX".*\\.[x|y]rl\$"),
+ YrlFiles = rebar_utils:find_files(filename:join(AppDir, "src"), ?RE_PREFIX".*\\.[x|y]rl\$"),
rebar_file_utils:delete_each(
[ binary_to_list(iolist_to_binary(re:replace(F, "\\.[x|y]rl$", ".erl")))
|| F <- YrlFiles ]),
@@ -131,9 +131,9 @@ clean(Config, _AppFile) ->
%% directory structure in ebin with .beam files within. As such, we want
%% to scan whatever is left in the ebin/ directory for sub-dirs which
%% satisfy our criteria.
- BeamFiles = rebar_utils:find_files("ebin", ?RE_PREFIX".*\\.beam\$"),
+ BeamFiles = rebar_utils:find_files(filename:join(AppDir, "ebin"), ?RE_PREFIX".*\\.beam\$"),
rebar_file_utils:delete_each(BeamFiles),
- lists:foreach(fun(Dir) -> delete_dir(Dir, dirs(Dir)) end, dirs("ebin")),
+ lists:foreach(fun(Dir) -> delete_dir(Dir, dirs(Dir)) end, dirs(filename:join(AppDir, "ebin"))),
ok.
%% ===================================================================
--
cgit v1.1
From f1a0249bcf12f08b7aae21aec373fec4cd583dbe Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Mon, 13 Oct 2014 16:23:50 -0500
Subject: preliminary _checkouts/ support
---
src/rebar_app_discover.erl | 3 +-
src/rebar_erlydtl_compiler.erl | 5 ++--
src/rebar_prv_install_deps.erl | 68 +++++++++++++++++++++++++-----------------
src/rebar_topo.erl | 8 ++---
4 files changed, 49 insertions(+), 35 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 9fa7b4a..147bc92 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -13,7 +13,8 @@ do(State, LibDirs) ->
Apps = find_apps(Dirs, all),
ProjectDeps = rebar_state:deps_names(State),
lists:foldl(fun(AppInfo, StateAcc) ->
- rebar_state:project_apps(StateAcc, rebar_app_info:deps(AppInfo, ProjectDeps))
+ ProjectDeps1 = lists:delete(rebar_app_info:name(AppInfo), ProjectDeps),
+ rebar_state:project_apps(StateAcc, rebar_app_info:deps(AppInfo, ProjectDeps1))
end, State, Apps).
-spec all_app_dirs(list(file:name())) -> list(file:name()).
diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
index 88ffb96..5fecd48 100644
--- a/src/rebar_erlydtl_compiler.erl
+++ b/src/rebar_erlydtl_compiler.erl
@@ -126,9 +126,10 @@ init(State) ->
do(Config) ->
MultiDtlOpts = erlydtl_opts(Config),
OrigPath = code:get_path(),
- true = code:add_path(rebar_utils:ebin_dir()),
+ %true = code:add_path(rebar_utils:ebin_dir()),
Result = lists:foldl(fun(DtlOpts, _) ->
+ file:make_dir(option(out_dir, DtlOpts)),
rebar_base_compiler:run(Config, [],
option(doc_root, DtlOpts),
option(source_ext, DtlOpts),
@@ -231,7 +232,7 @@ do_compile(Config, Source, Target, DtlOpts) ->
?INFO("Compiling \"~s\" -> \"~s\" with options:~n ~s~n",
[Source, Target, io_lib:format("~p", [Opts])]),
case erlydtl:compile(ec_cnv:to_binary(Source),
- ec_cnv:to_atom(module_name(Target)),
+ list_to_atom(module_name(Target)),
Opts) of
{ok, _Mod} ->
ok;
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 8b56ac3..6cd004c 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -75,8 +75,12 @@ do(State) ->
end,
Source = ProjectApps ++ rebar_state:src_apps(State1),
- {ok, Sort} = rebar_topo:sort_apps(Source),
- {ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))}.
+ case rebar_topo:sort_apps(Source) of
+ {ok, Sort} ->
+ {ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))};
+ {error, Error} ->
+ {error, Error}
+ end.
-spec get_deps_dir(rebar_state:t()) -> file:filename_all().
get_deps_dir(State) ->
@@ -114,19 +118,22 @@ handle_deps(State, Deps, Update) ->
%% Find pkg deps needed
{ok, S} = rlx_depsolver:solve(Graph, PkgDeps1),
%% Create app_info record for each pkg dep
- lists:map(fun(Pkg) ->
- AppInfo = package_to_app(DepsDir
- ,Packages
- ,Pkg),
- maybe_fetch(AppInfo, Update),
- AppInfo
- end, S)
+ lists:flatmap(fun(Pkg) ->
+ AppInfo = package_to_app(DepsDir
+ ,Packages
+ ,Pkg),
+ case maybe_fetch(AppInfo, Update) of
+ false ->
+ [];
+ true ->
+ AppInfo
+ end
+ end, S)
end,
AllDeps = lists:ukeymerge(2
,lists:ukeysort(2, rebar_state:src_apps(State2))
,lists:ukeysort(2, Solved)),
-
%% Sort all apps to build order
State3 = rebar_state:set(State2, all_deps, AllDeps),
{ok, State3}.
@@ -221,28 +228,33 @@ handle_dep(DepsDir, AppInfo) ->
-spec maybe_fetch(rebar_app_info:t(), boolean()) -> boolean().
maybe_fetch(AppInfo, Update) ->
AppDir = ec_cnv:to_list(rebar_app_info:dir(AppInfo)),
- %Apps = rebar_app_discover:find_apps([get_deps_dir(State)], all),
- %case rebar_app_utils:find(rebar_app_info:name(AppInfo), Apps) of
- Exists = case rebar_app_utils:is_app_dir(filename:absname(AppDir)++"-*") of
- {true, _} ->
- true;
- _ ->
- case rebar_app_utils:is_app_dir(filename:absname(AppDir)) of
+ Apps = rebar_app_discover:find_apps(["_checkouts"], all),
+ case rebar_app_utils:find(rebar_app_info:name(AppInfo), Apps) of
+ {ok, _} ->
+ %% Don't fetch dep if it exists in the _checkouts dir
+ false;
+ error ->
+ Exists = case rebar_app_utils:is_app_dir(filename:absname(AppDir)++"-*") of
{true, _} ->
true;
_ ->
- false
- end
- end,
+ case rebar_app_utils:is_app_dir(filename:absname(AppDir)) of
+ {true, _} ->
+ true;
+ _ ->
+ false
+ end
+ end,
- case not Exists orelse Update of
- true ->
- ?INFO("Fetching ~s~n", [rebar_app_info:name(AppInfo)]),
- Source = rebar_app_info:source(AppInfo),
- rebar_fetch:download_source(AppDir, Source),
- true;
- _ ->
- false
+ case not Exists orelse Update of
+ true ->
+ ?INFO("Fetching ~s~n", [rebar_app_info:name(AppInfo)]),
+ Source = rebar_app_info:source(AppInfo),
+ rebar_fetch:download_source(AppDir, Source),
+ true;
+ _ ->
+ false
+ end
end.
-spec parse_deps(binary(), [dep()]) -> {[rebar_app_info:t()], [pkg_dep()]}.
diff --git a/src/rebar_topo.erl b/src/rebar_topo.erl
index 9ab4c28..e4a3e26 100644
--- a/src/rebar_topo.erl
+++ b/src/rebar_topo.erl
@@ -76,10 +76,10 @@ format_error({cycle, Pairs}) ->
"before we can continue:\n",
case Pairs of
[{P1, P2}] ->
- [rebar_util:indent(2), erlang:atom_to_list(P2), "->", erlang:atom_to_list(P1)];
+ [rebar_utils:indent(2), P2, "->", P1];
[{P1, P2} | Rest] ->
- [rebar_util:indent(2), erlang:atom_to_list(P2), "->", erlang:atom_to_list(P1),
- [["-> ", erlang:atom_to_list(PP2), " -> ", erlang:atom_to_list(PP1)] || {PP1, PP2} <- Rest]];
+ [rebar_utils:indent(2), P2, "->", P1,
+ [["-> ", PP2, " -> ", PP1] || {PP1, PP2} <- Rest]];
[] ->
[]
end].
@@ -116,7 +116,7 @@ iterate([], L, All) ->
iterate(Pairs, L, All) ->
case subtract(lhs(Pairs), rhs(Pairs)) of
[] ->
- ?ERROR(format_error({cycle, Pairs}), []);
+ format_error({cycle, Pairs});
Lhs ->
iterate(remove_pairs(Lhs, Pairs), L ++ Lhs, All)
end.
--
cgit v1.1
From 141d34a5d01216b7e918b07c22ee998766217b6d Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Thu, 16 Oct 2014 11:15:37 -0500
Subject: remove unused utils functions
---
src/rebar_prv_compile.erl | 5 +-
src/rebar_prv_install_deps.erl | 21 +++---
src/rebar_utils.erl | 146 ++++++-----------------------------------
3 files changed, 30 insertions(+), 142 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index e8a7154..fe0e197 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -42,8 +42,9 @@ do(State) ->
Deps = rebar_state:get(State1, deps_to_build, []),
lists:foreach(fun(AppInfo) ->
- C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
- S = rebar_state:new(State1, C, rebar_app_info:dir(AppInfo)),
+ AppDir = rebar_app_info:dir(AppInfo),
+ C = rebar_config:consult(AppDir),
+ S = rebar_state:new(State1, C, AppDir),
build(S, AppInfo)
end, Deps++ProjectApps),
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 6cd004c..a717e5f 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -118,17 +118,12 @@ handle_deps(State, Deps, Update) ->
%% Find pkg deps needed
{ok, S} = rlx_depsolver:solve(Graph, PkgDeps1),
%% Create app_info record for each pkg dep
- lists:flatmap(fun(Pkg) ->
- AppInfo = package_to_app(DepsDir
- ,Packages
- ,Pkg),
- case maybe_fetch(AppInfo, Update) of
- false ->
- [];
- true ->
- AppInfo
- end
- end, S)
+ [AppInfo || Pkg <- S,
+ AppInfo <- package_to_app(DepsDir
+ ,Packages
+ ,Pkg),
+ maybe_fetch(AppInfo, Update)]
+
end,
AllDeps = lists:ukeymerge(2
@@ -147,7 +142,7 @@ is_valid(App) ->
rebar_app_info:valid(App).
-spec package_to_app(file:filename_all(), rebar_dict(),
- rlx_depsolver:pkg()) -> rebar_app_info:t().
+ rlx_depsolver:pkg()) -> [rebar_app_info:t()].
package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)),
FmtVsn = iolist_to_binary(rlx_depsolver:format_version(Vsn)),
@@ -159,7 +154,7 @@ package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
AppInfo1 = rebar_app_info:deps(AppInfo, PkgDeps),
AppInfo2 =
rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, Name)),
- rebar_app_info:source(AppInfo2, Link).
+ [rebar_app_info:source(AppInfo2, Link)].
-spec update_src_deps(integer(), rebar_state:t(), boolean()) -> rebar_state:t().
update_src_deps(Level, State, Update) ->
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 5397aa8..5661501 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -30,42 +30,25 @@
filtermap/2,
get_cwd/0,
is_arch/1,
- get_arch/0,
- wordsize/0,
sh/2,
sh_send/3,
escript_foldl/3,
find_files/2,
find_files/3,
- now_str/0,
ensure_dir/1,
beam_to_mod/1,
beams/1,
- erl_to_mod/1,
- abort/0,
- abort/2,
find_executable/1,
- prop_check/3,
expand_code_path/0,
- expand_env_variable/3,
vcs_vsn/3,
deprecated/3,
deprecated/4,
- get_deprecated_global/4,
- get_deprecated_global/5,
- get_experimental_global/3,
- get_experimental_local/3,
- get_deprecated_list/4,
- get_deprecated_list/5,
- get_deprecated_local/4,
- get_deprecated_local/5,
delayed_halt/1,
erl_opts/1,
src_dirs/1,
ebin_dir/0,
processing_base_dir/1,
processing_base_dir/2,
- patch_env/2,
indent/1]).
%% for internal use only
@@ -177,11 +160,6 @@ find_files(Dir, Regex, Recursive) ->
filelib:fold_files(Dir, Regex, Recursive,
fun(F, Acc) -> [F | Acc] end, []).
-now_str() ->
- {{Year, Month, Day}, {Hour, Minute, Second}} = calendar:local_time(),
- lists:flatten(io_lib:format("~4b/~2..0b/~2..0b ~2..0b:~2..0b:~2..0b",
- [Year, Month, Day, Hour, Minute, Second])).
-
%% TODO: filelib:ensure_dir/1 corrected in R13B04. Remove when we drop
%% support for OTP releases older than R13B04.
ensure_dir(Path) ->
@@ -194,15 +172,6 @@ ensure_dir(Path) ->
Error
end.
--spec abort() -> no_return().
-abort() ->
- throw(rebar_abort).
-
--spec abort(string(), [term()]) -> no_return().
-abort(String, Args) ->
- ?ERROR(String, Args),
- abort().
-
find_executable(Name) ->
case os:find_executable(Name) of
false -> false;
@@ -210,10 +179,6 @@ find_executable(Name) ->
"\"" ++ filename:nativename(Path) ++ "\""
end.
-%% Helper function for checking values and aborting when needed
-prop_check(true, _, _) -> true;
-prop_check(false, Msg, Args) -> ?ABORT(Msg, Args).
-
%% Convert all the entries in the code path to absolute paths.
expand_code_path() ->
CodePath = lists:foldl(fun(Path, Acc) ->
@@ -221,25 +186,6 @@ expand_code_path() ->
end, [], code:get_path()),
code:set_path(lists:reverse(CodePath)).
-%%
-%% Given env. variable FOO we want to expand all references to
-%% it in InStr. References can have two forms: $FOO and ${FOO}
-%% The end of form $FOO is delimited with whitespace or eol
-%%
-expand_env_variable(InStr, VarName, RawVarValue) ->
- case string:chr(InStr, $$) of
- 0 ->
- %% No variables to expand
- InStr;
- _ ->
- ReOpts = [global, unicode, {return, list}],
- VarValue = re:replace(RawVarValue, "\\\\", "\\\\\\\\", ReOpts),
- %% Use a regex to match/replace:
- %% Given variable "FOO": match $FOO\s | $FOOeol | ${FOO}
- RegEx = io_lib:format("\\\$(~s(\\s|$)|{~s})", [VarName, VarName]),
- re:replace(InStr, RegEx, [VarValue, "\\2"], ReOpts)
- end.
-
vcs_vsn(Config, Vsn, Dir) ->
Key = {Vsn, Dir},
Cache = rebar_state:get(Config, vsn_cache, dict:new()),
@@ -253,33 +199,6 @@ vcs_vsn(Config, Vsn, Dir) ->
{Config, VsnString}
end.
-get_deprecated_global(Config, OldOpt, NewOpt, When) ->
- get_deprecated_global(Config, OldOpt, NewOpt, undefined, When).
-
-get_deprecated_global(Config, OldOpt, NewOpt, Default, When) ->
- get_deprecated_3(fun rebar_state:get/3,
- Config, OldOpt, NewOpt, Default, When).
-
-get_experimental_global(Config, Opt, Default) ->
- get_experimental_3(fun rebar_state:get/3, Config, Opt, Default).
-
-get_experimental_local(Config, Opt, Default) ->
- get_experimental_3(fun rebar_state:get/3, Config, Opt, Default).
-
-get_deprecated_list(Config, OldOpt, NewOpt, When) ->
- get_deprecated_list(Config, OldOpt, NewOpt, undefined, When).
-
-get_deprecated_list(Config, OldOpt, NewOpt, Default, When) ->
- get_deprecated_3(fun rebar_state:get_list/3,
- Config, OldOpt, NewOpt, Default, When).
-
-get_deprecated_local(Config, OldOpt, NewOpt, When) ->
- get_deprecated_local(Config, OldOpt, NewOpt, undefined, When).
-
-get_deprecated_local(Config, OldOpt, NewOpt, Default, When) ->
- get_deprecated_3(fun rebar_state:get/3,
- Config, OldOpt, NewOpt, Default, When).
-
deprecated(Old, New, Opts, When) when is_list(Opts) ->
case lists:member(Old, Opts) of
true ->
@@ -355,25 +274,6 @@ processing_base_dir(State, Dir) ->
AbsDir = filename:absname(Dir),
AbsDir =:= rebar_state:get(State, base_dir).
-%% @doc Returns the list of environment variables including 'REBAR' which
-%% points to the rebar executable used to execute the currently running
-%% command. The environment is not modified if rebar was invoked
-%% programmatically.
--spec patch_env(rebar_state:t(), [{string(), string()}])
- -> [{string(), string()}].
-patch_env(Config, []) ->
- %% If we reached an empty list, the env did not contain the REBAR variable.
- case rebar_state:get(Config, escript, "") of
- "" -> % rebar was invoked programmatically
- [];
- Path ->
- [{"REBAR", Path}]
- end;
-patch_env(_Config, [{"REBAR", _} | _]=All) ->
- All;
-patch_env(Config, [E | Rest]) ->
- [E | patch_env(Config, Rest)].
-
%% ====================================================================
%% Internal functions
%% ====================================================================
@@ -414,30 +314,6 @@ otp_release1(Rel) ->
binary:bin_to_list(Vsn, {0, Size - 1})
end.
-get_deprecated_3(Get, Config, OldOpt, NewOpt, Default, When) ->
- case Get(Config, NewOpt, Default) of
- Default ->
- case Get(Config, OldOpt, Default) of
- Default ->
- Default;
- Old ->
- deprecated(OldOpt, NewOpt, When),
- Old
- end;
- New ->
- New
- end.
-
-get_experimental_3(Get, Config, Opt, Default) ->
- Val = Get(Config, Opt, Default),
- case Val of
- Default ->
- Default;
- Val ->
- ?CONSOLE("NOTICE: Using experimental option '~p'~n", [Opt]),
- Val
- end.
-
%% We do the shell variable substitution ourselves on Windows and hope that the
%% command doesn't use any other shell magic.
patch_on_windows(Cmd, Env) ->
@@ -454,6 +330,25 @@ patch_on_windows(Cmd, Env) ->
Cmd
end.
+%%
+%% Given env. variable FOO we want to expand all references to
+%% it in InStr. References can have two forms: $FOO and ${FOO}
+%% The end of form $FOO is delimited with whitespace or eol
+%%
+expand_env_variable(InStr, VarName, RawVarValue) ->
+ case string:chr(InStr, $$) of
+ 0 ->
+ %% No variables to expand
+ InStr;
+ _ ->
+ ReOpts = [global, unicode, {return, list}],
+ VarValue = re:replace(RawVarValue, "\\\\", "\\\\\\\\", ReOpts),
+ %% Use a regex to match/replace:
+ %% Given variable "FOO": match $FOO\s | $FOOeol | ${FOO}
+ RegEx = io_lib:format("\\\$(~s(\\s|$)|{~s})", [VarName, VarName]),
+ re:replace(InStr, RegEx, [VarValue, "\\2"], ReOpts)
+ end.
+
expand_sh_flag(return_on_error) ->
{error_handler,
fun(_Command, Err) ->
@@ -509,9 +404,6 @@ sh_loop(Port, Fun, Acc) ->
beam_to_mod(Filename) ->
list_to_atom(filename:basename(Filename, ".beam")).
-erl_to_mod(Filename) ->
- list_to_atom(filename:rootname(filename:basename(Filename))).
-
beams(Dir) ->
filelib:fold_files(Dir, ".*\.beam\$", true,
fun(F, Acc) -> [F | Acc] end, []).
--
cgit v1.1
From fa74056d2ac7add49397615cde8b5591f3c36bf6 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Thu, 16 Oct 2014 21:43:44 -0500
Subject: test deps support, but builds them after project apps currently
---
src/rebar.app.src | 1 +
src/rebar_app_discover.erl | 5 +++-
src/rebar_prv_install_deps.erl | 6 +----
src/rebar_prv_test_deps.erl | 55 ++++++++++++++++++++++++++++++++++++++++++
src/rebar_utils.erl | 10 ++++++++
5 files changed, 71 insertions(+), 6 deletions(-)
create mode 100644 src/rebar_prv_test_deps.erl
(limited to 'src')
diff --git a/src/rebar.app.src b/src/rebar.app.src
index 2ede1db..e7cbcd1 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -25,6 +25,7 @@
rebar_prv_deps,
rebar_prv_do,
rebar_prv_lock,
+ rebar_prv_test_deps,
rebar_prv_install_deps,
rebar_prv_packages,
rebar_erlydtl_compiler,
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 147bc92..a51252e 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -111,7 +111,10 @@ create_app_info(AppDir, AppFile) ->
case file:consult(AppFile) of
{ok, [{application, AppName, AppDetails}]} ->
AppVsn = proplists:get_value(vsn, AppDetails),
- AppDeps = proplists:get_value(applications, AppDetails, []),
+ %AppDeps = proplists:get_value(applications, AppDetails, []),
+ C = rebar_config:consult(AppDir),
+ S = rebar_state:new(rebar_state:new(), C, AppDir),
+ AppDeps = rebar_state:deps_names(S),
AbsCwd = filename:absname(rebar_utils:get_cwd()),
{ok, AppInfo} = rebar_app_info:new(AppName, AppVsn, AppDir, AppDeps),
RebarConfig = filename:join(AppDir, "rebar.config"),
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index a717e5f..654a5fb 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -77,7 +77,7 @@ do(State) ->
Source = ProjectApps ++ rebar_state:src_apps(State1),
case rebar_topo:sort_apps(Source) of
{ok, Sort} ->
- {ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun is_valid/1, Sort -- ProjectApps))};
+ {ok, rebar_state:set(State1, deps_to_build, lists:dropwhile(fun rebar_app_info:valid/1, Sort -- ProjectApps))};
{error, Error} ->
{error, Error}
end.
@@ -137,10 +137,6 @@ handle_deps(State, Deps, Update) ->
%% Internal functions
%% ===================================================================
--spec is_valid(rebar_app_info:t()) -> boolean().
-is_valid(App) ->
- rebar_app_info:valid(App).
-
-spec package_to_app(file:filename_all(), rebar_dict(),
rlx_depsolver:pkg()) -> [rebar_app_info:t()].
package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
diff --git a/src/rebar_prv_test_deps.erl b/src/rebar_prv_test_deps.erl
new file mode 100644
index 0000000..7dea0ab
--- /dev/null
+++ b/src/rebar_prv_test_deps.erl
@@ -0,0 +1,55 @@
+-module(rebar_prv_test_deps).
+
+-behaviour(provider).
+
+-export([init/1,
+ do/1]).
+
+-include("rebar.hrl").
+
+-define(PROVIDER, test_deps).
+-define(DEPS, [install_deps]).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, true},
+ {deps, ?DEPS},
+ {example, undefined},
+ {short_desc, "Install dependencies needed only for testing."},
+ {desc, ""},
+ {opts, []}])),
+ {ok, State1}.
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+ ProjectApps = rebar_state:project_apps(State),
+ TestDeps = rebar_state:get(State, test_deps, []),
+ Names = [ec_cnv:to_binary(element(1, Dep)) || Dep <- TestDeps],
+ ProjectApps1 = [rebar_app_info:deps(A, Names) || A <- ProjectApps],
+
+ {ok, State1} = rebar_prv_install_deps:handle_deps(State, TestDeps),
+ AllDeps = rebar_state:get(State1, all_deps, []),
+
+ case rebar_topo:sort_apps(ProjectApps1++AllDeps) of
+ {ok, Sort} ->
+ ToBuild = lists:dropwhile(fun rebar_app_info:valid/1, Sort),
+ lists:foreach(fun(AppInfo) ->
+ AppDir = rebar_app_info:dir(AppInfo),
+ C = rebar_config:consult(AppDir),
+ S = rebar_state:new(State1, C, AppDir),
+ rebar_prv_compile:build(S, AppInfo)
+ end, ToBuild),
+ {ok, State1};
+ {error, Error} ->
+ {error, Error}
+ end.
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 5661501..87387be 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -32,6 +32,8 @@
is_arch/1,
sh/2,
sh_send/3,
+ abort/0,
+ abort/2,
escript_foldl/3,
find_files/2,
find_files/3,
@@ -408,6 +410,14 @@ beams(Dir) ->
filelib:fold_files(Dir, ".*\.beam\$", true,
fun(F, Acc) -> [F | Acc] end, []).
+-spec abort() -> no_return().
+abort() ->
+ throw(rebar_abort).
+-spec abort(string(), [term()]) -> no_return().
+abort(String, Args) ->
+ ?ERROR(String, Args),
+ abort().
+
escript_foldl(Fun, Acc, File) ->
case escript:extract(File, [compile_source]) of
{ok, [_Shebang, _Comment, _EmuArgs, Body]} ->
--
cgit v1.1
From da8c6760187ef91fad921e9c0915e7bb7db79a42 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 17 Oct 2014 14:02:51 -0500
Subject: run compile as post hook for test_deps
---
src/rebar.app.src | 4 ++--
src/rebar_prv_test_deps.erl | 17 ++++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/rebar.app.src b/src/rebar.app.src
index e7cbcd1..28c683c 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -25,7 +25,6 @@
rebar_prv_deps,
rebar_prv_do,
rebar_prv_lock,
- rebar_prv_test_deps,
rebar_prv_install_deps,
rebar_prv_packages,
rebar_erlydtl_compiler,
@@ -38,6 +37,7 @@
rebar_prv_upgrade,
rebar_prv_release,
rebar_prv_version,
- rebar_prv_help]}
+ rebar_prv_help,
+ rebar_prv_test_deps]}
]}
]}.
diff --git a/src/rebar_prv_test_deps.erl b/src/rebar_prv_test_deps.erl
index 7dea0ab..b4c7250 100644
--- a/src/rebar_prv_test_deps.erl
+++ b/src/rebar_prv_test_deps.erl
@@ -16,10 +16,13 @@
-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
init(State) ->
+ Providers = rebar_state:providers(State),
+ CompileProvider = providers:get_provider(compile, Providers),
State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
{module, ?MODULE},
{bare, true},
{deps, ?DEPS},
+ {hooks, {[], [CompileProvider]}},
{example, undefined},
{short_desc, "Install dependencies needed only for testing."},
{desc, ""},
@@ -38,13 +41,13 @@ do(State) ->
case rebar_topo:sort_apps(ProjectApps1++AllDeps) of
{ok, Sort} ->
- ToBuild = lists:dropwhile(fun rebar_app_info:valid/1, Sort),
- lists:foreach(fun(AppInfo) ->
- AppDir = rebar_app_info:dir(AppInfo),
- C = rebar_config:consult(AppDir),
- S = rebar_state:new(State1, C, AppDir),
- rebar_prv_compile:build(S, AppInfo)
- end, ToBuild),
+ _ToBuild = lists:dropwhile(fun rebar_app_info:valid/1, Sort),
+ %% lists:foreach(fun(AppInfo) ->
+ %% AppDir = rebar_app_info:dir(AppInfo),
+ %% C = rebar_config:consult(AppDir),
+ %% S = rebar_state:new(State1, C, AppDir),
+ %% rebar_prv_compile:build(S, AppInfo)
+ %% end, ToBuild),
{ok, State1};
{error, Error} ->
{error, Error}
--
cgit v1.1
From 4b7281effc83a359662d32d3ec840deadd2eaf22 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 17 Oct 2014 14:28:07 -0500
Subject: fix update provider do/1 return
---
src/rebar_prv_update.erl | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index 53402db..8ac4426 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -37,12 +37,13 @@ do(State) ->
%{ok, [Home]} = init:get_argument(home),
ec_file:mkdir_p(filename:join([os:getenv("HOME"), ".rebar"])),
PackagesFile = filename:join([os:getenv("HOME"), ".rebar", "packages"]),
- {ok, RequestId} = httpc:request(get, {Url, []}, [], [{stream, PackagesFile}
- ,{sync, true}])
+ {ok, _RequestId} = httpc:request(get, {Url, []}, [], [{stream, PackagesFile}
+ ,{sync, true}])
catch
_:_ ->
{error, io_lib:format("Failed to write package index.~n", [])}
- end.
+ end,
+ {ok, State}.
url(State) ->
SystemArch = erlang:system_info(system_architecture),
--
cgit v1.1
From 2930eb480deba84fbc3d5408c6134a68411a4651 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 17 Oct 2014 14:44:21 -0500
Subject: pass command as arg to run_aux for now
---
src/rebar3.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 64eed39..a1916f5 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -64,7 +64,7 @@ main(Args) ->
run(BaseState, Command) ->
_ = application:load(rebar),
BaseState1 = rebar_state:set(BaseState, task, Command),
- run_aux(BaseState1, []).
+ run_aux(BaseState1, [Command]).
%% ====================================================================
%% Internal functions
--
cgit v1.1
From 21cf46ff9ce8b7748b46d2562259791e20797597 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 18 Oct 2014 13:00:18 -0500
Subject: dialyzer fixes
---
src/rebar_app_discover.erl | 2 ++
src/rebar_app_info.erl | 17 ++++++-----------
src/rebar_packages.erl | 10 +++++-----
src/rebar_prv_do.erl | 5 ++---
src/rebar_prv_help.erl | 2 +-
src/rebar_prv_install_deps.erl | 30 +++++++++++++++---------------
src/rebar_state.erl | 3 ++-
src/rebar_topo.erl | 14 ++++++--------
8 files changed, 39 insertions(+), 44 deletions(-)
(limited to 'src')
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index a51252e..ae4916e 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -48,9 +48,11 @@ app_dirs(LibDir) ->
find_unbuilt_apps(LibDirs) ->
find_apps(LibDirs, invalid).
+-spec find_apps([file:filename_all()]) -> [rebar_app_info:t()].
find_apps(LibDirs) ->
find_apps(LibDirs, valid).
+-spec find_apps([file:filename_all()], valid | invalid | all) -> [rebar_app_info:t()].
find_apps(LibDirs, Validate) ->
rebar_utils:filtermap(fun(AppDir) ->
find_app(AppDir, Validate)
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index ac668e2..7a33811 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -1,7 +1,6 @@
-module(rebar_app_info).
--export([new/0,
- new/1,
+-export([new/1,
new/2,
new/3,
new/4,
@@ -36,7 +35,7 @@
app_file_src :: file:filename_all() | undefined,
app_file :: file:filename_all() | undefined,
config :: rebar_state:t() | undefined,
- original_vsn :: string() | undefined,
+ original_vsn :: binary() | string() | undefined,
app_details=[] :: list(),
deps=[] :: list(),
dep_level :: integer(),
@@ -54,23 +53,19 @@
%% ============================================================================
%% @doc Build a new, empty, app info value. This is not of a lot of use and you
%% probably wont be doing this much.
--spec new() -> {ok, t()}.
-new() ->
- {ok, #app_info_t{}}.
-
-spec new(atom() | binary() | string()) ->
{ok, t()}.
new(AppName) ->
{ok, #app_info_t{name=ec_cnv:to_binary(AppName)}}.
--spec new(atom() | binary() | string(), string()) ->
+-spec new(atom() | binary() | string(), binary() | string()) ->
{ok, t()}.
new(AppName, Vsn) ->
{ok, #app_info_t{name=ec_cnv:to_binary(AppName),
original_vsn=Vsn}}.
%% @doc build a complete version of the app info with all fields set.
--spec new(atom() | binary() | string(), string(), file:name()) ->
+-spec new(atom() | binary() | string(), binary() | string(), file:name()) ->
{ok, t()}.
new(AppName, Vsn, Dir) ->
{ok, #app_info_t{name=ec_cnv:to_binary(AppName),
@@ -78,7 +73,7 @@ new(AppName, Vsn, Dir) ->
dir=Dir}}.
%% @doc build a complete version of the app info with all fields set.
--spec new(atom() | binary() | string(), string(), file:name(), list()) ->
+-spec new(atom() | binary() | string(), binary() | string(), file:name(), list()) ->
{ok, t()}.
new(AppName, Vsn, Dir, Deps) ->
{ok, #app_info_t{name=ec_cnv:to_binary(AppName),
@@ -96,7 +91,7 @@ discover(Dir) ->
not_found
end.
--spec name(t()) -> atom().
+-spec name(t()) -> binary().
name(#app_info_t{name=Name}) ->
Name.
diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl
index b3a7542..cd979fa 100644
--- a/src/rebar_packages.erl
+++ b/src/rebar_packages.erl
@@ -4,7 +4,7 @@
-include("rebar.hrl").
--spec get_packages(rebar_state:t()) -> {rebar_dict(), tuple()}.
+-spec get_packages(rebar_state:t()) -> {rebar_dict(), rlx_depsolver:t()}.
get_packages(State) ->
RebarDir = rebar_state:get(State, global_rebar_dir, filename:join(os:getenv("HOME"), ".rebar")),
PackagesFile = filename:join(RebarDir, "packages"),
@@ -12,13 +12,13 @@ get_packages(State) ->
true ->
try
{ok, Binary} = file:read_file(PackagesFile),
- {List, Graph} = binary_to_term(Binary),
- {List, Graph}
+ {Dict, Graph} = binary_to_term(Binary),
+ {Dict, Graph}
catch
_:_ ->
?ERROR("Bad packages index, try to fix with `rebar update`~n", []),
- {[], rlx_depsolver:new_graph()}
+ {dict:new(), rlx_depsolver:new_graph()}
end;
false ->
- {[], rlx_depsolver:new_graph()}
+ {dict:new(), rlx_depsolver:new_graph()}
end.
diff --git a/src/rebar_prv_do.erl b/src/rebar_prv_do.erl
index c8f383d..5f6e751 100644
--- a/src/rebar_prv_do.erl
+++ b/src/rebar_prv_do.erl
@@ -32,14 +32,13 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
Tasks = args_to_tasks(rebar_state:command_args(State)),
- State1 = lists:foldl(fun(TaskArgs, {ok, StateAcc}) ->
+ lists:foldl(fun(TaskArgs, {ok, StateAcc}) ->
[TaskStr | Args] = string:tokens(TaskArgs, " "),
Task = list_to_atom(TaskStr),
StateAcc1 = rebar_state:set(StateAcc, task, Task),
StateAcc2 = rebar_state:command_args(StateAcc1, Args),
rebar_core:process_command(StateAcc2, Task)
- end, {ok, State}, Tasks),
- {ok, State1}.
+ end, {ok, State}, Tasks).
args_to_tasks(Args) ->
[string:strip(T) || T <- string:tokens(string:join(Args, " "), ",")].
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index 690ca7d..c2e1cd7 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -41,7 +41,7 @@ do(State) ->
Name ->
Providers = rebar_state:providers(State),
case providers:get_provider(list_to_atom(Name), Providers) of
- [] ->
+ not_found ->
{error, io_lib:format("Unknown task ~s", [Name])};
Provider ->
providers:help(Provider),
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 654a5fb..d752fb9 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -96,7 +96,7 @@ get_deps_dir(DepsDir, App) ->
handle_deps(State, Deps) ->
handle_deps(State, Deps, false).
--spec handle_deps(rebar_state:t(), [dep()], false | {true, integer()}) -> {ok, rebar_state:t()}.
+-spec handle_deps(rebar_state:t(), [dep()], boolean() | {true, binary(), integer()}) -> {ok, rebar_state:t()}.
handle_deps(State, [], _) ->
{ok, State};
handle_deps(State, Deps, Update) ->
@@ -113,7 +113,7 @@ handle_deps(State, Deps, Update) ->
State2 = update_src_deps(0, State1, Update),
Solved = case rebar_state:pkg_deps(State2) of
[] -> %% No pkg deps
- [];
+ [];
PkgDeps1 ->
%% Find pkg deps needed
{ok, S} = rlx_depsolver:solve(Graph, PkgDeps1),
@@ -123,7 +123,6 @@ handle_deps(State, Deps, Update) ->
,Packages
,Pkg),
maybe_fetch(AppInfo, Update)]
-
end,
AllDeps = lists:ukeymerge(2
@@ -137,20 +136,21 @@ handle_deps(State, Deps, Update) ->
%% Internal functions
%% ===================================================================
--spec package_to_app(file:filename_all(), rebar_dict(),
- rlx_depsolver:pkg()) -> [rebar_app_info:t()].
+%-spec package_to_app(any(), ) -> []. % [rebar_app_info:t()].
package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)),
FmtVsn = iolist_to_binary(rlx_depsolver:format_version(Vsn)),
- {ok, P} = dict:find({Name, FmtVsn}, Packages),
- PkgDeps = proplists:get_value(<<"deps">>, P),
- Link = proplists:get_value(<<"link">>, P),
-
- {ok, AppInfo} = rebar_app_info:new(Name, FmtVsn),
- AppInfo1 = rebar_app_info:deps(AppInfo, PkgDeps),
- AppInfo2 =
- rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, Name)),
- [rebar_app_info:source(AppInfo2, Link)].
+ case dict:find({Name, FmtVsn}, Packages) of
+ error ->
+ [];
+ {ok, P} ->
+ PkgDeps = proplists:get_value(<<"deps">>, P, []),
+ Link = proplists:get_value(<<"link">>, P, ""),
+ {ok, AppInfo} = rebar_app_info:new(Name, FmtVsn),
+ AppInfo1 = rebar_app_info:deps(AppInfo, PkgDeps),
+ AppInfo2 = rebar_app_info:dir(AppInfo1, get_deps_dir(DepsDir, Name)),
+ [rebar_app_info:source(AppInfo2, Link)]
+ end.
-spec update_src_deps(integer(), rebar_state:t(), boolean()) -> rebar_state:t().
update_src_deps(Level, State, Update) ->
@@ -216,7 +216,7 @@ handle_dep(DepsDir, AppInfo) ->
{SrcDeps, PkgDeps} = parse_deps(DepsDir, Deps),
{AppInfo1, SrcDeps, PkgDeps}.
--spec maybe_fetch(rebar_app_info:t(), boolean()) -> boolean().
+-spec maybe_fetch(rebar_app_info:t(), boolean() | {true, binary(), integer()}) -> boolean().
maybe_fetch(AppInfo, Update) ->
AppDir = ec_cnv:to_list(rebar_app_info:dir(AppInfo)),
Apps = rebar_app_discover:find_apps(["_checkouts"], all),
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 2d9266a..130f08d 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -28,7 +28,7 @@
src_deps = [],
src_apps = [],
- pkg_deps = [],
+ pkg_deps = [] :: [rlx_depsolver:constraint()],
project_apps = [],
providers = []}).
@@ -103,6 +103,7 @@ deps_names(State) ->
ec_cnv:to_binary(Dep)
end, Deps).
+-spec pkg_deps(t()) -> [rlx_depsolver:constraint()].
pkg_deps(#state_t{pkg_deps=PkgDeps}) ->
PkgDeps.
diff --git a/src/rebar_topo.erl b/src/rebar_topo.erl
index e4a3e26..26ebbc4 100644
--- a/src/rebar_topo.erl
+++ b/src/rebar_topo.erl
@@ -94,7 +94,7 @@ names_to_apps(Names, Apps) ->
-spec find_app_by_name(atom(), [rebar_app_info:t()]) -> {ok, rebar_app_info:t()} | error.
find_app_by_name(Name, Apps) ->
ec_lists:find(fun(App) ->
- rebar_app_info:name(App) =:= Name
+ ec_cnv:to_atom(rebar_app_info:name(App)) =:= ec_cnv:to_atom(Name)
end, Apps).
-spec apps_to_pairs([rebar_app_info:t()]) -> [pair()].
@@ -103,20 +103,20 @@ apps_to_pairs(Apps) ->
-spec app_to_pairs(rebar_app_info:t()) -> [pair()].
app_to_pairs(App) ->
- [{ec_cnv:to_binary(DepApp), rebar_app_info:name(App)} ||
+ [{ec_cnv:to_atom(DepApp), ec_cnv:to_atom(rebar_app_info:name(App))} ||
DepApp <-
rebar_app_info:deps(App)].
%% @doc Iterate over the system. @private
-spec iterate([pair()], [name()], [name()]) ->
- {ok, [name()]} | relx:error().
+ {ok, [name()]} | {error, iolist()}.
iterate([], L, All) ->
{ok, remove_duplicates(L ++ subtract(All, L))};
iterate(Pairs, L, All) ->
case subtract(lhs(Pairs), rhs(Pairs)) of
[] ->
- format_error({cycle, Pairs});
+ {error, format_error({cycle, Pairs})};
Lhs ->
iterate(remove_pairs(Lhs, Pairs), L ++ Lhs, All)
end.
@@ -186,15 +186,13 @@ topo_2_test() ->
topo_pairs_cycle_test() ->
Pairs = [{app2, app1}, {app1, app2}, {stdlib, app1}],
- ?assertMatch({error, {_, {cycle, [{app2, app1}, {app1, app2}]}}},
- sort(Pairs)).
+ ?assertMatch({error, _}, sort(Pairs)).
topo_apps_cycle_test() ->
{ok, App1} = rebar_app_info:new(app1, "0.1", "/no-dir", [app2]),
{ok, App2} = rebar_app_info:new(app2, "0.1", "/no-dir", [app1]),
Apps = [App1, App2],
- ?assertMatch({error, {_, {cycle, [{app2,app1},{app1,app2}]}}},
- sort_apps(Apps)).
+ ?assertMatch({error, _}, sort_apps(Apps)).
topo_apps_good_test() ->
Apps = [App ||
--
cgit v1.1
From b1e9930efc8169b0181c17c49949c964b8e5346a Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 18 Oct 2014 23:04:25 -0500
Subject: fix erlydtl compile
---
src/rebar_erlydtl_compiler.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
index 5fecd48..1a4de6b 100644
--- a/src/rebar_erlydtl_compiler.erl
+++ b/src/rebar_erlydtl_compiler.erl
@@ -231,7 +231,7 @@ do_compile(Config, Source, Target, DtlOpts) ->
Opts = lists:ukeymerge(1, DtlOpts, Sorted),
?INFO("Compiling \"~s\" -> \"~s\" with options:~n ~s~n",
[Source, Target, io_lib:format("~p", [Opts])]),
- case erlydtl:compile(ec_cnv:to_binary(Source),
+ case erlydtl:compile_file(ec_cnv:to_list(Source),
list_to_atom(module_name(Target)),
Opts) of
{ok, _Mod} ->
--
cgit v1.1
From 7de514e000d289664bed124c78edbbad785f8856 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 19 Oct 2014 08:33:36 -0500
Subject: fix find and includefile paths for yrl/xrl files
---
src/rebar_erlc_compiler.erl | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index d1eac8c..33983e4 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -96,17 +96,17 @@ compile(Config, Dir) ->
rebar_base_compiler:run(Config,
check_files(rebar_state:get(
Config, xrl_first_files, [])),
- "src", ".xrl", "src", ".erl",
+ filename:join(Dir, "src"), ".xrl", filename:join(Dir, "src"), ".erl",
fun compile_xrl/3),
rebar_base_compiler:run(Config,
check_files(rebar_state:get(
Config, yrl_first_files, [])),
- "src", ".yrl", "src", ".erl",
+ filename:join(Dir, "src"), ".yrl", filename:join(Dir, "src"), ".erl",
fun compile_yrl/3),
rebar_base_compiler:run(Config,
check_files(rebar_state:get(
Config, mib_first_files, [])),
- "mibs", ".mib", "priv/mibs", ".bin",
+ filename:join(Dir, "mibs"), ".mib", filename:join([Dir, "priv", "mibs"]), ".bin",
fun compile_mib/3),
doterl_compile(Config, Dir).
@@ -634,16 +634,19 @@ compile_yrl(Source, Target, Config) ->
-spec compile_xrl_yrl(rebar_state:t(), file:filename(),
file:filename(), list(), module()) -> 'ok'.
compile_xrl_yrl(Config, Source, Target, Opts, Mod) ->
+ Dir = rebar_state:dir(Config),
+ Opts1 = [{includefile, filename:join(Dir, I)} || {includefile, I} <- Opts,
+ filename:pathtype(I) =:= relative],
case needs_compile(Source, Target, []) of
true ->
- case Mod:file(Source, Opts ++ [{return, true}]) of
+ case Mod:file(Source, Opts1 ++ [{return, true}]) of
{ok, _} ->
ok;
{ok, _Mod, Ws} ->
rebar_base_compiler:ok_tuple(Config, Source, Ws);
{error, Es, Ws} ->
rebar_base_compiler:error_tuple(Config, Source,
- Es, Ws, Opts)
+ Es, Ws, Opts1)
end;
false ->
skipped
--
cgit v1.1
From e8ef242c8bda1890b5e587527ae0f3d988b36d9c Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 19 Oct 2014 12:25:37 -0500
Subject: code cleanup
---
src/rebar_prv_install_deps.erl | 81 +++++++++++++++++++++++-------------------
1 file changed, 44 insertions(+), 37 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index d752fb9..dacd4e1 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -155,47 +155,23 @@ package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
-spec update_src_deps(integer(), rebar_state:t(), boolean()) -> rebar_state:t().
update_src_deps(Level, State, Update) ->
SrcDeps = rebar_state:src_deps(State),
- DepsDir = get_deps_dir(State),
case lists:foldl(fun(AppInfo, {SrcDepsAcc, PkgDepsAcc, StateAcc}) ->
- Name = rebar_app_info:name(AppInfo),
- Locks = rebar_state:get(State, locks, []),
case Update of
{true, UpdateName, UpdateLevel} ->
- {_, _, _, DepLevel} = lists:keyfind(Name, 1, Locks),
- case UpdateLevel < DepLevel
- orelse Name =:= UpdateName of
- true ->
- case maybe_fetch(AppInfo, true) of
- true ->
- {AppInfo1, NewSrcDeps, NewPkgDeps} =
- handle_dep(DepsDir, AppInfo),
- AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
- {NewSrcDeps ++ SrcDepsAcc
- ,NewPkgDeps++PkgDepsAcc
- ,rebar_state:src_apps(StateAcc, AppInfo2)};
- false ->
- {SrcDepsAcc, PkgDepsAcc, State}
- end;
- false ->
- {SrcDepsAcc, PkgDepsAcc, State}
- end;
+ handle_update(AppInfo
+ ,UpdateName
+ ,UpdateLevel
+ ,SrcDepsAcc
+ ,PkgDepsAcc
+ ,Level
+ ,StateAcc);
_ ->
- case maybe_fetch(AppInfo, false) of
- true ->
- {AppInfo1, NewSrcDeps, NewPkgDeps} =
- handle_dep(DepsDir, AppInfo),
- AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
- {NewSrcDeps ++ SrcDepsAcc
- ,NewPkgDeps++PkgDepsAcc
- ,rebar_state:src_apps(StateAcc, AppInfo2)};
- false ->
- {AppInfo1, NewSrcDeps, NewPkgDeps} =
- handle_dep(DepsDir, AppInfo),
- AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
- {NewSrcDeps ++ SrcDepsAcc
- ,NewPkgDeps++PkgDepsAcc
- ,rebar_state:src_apps(StateAcc, AppInfo2)}
- end
+ maybe_fetch(AppInfo, false),
+ handle_dep(AppInfo
+ ,SrcDepsAcc
+ ,PkgDepsAcc
+ ,Level
+ ,StateAcc)
end
end, {[], rebar_state:pkg_deps(State), State}, SrcDeps) of
{[], NewPkgDeps, State1} ->
@@ -206,6 +182,37 @@ update_src_deps(Level, State, Update) ->
update_src_deps(Level+1, State3, Update)
end.
+handle_update(AppInfo, UpdateName, UpdateLevel, SrcDeps, PkgDeps, Level, State) ->
+ Name = rebar_app_info:name(AppInfo),
+ Locks = rebar_state:get(State, locks, []),
+ {_, _, _, DepLevel} = lists:keyfind(Name, 1, Locks),
+ case UpdateLevel < DepLevel
+ orelse Name =:= UpdateName of
+ true ->
+ case maybe_fetch(AppInfo, true) of
+ true ->
+ handle_dep(AppInfo
+ ,SrcDeps
+ ,PkgDeps
+ ,Level
+ ,State);
+
+ false ->
+ {SrcDeps, PkgDeps, State}
+ end;
+ false ->
+ {SrcDeps, PkgDeps, State}
+ end.
+
+handle_dep(AppInfo, SrcDeps, PkgDeps, Level, State) ->
+ DepsDir = get_deps_dir(State),
+ {AppInfo1, NewSrcDeps, NewPkgDeps} =
+ handle_dep(DepsDir, AppInfo),
+ AppInfo2 = rebar_app_info:dep_level(AppInfo1, Level),
+ {NewSrcDeps ++ SrcDeps
+ ,NewPkgDeps++PkgDeps
+ ,rebar_state:src_apps(State, AppInfo2)}.
+
-spec handle_dep(file:filename_all(), rebar_app_info:t()) ->
{rebar_app_info:t(), [rebar_app_info:t()], [pkg_dep()]}.
handle_dep(DepsDir, AppInfo) ->
--
cgit v1.1
From da75d73b2fd1801826dbc2fc6173afe471059f0f Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 19 Oct 2014 19:41:27 -0500
Subject: code cleanup
---
src/rebar_prv_install_deps.erl | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index dacd4e1..2ff7f19 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -136,7 +136,6 @@ handle_deps(State, Deps, Update) ->
%% Internal functions
%% ===================================================================
-%-spec package_to_app(any(), ) -> []. % [rebar_app_info:t()].
package_to_app(DepsDir, Packages, Pkg={_, Vsn}) ->
Name = ec_cnv:to_binary(rlx_depsolver:dep_pkg(Pkg)),
FmtVsn = iolist_to_binary(rlx_depsolver:format_version(Vsn)),
@@ -263,27 +262,23 @@ parse_deps(DepsDir, Deps) ->
(Name, {SrcDepsAcc, PkgDepsAcc}) when is_atom(Name) ->
{SrcDepsAcc, [ec_cnv:to_binary(Name) | PkgDepsAcc]};
({Name, Vsn, Source}, {SrcDepsAcc, PkgDepsAcc}) when is_tuple (Source) ->
- Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
- {ok, Dep} = case rebar_app_info:discover(Dir) of
- {ok, App} ->
- {ok, App};
- not_found ->
- rebar_app_info:new(Name, Vsn, Dir)
- end,
- Dep1 = rebar_app_info:source(Dep, Source),
- {[Dep1 | SrcDepsAcc], PkgDepsAcc};
+ Dep = new_dep(DepsDir, Name, Vsn, Source),
+ {[Dep | SrcDepsAcc], PkgDepsAcc};
({Name, Vsn, Source, _Level}, {SrcDepsAcc, PkgDepsAcc}) when is_tuple (Source) ->
- Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
- {ok, Dep} = case rebar_app_info:discover(Dir) of
- {ok, App} ->
- {ok, App};
- not_found ->
- rebar_app_info:new(Name, Vsn, Dir)
- end,
- Dep1 = rebar_app_info:source(Dep, Source),
- {[Dep1 | SrcDepsAcc], PkgDepsAcc}
+ Dep = new_dep(DepsDir, Name, Vsn, Source),
+ {[Dep | SrcDepsAcc], PkgDepsAcc}
end, {[], []}, Deps).
+new_dep(DepsDir, Name, Vsn, Source) ->
+ Dir = ec_cnv:to_list(get_deps_dir(DepsDir, Name)),
+ {ok, Dep} = case rebar_app_info:discover(Dir) of
+ {ok, App} ->
+ {ok, App};
+ not_found ->
+ rebar_app_info:new(Name, Vsn, Dir)
+ end,
+ rebar_app_info:source(Dep, Source).
+
-spec parse_goal(binary(), binary()) -> pkg_dep().
parse_goal(Name, Constraint) ->
case re:run(Constraint, "([^\\d]*)(\\d.*)", [{capture, [1,2], binary}]) of
@@ -300,9 +295,7 @@ info(Description) ->
"~n"
"Valid rebar.config options:~n"
" ~p~n"
- " ~p~n"
- "Valid command line options:~n"
- " deps_dir=\"deps\" (override default or rebar.config deps_dir)~n",
+ " ~p~n",
[
Description,
{deps_dir, "deps"},
--
cgit v1.1
From bd1501f079aea3d2a991343224f2b9fc472f5d5f Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 22 Oct 2014 12:03:34 -0500
Subject: fix format_error cycle
---
src/rebar_topo.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/rebar_topo.erl b/src/rebar_topo.erl
index 26ebbc4..de3351a 100644
--- a/src/rebar_topo.erl
+++ b/src/rebar_topo.erl
@@ -76,10 +76,10 @@ format_error({cycle, Pairs}) ->
"before we can continue:\n",
case Pairs of
[{P1, P2}] ->
- [rebar_utils:indent(2), P2, "->", P1];
+ [rebar_utils:indent(2), erlang:atom_to_list(P2), "->", erlang:atom_to_list(P1)];
[{P1, P2} | Rest] ->
- [rebar_utils:indent(2), P2, "->", P1,
- [["-> ", PP2, " -> ", PP1] || {PP1, PP2} <- Rest]];
+ [rebar_utils:indent(2), erlang:atom_to_list(P2), "->", erlang:atom_to_list(P1),
+ [["-> ", erlang:atom_to_list(PP2), " -> ", erlang:atom_to_list(PP1)] || {PP1, PP2} <- Rest]];
[] ->
[]
end].
--
cgit v1.1
From 8c0212d6d3f938ed4a9cfc24828b98224619d475 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 22 Oct 2014 18:27:06 -0500
Subject: return error on not found provider for command
---
src/rebar.app.src | 2 +-
src/rebar_core.erl | 28 ++--
src/rebar_erlydtl_compiler.erl | 290 -----------------------------------------
3 files changed, 17 insertions(+), 303 deletions(-)
delete mode 100644 src/rebar_erlydtl_compiler.erl
(limited to 'src')
diff --git a/src/rebar.app.src b/src/rebar.app.src
index 28c683c..a23c246 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -27,7 +27,7 @@
rebar_prv_lock,
rebar_prv_install_deps,
rebar_prv_packages,
- rebar_erlydtl_compiler,
+ rebar_prv_erlydtl_compiler,
rebar_prv_compile,
rebar_prv_app_discovery,
rebar_prv_shell,
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 155e14f..16d8f07 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -36,18 +36,22 @@ process_command(State, Command) ->
%% ? rebar_prv_install_deps:setup_env(State),
Providers = rebar_state:providers(State),
TargetProviders = providers:get_target_providers(Command, Providers),
- CommandProvider = providers:get_provider(Command, Providers),
- Opts = providers:opts(CommandProvider)++rebar3:global_option_spec_list(),
- case Command of
- do ->
- do(TargetProviders, State);
- _ ->
- case getopt:parse(Opts, rebar_state:command_args(State)) of
- {ok, Args} ->
- State2 = rebar_state:command_parsed_args(State, Args),
- do(TargetProviders, State2);
- {error, {invalid_option, Option}} ->
- {error, io_lib:format("Invalid option ~s on task ~p", [Option, Command])}
+ case providers:get_provider(Command, Providers) of
+ not_found ->
+ {error, io_lib:format("Command ~p not found", [Command])};
+ CommandProvider ->
+ Opts = providers:opts(CommandProvider)++rebar3:global_option_spec_list(),
+ case Command of
+ do ->
+ do(TargetProviders, State);
+ _ ->
+ case getopt:parse(Opts, rebar_state:command_args(State)) of
+ {ok, Args} ->
+ State2 = rebar_state:command_parsed_args(State, Args),
+ do(TargetProviders, State2);
+ {error, {invalid_option, Option}} ->
+ {error, io_lib:format("Invalid option ~s on task ~p", [Option, Command])}
+ end
end
end.
diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
deleted file mode 100644
index 1a4de6b..0000000
--- a/src/rebar_erlydtl_compiler.erl
+++ /dev/null
@@ -1,290 +0,0 @@
-%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
-%% ex: ts=4 sw=4 et
-%% -------------------------------------------------------------------
-%%
-%% rebar: Erlang Build Tools
-%%
-%% Copyright (c) 2009 Dave Smith (dizzyd@dizzyd.com),
-%% Bryan Fink (bryan@basho.com)
-%%
-%% Permission is hereby granted, free of charge, to any person obtaining a copy
-%% of this software and associated documentation files (the "Software"), to deal
-%% in the Software without restriction, including without limitation the rights
-%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-%% copies of the Software, and to permit persons to whom the Software is
-%% furnished to do so, subject to the following conditions:
-%%
-%% The above copyright notice and this permission notice shall be included in
-%% all copies or substantial portions of the Software.
-%%
-%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-%% THE SOFTWARE.
-%% -------------------------------------------------------------------
-
-%% The rebar_erlydtl_compiler module is a plugin for rebar that compiles
-%% ErlyDTL templates. By default, it compiles all templates/*.dtl
-%% to ebin/*_dtl.beam.
-%%
-%% Configuration options should be placed in rebar.config under
-%% 'erlydtl_opts'. It can be a list of name-value tuples or a list of
-%% lists of name-value tuples if you have multiple template directories
-%% that need to have different settings (see example below).
-%%
-%% Available options include:
-%%
-%% doc_root: where to find templates to compile
-%% "templates" by default
-%%
-%% out_dir: where to put compiled template beam files
-%% "ebin" by default
-%%
-%% source_ext: the file extension the template sources have
-%% ".dtl" by default
-%%
-%% module_ext: characters to append to the template's module name
-%% "_dtl" by default
-%%
-%% recursive: boolean that determines if doc_root(s) need to be
-%% scanned recursively for matching template file names
-%% (default: true).
-%% For example, if you had:
-%% /t_src/
-%% base.html
-%% foo.html
-%%
-%% And you wanted them compiled to:
-%% /priv/
-%% base.beam
-%% foo.beam
-%%
-%% You would add to your rebar.config:
-%% {erlydtl_opts, [
-%% {doc_root, "t_src"},
-%% {out_dir, "priv"},
-%% {source_ext, ".html"},
-%% {module_ext, ""}
-%% ]}.
-%%
-%% The default settings are the equivalent of:
-%% {erlydtl_opts, [
-%% {doc_root, "templates"},
-%% {out_dir, "ebin"},
-%% {source_ext, ".dtl"},
-%% {module_ext, "_dtl"}
-%% ]}.
-%%
-%% The following example will compile the following templates:
-%% "src/*.dtl" files into "ebin/*_dtl.beam" and
-%% "templates/*.html" into "ebin/*.beam". Note that any tuple option
-%% (such as 'out_dir') in the outer list is added to each inner list:
-%% {erlydtl_opts, [
-%% {out_dir, "ebin"},
-%% {recursive, false},
-%% [
-%% {doc_root, "src"}, {module_ext, "_dtl"}
-%% ],
-%% [
-%% {doc_root, "templates"}, {module_ext, ""}, {source_ext, ".html"}
-%% ]
-%% ]}.
--module(rebar_erlydtl_compiler).
-
--behaviour(provider).
-
--export([init/1,
- do/1]).
-
-%% for internal use only
--export([info/2]).
-
--include("rebar.hrl").
-
--define(PROVIDER, erlydtl).
--define(DEPS, []).
-
-%% ===================================================================
-%% Public API
-%% ===================================================================
-
--spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
-init(State) ->
- State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
- {module, ?MODULE},
- {bare, false},
- {deps, ?DEPS},
- {example, "rebar erlydtl compile"},
- {short_desc, "Compile erlydtl templates."},
- {desc, ""},
- {opts, []}])),
- {ok, State1}.
-
-do(Config) ->
- MultiDtlOpts = erlydtl_opts(Config),
- OrigPath = code:get_path(),
- %true = code:add_path(rebar_utils:ebin_dir()),
-
- Result = lists:foldl(fun(DtlOpts, _) ->
- file:make_dir(option(out_dir, DtlOpts)),
- rebar_base_compiler:run(Config, [],
- option(doc_root, DtlOpts),
- option(source_ext, DtlOpts),
- option(out_dir, DtlOpts),
- option(module_ext, DtlOpts) ++ ".beam",
- fun(S, T, C) ->
- compile_dtl(C, S, T, DtlOpts)
- end,
- [{check_last_mod, false},
- {recursive, option(recursive, DtlOpts)}])
- end, ok, MultiDtlOpts),
-
- true = code:set_path(OrigPath),
- {Result, Config}.
-
-%% ===================================================================
-%% Internal functions
-%% ===================================================================
-
-info(help, compile) ->
- ?CONSOLE(
- "Build ErlyDtl (*.dtl) sources.~n"
- "~n"
- "Valid rebar.config options:~n"
- " ~p~n",
- [
- {erlydtl_opts, [{doc_root, "templates"},
- {out_dir, "ebin"},
- {source_ext, ".dtl"},
- {module_ext, "_dtl"},
- {recursive, true}]}
- ]).
-
-erlydtl_opts(Config) ->
- Opts = rebar_state:get(Config, erlydtl_opts, []),
- Tuples = [{K,V} || {K,V} <- Opts],
- case [L || L <- Opts, is_list(L), not io_lib:printable_list(L)] of
- [] ->
- [lists:keysort(1, Tuples)];
- Lists ->
- lists:map(
- fun(L) ->
- lists:keysort(1,
- lists:foldl(
- fun({K,T}, Acc) ->
- lists:keystore(K, 1, Acc, {K, T})
- end, Tuples, L))
- end, Lists)
- end.
-
-option(Opt, DtlOpts) ->
- proplists:get_value(Opt, DtlOpts, default(Opt)).
-
-default(doc_root) -> "templates";
-default(out_dir) -> "ebin";
-default(source_ext) -> ".dtl";
-default(module_ext) -> "_dtl";
-default(custom_tags_dir) -> "";
-default(compiler_options) -> [return];
-default(recursive) -> true.
-
-compile_dtl(Config, Source, Target, DtlOpts) ->
- case code:which(erlydtl) of
- non_existing ->
- ?ERROR("~n===============================================~n"
- " You need to install erlydtl to compile DTL templates~n"
- " Download the latest tarball release from github~n"
- " https://github.com/erlydtl/erlydtl/releases~n"
- " and install it into your erlang library dir~n"
- "===============================================~n~n", []),
- ?FAIL;
- _ ->
- case needs_compile(Source, Target, DtlOpts) of
- true ->
- do_compile(Config, Source, Target, DtlOpts);
- false ->
- skipped
- end
- end.
-
-do_compile(Config, Source, Target, DtlOpts) ->
- %% TODO: Check last mod on target and referenced DTLs here..
-
- %% erlydtl >= 0.8.1 does not use the extra indirection using the
- %% compiler_options. Kept for backward compatibility with older
- %% versions of erlydtl.
- CompilerOptions = option(compiler_options, DtlOpts),
-
- Sorted = proplists:unfold(
- lists:sort(
- [{out_dir, option(out_dir, DtlOpts)},
- {doc_root, option(doc_root, DtlOpts)},
- {custom_tags_dir, option(custom_tags_dir, DtlOpts)},
- {compiler_options, CompilerOptions}
- |CompilerOptions])),
-
- %% ensure that doc_root and out_dir are defined,
- %% using defaults if necessary
- Opts = lists:ukeymerge(1, DtlOpts, Sorted),
- ?INFO("Compiling \"~s\" -> \"~s\" with options:~n ~s~n",
- [Source, Target, io_lib:format("~p", [Opts])]),
- case erlydtl:compile_file(ec_cnv:to_list(Source),
- list_to_atom(module_name(Target)),
- Opts) of
- {ok, _Mod} ->
- ok;
- {ok, _Mod, Ws} ->
- rebar_base_compiler:ok_tuple(Config, Source, Ws);
- error ->
- rebar_base_compiler:error_tuple(Config, Source, [], [], Opts);
- {error, Es, Ws} ->
- rebar_base_compiler:error_tuple(Config, Source, Es, Ws, Opts)
- end.
-
-module_name(Target) ->
- F = filename:basename(Target),
- string:substr(F, 1, length(F)-length(".beam")).
-
-needs_compile(Source, Target, DtlOpts) ->
- LM = filelib:last_modified(Target),
- LM < filelib:last_modified(Source) orelse
- lists:any(fun(D) -> LM < filelib:last_modified(D) end,
- referenced_dtls(Source, DtlOpts)).
-
-referenced_dtls(Source, DtlOpts) ->
- DtlOpts1 = lists:keyreplace(doc_root, 1, DtlOpts,
- {doc_root, filename:dirname(Source)}),
- Set = referenced_dtls1([Source], DtlOpts1,
- sets:add_element(Source, sets:new())),
- sets:to_list(sets:del_element(Source, Set)).
-
-referenced_dtls1(Step, DtlOpts, Seen) ->
- ExtMatch = re:replace(option(source_ext, DtlOpts), "\.", "\\\\\\\\.",
- [{return, list}]),
-
- ShOpts = [{use_stdout, false}, return_on_error],
- AllRefs =
- lists:append(
- [begin
- Cmd = lists:flatten(["grep -o [^\\\"]*\\",
- ExtMatch, "[^\\\"]* ", F]),
- case rebar_utils:sh(Cmd, ShOpts) of
- {ok, Res} ->
- string:tokens(Res, "\n");
- {error, _} ->
- ""
- end
- end || F <- Step]),
- DocRoot = option(doc_root, DtlOpts),
- WithPaths = [ filename:join([DocRoot, F]) || F <- AllRefs ],
- ?DEBUG("All deps: ~p\n", [WithPaths]),
- Existing = [F || F <- WithPaths, filelib:is_regular(F)],
- New = sets:subtract(sets:from_list(Existing), Seen),
- case sets:size(New) of
- 0 -> Seen;
- _ -> referenced_dtls1(sets:to_list(New), DtlOpts,
- sets:union(New, Seen))
- end.
--
cgit v1.1
From 774706b15e530fe352cd213908c416d58e10db0e Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 22 Oct 2014 18:26:52 -0500
Subject: output error on bad provider attempting to be added
---
src/rebar_state.erl | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 130f08d..f39251d 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -152,8 +152,13 @@ add_provider(State=#state_t{providers=Providers}, Provider) ->
create_logic_providers(ProviderModules, State0) ->
lists:foldl(fun(ProviderMod, Acc) ->
- {ok, State1} = providers:new(ProviderMod, Acc),
- State1
+ case providers:new(ProviderMod, Acc) of
+ {error, Reason} ->
+ ?ERROR(Reason++"~n", []),
+ Acc;
+ {ok, State1} ->
+ State1
+ end
end, State0, ProviderModules).
prepend_hook(State=#state_t{providers=Providers}, Target, Hook) ->
--
cgit v1.1
From e5c872101fffa52741a29a3bfa06f63f51547020 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 22 Oct 2014 18:24:23 -0500
Subject: fix erlydtl provider module name
---
src/rebar_prv_erlydtl_compiler.erl | 295 +++++++++++++++++++++++++++++++++++++
1 file changed, 295 insertions(+)
create mode 100644 src/rebar_prv_erlydtl_compiler.erl
(limited to 'src')
diff --git a/src/rebar_prv_erlydtl_compiler.erl b/src/rebar_prv_erlydtl_compiler.erl
new file mode 100644
index 0000000..8d80cdd
--- /dev/null
+++ b/src/rebar_prv_erlydtl_compiler.erl
@@ -0,0 +1,295 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2009 Dave Smith (dizzyd@dizzyd.com),
+%% Bryan Fink (bryan@basho.com)
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+%% -------------------------------------------------------------------
+
+%% The rebar_erlydtl_compiler module is a plugin for rebar that compiles
+%% ErlyDTL templates. By default, it compiles all templates/*.dtl
+%% to ebin/*_dtl.beam.
+%%
+%% Configuration options should be placed in rebar.config under
+%% 'erlydtl_opts'. It can be a list of name-value tuples or a list of
+%% lists of name-value tuples if you have multiple template directories
+%% that need to have different settings (see example below).
+%%
+%% Available options include:
+%%
+%% doc_root: where to find templates to compile
+%% "templates" by default
+%%
+%% out_dir: where to put compiled template beam files
+%% "ebin" by default
+%%
+%% source_ext: the file extension the template sources have
+%% ".dtl" by default
+%%
+%% module_ext: characters to append to the template's module name
+%% "_dtl" by default
+%%
+%% recursive: boolean that determines if doc_root(s) need to be
+%% scanned recursively for matching template file names
+%% (default: true).
+%% For example, if you had:
+%% /t_src/
+%% base.html
+%% foo.html
+%%
+%% And you wanted them compiled to:
+%% /priv/
+%% base.beam
+%% foo.beam
+%%
+%% You would add to your rebar.config:
+%% {erlydtl_opts, [
+%% {doc_root, "t_src"},
+%% {out_dir, "priv"},
+%% {source_ext, ".html"},
+%% {module_ext, ""}
+%% ]}.
+%%
+%% The default settings are the equivalent of:
+%% {erlydtl_opts, [
+%% {doc_root, "templates"},
+%% {out_dir, "ebin"},
+%% {source_ext, ".dtl"},
+%% {module_ext, "_dtl"}
+%% ]}.
+%%
+%% The following example will compile the following templates:
+%% "src/*.dtl" files into "ebin/*_dtl.beam" and
+%% "templates/*.html" into "ebin/*.beam". Note that any tuple option
+%% (such as 'out_dir') in the outer list is added to each inner list:
+%% {erlydtl_opts, [
+%% {out_dir, "ebin"},
+%% {recursive, false},
+%% [
+%% {doc_root, "src"}, {module_ext, "_dtl"}
+%% ],
+%% [
+%% {doc_root, "templates"}, {module_ext, ""}, {source_ext, ".html"}
+%% ]
+%% ]}.
+-module(rebar_prv_erlydtl_compiler).
+
+-behaviour(provider).
+
+-export([init/1,
+ do/1,
+ format_error/2]).
+
+%% for internal use only
+-export([info/2]).
+
+-include("rebar.hrl").
+
+-define(PROVIDER, erlydtl).
+-define(DEPS, []).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+ State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
+ {module, ?MODULE},
+ {bare, false},
+ {deps, ?DEPS},
+ {example, "rebar erlydtl compile"},
+ {short_desc, "Compile erlydtl templates."},
+ {desc, ""},
+ {opts, []}])),
+ {ok, State1}.
+
+do(Config) ->
+ MultiDtlOpts = erlydtl_opts(Config),
+ OrigPath = code:get_path(),
+ %true = code:add_path(rebar_utils:ebin_dir()),
+
+ Result = lists:foldl(fun(DtlOpts, _) ->
+ file:make_dir(option(out_dir, DtlOpts)),
+ rebar_base_compiler:run(Config, [],
+ option(doc_root, DtlOpts),
+ option(source_ext, DtlOpts),
+ option(out_dir, DtlOpts),
+ option(module_ext, DtlOpts) ++ ".beam",
+ fun(S, T, C) ->
+ compile_dtl(C, S, T, DtlOpts)
+ end,
+ [{check_last_mod, false},
+ {recursive, option(recursive, DtlOpts)}])
+ end, ok, MultiDtlOpts),
+
+ true = code:set_path(OrigPath),
+ {Result, Config}.
+
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
+
+info(help, compile) ->
+ ?CONSOLE(
+ "Build ErlyDtl (*.dtl) sources.~n"
+ "~n"
+ "Valid rebar.config options:~n"
+ " ~p~n",
+ [
+ {erlydtl_opts, [{doc_root, "templates"},
+ {out_dir, "ebin"},
+ {source_ext, ".dtl"},
+ {module_ext, "_dtl"},
+ {recursive, true}]}
+ ]).
+
+erlydtl_opts(Config) ->
+ Opts = rebar_state:get(Config, erlydtl_opts, []),
+ Tuples = [{K,V} || {K,V} <- Opts],
+ case [L || L <- Opts, is_list(L), not io_lib:printable_list(L)] of
+ [] ->
+ [lists:keysort(1, Tuples)];
+ Lists ->
+ lists:map(
+ fun(L) ->
+ lists:keysort(1,
+ lists:foldl(
+ fun({K,T}, Acc) ->
+ lists:keystore(K, 1, Acc, {K, T})
+ end, Tuples, L))
+ end, Lists)
+ end.
+
+option(Opt, DtlOpts) ->
+ proplists:get_value(Opt, DtlOpts, default(Opt)).
+
+default(doc_root) -> "templates";
+default(out_dir) -> "ebin";
+default(source_ext) -> ".dtl";
+default(module_ext) -> "_dtl";
+default(custom_tags_dir) -> "";
+default(compiler_options) -> [return];
+default(recursive) -> true.
+
+compile_dtl(Config, Source, Target, DtlOpts) ->
+ case code:which(erlydtl) of
+ non_existing ->
+ ?ERROR("~n===============================================~n"
+ " You need to install erlydtl to compile DTL templates~n"
+ " Download the latest tarball release from github~n"
+ " https://github.com/erlydtl/erlydtl/releases~n"
+ " and install it into your erlang library dir~n"
+ "===============================================~n~n", []),
+ ?FAIL;
+ _ ->
+ case needs_compile(Source, Target, DtlOpts) of
+ true ->
+ do_compile(Config, Source, Target, DtlOpts);
+ false ->
+ skipped
+ end
+ end.
+
+do_compile(Config, Source, Target, DtlOpts) ->
+ %% TODO: Check last mod on target and referenced DTLs here..
+
+ %% erlydtl >= 0.8.1 does not use the extra indirection using the
+ %% compiler_options. Kept for backward compatibility with older
+ %% versions of erlydtl.
+ CompilerOptions = option(compiler_options, DtlOpts),
+
+ Sorted = proplists:unfold(
+ lists:sort(
+ [{out_dir, option(out_dir, DtlOpts)},
+ {doc_root, option(doc_root, DtlOpts)},
+ {custom_tags_dir, option(custom_tags_dir, DtlOpts)},
+ {compiler_options, CompilerOptions}
+ |CompilerOptions])),
+
+ %% ensure that doc_root and out_dir are defined,
+ %% using defaults if necessary
+ Opts = lists:ukeymerge(1, DtlOpts, Sorted),
+ ?INFO("Compiling \"~s\" -> \"~s\" with options:~n ~s~n",
+ [Source, Target, io_lib:format("~p", [Opts])]),
+ case erlydtl:compile_file(ec_cnv:to_list(Source),
+ list_to_atom(module_name(Target)),
+ Opts) of
+ {ok, _Mod} ->
+ ok;
+ {ok, _Mod, Ws} ->
+ rebar_base_compiler:ok_tuple(Config, Source, Ws);
+ error ->
+ rebar_base_compiler:error_tuple(Config, Source, [], [], Opts);
+ {error, Es, Ws} ->
+ rebar_base_compiler:error_tuple(Config, Source, Es, Ws, Opts)
+ end.
+
+module_name(Target) ->
+ F = filename:basename(Target),
+ string:substr(F, 1, length(F)-length(".beam")).
+
+needs_compile(Source, Target, DtlOpts) ->
+ LM = filelib:last_modified(Target),
+ LM < filelib:last_modified(Source) orelse
+ lists:any(fun(D) -> LM < filelib:last_modified(D) end,
+ referenced_dtls(Source, DtlOpts)).
+
+referenced_dtls(Source, DtlOpts) ->
+ DtlOpts1 = lists:keyreplace(doc_root, 1, DtlOpts,
+ {doc_root, filename:dirname(Source)}),
+ Set = referenced_dtls1([Source], DtlOpts1,
+ sets:add_element(Source, sets:new())),
+ sets:to_list(sets:del_element(Source, Set)).
+
+referenced_dtls1(Step, DtlOpts, Seen) ->
+ ExtMatch = re:replace(option(source_ext, DtlOpts), "\.", "\\\\\\\\.",
+ [{return, list}]),
+
+ ShOpts = [{use_stdout, false}, return_on_error],
+ AllRefs =
+ lists:append(
+ [begin
+ Cmd = lists:flatten(["grep -o [^\\\"]*\\",
+ ExtMatch, "[^\\\"]* ", F]),
+ case rebar_utils:sh(Cmd, ShOpts) of
+ {ok, Res} ->
+ string:tokens(Res, "\n");
+ {error, _} ->
+ ""
+ end
+ end || F <- Step]),
+ DocRoot = option(doc_root, DtlOpts),
+ WithPaths = [ filename:join([DocRoot, F]) || F <- AllRefs ],
+ ?DEBUG("All deps: ~p\n", [WithPaths]),
+ Existing = [F || F <- WithPaths, filelib:is_regular(F)],
+ New = sets:subtract(sets:from_list(Existing), Seen),
+ case sets:size(New) of
+ 0 -> Seen;
+ _ -> referenced_dtls1(sets:to_list(New), DtlOpts,
+ sets:union(New, Seen))
+ end.
--
cgit v1.1
From 1dce2d36cc75263db279abd7f282772ce0f0f3e6 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 22 Oct 2014 12:03:49 -0500
Subject: add format_error/2 provider callback to providers
---
src/rebar_prv_app_discovery.erl | 7 ++++++-
src/rebar_prv_clean.erl | 7 ++++++-
src/rebar_prv_compile.erl | 5 +++++
src/rebar_prv_deps.erl | 7 ++++++-
src/rebar_prv_do.erl | 7 ++++++-
src/rebar_prv_help.erl | 7 ++++++-
src/rebar_prv_install_deps.erl | 10 ++++++++--
src/rebar_prv_lock.erl | 7 ++++++-
src/rebar_prv_new.erl | 7 ++++++-
src/rebar_prv_packages.erl | 7 ++++++-
src/rebar_prv_release.erl | 7 ++++++-
src/rebar_prv_shell.erl | 7 ++++++-
src/rebar_prv_tar.erl | 7 ++++++-
src/rebar_prv_test_deps.erl | 7 ++++++-
src/rebar_prv_update.erl | 7 ++++++-
src/rebar_prv_upgrade.erl | 7 ++++++-
src/rebar_prv_version.erl | 7 ++++++-
17 files changed, 103 insertions(+), 17 deletions(-)
(limited to 'src')
diff --git a/src/rebar_prv_app_discovery.erl b/src/rebar_prv_app_discovery.erl
index 775aa3d..e2dcf23 100644
--- a/src/rebar_prv_app_discovery.erl
+++ b/src/rebar_prv_app_discovery.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -34,3 +35,7 @@ do(State) ->
LibDirs = rebar_state:get(State, lib_dirs, ?DEFAULT_LIB_DIRS),
State1 = rebar_app_discover:do(State, LibDirs),
{ok, State1}.
+
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl
index 2f983f3..72b85dc 100644
--- a/src/rebar_prv_clean.erl
+++ b/src/rebar_prv_clean.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -37,3 +38,7 @@ do(State) ->
rebar_erlc_compiler:clean(State, ec_cnv:to_list(rebar_app_info:dir(AppInfo)))
end, ProjectApps),
{ok, State}.
+
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
index fe0e197..30611cd 100644
--- a/src/rebar_prv_compile.erl
+++ b/src/rebar_prv_compile.erl
@@ -4,6 +4,7 @@
-export([init/1,
do/1,
+ format_error/2,
build/2]).
-include("rebar.hrl").
@@ -50,6 +51,10 @@ do(State) ->
{ok, State1}.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
build(State, AppInfo) ->
?INFO("Compiling ~s~n", [rebar_app_info:name(AppInfo)]),
rebar_erlc_compiler:compile(State, ec_cnv:to_list(rebar_app_info:dir(AppInfo))),
diff --git a/src/rebar_prv_deps.erl b/src/rebar_prv_deps.erl
index 6ba0d3a..80122ac 100644
--- a/src/rebar_prv_deps.erl
+++ b/src/rebar_prv_deps.erl
@@ -3,7 +3,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -26,6 +27,10 @@ init(State) ->
do(State) ->
{ok, State}.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
info(Description) ->
io_lib:format("~s.~n"
"~n"
diff --git a/src/rebar_prv_do.erl b/src/rebar_prv_do.erl
index 5f6e751..e66fdbd 100644
--- a/src/rebar_prv_do.erl
+++ b/src/rebar_prv_do.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -40,5 +41,9 @@ do(State) ->
rebar_core:process_command(StateAcc2, Task)
end, {ok, State}, Tasks).
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
args_to_tasks(Args) ->
[string:strip(T) || T <- string:tokens(string:join(Args, " "), ",")].
diff --git a/src/rebar_prv_help.erl b/src/rebar_prv_help.erl
index c2e1cd7..8300378 100644
--- a/src/rebar_prv_help.erl
+++ b/src/rebar_prv_help.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -49,6 +50,10 @@ do(State) ->
end
end.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
%%
%% print help/usage string
%%
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 2ff7f19..522420d 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -29,7 +29,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -82,6 +83,10 @@ do(State) ->
{error, Error}
end.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
-spec get_deps_dir(rebar_state:t()) -> file:filename_all().
get_deps_dir(State) ->
BaseDir = rebar_state:get(State, base_dir, ""),
@@ -96,7 +101,8 @@ get_deps_dir(DepsDir, App) ->
handle_deps(State, Deps) ->
handle_deps(State, Deps, false).
--spec handle_deps(rebar_state:t(), [dep()], boolean() | {true, binary(), integer()}) -> {ok, rebar_state:t()}.
+-spec handle_deps(rebar_state:t(), [dep()], boolean() | {true, binary(), integer()})
+ -> {ok, rebar_state:t()}.
handle_deps(State, [], _) ->
{ok, State};
handle_deps(State, Deps, Update) ->
diff --git a/src/rebar_prv_lock.erl b/src/rebar_prv_lock.erl
index dfe04cd..32c5f1a 100644
--- a/src/rebar_prv_lock.erl
+++ b/src/rebar_prv_lock.erl
@@ -3,7 +3,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -54,5 +55,9 @@ do(State) ->
{ok, State}
end.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
info(_) ->
"".
diff --git a/src/rebar_prv_new.erl b/src/rebar_prv_new.erl
index 3535061..2555b4d 100644
--- a/src/rebar_prv_new.erl
+++ b/src/rebar_prv_new.erl
@@ -3,7 +3,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -41,6 +42,10 @@ do(State) ->
{ok, State}
end.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
%% ===================================================================
%% Internal functions
%% ===================================================================
diff --git a/src/rebar_prv_packages.erl b/src/rebar_prv_packages.erl
index 6c0dd3f..be51833 100644
--- a/src/rebar_prv_packages.erl
+++ b/src/rebar_prv_packages.erl
@@ -3,7 +3,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -28,6 +29,10 @@ do(State) ->
print_packages(Packages),
{ok, State}.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
print_packages(Packages) ->
Keys = lists:keysort(1, dict:fetch_keys(Packages)),
Pkgs = merge(Keys),
diff --git a/src/rebar_prv_release.erl b/src/rebar_prv_release.erl
index 6be639c..572f909 100644
--- a/src/rebar_prv_release.erl
+++ b/src/rebar_prv_release.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -40,3 +41,7 @@ do(State) ->
relx:main([{config, Config}], AllOptions)
end,
{ok, State}.
+
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl
index e74486d..24e357b 100644
--- a/src/rebar_prv_shell.erl
+++ b/src/rebar_prv_shell.erl
@@ -31,7 +31,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -59,6 +60,10 @@ do(Config) ->
shell(),
{ok, Config}.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
%% NOTE:
%% this is an attempt to replicate `erl -pa ./ebin -pa deps/*/ebin`. it is
%% mostly successful but does stop and then restart the user io system to get
diff --git a/src/rebar_prv_tar.erl b/src/rebar_prv_tar.erl
index 06a4014..04a1b33 100644
--- a/src/rebar_prv_tar.erl
+++ b/src/rebar_prv_tar.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -38,3 +39,7 @@ do(State) ->
relx:main([{config, Config}], ["release tar"])
end,
{ok, State}.
+
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
diff --git a/src/rebar_prv_test_deps.erl b/src/rebar_prv_test_deps.erl
index b4c7250..081b210 100644
--- a/src/rebar_prv_test_deps.erl
+++ b/src/rebar_prv_test_deps.erl
@@ -3,7 +3,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -53,6 +54,10 @@ do(State) ->
{error, Error}
end.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
%% ===================================================================
%% Internal functions
%% ===================================================================
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index 8ac4426..0d388c8 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -45,6 +46,10 @@ do(State) ->
end,
{ok, State}.
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
+
url(State) ->
SystemArch = erlang:system_info(system_architecture),
ErtsVsn = erlang:system_info(version),
diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl
index cbeec98..1668e1c 100644
--- a/src/rebar_prv_upgrade.erl
+++ b/src/rebar_prv_upgrade.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -48,3 +49,7 @@ do(State) ->
_ ->
{error, io_lib:format("No such dependency ~s~n", [Name])}
end.
+
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
diff --git a/src/rebar_prv_version.erl b/src/rebar_prv_version.erl
index f158b6d..1e907d1 100644
--- a/src/rebar_prv_version.erl
+++ b/src/rebar_prv_version.erl
@@ -6,7 +6,8 @@
-behaviour(provider).
-export([init/1,
- do/1]).
+ do/1,
+ format_error/2]).
-include("rebar.hrl").
@@ -34,3 +35,7 @@ init(State) ->
do(State) ->
rebar3:version(),
{ok, State}.
+
+-spec format_error(any(), rebar_state:t()) -> {iolist(), rebar_state:t()}.
+format_error(Reason, State) ->
+ {io_lib:format("~p", [Reason]), State}.
--
cgit v1.1
From 1714e735f1e271cd997c9f1e055ac732d3c3ae69 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Fri, 24 Oct 2014 17:40:37 -0500
Subject: use error_format for prodiver error
---
src/rebar3.erl | 3 +++
1 file changed, 3 insertions(+)
(limited to 'src')
diff --git a/src/rebar3.erl b/src/rebar3.erl
index a1916f5..22c08ca 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -49,6 +49,9 @@ main(Args) ->
ok;
rebar_abort ->
rebar_utils:delayed_halt(1);
+ {error, {Module, Reason}} ->
+ ?ERROR(Module:format_error(Reason, []), []),
+ rebar_utils:delayed_halt(1);
{error, Error} ->
?ERROR(Error++"~n", []),
rebar_utils:delayed_halt(1);
--
cgit v1.1