Request 1675 (accepted)

erlang-rebar.spec Changed

@@ -14,14 +14,14 @@
 %global bootstrap 1
 
 Name:           erlang-%{realname}
-Version:        2.5.1
+Version:        2.6.1
 Release:        1%{?dist}
 Summary:        Erlang Build Tools
 Group:          Development/Tools
 License:        MIT
 URL:            https://github.com/rebar/rebar
-# wget --content-disposition https://github.com/rebar/rebar/tarball/2.5.1
-Source0:        %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+# From https://github.com/rebar/rebar/archive/2.6.1.tar.gz
+Source0:        %{realname}-%{version}.tar.gz
 Source1:        rebar.escript
 
 Patch1:         0001-Don-t-load-templates-from-the-bundle.patch
@@ -41,6 +41,9 @@
 %else
 BuildRequires:  erlang
 %endif
+BuildRequires:  erlang-rpm-macros >= 0.2.2
+
+Requires:       erlang-rpm-macros >= 0.2.2
 
 %if 0%{?bootstrap} < 1
 Requires:       erlang-erlydtl%{?_isa}
@@ -50,7 +53,6 @@
 %endif
 
 # FIXME wip
-#Requires:       erlang-abnfc%{?_isa}
 Requires:       erlang-asn1%{?_isa}
 Requires:       erlang-common_test%{?_isa}
 Requires:       erlang-compiler%{?_isa}
@@ -83,7 +85,8 @@
 Erlang Build Tools.
 
 %prep
-%setup -q -n %{upstream}-%{realname}-57ea1c5
+%setup -q -n %{realname}-%{version}
+
 %patch1 -p1
 
 %if 0%{?bootstrap} < 1
@@ -117,15 +120,17 @@
 
 
 %check
-#rebar eunit -v
-
+#rebar eunit -vv
 
 %files
-%doc LICENSE NOTES.org README.md THANKS rebar.config.sample
+%doc LICENSE README.md THANKS rebar.config.sample
 %{_bindir}/rebar
 %{_libdir}/erlang/lib/%{realname}-%{version}
 
 %changelog
+* Thu Mar 17 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.6.1-1
+- Update to version 2.6.1
+
 * Mon May 18 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.1-1
 - Use the upstream version of rebar

0001-Don-t-load-templates-from-the-bundle.patch Changed

@@ -1,4 +1,4 @@
-From 4c221409234ce24cedce19c56efa5e2192b0970c Mon Sep 17 00:00:00 2001
+From fe3b26384e237d067c601fbc29377a2b83d79c33 Mon Sep 17 00:00:00 2001
 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
 Date: Mon, 18 May 2015 11:45:03 +0200
 Subject: [PATCH 1/7] Don't load templates from the bundle
@@ -8,7 +8,7 @@
  1 file changed, 5 insertions(+), 26 deletions(-)
 
 diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl
-index dd89f3a..4c237a2 100644
+index 085ac1c..efee394 100644
 --- a/src/rebar_templater.erl
 +++ b/src/rebar_templater.erl
 @@ -205,27 +205,11 @@ create1(Config, TemplateId) ->
@@ -54,7 +54,7 @@
  
  find_disk_templates(Config) ->
      OtherTemplates = find_other_templates(Config),
-@@ -270,10 +252,7 @@ select_template([{Type, Avail} | Rest], Template) ->
+@@ -269,10 +251,7 @@ select_template([{Type, Avail} | Rest], Template) ->
  %%
  %% Read the contents of a file from the appropriate source
  %%
@@ -67,5 +67,5 @@
      Bin.
  
 -- 
-2.1.0
+2.5.0

0002-Unbundle-mustache.patch Changed

@@ -1,264 +1,24 @@
-From f4b1720e7f58feaa415473c353f3e5c2d390e74a Mon Sep 17 00:00:00 2001
+From aba0583d471bf8cf380600f2acf1ac42c1597818 Mon Sep 17 00:00:00 2001
 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
 Date: Mon, 18 May 2015 11:45:34 +0200
 Subject: [PATCH 2/7] Unbundle mustache
 
 ---
- ebin/rebar.app         |   3 +-
- src/rebar_mustache.erl | 230 -------------------------------------------------
- 2 files changed, 1 insertion(+), 232 deletions(-)
- delete mode 100644 src/rebar_mustache.erl
+ ebin/rebar.app | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/ebin/rebar.app b/ebin/rebar.app
-index 55454e9..9a81f90 100644
+index b4de616..27707c3 100644
 --- a/ebin/rebar.app
 +++ b/ebin/rebar.app
-@@ -40,8 +40,7 @@
-               rebar_utils,
+@@ -45,7 +45,6 @@
                rebar_xref,
                rebar_metacmds,
--              rebar_getopt,
--              rebar_mustache ]},
-+              rebar_getopt ]},
+               rebar_getopt,
+-              rebar_mustache,
+               rmemo ]},
    {registered, []},
-   {applications, [kernel,
-                   stdlib,
-diff --git a/src/rebar_mustache.erl b/src/rebar_mustache.erl
-deleted file mode 100644
-index 9016c0f..0000000
---- a/src/rebar_mustache.erl
-+++ /dev/null
-@@ -1,230 +0,0 @@
--%% The MIT License
--%%
--%% Copyright (c) 2009 Tom Preston-Werner <tom@mojombo.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.
--
--%% See the README at http://github.com/mojombo/mustache.erl for additional
--%% documentation and usage examples.
--
---module(rebar_mustache).  %% v0.1.0
---author("Tom Preston-Werner").
---export([compile/1, compile/2, render/1, render/2, render/3, get/2, get/3, escape/1, start/1]).
--
---record(mstate, {mod = undefined,
--                 section_re = undefined,
--                 tag_re = undefined}).
--
---define(MUSTACHE_STR, "rebar_mustache").
--
--compile(Body) when is_list(Body) ->
--  State = #mstate{},
--  CompiledTemplate = pre_compile(Body, State),
--  % io:format("~p~n~n", [CompiledTemplate]),
--  % io:format(CompiledTemplate ++ "~n", []),
--  {ok, Tokens, _} = erl_scan:string(CompiledTemplate),
--  {ok, [Form]} = erl_parse:parse_exprs(Tokens),
--  Bindings = erl_eval:new_bindings(),
--  {value, Fun, _} = erl_eval:expr(Form, Bindings),
--  Fun;
--compile(Mod) ->
--  TemplatePath = template_path(Mod),
--  compile(Mod, TemplatePath).
--
--compile(Mod, File) ->
--  code:purge(Mod),
--  {module, _} = code:load_file(Mod),
--  {ok, TemplateBin} = file:read_file(File),
--  Template = re:replace(TemplateBin, "\"", "\\\\\"", [global, {return,list}]),
--  State = #mstate{mod = Mod},
--  CompiledTemplate = pre_compile(Template, State),
--  % io:format("~p~n~n", [CompiledTemplate]),
--  % io:format(CompiledTemplate ++ "~n", []),
--  {ok, Tokens, _} = erl_scan:string(CompiledTemplate),
--  {ok, [Form]} = erl_parse:parse_exprs(Tokens),
--  Bindings = erl_eval:new_bindings(),
--  {value, Fun, _} = erl_eval:expr(Form, Bindings),
--  Fun.
--
--render(Mod) ->
--  TemplatePath = template_path(Mod),
--  render(Mod, TemplatePath).
--
--render(Body, Ctx) when is_list(Body) ->
--  TFun = compile(Body),
--  render(undefined, TFun, Ctx);
--render(Mod, File) when is_list(File) ->
--  render(Mod, File, dict:new());
--render(Mod, CompiledTemplate) ->
--  render(Mod, CompiledTemplate, dict:new()).
--
--render(Mod, File, Ctx) when is_list(File) ->
--  CompiledTemplate = compile(Mod, File),
--  render(Mod, CompiledTemplate, Ctx);
--render(Mod, CompiledTemplate, Ctx) ->
--  Ctx2 = dict:store('__mod__', Mod, Ctx),
--  lists:flatten(CompiledTemplate(Ctx2)).
--
--pre_compile(T, State) ->
--  SectionRE = "\{\{\#([^\}]*)}}\s*(.+?){{\/\\1\}\}\s*",
--  {ok, CompiledSectionRE} = re:compile(SectionRE, [dotall]),
--  TagRE = "\{\{(#|=|!|<|>|\{)?(.+?)\\1?\}\}+",
--  {ok, CompiledTagRE} = re:compile(TagRE, [dotall]),
--  State2 = State#mstate{section_re = CompiledSectionRE, tag_re = CompiledTagRE},
--  "fun(Ctx) -> " ++
--    "CFun = fun(A, B) -> A end, " ++
--    compiler(T, State2) ++ " end.".
--
--compiler(T, State) ->
--  Res = re:run(T, State#mstate.section_re),
--  case Res of
--    {match, [{M0, M1}, {N0, N1}, {C0, C1}]} ->
--      Front = string:substr(T, 1, M0),
--      Back = string:substr(T, M0 + M1 + 1),
--      Name = string:substr(T, N0 + 1, N1),
--      Content = string:substr(T, C0 + 1, C1),
--      "[" ++ compile_tags(Front, State) ++
--        " | [" ++ compile_section(Name, Content, State) ++
--        " | [" ++ compiler(Back, State) ++ "]]]";
--    nomatch ->
--      compile_tags(T, State)
--  end.
--
--compile_section(Name, Content, State) ->
--  Mod = State#mstate.mod,
--  Result = compiler(Content, State),
--  "fun() -> " ++
--    "case " ++ ?MUSTACHE_STR ++ ":get(" ++ Name ++ ", Ctx, " ++ atom_to_list(Mod) ++ ") of " ++
--      "\"true\" -> " ++
--        Result ++ "; " ++
--      "\"false\" -> " ++
--        "[]; " ++
--      "List when is_list(List) -> " ++
--        "[fun(Ctx) -> " ++ Result ++ " end(dict:merge(CFun, SubCtx, Ctx)) || SubCtx <- List]; " ++
--      "Else -> " ++
--        "throw({template, io_lib:format(\"Bad context for ~p: ~p\", [" ++ Name ++ ", Else])}) " ++
--    "end " ++
--  "end()".
--
--compile_tags(T, State) ->
--  Res = re:run(T, State#mstate.tag_re),
--  case Res of
--    {match, [{M0, M1}, K, {C0, C1}]} ->
--      Front = string:substr(T, 1, M0),
--      Back = string:substr(T, M0 + M1 + 1),
--      Content = string:substr(T, C0 + 1, C1),
--      Kind = tag_kind(T, K),
--      Result = compile_tag(Kind, Content, State),
--      "[\"" ++ Front ++
--        "\" | [" ++ Result ++
--        " | " ++ compile_tags(Back, State) ++ "]]";
--    nomatch ->
--      "[\"" ++ T ++ "\"]"
--  end.
--
--tag_kind(_T, {-1, 0}) ->
--  none;
--tag_kind(T, {K0, K1}) ->
--  string:substr(T, K0 + 1, K1).
--
--compile_tag(none, Content, State) ->
--  Mod = State#mstate.mod,
--  ?MUSTACHE_STR ++ ":escape(" ++ ?MUSTACHE_STR ++ ":get(" ++ Content ++ ", Ctx, " ++ atom_to_list(Mod) ++ "))";
--compile_tag("{", Content, State) ->
--  Mod = State#mstate.mod,
--  ?MUSTACHE_STR ++ ":get(" ++ Content ++ ", Ctx, " ++ atom_to_list(Mod) ++ ")";
--compile_tag("!", _Content, _State) ->
--  "[]".
--
--template_dir(Mod) ->
--  DefaultDirPath = filename:dirname(code:which(Mod)),
--  case application:get_env(mustache, templates_dir) of
--    {ok, DirPath} when is_list(DirPath) ->
--      case filelib:ensure_dir(DirPath) of
--        ok -> DirPath;
--        _  -> DefaultDirPath
--      end;
--    _ ->
--      DefaultDirPath
--  end.
--template_path(Mod) ->
--  DirPath = template_dir(Mod),
--  Basename = atom_to_list(Mod),
--  filename:join(DirPath, Basename ++ ".mustache").
--
--get(Key, Ctx) when is_list(Key) ->
--  {ok, Mod} = dict:find('__mod__', Ctx),
--  get(list_to_atom(Key), Ctx, Mod);
--get(Key, Ctx) ->
--  {ok, Mod} = dict:find('__mod__', Ctx),
--  get(Key, Ctx, Mod).
--
--get(Key, Ctx, Mod) when is_list(Key) ->
--  get(list_to_atom(Key), Ctx, Mod);
--get(Key, Ctx, Mod) ->
--  case dict:find(Key, Ctx) of
--    {ok, Val} ->
--      % io:format("From Ctx {~p, ~p}~n", [Key, Val]),
--      to_s(Val);
--    error ->
--      case erlang:function_exported(Mod, Key, 1) of
--        true ->
--          Val = to_s(Mod:Key(Ctx)),
--          % io:format("From Mod/1 {~p, ~p}~n", [Key, Val]),
--          Val;
--        false ->
--          case erlang:function_exported(Mod, Key, 0) of
--            true ->
--              Val = to_s(Mod:Key()),
--              % io:format("From Mod/0 {~p, ~p}~n", [Key, Val]),
--              Val;
--            false ->
--              []
--          end
--      end
--  end.
--
--to_s(Val) when is_integer(Val) ->
--  integer_to_list(Val);
--to_s(Val) when is_float(Val) ->
--  io_lib:format("~.2f", [Val]);
--to_s(Val) when is_atom(Val) ->
--  atom_to_list(Val);
--to_s(Val) ->
--  Val.
--
--escape(HTML) ->
--  escape(HTML, []).
--
--escape([], Acc) ->
--  lists:reverse(Acc);
--escape(["<" | Rest], Acc) ->
--  escape(Rest, lists:reverse("&lt;", Acc));
--escape([">" | Rest], Acc) ->
--  escape(Rest, lists:reverse("&gt;", Acc));
--escape(["&" | Rest], Acc) ->
--  escape(Rest, lists:reverse("&amp;", Acc));
--escape([X | Rest], Acc) ->
--  escape(Rest, [X | Acc]).
--
--%%---------------------------------------------------------------------------
--
--start([T]) ->
--  Out = render(list_to_atom(T)),
--  io:format(Out ++ "~n", []).
+   {applications,
 -- 
-2.1.0
+2.5.0

0003-Unbundle-getopt.patch Changed

@@ -1,948 +1,24 @@
-From a840b65449ff1993c99f0b5f6ac7db11da882471 Mon Sep 17 00:00:00 2001
+From 349f993c792e890dcab8867d30753b1efd864e6d Mon Sep 17 00:00:00 2001
 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
 Date: Mon, 18 May 2015 11:46:47 +0200
 Subject: [PATCH 3/7] Unbundle getopt
 
 ---
- ebin/rebar.app       |   3 +-
- src/rebar_getopt.erl | 914 ---------------------------------------------------
- 2 files changed, 1 insertion(+), 916 deletions(-)
- delete mode 100644 src/rebar_getopt.erl
+ ebin/rebar.app | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/ebin/rebar.app b/ebin/rebar.app
-index 9a81f90..c9932fc 100644
+index 27707c3..f9b0c22 100644
 --- a/ebin/rebar.app
 +++ b/ebin/rebar.app
-@@ -39,8 +39,7 @@
-               rebar_upgrade,
+@@ -44,7 +44,6 @@
                rebar_utils,
                rebar_xref,
--              rebar_metacmds,
--              rebar_getopt ]},
-+              rebar_metacmds ]},
+               rebar_metacmds,
+-              rebar_getopt,
+               rmemo ]},
    {registered, []},
-   {applications, [kernel,
-                   stdlib,
-diff --git a/src/rebar_getopt.erl b/src/rebar_getopt.erl
-deleted file mode 100644
-index 79b871d..0000000
---- a/src/rebar_getopt.erl
-+++ /dev/null
-@@ -1,914 +0,0 @@
--%%%-------------------------------------------------------------------
--%%% @author Juan Jose Comellas <juanjo@comellas.org>
--%%% @copyright (C) 2009 Juan Jose Comellas
--%%% @doc Parses command line options with a format similar to that of GNU getopt.
--%%% @end
--%%%
--%%% This source file is subject to the New BSD License. You should have received
--%%% a copy of the New BSD license with this software. If not, it can be
--%%% retrieved from: http://www.opensource.org/licenses/bsd-license.php
--%%%-------------------------------------------------------------------
---module(rebar_getopt).
---author('juanjo@comellas.org').
--
---export([parse/2, check/2, parse_and_check/2, format_error/2,
--         usage/2, usage/3, usage/4, tokenize/1]).
---export([usage_cmd_line/2]).
--
---define(LINE_LENGTH, 75).
---define(MIN_USAGE_COMMAND_LINE_OPTION_LENGTH, 25).
--
--%% Position of each field in the option specification tuple.
---define(OPT_NAME, 1).
---define(OPT_SHORT, 2).
---define(OPT_LONG, 3).
---define(OPT_ARG, 4).
---define(OPT_HELP, 5).
--
---define(IS_OPT_SPEC(Opt), (tuple_size(Opt) =:= ?OPT_HELP)).
---define(IS_WHITESPACE(Char), ((Char) =:= $\s orelse (Char) =:= $\t orelse
--                              (Char) =:= $\n orelse (Char) =:= $\r)).
--
--%% Atom indicating the data type that an argument can be converted to.
---type arg_type()                                :: 'atom' | 'binary' | 'boolean' | 'float' | 'integer' | 'string'.
--%% Data type that an argument can be converted to.
---type arg_value()                               :: atom() | binary() | boolean() | float() | integer() | string().
--%% Argument specification.
---type arg_spec()                                :: arg_type() | {arg_type(), arg_value()} | undefined.
--%% Option type and optional default argument.
---type simple_option()                           :: atom().
---type compound_option()                         :: {atom(), arg_value()}.
---type option()                                  :: simple_option() | compound_option().
--%% Command line option specification.
---type option_spec() :: {
--                   Name                         :: atom(),
--                   Short                        :: char() | undefined,
--                   Long                         :: string() | undefined,
--                   ArgSpec                      :: arg_spec(),
--                   Help                         :: string() | undefined
--                  }.
--%% Output streams
---type output_stream()                           :: 'standard_io' | 'standard_error'.
--
--%% For internal use
---type usage_line()                              :: {OptionText :: string(), HelpText :: string()}.
---type usage_line_with_length()                  :: {OptionLength :: non_neg_integer(), OptionText :: string(), HelpText :: string()}.
--
--
---export_type([arg_type/0, arg_value/0, arg_spec/0, simple_option/0, compound_option/0, option/0, option_spec/0]).
--
--
--%% @doc Parse the command line options and arguments returning a list of tuples
--%%      and/or atoms using the Erlang convention for sending options to a
--%%      function.  Additionally perform check if all required options (the ones
--%%      without default values) are present.  The function is a combination of
--%%      two calls: parse/2 and check/2.
---spec parse_and_check([option_spec()], string() | [string()]) ->
--                {ok, {[option()], [string()]}} | {error, {Reason :: atom(), Data :: term()}}.
--parse_and_check(OptSpecList, CmdLine) when is_list(OptSpecList), is_list(CmdLine) ->
--    case parse(OptSpecList, CmdLine) of
--        {ok, {Opts, _}} = Result ->
--            case check(OptSpecList, Opts) of
--                ok    -> Result;
--                Error -> Error
--            end;
--        Error ->
--            Error
--    end.
--
--%% @doc Check the parsed command line arguments returning ok if all required
--%%      options (i.e. that don't have defaults) are present, and returning
--%%      error otherwise.
---spec check([option_spec()], [option()]) ->
--                ok | {error, {Reason :: atom(), Option :: atom()}}.
--check(OptSpecList, ParsedOpts) when is_list(OptSpecList), is_list(ParsedOpts) ->
--    try
--        RequiredOpts = [Name || {Name, _, _, Arg, _} <- OptSpecList,
--                                not is_tuple(Arg) andalso Arg =/= undefined],
--        lists:foreach(fun (Option) ->
--            case proplists:is_defined(Option, ParsedOpts) of
--                true ->
--                    ok;
--                false ->
--                    throw({error, {missing_required_option, Option}})
--            end
--        end, RequiredOpts)
--    catch
--        _:Error ->
--            Error
--    end.
--
--
--%% @doc Parse the command line options and arguments returning a list of tuples
--%%      and/or atoms using the Erlang convention for sending options to a
--%%      function.
---spec parse([option_spec()], string() | [string()]) ->
--                   {ok, {[option()], [string()]}} | {error, {Reason :: atom(), Data :: term()}}.
--parse(OptSpecList, CmdLine) when is_list(CmdLine) ->
--    try
--        Args = if
--                   is_integer(hd(CmdLine)) -> tokenize(CmdLine);
--                   true                    -> CmdLine
--               end,
--        parse(OptSpecList, [], [], 0, Args)
--    catch
--        throw: {error, {_Reason, _Data}} = Error ->
--            Error
--    end.
--
--
---spec parse([option_spec()], [option()], [string()], integer(), [string()]) ->
--                   {ok, {[option()], [string()]}}.
--%% Process the option terminator.
--parse(OptSpecList, OptAcc, ArgAcc, _ArgPos, ["--" | Tail]) ->
--    %% Any argument present after the terminator is not considered an option.
--    {ok, {lists:reverse(append_default_options(OptSpecList, OptAcc)), lists:reverse(ArgAcc, Tail)}};
--%% Process long options.
--parse(OptSpecList, OptAcc, ArgAcc, ArgPos, ["--" ++ OptArg = OptStr | Tail]) ->
--    parse_long_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Tail, OptStr, OptArg);
--%% Process short options.
--parse(OptSpecList, OptAcc, ArgAcc, ArgPos, ["-" ++ ([_Char | _] = OptArg) = OptStr | Tail]) ->
--    parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Tail, OptStr, OptArg);
--%% Process non-option arguments.
--parse(OptSpecList, OptAcc, ArgAcc, ArgPos, [Arg | Tail]) ->
--    case find_non_option_arg(OptSpecList, ArgPos) of
--        {value, OptSpec} when ?IS_OPT_SPEC(OptSpec) ->
--            parse(OptSpecList, add_option_with_arg(OptSpec, Arg, OptAcc), ArgAcc, ArgPos + 1, Tail);
--        false ->
--            parse(OptSpecList, OptAcc, [Arg | ArgAcc], ArgPos, Tail)
--    end;
--parse(OptSpecList, OptAcc, ArgAcc, _ArgPos, []) ->
--    %% Once we have completed gathering the options we add the ones that were
--    %% not present but had default arguments in the specification.
--    {ok, {lists:reverse(append_default_options(OptSpecList, OptAcc)), lists:reverse(ArgAcc)}}.
--
--
--%% @doc Format the error code returned by prior call to parse/2 or check/2.
---spec format_error([option_spec()], {error, {Reason :: atom(), Data :: term()}} |
--                   {Reason :: term(), Data :: term()}) -> string().
--format_error(OptSpecList, {error, Reason}) ->
--    format_error(OptSpecList, Reason);
--format_error(OptSpecList, {missing_required_option, Name}) ->
--    {_Name, Short, Long, _Type, _Help} = lists:keyfind(Name, 1, OptSpecList),
--    lists:flatten(["missing required option: -", [Short], " (", to_string(Long), ")"]);
--format_error(_OptSpecList, {invalid_option, OptStr}) ->
--    lists:flatten(["invalid option: ", to_string(OptStr)]);
--format_error(_OptSpecList, {invalid_option_arg, {Name, Arg}}) ->
--    lists:flatten(["option \'", to_string(Name) ++ "\' has invalid argument: ", to_string(Arg)]);
--format_error(_OptSpecList, {invalid_option_arg, OptStr}) ->
--    lists:flatten(["invalid option argument: ", to_string(OptStr)]);
--format_error(_OptSpecList, {Reason, Data}) ->
--    lists:flatten([to_string(Reason), " ", to_string(Data)]).
--
--
--%% @doc Parse a long option, add it to the option accumulator and continue
--%%      parsing the rest of the arguments recursively.
--%%      A long option can have the following syntax:
--%%        --foo      Single option 'foo', no argument
--%%        --foo=bar  Single option 'foo', argument "bar"
--%%        --foo bar  Single option 'foo', argument "bar"
---spec parse_long_option([option_spec()], [option()], [string()], integer(), [string()], string(), string()) ->
--                               {ok, {[option()], [string()]}}.
--parse_long_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptArg) ->
--    case split_assigned_arg(OptArg) of
--        {Long, Arg} ->
--            %% Get option that has its argument within the same string
--            %% separated by an equal ('=') character (e.g. "--port=1000").
--            parse_long_option_assigned_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, Long, Arg);
--
--        Long ->
--            case lists:keyfind(Long, ?OPT_LONG, OptSpecList) of
--                {Name, _Short, Long, undefined, _Help} ->
--                    parse(OptSpecList, [Name | OptAcc], ArgAcc, ArgPos, Args);
--
--                {_Name, _Short, Long, _ArgSpec, _Help} = OptSpec ->
--                    %% The option argument string is empty, but the option requires
--                    %% an argument, so we look into the next string in the list.
--                    %% e.g ["--port", "1000"]
--                    parse_long_option_next_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptSpec);
--                false ->
--                    throw({error, {invalid_option, OptStr}})
--            end
--    end.
--
--
--%% @doc Parse an option where the argument is 'assigned' in the same string using
--%%      the '=' character, add it to the option accumulator and continue parsing the
--%%      rest of the arguments recursively. This syntax is only valid for long options.
---spec parse_long_option_assigned_arg([option_spec()], [option()], [string()], integer(),
--                                     [string()], string(), string(), string()) ->
--                                            {ok, {[option()], [string()]}}.
--parse_long_option_assigned_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, Long, Arg) ->
--    case lists:keyfind(Long, ?OPT_LONG, OptSpecList) of
--        {_Name, _Short, Long, ArgSpec, _Help} = OptSpec ->
--            case ArgSpec of
--                undefined ->
--                    throw({error, {invalid_option_arg, OptStr}});
--                _ ->
--                    parse(OptSpecList, add_option_with_assigned_arg(OptSpec, Arg, OptAcc), ArgAcc, ArgPos, Args)
--            end;
--        false ->
--            throw({error, {invalid_option, OptStr}})
--    end.
--
--
--%% @doc Split an option string that may contain an option with its argument
--%%      separated by an equal ('=') character (e.g. "port=1000").
---spec split_assigned_arg(string()) -> {Name :: string(), Arg :: string()} | string().
--split_assigned_arg(OptStr) ->
--    split_assigned_arg(OptStr, OptStr, []).
--
--split_assigned_arg(_OptStr, "=" ++ Tail, Acc) ->
--    {lists:reverse(Acc), Tail};
--split_assigned_arg(OptStr, [Char | Tail], Acc) ->
--    split_assigned_arg(OptStr, Tail, [Char | Acc]);
--split_assigned_arg(OptStr, [], _Acc) ->
--    OptStr.
--
--
--%% @doc Retrieve the argument for an option from the next string in the list of
--%%      command-line parameters or set the value of the argument from the argument
--%%      specification (for boolean and integer arguments), if possible.
--parse_long_option_next_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, {Name, _Short, _Long, ArgSpec, _Help} = OptSpec) ->
--    ArgSpecType = arg_spec_type(ArgSpec),
--    case Args =:= [] orelse is_implicit_arg(ArgSpecType, hd(Args)) of
--        true ->
--            parse(OptSpecList, add_option_with_implicit_arg(OptSpec, OptAcc), ArgAcc, ArgPos, Args);
--        false ->
--            [Arg | Tail] = Args,
--            try
--                parse(OptSpecList, [{Name, to_type(ArgSpecType, Arg)} | OptAcc], ArgAcc, ArgPos, Tail)
--            catch
--                error:_ ->
--                    throw({error, {invalid_option_arg, {Name, Arg}}})
--            end
--    end.
--
--
--%% @doc Parse a short option, add it to the option accumulator and continue
--%%      parsing the rest of the arguments recursively.
--%%      A short option can have the following syntax:
--%%        -a       Single option 'a', no argument or implicit boolean argument
--%%        -a foo   Single option 'a', argument "foo"
--%%        -afoo    Single option 'a', argument "foo"
--%%        -abc     Multiple options: 'a'; 'b'; 'c'
--%%        -bcafoo  Multiple options: 'b'; 'c'; 'a' with argument "foo"
--%%        -aaa     Multiple repetitions of option 'a' (only valid for options with integer arguments)
---spec parse_short_option([option_spec()], [option()], [string()], integer(), [string()], string(), string()) ->
--                                {ok, {[option()], [string()]}}.
--parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptArg) ->
--    parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, first, OptArg).
--
--parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptPos, [Short | Arg]) ->
--    case lists:keyfind(Short, ?OPT_SHORT, OptSpecList) of
--        {Name, Short, _Long, undefined, _Help} ->
--            parse_short_option(OptSpecList, [Name | OptAcc], ArgAcc, ArgPos, Args, OptStr, first, Arg);
--
--        {_Name, Short, _Long, ArgSpec, _Help} = OptSpec ->
--            %% The option has a specification, so it requires an argument.
--            case Arg of
--                [] ->
--                    %% The option argument string is empty, but the option requires
--                    %% an argument, so we look into the next string in the list.
--                    parse_short_option_next_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptSpec, OptPos);
--
--                _ ->
--                    case is_valid_arg(ArgSpec, Arg) of
--                        true ->
--                            parse(OptSpecList, add_option_with_arg(OptSpec, Arg, OptAcc), ArgAcc, ArgPos, Args);
--                        _ ->
--                            NewOptAcc = case OptPos of
--                                            first -> add_option_with_implicit_arg(OptSpec, OptAcc);
--                                            _     -> add_option_with_implicit_incrementable_arg(OptSpec, OptAcc)
--                                        end,
--                            parse_short_option(OptSpecList, NewOptAcc, ArgAcc, ArgPos, Args, OptStr, next, Arg)
--                    end
--            end;
--
--        false ->
--            throw({error, {invalid_option, OptStr}})
--    end;
--parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, _OptStr, _OptPos, []) ->
--    parse(OptSpecList, OptAcc, ArgAcc, ArgPos, Args).
--
--
--%% @doc Retrieve the argument for an option from the next string in the list of
--%%      command-line parameters or set the value of the argument from the argument
--%%      specification (for boolean and integer arguments), if possible.
--parse_short_option_next_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, {Name, _Short, _Long, ArgSpec, _Help} = OptSpec, OptPos) ->
--    case Args =:= [] orelse is_implicit_arg(ArgSpec, hd(Args)) of
--        true when OptPos =:= first ->
--            parse(OptSpecList, add_option_with_implicit_arg(OptSpec, OptAcc), ArgAcc, ArgPos, Args);
--        true ->
--            parse(OptSpecList, add_option_with_implicit_incrementable_arg(OptSpec, OptAcc), ArgAcc, ArgPos, Args);
--        false ->
--            [Arg | Tail] = Args,
--            try
--                parse(OptSpecList, [{Name, to_type(ArgSpec, Arg)} | OptAcc], ArgAcc, ArgPos, Tail)
--            catch
--                error:_ ->
--                    throw({error, {invalid_option_arg, {Name, Arg}}})
--            end
--    end.
--
--
--%% @doc Find the option for the discrete argument in position specified in the
--%%      Pos argument.
---spec find_non_option_arg([option_spec()], integer()) -> {value, option_spec()} | false.
--find_non_option_arg([{_Name, undefined, undefined, _ArgSpec, _Help} = OptSpec | _Tail], 0) ->
--    {value, OptSpec};
--find_non_option_arg([{_Name, undefined, undefined, _ArgSpec, _Help} | Tail], Pos) ->
--    find_non_option_arg(Tail, Pos - 1);
--find_non_option_arg([_Head | Tail], Pos) ->
--    find_non_option_arg(Tail, Pos);
--find_non_option_arg([], _Pos) ->
--    false.
--
--
--%% @doc Append options that were not present in the command line arguments with
--%%      their default arguments.
---spec append_default_options([option_spec()], [option()]) -> [option()].
--append_default_options([{Name, _Short, _Long, {_Type, DefaultArg}, _Help} | Tail], OptAcc) ->
--    append_default_options(Tail,
--                           case lists:keymember(Name, 1, OptAcc) of
--                               false ->
--                                   [{Name, DefaultArg} | OptAcc];
--                               _ ->
--                                   OptAcc
--                           end);
--%% For options with no default argument.
--append_default_options([_Head | Tail], OptAcc) ->
--    append_default_options(Tail, OptAcc);
--append_default_options([], OptAcc) ->
--    OptAcc.
--
--
--%% @doc Add an option with argument converting it to the data type indicated by the
--%%      argument specification.
---spec add_option_with_arg(option_spec(), string(), [option()]) -> [option()].
--add_option_with_arg({Name, _Short, _Long, ArgSpec, _Help} = OptSpec, Arg, OptAcc) ->
--    case is_valid_arg(ArgSpec, Arg) of
--        true ->
--            try
--                [{Name, to_type(ArgSpec, Arg)} | OptAcc]
--            catch
--                error:_ ->
--                    throw({error, {invalid_option_arg, {Name, Arg}}})
--            end;
--        false ->
--            add_option_with_implicit_arg(OptSpec, OptAcc)
--    end.
--
--
--%% @doc Add an option with argument that was part of an assignment expression
--%%      (e.g. "--verbose=3") converting it to the data type indicated by the
--%%      argument specification.
---spec add_option_with_assigned_arg(option_spec(), string(), [option()]) -> [option()].
--add_option_with_assigned_arg({Name, _Short, _Long, ArgSpec, _Help}, Arg, OptAcc) ->
--    try
--        [{Name, to_type(ArgSpec, Arg)} | OptAcc]
--    catch
--        error:_ ->
--            throw({error, {invalid_option_arg, {Name, Arg}}})
--    end.
--
--
--%% @doc Add an option that required an argument but did not have one. Some data
--%%      types (boolean, integer) allow implicit or assumed arguments.
---spec add_option_with_implicit_arg(option_spec(), [option()]) -> [option()].
--add_option_with_implicit_arg({Name, _Short, _Long, ArgSpec, _Help}, OptAcc) ->
--    case arg_spec_type(ArgSpec) of
--        boolean ->
--            %% Special case for boolean arguments: if there is no argument we
--            %% set the value to 'true'.
--            [{Name, true} | OptAcc];
--        integer ->
--            %% Special case for integer arguments: if the option had not been set
--            %% before we set the value to 1. This is needed to support options like
--            %% "-v" to return something like {verbose, 1}.
--            [{Name, 1} | OptAcc];
--        _ ->
--            throw({error, {missing_option_arg, Name}})
--    end.
--
--
--%% @doc Add an option with an implicit or assumed argument.
---spec add_option_with_implicit_incrementable_arg(option_spec() | arg_spec(), [option()]) -> [option()].
--add_option_with_implicit_incrementable_arg({Name, _Short, _Long, ArgSpec, _Help}, OptAcc) ->
--    case arg_spec_type(ArgSpec) of
--        boolean ->
--            %% Special case for boolean arguments: if there is no argument we
--            %% set the value to 'true'.
--            [{Name, true} | OptAcc];
--        integer ->
--            %% Special case for integer arguments: if the option had not been set
--            %% before we set the value to 1; if not we increment the previous value
--            %% the option had. This is needed to support options like "-vvv" to
--            %% return something like {verbose, 3}.
--            case OptAcc of
--                [{Name, Count} | Tail] ->
--                    [{Name, Count + 1} | Tail];
--                _ ->
--                    [{Name, 1} | OptAcc]
--            end;
--        _ ->
--            throw({error, {missing_option_arg, Name}})
--    end.
--
--
--%% @doc Retrieve the data type form an argument specification.
---spec arg_spec_type(arg_spec()) -> arg_type() | undefined.
--arg_spec_type({Type, _DefaultArg}) ->
--    Type;
--arg_spec_type(Type) when is_atom(Type) ->
--    Type.
--
--
--%% @doc Convert an argument string to its corresponding data type.
---spec to_type(arg_spec() | arg_type(), string()) -> arg_value().
--to_type({Type, _DefaultArg}, Arg) ->
--    to_type(Type, Arg);
--to_type(binary, Arg) ->
--    list_to_binary(Arg);
--to_type(atom, Arg) ->
--    list_to_atom(Arg);
--to_type(integer, Arg) ->
--    list_to_integer(Arg);
--to_type(float, Arg) ->
--    list_to_float(Arg);
--to_type(boolean, Arg) ->
--    LowerArg = string:to_lower(Arg),
--    case is_arg_true(LowerArg) of
--        true ->
--            true;
--        _ ->
--            case is_arg_false(LowerArg) of
--                true ->
--                    false;
--                false ->
--                    erlang:error(badarg)
--            end
--    end;
--to_type(_Type, Arg) ->
--    Arg.
--
--
---spec is_arg_true(string()) -> boolean().
--is_arg_true(Arg) ->
--    (Arg =:= "true") orelse (Arg =:= "t") orelse
--    (Arg =:= "yes") orelse (Arg =:= "y") orelse
--    (Arg =:= "on") orelse (Arg =:= "enabled") orelse
--    (Arg =:= "1").
--
--
---spec is_arg_false(string()) -> boolean().
--is_arg_false(Arg) ->
--    (Arg =:= "false") orelse (Arg =:= "f") orelse
--    (Arg =:= "no") orelse (Arg =:= "n") orelse
--    (Arg =:= "off") orelse (Arg =:= "disabled") orelse
--    (Arg =:= "0").
--
--
---spec is_valid_arg(arg_spec(), nonempty_string()) -> boolean().
--is_valid_arg({Type, _DefaultArg}, Arg) ->
--    is_valid_arg(Type, Arg);
--is_valid_arg(boolean, Arg) ->
--    is_boolean_arg(Arg);
--is_valid_arg(integer, Arg) ->
--    is_non_neg_integer_arg(Arg);
--is_valid_arg(float, Arg) ->
--    is_non_neg_float_arg(Arg);
--is_valid_arg(_Type, _Arg) ->
--    true.
--
--
---spec is_implicit_arg(arg_spec(), nonempty_string()) -> boolean().
--is_implicit_arg({Type, _DefaultArg}, Arg) ->
--    is_implicit_arg(Type, Arg);
--is_implicit_arg(boolean, Arg) ->
--    not is_boolean_arg(Arg);
--is_implicit_arg(integer, Arg) ->
--    not is_integer_arg(Arg);
--is_implicit_arg(_Type, _Arg) ->
--    false.
--
--
---spec is_boolean_arg(string()) -> boolean().
--is_boolean_arg(Arg) ->
--    LowerArg = string:to_lower(Arg),
--    is_arg_true(LowerArg) orelse is_arg_false(LowerArg).
--
--
---spec is_integer_arg(string()) -> boolean().
--is_integer_arg("-" ++ Tail) ->
--    is_non_neg_integer_arg(Tail);
--is_integer_arg(Arg) ->
--    is_non_neg_integer_arg(Arg).
--
--
---spec is_non_neg_integer_arg(string()) -> boolean().
--is_non_neg_integer_arg([Head | Tail]) when Head >= $0, Head =< $9 ->
--    is_non_neg_integer_arg(Tail);
--is_non_neg_integer_arg([_Head | _Tail]) ->
--    false;
--is_non_neg_integer_arg([]) ->
--    true.
--
--
---spec is_non_neg_float_arg(string()) -> boolean().
--is_non_neg_float_arg([Head | Tail]) when (Head >= $0 andalso Head =< $9) orelse Head =:= $. ->
--    is_non_neg_float_arg(Tail);
--is_non_neg_float_arg([_Head | _Tail]) ->
--    false;
--is_non_neg_float_arg([]) ->
--    true.
--
--
--%% @doc  Show a message on standard_error indicating the command line options and
--%%       arguments that are supported by the program.
---spec usage([option_spec()], string()) -> ok.
--usage(OptSpecList, ProgramName) ->
--    usage(OptSpecList, ProgramName, standard_error).
--
--
--%% @doc  Show a message on standard_error or standard_io indicating the command line options and
--%%       arguments that are supported by the program.
---spec usage([option_spec()], string(), output_stream() | string()) -> ok.
--usage(OptSpecList, ProgramName, OutputStream) when is_atom(OutputStream) ->
--    io:format(OutputStream, "~s~n~n~s~n",
--              [usage_cmd_line(ProgramName, OptSpecList), usage_options(OptSpecList)]);
--%% @doc  Show a message on standard_error indicating the command line options and
--%%       arguments that are supported by the program. The CmdLineTail argument
--%%       is a string that is added to the end of the usage command line.
--usage(OptSpecList, ProgramName, CmdLineTail) ->
--    usage(OptSpecList, ProgramName, CmdLineTail, standard_error).
--
--
--%% @doc  Show a message on standard_error or standard_io indicating the command line options and
--%%       arguments that are supported by the program. The CmdLineTail argument
--%%       is a string that is added to the end of the usage command line.
---spec usage([option_spec()], ProgramName :: string(), CmdLineTail :: string(), output_stream() | [{string(), string()}]) -> ok.
--usage(OptSpecList, ProgramName, CmdLineTail, OutputStream) when is_atom(OutputStream) ->
--    io:format(OutputStream, "~s~n~n~s~n",
--              [usage_cmd_line(ProgramName, OptSpecList, CmdLineTail), usage_options(OptSpecList)]);
--%% @doc  Show a message on standard_error indicating the command line options and
--%%       arguments that are supported by the program. The CmdLineTail and OptionsTail
--%%       arguments are a string that is added to the end of the usage command line
--%%       and a list of tuples that are added to the end of the options' help lines.
--usage(OptSpecList, ProgramName, CmdLineTail, OptionsTail) ->
--    usage(OptSpecList, ProgramName, CmdLineTail, OptionsTail, standard_error).
--
--
--%% @doc  Show a message on standard_error or standard_io indicating the command line options and
--%%       arguments that are supported by the program. The CmdLineTail and OptionsTail
--%%       arguments are a string that is added to the end of the usage command line
--%%       and a list of tuples that are added to the end of the options' help lines.
---spec usage([option_spec()], ProgramName :: string(), CmdLineTail :: string(),
--            [{OptionName :: string(), Help :: string()}], output_stream()) -> ok.
--usage(OptSpecList, ProgramName, CmdLineTail, OptionsTail, OutputStream) ->
--    io:format(OutputStream, "~s~n~n~s~n",
--              [usage_cmd_line(ProgramName, OptSpecList, CmdLineTail), usage_options(OptSpecList, OptionsTail)]).
--
--
---spec usage_cmd_line(ProgramName :: string(), [option_spec()]) -> iolist().
--usage_cmd_line(ProgramName, OptSpecList) ->
--    usage_cmd_line(ProgramName, OptSpecList, "").
--
---spec usage_cmd_line(ProgramName :: string(), [option_spec()], CmdLineTail :: string()) -> iolist().
--usage_cmd_line(ProgramName, OptSpecList, CmdLineTail) ->
--    Prefix = "Usage: " ++ ProgramName,
--    PrefixLength = length(Prefix),
--    LineLength = line_length(),
--    %% Only align the command line options after the program name when there is
--    %% enough room to do so (i.e. at least 25 characters). If not, show the
--    %% command line options below the program name with a 2-character indentation.
--    if
--        (LineLength - PrefixLength) > ?MIN_USAGE_COMMAND_LINE_OPTION_LENGTH ->
--            Indentation = lists:duplicate(PrefixLength, $\s),
--            [FirstOptLine | OptLines] = usage_cmd_line_options(LineLength - PrefixLength, OptSpecList, CmdLineTail),
--            IndentedOptLines = [[Indentation | OptLine] || OptLine <- OptLines],
--            [Prefix, FirstOptLine | IndentedOptLines];
--        true ->
--            IndentedOptLines = [[" " | OptLine] || OptLine <- usage_cmd_line_options(LineLength, OptSpecList, CmdLineTail)],
--            [Prefix, $\n, IndentedOptLines]
--    end.
--
--
--%% @doc Return a list of the lines corresponding to the usage command line
--%%      already wrapped according to the maximum MaxLineLength.
---spec usage_cmd_line_options(MaxLineLength :: non_neg_integer(), [option_spec()], CmdLineTail :: string()) -> iolist().
--usage_cmd_line_options(MaxLineLength, OptSpecList, CmdLineTail) ->
--    usage_cmd_line_options(MaxLineLength, OptSpecList ++ string:tokens(CmdLineTail, " "), [], 0, []).
--
--usage_cmd_line_options(MaxLineLength, [OptSpec | Tail], LineAcc, LineAccLength, Acc) ->
--    Option = [$\s | lists:flatten(usage_cmd_line_option(OptSpec))],
--    OptionLength = length(Option),
--    %% We accumulate the options in LineAcc until its length is over the
--    %% maximum allowed line length. When that happens, we append the line in
--    %% LineAcc to the list with all the lines in the command line (Acc).
--    NewLineAccLength = LineAccLength + OptionLength,
--    if
--        NewLineAccLength < MaxLineLength ->
--            usage_cmd_line_options(MaxLineLength, Tail, [Option | LineAcc], NewLineAccLength, Acc);
--        true ->
--            usage_cmd_line_options(MaxLineLength, Tail, [Option], OptionLength + 1,
--                                   [lists:reverse([$\n | LineAcc]) | Acc])
--    end;
--usage_cmd_line_options(MaxLineLength, [], [_ | _] = LineAcc, _LineAccLength, Acc) ->
--    %% If there was a non-empty line in LineAcc when there are no more options
--    %% to process, we add it to the list of lines to return.
--    usage_cmd_line_options(MaxLineLength, [], [], 0, [lists:reverse(LineAcc) | Acc]);
--usage_cmd_line_options(_MaxLineLength, [], [], _LineAccLength, Acc) ->
--    lists:reverse(Acc).
--
--
---spec usage_cmd_line_option(option_spec()) -> string().
--usage_cmd_line_option({_Name, Short, _Long, undefined, _Help}) when Short =/= undefined ->
--    %% For options with short form and no argument.
--    [$[, $-, Short, $]];
--usage_cmd_line_option({_Name, _Short, Long, undefined, _Help}) when Long =/= undefined ->
--    %% For options with only long form and no argument.
--    [$[, $-, $-, Long, $]];
--usage_cmd_line_option({_Name, _Short, _Long, undefined, _Help}) ->
--    [];
--usage_cmd_line_option({Name, Short, Long, ArgSpec, _Help}) when is_atom(ArgSpec) ->
--    %% For options with no default argument.
--    if
--        %% For options with short form and argument.
--        Short =/= undefined -> [$[, $-, Short, $\s, $<, atom_to_list(Name), $>, $]];
--        %% For options with only long form and argument.
--        Long =/= undefined  -> [$[, $-, $-, Long, $\s, $<, atom_to_list(Name), $>, $]];
--        %% For options with neither short nor long form and argument.
--        true                -> [$[, $<, atom_to_list(Name), $>, $]]
--    end;
--usage_cmd_line_option({Name, Short, Long, ArgSpec, _Help}) when is_tuple(ArgSpec) ->
--    %% For options with default argument.
--    if
--        %% For options with short form and default argument.
--        Short =/= undefined -> [$[, $-, Short, $\s, $[, $<, atom_to_list(Name), $>, $], $]];
--        %% For options with only long form and default argument.
--        Long =/= undefined  -> [$[, $-, $-, Long, $\s, $[, $<, atom_to_list(Name), $>, $], $]];
--        %% For options with neither short nor long form and default argument.
--        true                -> [$[, $<, atom_to_list(Name), $>, $]]
--    end;
--usage_cmd_line_option(Option) when is_list(Option) ->
--    %% For custom options that are added to the command line.
--    Option.
--
--
--%% @doc Return a list of help messages to print for each of the options and arguments.
---spec usage_options([option_spec()]) -> [string()].
--usage_options(OptSpecList) ->
--    usage_options(OptSpecList, []).
--
--
--%% @doc Return a list of usage lines to print for each of the options and arguments.
---spec usage_options([option_spec()], [{OptionName :: string(), Help :: string()}]) -> [string()].
--usage_options(OptSpecList, CustomHelp) ->
--    %% Add the usage lines corresponding to the option specifications.
--    {MaxOptionLength0, UsageLines0} = add_option_spec_help_lines(OptSpecList, 0, []),
--    %% Add the custom usage lines.
--    {MaxOptionLength, UsageLines} = add_custom_help_lines(CustomHelp, MaxOptionLength0, UsageLines0),
--    MaxLineLength = line_length(),
--    lists:reverse([format_usage_line(MaxOptionLength + 1, MaxLineLength, UsageLine) || UsageLine <- UsageLines]).
--
--
---spec add_option_spec_help_lines([option_spec()], PrevMaxOptionLength :: non_neg_integer(), [usage_line_with_length()]) ->
--                                        {MaxOptionLength :: non_neg_integer(), [usage_line_with_length()]}.
--add_option_spec_help_lines([OptSpec | Tail], PrevMaxOptionLength, Acc) ->
--    OptionText = usage_option_text(OptSpec),
--    HelpText = usage_help_text(OptSpec),
--    {MaxOptionLength, ColsWithLength} = get_max_option_length({OptionText, HelpText}, PrevMaxOptionLength),
--    add_option_spec_help_lines(Tail, MaxOptionLength, [ColsWithLength | Acc]);
--add_option_spec_help_lines([], MaxOptionLength, Acc) ->
--    {MaxOptionLength, Acc}.
--
--
---spec add_custom_help_lines([usage_line()], PrevMaxOptionLength :: non_neg_integer(), [usage_line_with_length()]) ->
--                                   {MaxOptionLength :: non_neg_integer(), [usage_line_with_length()]}.
--add_custom_help_lines([CustomCols | Tail], PrevMaxOptionLength, Acc) ->
--    {MaxOptionLength, ColsWithLength} = get_max_option_length(CustomCols, PrevMaxOptionLength),
--    add_custom_help_lines(Tail, MaxOptionLength, [ColsWithLength | Acc]);
--add_custom_help_lines([], MaxOptionLength, Acc) ->
--    {MaxOptionLength, Acc}.
--
--
---spec usage_option_text(option_spec()) -> string().
--usage_option_text({Name, undefined, undefined, _ArgSpec, _Help}) ->
--    %% Neither short nor long form (non-option argument).
--    "<" ++ atom_to_list(Name) ++ ">";
--usage_option_text({_Name, Short, undefined, _ArgSpec, _Help}) ->
--    %% Only short form.
--    [$-, Short];
--usage_option_text({_Name, undefined, Long, _ArgSpec, _Help}) ->
--    %% Only long form.
--    [$-, $- | Long];
--usage_option_text({_Name, Short, Long, _ArgSpec, _Help}) ->
--    %% Both short and long form.
--    [$-, Short, $,, $\s, $-, $- | Long].
--
--
---spec usage_help_text(option_spec()) -> string().
--usage_help_text({_Name, _Short, _Long, {_ArgType, ArgValue}, [_ | _] = Help}) ->
--    Help ++ " [default: " ++ default_arg_value_to_string(ArgValue) ++ "]";
--usage_help_text({_Name, _Short, _Long, _ArgSpec, Help}) ->
--    Help.
--
--
--%% @doc Calculate the maximum width of the column that shows the option's short
--%%      and long form.
---spec get_max_option_length(usage_line(), PrevMaxOptionLength :: non_neg_integer()) ->
--                                   {MaxOptionLength :: non_neg_integer(), usage_line_with_length()}.
--get_max_option_length({OptionText, HelpText}, PrevMaxOptionLength) ->
--    OptionLength = length(OptionText),
--    {erlang:max(OptionLength, PrevMaxOptionLength), {OptionLength, OptionText, HelpText}}.
--
--
--%% @doc Format the usage line that is shown for the options' usage. Each usage
--%%      line has 2 columns. The first column shows the options in their short
--%%      and long form. The second column shows the wrapped (if necessary) help
--%%      text lines associated with each option. e.g.:
--%%
--%%        -h, --host  Database server host name or IP address; this is the
--%%                    hostname of the server where the database is running
--%%                    [default: localhost]
--%%        -p, --port  Database server port [default: 1000]
--%%
---spec format_usage_line(MaxOptionLength :: non_neg_integer(), MaxLineLength :: non_neg_integer(),
--                        usage_line_with_length()) -> iolist().
--format_usage_line(MaxOptionLength, MaxLineLength, {OptionLength, OptionText, [_ | _] = HelpText})
--  when MaxOptionLength < (MaxLineLength div 2) ->
--    %% If the width of the column where the options are shown is smaller than
--    %% half the width of a console line then we show the help text line aligned
--    %% next to its corresponding option, with a separation of at least 2
--    %% characters.
--    [Head | Tail] = wrap_text_line(MaxLineLength - MaxOptionLength - 3, HelpText),
--    FirstLineIndentation = lists:duplicate(MaxOptionLength - OptionLength + 1, $\s),
--    Indentation = [$\n | lists:duplicate(MaxOptionLength + 3, $\s)],
--    ["  ", OptionText, FirstLineIndentation, Head,
--     [[Indentation, Line] || Line <- Tail], $\n];
--format_usage_line(_MaxOptionLength, MaxLineLength, {_OptionLength, OptionText, [_ | _] = HelpText}) ->
--    %% If the width of the first column is bigger than the width of a console
--    %% line, we show the help text on the next line with an indentation of 6
--    %% characters.
--    HelpLines = wrap_text_line(MaxLineLength - 6, HelpText),
--    ["  ", OptionText, [["\n      ", Line] || Line <- HelpLines], $\n];
--format_usage_line(_MaxOptionLength, _MaxLineLength, {_OptionLength, OptionText, _HelpText}) ->
--    ["  ", OptionText, $\n].
--
--
--%% @doc Wrap a text line converting it into several text lines so that the
--%%      length of each one of them is never over Length characters.
---spec wrap_text_line(Length :: non_neg_integer(), Text :: string()) -> [string()].
--wrap_text_line(Length, Text) ->
--    wrap_text_line(Length, Text, [], 0, []).
--
--wrap_text_line(Length, [Char | Tail], Acc, Count, CurrentLineAcc) when Count < Length ->
--    wrap_text_line(Length, Tail, Acc, Count + 1, [Char | CurrentLineAcc]);
--wrap_text_line(Length, [_ | _] = Help, Acc, Count, CurrentLineAcc) ->
--    %% Look for the first whitespace character in the current (reversed) line
--    %% buffer to get a wrapped line. If there is no whitespace just cut the
--    %% line at the position corresponding to the maximum length.
--    {NextLineAcc, WrappedLine} = case string:cspan(CurrentLineAcc, " \t") of
--                                     WhitespacePos when WhitespacePos < Count ->
--                                         lists:split(WhitespacePos, CurrentLineAcc);
--                                     _ ->
--                                         {[], CurrentLineAcc}
--                                 end,
--    wrap_text_line(Length, Help, [lists:reverse(WrappedLine) | Acc], length(NextLineAcc), NextLineAcc);
--wrap_text_line(_Length, [], Acc, _Count, [_ | _] = CurrentLineAcc) ->
--    %% If there was a non-empty line when we reached the buffer, add it to the accumulator
--    lists:reverse([lists:reverse(CurrentLineAcc) | Acc]);
--wrap_text_line(_Length, [], Acc, _Count, _CurrentLineAcc) ->
--    lists:reverse(Acc).
--
--
--default_arg_value_to_string(Value) when is_atom(Value) ->
--    atom_to_list(Value);
--default_arg_value_to_string(Value) when is_binary(Value) ->
--    binary_to_list(Value);
--default_arg_value_to_string(Value) when is_integer(Value) ->
--    integer_to_list(Value);
--default_arg_value_to_string(Value) when is_float(Value) ->
--    lists:flatten(io_lib:format("~w", [Value]));
--default_arg_value_to_string(Value) ->
--    Value.
--
--
--%% @doc Tokenize a command line string with support for single and double
--%%      quoted arguments (needed for arguments that have embedded whitespace).
--%%      The function also supports the expansion of environment variables in
--%%      both the Unix (${VAR}; $VAR) and Windows (%VAR%) formats. It does NOT
--%%      support wildcard expansion of paths.
---spec tokenize(CmdLine :: string()) -> [nonempty_string()].
--tokenize(CmdLine) ->
--    tokenize(CmdLine, [], []).
--
---spec tokenize(CmdLine :: string(), Acc :: [string()], ArgAcc :: string()) -> [string()].
--tokenize([Sep | Tail], Acc, ArgAcc) when ?IS_WHITESPACE(Sep) ->
--    NewAcc = case ArgAcc of
--                 [_ | _] ->
--                     %% Found separator: add to the list of arguments.
--                     [lists:reverse(ArgAcc) | Acc];
--                 [] ->
--                     %% Found separator with no accumulated argument; discard it.
--                     Acc
--             end,
--    tokenize(Tail, NewAcc, []);
--tokenize([QuotationMark | Tail], Acc, ArgAcc) when QuotationMark =:= $"; QuotationMark =:= $' ->
--    %% Quoted argument (might contain spaces, tabs, etc.)
--    tokenize_quoted_arg(QuotationMark, Tail, Acc, ArgAcc);
--tokenize([Char | _Tail] = CmdLine, Acc, ArgAcc) when Char =:= $$; Char =:= $% ->
--    %% Unix and Windows environment variable expansion: ${VAR}; $VAR; %VAR%
--    {NewCmdLine, Var} = expand_env_var(CmdLine),
--    tokenize(NewCmdLine, Acc, lists:reverse(Var, ArgAcc));
--tokenize([$\\, Char | Tail], Acc, ArgAcc) ->
--    %% Escaped char.
--    tokenize(Tail, Acc, [Char | ArgAcc]);
--tokenize([Char | Tail], Acc, ArgAcc) ->
--    tokenize(Tail, Acc, [Char | ArgAcc]);
--tokenize([], Acc, []) ->
--    lists:reverse(Acc);
--tokenize([], Acc, ArgAcc) ->
--    lists:reverse([lists:reverse(ArgAcc) | Acc]).
--
---spec tokenize_quoted_arg(QuotationMark :: char(), CmdLine :: string(), Acc :: [string()], ArgAcc :: string()) -> [string()].
--tokenize_quoted_arg(QuotationMark, [QuotationMark | Tail], Acc, ArgAcc) ->
--    %% End of quoted argument
--    tokenize(Tail, Acc, ArgAcc);
--tokenize_quoted_arg(QuotationMark, [$\\, Char | Tail], Acc, ArgAcc) ->
--    %% Escaped char.
--    tokenize_quoted_arg(QuotationMark, Tail, Acc, [Char | ArgAcc]);
--tokenize_quoted_arg($" = QuotationMark, [Char | _Tail] = CmdLine, Acc, ArgAcc) when Char =:= $$; Char =:= $% ->
--    %% Unix and Windows environment variable expansion (only for double-quoted arguments): ${VAR}; $VAR; %VAR%
--    {NewCmdLine, Var} = expand_env_var(CmdLine),
--    tokenize_quoted_arg(QuotationMark, NewCmdLine, Acc, lists:reverse(Var, ArgAcc));
--tokenize_quoted_arg(QuotationMark, [Char | Tail], Acc, ArgAcc) ->
--    tokenize_quoted_arg(QuotationMark, Tail, Acc, [Char | ArgAcc]);
--tokenize_quoted_arg(_QuotationMark, CmdLine, Acc, ArgAcc) ->
--    tokenize(CmdLine, Acc, ArgAcc).
--
--
---spec expand_env_var(CmdLine :: nonempty_string()) -> {string(), string()}.
--expand_env_var(CmdLine) ->
--    case CmdLine of
--        "${" ++ Tail ->
--            expand_env_var("${", $}, Tail, []);
--        "$" ++ Tail ->
--            expand_env_var("$", Tail, []);
--        "%" ++ Tail ->
--            expand_env_var("%", $%, Tail, [])
--    end.
--
---spec expand_env_var(Prefix :: string(), EndMark :: char(), CmdLine :: string(), Acc :: string()) -> {string(), string()}.
--expand_env_var(Prefix, EndMark, [Char | Tail], Acc)
--  when (Char >= $A andalso Char =< $Z) orelse (Char >= $a andalso Char =< $z) orelse
--       (Char >= $0 andalso Char =< $9) orelse (Char =:= $_) ->
--    expand_env_var(Prefix, EndMark, Tail, [Char | Acc]);
--expand_env_var(Prefix, EndMark, [EndMark | Tail], Acc) ->
--    {Tail, get_env_var(Prefix, [EndMark], Acc)};
--expand_env_var(Prefix, _EndMark, CmdLine, Acc) ->
--    {CmdLine, Prefix ++ lists:reverse(Acc)}.
--
--
---spec expand_env_var(Prefix :: string(), CmdLine :: string(), Acc :: string()) -> {string(), string()}.
--expand_env_var(Prefix, [Char | Tail], Acc)
--  when (Char >= $A andalso Char =< $Z) orelse (Char >= $a andalso Char =< $z) orelse
--       (Char >= $0 andalso Char =< $9) orelse (Char =:= $_) ->
--    expand_env_var(Prefix, Tail, [Char | Acc]);
--expand_env_var(Prefix, CmdLine, Acc) ->
--    {CmdLine, get_env_var(Prefix, "", Acc)}.
--
--
---spec get_env_var(Prefix :: string(), Suffix :: string(), Acc :: string()) -> string().
--get_env_var(Prefix, Suffix, [_ | _] = Acc) ->
--    Name = lists:reverse(Acc),
--    %% Only expand valid/existing variables.
--    case os:getenv(Name) of
--        false -> Prefix ++ Name ++ Suffix;
--        Value -> Value
--    end;
--get_env_var(Prefix, Suffix, []) ->
--    Prefix ++ Suffix.
--
--
---spec line_length() -> 0..?LINE_LENGTH.
--line_length() ->
--    case io:columns() of
--        {ok, Columns} when Columns < ?LINE_LENGTH ->
--            Columns - 1;
--        _ ->
--            ?LINE_LENGTH
--    end.
--
--
---spec to_string(term()) -> string().
--to_string(List) when is_list(List) ->
--    case io_lib:printable_list(List) of
--        true  -> List;
--        false -> io_lib:format("~p", [List])
--    end;
--to_string(Atom) when is_atom(Atom) ->
--    atom_to_list(Atom);
--to_string(Value) ->
--    io_lib:format("~p", [Value]).
+   {applications,
 -- 
-2.1.0
+2.5.0

0004-Allow-discarding-building-ports.patch Changed

@@ -1,4 +1,4 @@
-From 764c71d5df5786ed5b74d11a4904b282b5a29c4a Mon Sep 17 00:00:00 2001
+From 7802b5dc11b3569cdb2c25c2703632bc84756823 Mon Sep 17 00:00:00 2001
 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
 Date: Mon, 18 May 2015 11:48:22 +0200
 Subject: [PATCH 4/7] Allow discarding building ports
@@ -8,10 +8,10 @@
  1 file changed, 6 insertions(+)
 
 diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl
-index 35adc3c..04a4382 100644
+index 906bcb0..9ae4778 100644
 --- a/src/rebar_port_compiler.erl
 +++ b/src/rebar_port_compiler.erl
-@@ -278,6 +278,12 @@ get_specs(Config, AppFile) ->
+@@ -300,6 +300,12 @@ get_specs(Config, AppFile) ->
                      %% No spec provided. Construct a spec
                      %% from old-school so_name and sources
                      [port_spec_from_legacy(Config, AppFile)];
@@ -25,5 +25,5 @@
                      Filtered = filter_port_specs(PortSpecs),
                      OsType = os:type(),
 -- 
-2.1.0
+2.5.0

0005-Check-system-wide-libdir-in-case-of-source-based-dep.patch Changed

0006-Remove-any-traces-of-long-time-obsolete-escript-fold.patch Changed

0007-Remove-abnfc-compiler-support-n-a-in-Fedora-EPEL.patch Changed

@@ -1,4 +1,4 @@
-From 9fdfcad5045c067e66a66cf6c6e2165f71a324a9 Mon Sep 17 00:00:00 2001
+From 73f0c7308abde2991696093dd74e6fb1b7b37658 Mon Sep 17 00:00:00 2001
 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
 Date: Mon, 18 May 2015 11:51:07 +0200
 Subject: [PATCH 7/7] Remove abnfc compiler support (n/a in Fedora/EPEL)
@@ -10,25 +10,25 @@
  delete mode 100644 src/rebar_abnfc_compiler.erl
 
 diff --git a/ebin/rebar.app b/ebin/rebar.app
-index c9932fc..bca047e 100644
+index f9b0c22..9f5ae44 100644
 --- a/ebin/rebar.app
 +++ b/ebin/rebar.app
 @@ -5,7 +5,6 @@
   [{description, "Rebar: Erlang Build Tool"},
-   {vsn, "2.5.1"},
+   {vsn, "2.6.1"},
    {modules, [ rebar,
 -              rebar_abnfc_compiler,
                rebar_app_utils,
                rebar_appups,
                rebar_asn1_compiler,
-@@ -64,7 +63,6 @@
+@@ -81,7 +80,6 @@
           %% Dir specific processing modules
           {modules, [
                      {app_dir, [
 -                               rebar_abnfc_compiler,
+                                rebar_proto_compiler,
                                 rebar_protobuffs_compiler,
-                                rebar_neotoma_compiler,
-                                rebar_asn1_compiler,
+                                rebar_proto_gpb_compiler,
 diff --git a/src/rebar_abnfc_compiler.erl b/src/rebar_abnfc_compiler.erl
 deleted file mode 100644
 index 37731b5..0000000
@@ -159,5 +159,5 @@
 -            end
 -    end.
 -- 
-2.1.0
+2.5.0

debian.changelog Changed

erlang-rebar.dsc Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/.gitignore -> rebar-2.6.1.tar.gz/.gitignore Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/.travis.yml -> rebar-2.6.1.tar.gz/.travis.yml Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/CONTRIBUTING.md -> rebar-2.6.1.tar.gz/CONTRIBUTING.md Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/Makefile -> rebar-2.6.1.tar.gz/Makefile Changed

@@ -1,17 +1,17 @@
-.PHONY: clean dialyzer_warnings xref_warnings deps test
+.PHONY: clean xref_warnings deps test test_eunit test_inttest
 
 REBAR=$(PWD)/rebar
 RETEST=$(PWD)/deps/retest/retest
+LOG_LEVEL?=debug
+RT_TARGETS?=inttest
 
 all:
 	./bootstrap
 
 clean:
-	@rm -rf rebar ebin/*.beam inttest/rt.work rt.work .eunit
-	@rm -f .rebarinfo
+	@rm -rf rebar .rebar/erlcinfo ebin/*.beam inttest/rt.work rt.work .eunit
 
 distclean: clean
-	@rm -f dialyzer_warnings
 	@rm -rf deps
 
 debug:
@@ -22,12 +22,11 @@
 xref:
 	@./rebar xref
 
-dialyzer: dialyzer_warnings
-	@diff -U0 dialyzer_reference dialyzer_warnings
+build_plt:
+	@./rebar build-plt
 
-dialyzer_warnings:
-	-@dialyzer -q -nn -n ebin -Wunmatched_returns -Werror_handling \
-		-Wrace_conditions > dialyzer_warnings
+dialyzer:
+	@./rebar dialyze
 
 binary: VSN = $(shell ./rebar -V)
 binary: clean all
@@ -35,11 +34,15 @@
 	(cd ../rebar.wiki && git commit -m "Update $(VSN)" rebar)
 
 deps:
-	@REBAR_EXTRA_DEPS=1 ./rebar get-deps
+	@REBAR_EXTRA_DEPS=1 $(REBAR) get-deps
 	@(cd deps/retest && $(REBAR) compile escriptize)
 
-test:
+test: test_eunit test_inttest
+
+test_eunit: all
 	@$(REBAR) eunit
-	@$(RETEST) -v inttest
+
+test_inttest: all deps
+	@$(RETEST) -l $(LOG_LEVEL) $(RT_TARGETS)
 
 travis: clean debug xref clean all deps test

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/README.md -> rebar-2.6.1.tar.gz/README.md Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/RELEASE-NOTES.md -> rebar-2.6.1.tar.gz/RELEASE-NOTES.md Changed

@@ -1,3 +1,108 @@
+# 2.6.1
+
+* rebar/514: [Add license to relnotes tool per reviewer request](https://github.com/rebar/rebar/pull/514)
+* rebar/518: [Generate reserved file for erlc regression test](https://github.com/rebar/rebar/pull/518)
+* rebar/520: [Fixed version of #451](https://github.com/rebar/rebar/pull/520)
+* rebar/521: [rebar_utils: fix comment](https://github.com/rebar/rebar/pull/521)
+* rebar/522: [Fixed version of #395](https://github.com/rebar/rebar/pull/522)
+* rebar/524: [completion: add libid= to bash and zsh scripts](https://github.com/rebar/rebar/pull/524)
+* rebar/530: [Allow behaviors defined inside xref_extra_path](https://github.com/rebar/rebar/pull/530)
+* rebar/535: [Add regression test for covered common test](https://github.com/rebar/rebar/pull/535)
+* rebar/537: [Fix eunit test on OTP18](https://github.com/rebar/rebar/pull/537)
+* rebar/538: [Fix #536](https://github.com/rebar/rebar/pull/538)
+* rebar/539: [Add erl_first_files in eunit_first_files and qc_first_files](https://github.com/rebar/rebar/pull/539)
+* rebar/540: [Complete port compiler help string](https://github.com/rebar/rebar/pull/540)
+* rebar/543: [rmemo: use a better R13 check (Reported-by: Stavros Aronis)](https://github.com/rebar/rebar/pull/543)
+* rebar/545: [Fix #544](https://github.com/rebar/rebar/pull/545)
+* rebar/546: [Added report and verbose options for LFE compile.](https://github.com/rebar/rebar/pull/546)
+
+# 2.6.0
+
+* rebar/203: [Pluggable proto compilers gpb](https://github.com/rebar/rebar/pull/203)
+* rebar/273: [Use target_dir as source of new version in generate-appups](https://github.com/rebar/rebar/pull/273)
+* rebar/293: [Check C source dependencies in needs_compile](https://github.com/rebar/rebar/pull/293)
+* rebar/305: [Fix compiler invocation on multiarch Linux](https://github.com/rebar/rebar/pull/305)
+* rebar/322: [Treat vsn mismatch as warning if -k/--keep-going](https://github.com/rebar/rebar/pull/322)
+* rebar/336: [Add details on Dialyzer with "make check"](https://github.com/rebar/rebar/pull/336)
+* rebar/337: [Implement eflame -p/--profile support](https://github.com/rebar/rebar/pull/337)
+* rebar/338: [Processing .app.src.script expects a single value to be returned.](https://github.com/rebar/rebar/pull/338)
+* rebar/344: [Manually clean up paths.](https://github.com/rebar/rebar/pull/344)
+* rebar/351: [fish shell completions for rebar](https://github.com/rebar/rebar/pull/351)
+* rebar/352: [Add typer target (rebase of #309)](https://github.com/rebar/rebar/pull/352)
+* rebar/354: [compiler respects 'keep_going' flag](https://github.com/rebar/rebar/pull/354)
+* rebar/355: [Fix 'make build_plt'](https://github.com/rebar/rebar/pull/355)
+* rebar/356: [Fix minor typo in CONTRIBUTING.md](https://github.com/rebar/rebar/pull/356)
+* rebar/360: [Minor follow-up fixes for #293](https://github.com/rebar/rebar/pull/360)
+* rebar/368: [Escape more characters in path (fix #367)](https://github.com/rebar/rebar/pull/368)
+* rebar/371: [Fix cover print truncation when coverage is 100%](https://github.com/rebar/rebar/pull/371)
+* rebar/372: [Implement eval command via nodetool](https://github.com/rebar/rebar/pull/372)
+* rebar/376: [Remove check adding ebin to path for edoc target](https://github.com/rebar/rebar/pull/376)
+* rebar/378: [deps: fix delete-deps if deps_dir ends with dot](https://github.com/rebar/rebar/pull/378)
+* rebar/382: [Adapt dialyzer_reference to ba466e2d changes](https://github.com/rebar/rebar/pull/382)
+* rebar/385: [Fix Dialyzer warning introduced in 0caf047f](https://github.com/rebar/rebar/pull/385)
+* rebar/386: [Recompile .proto files with gpb also with prefix/suffix](https://github.com/rebar/rebar/pull/386)
+* rebar/386: [Recompile .proto files with gpb also with prefix/suffix](https://github.com/rebar/rebar/pull/386)
+* rebar/386: [Recompile .proto files with gpb also with prefix/suffix](https://github.com/rebar/rebar/pull/386)
+* rebar/399: [Increase the timeout for the inttest/proto_gpb](https://github.com/rebar/rebar/pull/399)
+* rebar/400: [add Emacs/vi header to non-dummy test modules](https://github.com/rebar/rebar/pull/400)
+* rebar/403: [Update reference to installation notes](https://github.com/rebar/rebar/pull/403)
+* rebar/404: [Consistently format export attributes](https://github.com/rebar/rebar/pull/404)
+* rebar/405: [Generate cachegrind file if erlgrind is available](https://github.com/rebar/rebar/pull/405)
+* rebar/406: [Fix deps path check in rebar_ct:collect_glob/3](https://github.com/rebar/rebar/pull/406)
+* rebar/408: [Fix/remove duplicate console message](https://github.com/rebar/rebar/pull/408)
+* rebar/411: [Fix app.config argument passing when using ct_run (take 2)](https://github.com/rebar/rebar/pull/411)
+* rebar/413: [Revert "Merge pull request #386 ... gpb-recompilation...detection"](https://github.com/rebar/rebar/pull/413)
+* rebar/418: [Fix #415 (reltool vsn check)](https://github.com/rebar/rebar/pull/418)
+* rebar/420: [Mock gpb and protobuffs, in inttest, replacing external dependencies](https://github.com/rebar/rebar/pull/420)
+* rebar/421: [inttest/ct3: fix travis-ci breakage](https://github.com/rebar/rebar/pull/421)
+* rebar/424: [Gpb recompilation detection (using base compiler)](https://github.com/rebar/rebar/pull/424)
+* rebar/425: [Copy instead of rsync gpb and protobuffs inttest mocks](https://github.com/rebar/rebar/pull/425)
+* rebar/426: [Fixed #133. Release upgrade now handle long and short names properly.](https://github.com/rebar/rebar/pull/426)
+* rebar/428: [Remove a git url in gpb and protobuffs inttest configs](https://github.com/rebar/rebar/pull/428)
+* rebar/430: [Exit with proper status code if 'eval' fails](https://github.com/rebar/rebar/pull/430)
+* rebar/432: [Document recursive_cmds in -r help string as well](https://github.com/rebar/rebar/pull/432)
+* rebar/433: [inttest/ct3: fix overlong line](https://github.com/rebar/rebar/pull/433)
+* rebar/437: [Fix .app.src.script bug introduced in b44b4f4](https://github.com/rebar/rebar/pull/437)
+* rebar/440: [Delete obsolete file](https://github.com/rebar/rebar/pull/440)
+* rebar/442: [.travis.yml: print information before running script](https://github.com/rebar/rebar/pull/442)
+* rebar/444: [Fix incorrect "not an app dir" warning](https://github.com/rebar/rebar/pull/444)
+* rebar/445: [rebar doesn't respect the order of erl_first_files given in the rebar.conf file](https://github.com/rebar/rebar/pull/445)
+* rebar/447: [Support custom protobuf directory](https://github.com/rebar/rebar/pull/447)
+* rebar/449: [Support .appup.src files](https://github.com/rebar/rebar/pull/449)
+* rebar/452: [added 'shell' command to bash-completion](https://github.com/rebar/rebar/pull/452)
+* rebar/456: [Generate json output from cover](https://github.com/rebar/rebar/pull/456)
+* rebar/458: [Change env var delimiter to match non-word](https://github.com/rebar/rebar/pull/458)
+* rebar/459: [Remove -m64 flag.](https://github.com/rebar/rebar/pull/459)
+* rebar/460: [Add Dialyzer plugin](https://github.com/rebar/rebar/pull/460)
+* rebar/461: [Fix OTP .appup.src processing on empty lists](https://github.com/rebar/rebar/pull/461)
+* rebar/463: [Print more info when profiling](https://github.com/rebar/rebar/pull/463)
+* rebar/466: [Improve test targets in Makefile](https://github.com/rebar/rebar/pull/466)
+* rebar/467: [Refactor logic and optimizations in rebar_erlc_compiler:doterl_compile/4](https://github.com/rebar/rebar/pull/467)
+* rebar/469: [Fix dialyzer warnings](https://github.com/rebar/rebar/pull/469)
+* rebar/470: [Fix whitespace errors](https://github.com/rebar/rebar/pull/470)
+* rebar/471: [Fix whitespace errors](https://github.com/rebar/rebar/pull/471)
+* rebar/475: [Adapt to 18.x time api changes](https://github.com/rebar/rebar/pull/475)
+* rebar/477: [Enable parse transformations in rebar config](https://github.com/rebar/rebar/pull/477)
+* rebar/478: [bootstrap: better warning fix (Thanks James Fish)](https://github.com/rebar/rebar/pull/478)
+* rebar/482: [Windows runner - CD to node root](https://github.com/rebar/rebar/pull/482)
+* rebar/484: [/me added to THANKS](https://github.com/rebar/rebar/pull/484)
+* rebar/485: [avoid pre-compile time errors in expand_include_lib_path](https://github.com/rebar/rebar/pull/485)
+* rebar/487: [erlc: fix recently introduced whitespace errors](https://github.com/rebar/rebar/pull/487)
+* rebar/489: [Fix crash on failed build console output](https://github.com/rebar/rebar/pull/489)
+* rebar/494: [Update line number of allowed dialyzer error](https://github.com/rebar/rebar/pull/494)
+* rebar/496: [Update PLT detail for make build_plt](https://github.com/rebar/rebar/pull/496)
+* rebar/499: [Try one more location for the OTP_VERSION file](https://github.com/rebar/rebar/pull/499)
+* rebar/500: [Makefile: clean only .rebar/erlcinfo](https://github.com/rebar/rebar/pull/500)
+* rebar/502: [Don't crash if missing OTP_VERSION file (fix #350)](https://github.com/rebar/rebar/pull/502)
+* rebar/504: [Drop `shared` PLTs support and change PLT name to <OTP-VSN>.plt](https://github.com/rebar/rebar/pull/504)
+* rebar/505: [rebar_utils: explain pdict use](https://github.com/rebar/rebar/pull/505)
+* rebar/508: [rebar_core: add missing newline in log msg](https://github.com/rebar/rebar/pull/508)
+* rebar/509: [erlc: do not crash if dep file cannot be found](https://github.com/rebar/rebar/pull/509)
+* rebar/510: [Fix 'make deps'](https://github.com/rebar/rebar/pull/510)
+* rebar/511: [Add and use memoization server](https://github.com/rebar/rebar/pull/511)
+* rebar/512: [rmemo: properly handle unsupported call](https://github.com/rebar/rebar/pull/512)
+
+
 # Rebar 2.5.1
 
 * rebar/299: [Fix OS X resource fork handling (Reported-by: Richard O'Keefe)](https://github.com/rebar/rebar/pull/299)

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/THANKS -> rebar-2.6.1.tar.gz/THANKS Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/bootstrap -> rebar-2.6.1.tar.gz/bootstrap Changed

@@ -121,9 +121,22 @@
     ok.
 
 build_time() ->
-    {{Y, M, D}, {H, Min, S}} = calendar:now_to_universal_time(now()),
+    {{Y, M, D}, {H, Min, S}} = calendar:now_to_universal_time(rebar_now()),
     lists:flatten(io_lib:format("~4..0w~2..0w~2..0w_~2..0w~2..0w~2..0w",
                                 [Y, M, D, H, Min, S])).
+rebar_now() ->
+    case erlang:function_exported(erlang, timestamp, 0) of
+        true ->
+            erlang:timestamp();
+        false ->
+            %% erlang:now/0 was deprecated in 18.0, and as the escript has to
+            %% pass erl_lint:module/1 (even without -mode(compile)), we would
+            %% see a deprecation warning for erlang:now/0.  One solution is to
+            %% use -compile({nowarn_deprecated_function, [{erlang, now, 0}]}),
+            %% but that would raise a warning in versions older than 18.0.
+            %% Calling erlang:now/0 via apply/3 avoids that.
+            apply(erlang, now, [])
+    end.
 
 vcs_info([]) ->
     "No VCS info available.";

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/ebin/rebar.app -> rebar-2.6.1.tar.gz/ebin/rebar.app Changed

@@ -3,7 +3,7 @@
 
 {application, rebar,
  [{description, "Rebar: Erlang Build Tool"},
-  {vsn, "2.5.1"},
+  {vsn, "2.6.1"},
   {modules, [ rebar,
               rebar_abnfc_compiler,
               rebar_app_utils,
@@ -17,6 +17,7 @@
               rebar_cover_utils,
               rebar_ct,
               rebar_deps,
+              rebar_dialyzer,
               rebar_edoc,
               rebar_erlc_compiler,
               rebar_erlydtl_compiler,
@@ -27,8 +28,11 @@
               rebar_log,
               rebar_neotoma_compiler,
               rebar_otp_app,
+              rebar_otp_appup,
               rebar_port_compiler,
+              rebar_proto_compiler,
               rebar_protobuffs_compiler,
+              rebar_proto_gpb_compiler,
               rebar_qc,
               rebar_rel_utils,
               rebar_reltool,
@@ -41,19 +45,32 @@
               rebar_xref,
               rebar_metacmds,
               rebar_getopt,
-              rebar_mustache ]},
+              rebar_mustache,
+              rmemo ]},
   {registered, []},
-  {applications, [kernel,
-                  stdlib,
-                  sasl,
-                  compiler,
-                  crypto,
-                  syntax_tools,
-                  tools]},
+  {applications,
+   [
+    kernel,
+    stdlib,
+    sasl,
+    compiler,
+    crypto,
+    syntax_tools,
+    tools,
+    eunit,
+    reltool,
+    dialyzer,
+    asn1,
+    snmp,
+    edoc
+   ]},
   {env, [
          %% Default log level
          {log_level, warn},
 
+         %% Log colored
+         {log_colored, uncolored},
+
          %% any_dir processing modules
          {any_dir_modules, [
                             rebar_require_vsn,
@@ -67,15 +84,19 @@
          {modules, [
                     {app_dir, [
                                rebar_abnfc_compiler,
+                               rebar_proto_compiler,
                                rebar_protobuffs_compiler,
+                               rebar_proto_gpb_compiler,
                                rebar_neotoma_compiler,
                                rebar_asn1_compiler,
                                rebar_dia_compiler,
+                               rebar_dialyzer,
                                rebar_erlc_compiler,
                                rebar_lfe_compiler,
                                rebar_erlydtl_compiler,
                                rebar_port_compiler,
                                rebar_otp_app,
+                               rebar_otp_appup,
                                rebar_ct,
                                rebar_eunit,
                                rebar_qc,

rebar-2.6.1.tar.gz/inttest/app_src Added

rebar-2.6.1.tar.gz/inttest/app_src/app_src.erl Added

rebar-2.6.1.tar.gz/inttest/app_src/app_src_rt.erl Added

@@ -0,0 +1,78 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Vlad Dumitrescu
+%%
+%% 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(app_src_rt).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{copy, "../../rebar", "rebar"},
+     {create, "src/app_src.app.src", app(app_src)}].
+
+run(Dir) ->
+    retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
+    {ok, [_Pid|Output]} = retest:sh("./rebar compile -vv",
+                                    [{async, false}]),
+
+    LineRegexp = "DEBUG: Consult config file .*/app_src\.app\.src.*",
+    ?assertEqual(true, has_line(Output, LineRegexp)),
+    retest_log:log(debug, "Evaluated .app.src.script~n", []),
+
+    %% check that ebin/app_src.app exists
+    ?assertMatch(true, filelib:is_regular("ebin/app_src.app")),
+    retest_log:log(debug, "Generated ebin/.app~n", []),
+
+    %% check that ebin/.app has vsn="2"
+    {ok, Bin} = file:read_file("ebin/app_src.app"),
+    Str = binary_to_list(Bin),
+    ?assertMatch({match, _}, re:run(Str, "{vsn, *\"2\"}")),
+    retest_log:log(debug, "Variable replacement in .app is ok.~n", []),
+
+    ok.
+
+has_line([], _RE) ->
+    false;
+has_line([L|T], RE) ->
+    case re:run(L, RE, []) of
+        {match, _Captured} ->
+            true;
+        match ->
+            true;
+        nomatch ->
+            has_line(T, RE)
+    end.
+
+%%
+%% Generate the contents of a simple .app.src file
+%%
+app(Name) ->
+    "{application, " ++ atom_to_list(Name) ++ ",
+           [{vsn, \"2\"},
+            {modules, []},
+             {registered, []},
+             {applications, [kernel, stdlib]}]}.\n".

rebar-2.6.1.tar.gz/inttest/app_src_script Added

rebar-2.6.1.tar.gz/inttest/app_src_script/app_src_script.erl Added

rebar-2.6.1.tar.gz/inttest/app_src_script/app_src_script_rt.erl Added

@@ -0,0 +1,83 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Vlad Dumitrescu
+%%
+%% 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(app_src_script_rt).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{copy, "../../rebar", "rebar"},
+     {create, "src/app_src_script.app.src.script", app_script(app_src_script)}].
+
+run(Dir) ->
+    retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
+    {ok, [_Pid|Output]} = retest:sh("./rebar compile -vv",
+                                    [{async, false}]),
+
+    Regexp = "DEBUG: Evaluating config script .*/app_src_script\.app\.src\.script.*",
+    ?assertEqual(true, has_line(Output, Regexp)),
+    retest_log:log(debug, "Evaluated .app.src.script~n", []),
+
+    %% check that ebin/app_src.app exists
+    ?assertMatch(true, filelib:is_regular("ebin/app_src_script.app")),
+    retest_log:log(debug, "Generated ebin/.app~n", []),
+
+    %% check that ebin/.app has vsn="2"
+    {ok, Bin} = file:read_file("ebin/app_src_script.app"),
+    Str = binary_to_list(Bin),
+    ?assertMatch({match, _}, re:run(Str, "{vsn, *\"2\"}")),
+    retest_log:log(debug, "Variable replacement in .app is ok.~n", []),
+
+    %% check that ebin/.app doesn't have foo=ok
+    ?assertMatch(nomatch, re:run(Str, "{foo, *ok}")),
+    retest_log:log(debug, "app.src hasn't 'foo' config.~n", []),
+
+    ok.
+
+has_line([], _RE) ->
+    false;
+has_line([L|T], RE) ->
+    case re:run(L, RE, []) of
+        {match, _Captured} ->
+            true;
+        match ->
+            true;
+        nomatch ->
+            has_line(T, RE)
+    end.
+
+%%
+%% Generate the contents of a simple .app.src.script file
+%%
+app_script(Name) ->
+    "Vsn=\"2\".\n" ++
+        "{application, " ++ atom_to_list(Name) ++ ",
+           [{vsn, Vsn},
+            {modules, []},
+            {registered, []},
+            {applications, [kernel, stdlib]}]}.\n".

rebar-2.6.1.tar.gz/inttest/app_src_script_2 Added

rebar-2.6.1.tar.gz/inttest/app_src_script_2/app_src_script_2.erl Added

rebar-2.6.1.tar.gz/inttest/app_src_script_2/app_src_script_2_rt.erl Added

@@ -0,0 +1,93 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Vlad Dumitrescu
+%%
+%% 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(app_src_script_2_rt).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{copy, "../../rebar", "rebar"},
+     {create, "src/app_src_script_2.app.src.script", app_script(app_src_script_2)},
+     {create, "src/app_src_script_2.app.src", app(app_src_script_2)}].
+
+run(Dir) ->
+    retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
+    {ok, [_Pid|Output]} = retest:sh("./rebar compile -vv",
+                                    [{async, false}]),
+
+    Regexp = "DEBUG: Evaluating config script .*/app_src_script_2\.app\.src\.script.*",
+    ?assertEqual(true, has_line(Output, Regexp)),
+    retest_log:log(debug, "Evaluated .app.src.script~n", []),
+
+    %% check that ebin/app_src.app exists
+    ?assertMatch(true, filelib:is_regular("ebin/app_src_script_2.app")),
+    retest_log:log(debug, "Generated ebin/.app~n", []),
+
+    %% check that ebin/.app has vsn="2" (as in .script)
+    {ok, Bin} = file:read_file("ebin/app_src_script_2.app"),
+    Str = binary_to_list(Bin),
+    retest_log:log(debug, "app=~p~n", [Str]),
+    ?assertMatch({match, _}, re:run(Str, "{vsn, *\"2\"}")),
+    retest_log:log(debug, "app.src has version from script.~n", []),
+
+    %% check that ebin/.app has foo=ok (from .src)
+    ?assertMatch({match, _}, re:run(Str, "{foo, *ok}")),
+    retest_log:log(debug, "app.src has 'foo' config from .src.~n", []),
+
+    ok.
+
+has_line([], _RE) ->
+    false;
+has_line([L|T], RE) ->
+    case re:run(L, RE, []) of
+        {match, _Captured} ->
+            true;
+        match ->
+            true;
+        nomatch ->
+            has_line(T, RE)
+    end.
+
+%%
+%% Generate the contents of a simple .app.src.script file
+%%
+app_script(Name) ->
+	"[{application," ++ atom_to_list(Name) ++ ",Cfg}] = CONFIG,
+     [{application," ++ atom_to_list(Name) ++ ",lists:keyreplace(vsn, 1, Cfg,
+                                    {vsn, \"2\"})}].".
+
+%%
+%% Generate the contents of a simple .app.src file
+%%
+app(Name) ->
+    "{application, " ++ atom_to_list(Name) ++ ",
+           [{vsn, \"3\"},
+            {foo, ok},
+            {modules, []},
+             {registered, []},
+             {applications, [kernel, stdlib]}]}.\n".

rebar-2.6.1.tar.gz/inttest/appup_src Added

rebar-2.6.1.tar.gz/inttest/appup_src/appup_src_rt.erl Added

@@ -0,0 +1,67 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 Luis Rascao (luis.rascao@gmail.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(appup_src_rt).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{copy, "../../rebar", "rebar"},
+     {copy, "src", "src"}].
+
+run(Dir) ->
+    retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
+    {ok, [_Pid|Output]} = retest:sh("./rebar compile -vv",
+                                    [{async, false}]),
+
+    LineRegexp = "Compiled src/app\.appup\.src",
+    ?assertEqual(true, has_line(Output, LineRegexp)),
+
+    %% check that ebin/app.appup exists
+    ?assertMatch(true, filelib:is_regular("ebin/app.appup")),
+    retest_log:log(debug, "Generated ebin/app.appup~n", []),
+
+    %% check that ebin/app.appup has expected version
+    {ok, [{AppVersion, [{UpgradeFrom, _} |  _UpgradeFromRest], [{DowngradeTo, _} | _DowngradeToRest]}]} =
+        file:consult("ebin/app.appup"),
+    ?assertEqual(AppVersion, "%VSN%"),
+    ?assertEqual(UpgradeFrom, "1.3"),
+    ?assertEqual(DowngradeTo, "1.3"),
+    ok.
+
+has_line([], _RE) ->
+    false;
+has_line([L|T], RE) ->
+    case re:run(L, RE, []) of
+        {match, _Captured} ->
+            true;
+        match ->
+            true;
+        nomatch ->
+            has_line(T, RE)
+    end.

rebar-2.6.1.tar.gz/inttest/appup_src/src Added

rebar-2.6.1.tar.gz/inttest/appup_src/src/app.app.src Added

rebar-2.6.1.tar.gz/inttest/appup_src/src/app.appup.src Added

@@ -0,0 +1,162 @@
+{"%VSN%",
+ [
+  {"1.3",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_per_bin},
+     {add_module, asn1rt_check},
+     {add_module, asn1rt_per_bin_rt2ct},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler},
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_per_bin},
+     {add_module, asn1rt_check},
+     {add_module, asn1rt_per_bin_rt2ct},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler},
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.1.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_per_bin},
+     {add_module, asn1rt_check},
+     {add_module, asn1rt_per_bin_rt2ct},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler},
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.2",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {add_module, asn1rt_per_bin_rt2ct},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler},
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.3",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler},
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.3.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_bin_v2},
+     {add_module, asn1rt_driver_handler},
+     {remove, {asn1rt_ber_v1, soft_purge, soft_purge}}
+   ]
+  }
+ ],
+ [
+  {"1.3",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
+     {remove, {asn1rt_check, soft_purge, soft_purge}},
+     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
+     {remove, {asn1rt_check, soft_purge, soft_purge}},
+     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.1.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_per_bin, soft_purge, soft_purge}},
+     {remove, {asn1rt_check, soft_purge, soft_purge}},
+     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.2",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_per_bin_rt2ct, soft_purge, soft_purge}},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.3",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  },
+  {"1.3.3.1",
+   [
+     {load_module, asn1rt_per_v1, soft_purge, soft_purge, []},
+     {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
+     {load_module, asn1rt_check, soft_purge, soft_purge, []},
+     {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
+     {add_module, asn1rt_ber_v1},
+     {remove, {asn1rt_ber_bin_v2, soft_purge, soft_purge}},
+     {remove, {asn1rt_driver_handler, soft_purge, soft_purge}}
+   ]
+  }
+
+ ]}.

rebar-2.6.1.tar.gz/inttest/appup_src/src/appup_src.erl Added

rebar-2.6.1.tar.gz/inttest/appup_src_2 Added

rebar-2.6.1.tar.gz/inttest/appup_src_2/appup_src_2_rt.erl Added

@@ -0,0 +1,65 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 Luis Rascao (luis.rascao@gmail.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(appup_src_2_rt).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{copy, "../../rebar", "rebar"},
+     {copy, "src", "src"}].
+
+run(Dir) ->
+    retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
+    {ok, [_Pid|Output]} = retest:sh("./rebar compile -vv",
+                                    [{async, false}]),
+
+    LineRegexp = "Compiled src/app\.appup\.src",
+    ?assertEqual(true, has_line(Output, LineRegexp)),
+
+    %% check that ebin/app.appup exists
+    ?assertMatch(true, filelib:is_regular("ebin/app.appup")),
+    retest_log:log(debug, "Generated ebin/app.appup~n", []),
+
+    %% check that ebin/app.appup has expected version
+    {ok, [{AppVersion, [], []}]} =
+        file:consult("ebin/app.appup"),
+    ?assertEqual(AppVersion, "1.24"),
+    ok.
+
+has_line([], _RE) ->
+    false;
+has_line([L|T], RE) ->
+    case re:run(L, RE, []) of
+        {match, _Captured} ->
+            true;
+        match ->
+            true;
+        nomatch ->
+            has_line(T, RE)
+    end.

rebar-2.6.1.tar.gz/inttest/appup_src_2/appup_src_rt_2.erl Added

@@ -0,0 +1,67 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 Luis Rascao (luis.rascao@gmail.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(appup_src_rt_2).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{copy, "../../rebar", "rebar"},
+     {copy, "src", "src"}].
+
+run(Dir) ->
+    retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
+    {ok, [_Pid|Output]} = retest:sh("./rebar compile -vv",
+                                    [{async, false}]),
+
+    LineRegexp = "Compiled src/app\.appup\.src",
+    ?assertEqual(true, has_line(Output, LineRegexp)),
+
+    %% check that ebin/app.appup exists
+    ?assertMatch(true, filelib:is_regular("ebin/app.appup")),
+    retest_log:log(debug, "Generated ebin/app.appup~n", []),
+
+    %% check that ebin/app.appup has expected version
+    {ok, [{AppVersion, [{UpgradeFrom, _}], [{DowngradeTo, _}]}]} =
+        file:consult("ebin/app.appup"),
+    ?assertEqual(AppVersion, "1.2.2"),
+    ?assertEqual(UpgradeFrom, "1.2.1"),
+    ?assertEqual(DowngradeTo, "1.2.1"),
+    ok.
+
+has_line([], _RE) ->
+    false;
+has_line([L|T], RE) ->
+    case re:run(L, RE, []) of
+        {match, _Captured} ->
+            true;
+        match ->
+            true;
+        nomatch ->
+            has_line(T, RE)
+    end.

rebar-2.6.1.tar.gz/inttest/appup_src_2/src Added

rebar-2.6.1.tar.gz/inttest/appup_src_2/src/app.app.src Added

rebar-2.6.1.tar.gz/inttest/appup_src_2/src/app.appup.src Added

rebar-2.6.1.tar.gz/inttest/appup_src_2/src/appup_src.erl Added

rebar-2.6.1.tar.gz/inttest/appup_src_script Added

rebar-2.6.1.tar.gz/inttest/appup_src_script/appup_src_script_rt.erl Added

@@ -0,0 +1,67 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 Luis Rascao (luis.rascao@gmail.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(appup_src_script_rt).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{copy, "../../rebar", "rebar"},
+     {copy, "src", "src"}].
+
+run(Dir) ->
+    retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
+    {ok, [_Pid|Output]} = retest:sh("./rebar compile -vv",
+                                    [{async, false}]),
+
+    LineRegexp = "Compiled src/app\.appup\.src",
+    ?assertEqual(true, has_line(Output, LineRegexp)),
+
+    %% check that ebin/app.appup exists
+    ?assertMatch(true, filelib:is_regular("ebin/app.appup")),
+    retest_log:log(debug, "Generated ebin/app.appup~n", []),
+
+    %% check that ebin/app.appup has expected version
+    {ok, [{AppVersion, [{UpgradeFrom, _}], [{DowngradeTo, _}]}]} =
+        file:consult("ebin/app.appup"),
+    ?assertEqual(AppVersion, "2.1.2"),
+    ?assertEqual(UpgradeFrom, "2.1.1"),
+    ?assertEqual(DowngradeTo, "2.1.1"),
+    ok.
+
+has_line([], _RE) ->
+    false;
+has_line([L|T], RE) ->
+    case re:run(L, RE, []) of
+        {match, _Captured} ->
+            true;
+        match ->
+            true;
+        nomatch ->
+            has_line(T, RE)
+    end.

rebar-2.6.1.tar.gz/inttest/appup_src_script/src Added

rebar-2.6.1.tar.gz/inttest/appup_src_script/src/app.app.src Added

rebar-2.6.1.tar.gz/inttest/appup_src_script/src/app.appup.src Added

rebar-2.6.1.tar.gz/inttest/appup_src_script/src/app.appup.src.script Added

rebar-2.6.1.tar.gz/inttest/appup_src_script/src/appup_src.erl Added

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/bug_5_rt.erl -> rebar-2.6.1.tar.gz/inttest/bug_5_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/code_path_no_recurse/code_path_no_recurse_rt.erl -> rebar-2.6.1.tar.gz/inttest/code_path_no_recurse/code_path_no_recurse_rt.erl Changed

@@ -1,3 +1,29 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tuncer Ayaz
+%%
+%% 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(code_path_no_recurse_rt).
 -export([files/0,
          run/1]).

rebar-2.6.1.tar.gz/inttest/cover Added

rebar-2.6.1.tar.gz/inttest/cover/cover_rt.erl Added

@@ -0,0 +1,76 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Brian H. Ward
+%%
+%% 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(cover_rt).
+
+-export([files/0,run/1]).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{create, "ebin/foo.app", app(foo)},
+     {copy, "../../rebar","rebar"},
+     {copy, "src", "src"},
+     {copy,
+      "rebar-cover_export_json.config",
+      "rebar-cover_export_json.config"}].
+
+run(_Dir) ->
+    ifdef_test(),
+    cover_export_json_test(),
+    ok.
+
+ifdef_test() ->
+    {ok, Output} = retest:sh("./rebar -v eunit"),
+    io:format("output => ~p~n", [Output]),
+    ?assert(check_output(Output, "foo")),
+    {ok, Listing} = file:list_dir(".eunit"),
+    ?assert(check_output(Listing, "foo.beam")),
+    ?assertMatch({ok,_}, retest:sh("./rebar clean")).
+
+cover_export_json_test() ->
+    {ok, Output} =
+        retest:sh("./rebar -v -C rebar-cover_export_json.config eunit"),
+    ?assert(check_output(Output, "foo")),
+    ?assertEqual(
+       {ok, <<"{\"module\":\"foo\",\"covered\":2,\"not_covered\":1}">>},
+       file:read_file(".eunit/foo.COVER.json")),
+    ?assertMatch(
+       {ok, _},
+       retest:sh("./rebar -C rebar-cover_export_json.config clean")).
+
+check_output(Output,Target) ->
+    lists:any(fun(Line) ->
+                      string:str(Line, Target) > 0
+              end, Output).
+app(Name) ->
+    App = {application, Name,
+           [{description, atom_to_list(Name)},
+            {vsn, "1"},
+            {modules, []},
+            {registered, []},
+            {applications, [kernel, stdlib]}]},
+    io_lib:format("~p.\n", [App]).

rebar-2.6.1.tar.gz/inttest/cover/rebar-cover_export_json.config Added

rebar-2.6.1.tar.gz/inttest/cover/src Added

rebar-2.6.1.tar.gz/inttest/cover/src/foo.erl Added

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/ct1/ct1_rt.erl -> rebar-2.6.1.tar.gz/inttest/ct1/ct1_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/ct2/ct2_rt.erl -> rebar-2.6.1.tar.gz/inttest/ct2/ct2_rt.erl Changed

rebar-2.6.1.tar.gz/inttest/ct2/deps Added

rebar-2.6.1.tar.gz/inttest/ct2/deps/bar.test.spec Added

rebar-2.6.1.tar.gz/inttest/ct3 Added

rebar-2.6.1.tar.gz/inttest/ct3/app.config Added

rebar-2.6.1.tar.gz/inttest/ct3/converted Added

rebar-2.6.1.tar.gz/inttest/ct3/converted/.keep Added

rebar-2.6.1.tar.gz/inttest/ct3/ct3_rt.erl Added

@@ -0,0 +1,56 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Savchuk Igor
+%%
+%% 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(ct3_rt).
+
+-compile(export_all).
+
+
+files() ->
+    [{create, "ebin/a1.app", app(a1)},
+     {copy, "../../rebar", "rebar"},
+     {copy, "rebar.config", "rebar.config"},
+     {copy, "app.config", "itest/app.config"},
+     {copy, "test_SUITE.erl", "itest/test_SUITE.erl"},
+     {copy, "converted"},
+     {copy, "unconverted"}].
+
+run(_Dir) ->
+    {ok, _} = retest:sh("./rebar compile ct -v",
+                        [{env, [{"ERL_FLAGS", "-name ct_rt3"}]}]),
+    ok.
+
+%%
+%% Generate the contents of a simple .app file
+%%
+app(Name) ->
+    App = {application, Name,
+           [{description, atom_to_list(Name)},
+            {vsn, "1"},
+            {modules, []},
+            {registered, []},
+            {applications, [kernel, stdlib]}]},
+    io_lib:format("~p.\n", [App]).

rebar-2.6.1.tar.gz/inttest/ct3/rebar.config Added

rebar-2.6.1.tar.gz/inttest/ct3/test_SUITE.erl Added

@@ -0,0 +1,52 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Savchuk Igor
+%%
+%% 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(test_SUITE).
+
+-compile(export_all).
+
+-include_lib("ct.hrl").
+
+all() ->
+    [simple_test,
+     app_config_file_test,
+     check_path].
+
+simple_test(Config) ->
+    io:format("Test: ~p\n", [Config]).
+
+app_config_file_test(_Config) ->
+    application:start(a1),
+    {ok, bar} = application:get_env(a1, foo),
+    application:stop(a1).
+
+%% check if -erl_args in ct_extra_params of rebar.config is working
+%% if it is, path before -erl_args is converted to absolute
+%% and path after -erl_args is not
+check_path(_Config) ->
+    Path = code:get_path(),
+    false = lists:member("converted", Path),
+    true = lists:member("unconverted", Path).

rebar-2.6.1.tar.gz/inttest/ct3/unconverted Added

rebar-2.6.1.tar.gz/inttest/ct3/unconverted/.keep Added

rebar-2.6.1.tar.gz/inttest/ct_cover Added

rebar-2.6.1.tar.gz/inttest/ct_cover/app.config Added

rebar-2.6.1.tar.gz/inttest/ct_cover/cover.spec Added

rebar-2.6.1.tar.gz/inttest/ct_cover/ct_cover_rt.erl Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock/dummy Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock/dummy/app.config Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock/dummy/cover.spec Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock/dummy/ebin Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock/dummy/ebin/dummy.app Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock/dummy/itest Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock/dummy/itest/test_SUITE.erl Added

rebar-2.6.1.tar.gz/inttest/ct_cover/mock/dummy/rebar.config Added

rebar-2.6.1.tar.gz/inttest/ct_cover/rebar.config Added

rebar-2.6.1.tar.gz/inttest/ct_cover/test_SUITE.erl Added

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/depplugins/depplugins_rt.erl -> rebar-2.6.1.tar.gz/inttest/depplugins/depplugins_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/erlc/erlc_rt.erl -> rebar-2.6.1.tar.gz/inttest/erlc/erlc_rt.erl Changed

@@ -1,5 +1,29 @@
-%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
-%% ex: ts=4 sw=4 ft=erlang et
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tuncer Ayaz
+%%
+%% 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(erlc_rt).
 -export([files/0,
          run/1]).
@@ -7,7 +31,8 @@
 -include_lib("eunit/include/eunit.hrl").
 
 -define(MODULES,
-        [first_xrl,
+        [after_first_erl,
+         first_xrl,
          first_yrl,
          first_erl,
          foo,
@@ -18,7 +43,8 @@
          'SIMPLE-ASN']).
 
 -define(BEAM_FILES,
-        ["first_xrl.beam",
+        ["after_first_erl.beam",
+         "first_xrl.beam",
          "first_yrl.beam",
          "first_erl.beam",
          "foo.beam",
@@ -40,6 +66,10 @@
      {copy, "mibs", "mibs"},
      {copy, "asn1", "asn1"},
      {create, "ebin/foo.app", app(foo, ?MODULES)},
+     {create, "src/._do_not_compile.erl",
+              "syntax error\n"
+              "this file is here to verify that rebar does not try to compile\n"
+              "files like OS X resource forks and should not be processed at all\n"},
      %% deps
      {create, "deps/foobar/ebin/foobar.app", app(foobar, [foobar])},
      {copy, "foobar.erl", "deps/foobar/src/foobar.erl"}

rebar-2.6.1.tar.gz/inttest/erlc/extra-src/after_first_erl.erl Added

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/erlc/rebar.config -> rebar-2.6.1.tar.gz/inttest/erlc/rebar.config Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/erlc/src/first_erl.erl -> rebar-2.6.1.tar.gz/inttest/erlc/src/first_erl.erl Changed

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/erlc_dep_graph_rt.erl Added

@@ -0,0 +1,111 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 David Kubecka
+%%
+%% 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(erlc_dep_graph_rt).
+-export([files/0,
+         run/1]).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [{copy, "../../rebar", "rebar"},
+     {copy, "rebar.config", "rebar.config"},
+     {copy, "src", "src"},
+     {copy, "include", "include"},
+     {copy, "extra_include", "extra_include"}].
+
+run(_Dir) ->
+    compile_all(ok, ""),
+    check_beams_ok(),
+    check_beams_untouched(filelib:wildcard("ebin/*.beam")),
+    modify_and_recompile_ok("src/lisp.erl", "ebin/lisp.beam"),
+
+    clean_all_ok(),
+    compile_all(error, "-C rebar.config.non-existing"),
+    compile_all(ok, ""),
+    modify_and_recompile_ok("extra_include/extra.hrl", "ebin/java.beam"),
+
+    Java = "src/java.erl",
+    {ok, OrigContent} = file:read_file(Java),
+    %% Remove header file inclusion
+    {ok, _} = file:copy("src/java.erl.no_extra", Java),
+    %% Ensure recompilation
+    touch([Java]),
+    compile_all(ok, ""),
+    %% Modify that header file
+    touch(["extra_include/extra.hrl"]),
+    %% Ensure we don't have to recompile anything
+    check_beams_untouched(["ebin/java.beam"]),
+    %% Clean up
+    ok = file:write_file(Java, OrigContent),
+
+    %% Check that changes propagate deeply through the dependency tree
+    modify_and_recompile_ok("include/lambda.hrl", "ebin/perl.beam"),
+
+    ok.
+
+check_beams_ok() ->
+    F = fun(BeamFile) -> ?assert(filelib:is_regular(BeamFile)) end,
+    with_erl_beams(F).
+
+check_beams_untouched(Beams) ->
+    compile_all_and_assert_mtimes(Beams, fun erlang:'=:='/2).
+
+modify_and_recompile_ok(TouchFile, CheckFile) ->
+    touch([TouchFile]),
+    compile_all_and_assert_mtimes([CheckFile], fun erlang:'<'/2).
+
+compile_all_and_assert_mtimes(Beams, Cmp) ->
+    BeamsModifiedBefore = mtime_ns(Beams),
+    compile_all(ok, ""),
+    BeamsModifiedAfter = mtime_ns(Beams),
+    lists:zipwith(fun(Before, After) -> ?assert(Cmp(Before, After)) end,
+                  BeamsModifiedBefore, BeamsModifiedAfter).
+
+with_erl_beams(F) ->
+    lists:map(
+        fun(ErlFile) ->
+            ErlRoot = filename:rootname(filename:basename(ErlFile)),
+            BeamFile = filename:join("ebin", ErlRoot ++ ".beam"),
+            F(BeamFile)
+        end,
+        filelib:wildcard("src/*.erl")).
+
+mtime_ns(Files) ->
+    [os:cmd("stat -c%y " ++ File) || File <- Files].
+
+touch(Files) ->
+    %% Sleep one second so that filelib:last_modified/1 is guaranteed to notice
+    %% that files have changed.
+    ok = timer:sleep(1000),
+    [os:cmd("touch " ++ File) || File <- Files].
+
+compile_all(Result, Opts) ->
+    ?assertMatch({Result, _},
+        retest_sh:run("./rebar " ++ Opts ++ " compile", [])).
+
+clean_all_ok() ->
+    ?assertMatch({ok, _}, retest_sh:run("./rebar clean", [])).

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/extra_include Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/extra_include/extra.hrl Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/include Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/include/lambda.hrl Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/rebar.config Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/src Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/src/foo.app.src Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/src/java.erl Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/src/java.erl.no_extra Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/src/lisp.erl Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/src/pascal.erl Added

rebar-2.6.1.tar.gz/inttest/erlc_dep_graph/src/perl.erl Added

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/eunit/eunit_rt.erl -> rebar-2.6.1.tar.gz/inttest/eunit/eunit_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/logging/logging_rt.erl -> rebar-2.6.1.tar.gz/inttest/logging/logging_rt.erl Changed

@@ -1,3 +1,29 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tuncer Ayaz
+%%
+%% 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(logging_rt).
 -export([files/0,
          run/1]).
@@ -12,27 +38,36 @@
 
 run(_Dir) ->
     SharedExpected = "==> logging_rt \$compile\$",
+    {ERROR, WARN, INFO, DEBUG} = log_labels(),
     %% provoke ERROR due to an invalid app file
     retest:log(info, "Check 'compile' failure output~n"),
     ok = check_output("./rebar compile -q", should_fail,
-                      [SharedExpected, "ERROR: "],
-                      ["WARN: ", "INFO: ", "DEBUG: "]),
+                      [SharedExpected, ERROR],
+                      [WARN, INFO, DEBUG]),
     %% fix bad app file
     ok = file:write_file(?APP_FILE, app(logging, [])),
     retest:log(info, "Check 'compile' success output~n"),
     ok = check_output("./rebar compile", should_succeed,
                       [SharedExpected],
-                      ["ERROR: ", "WARN: ", "INFO: ", "DEBUG: "]),
+                      [ERROR, WARN, INFO, DEBUG]),
     retest:log(info, "Check 'compile -v' success output~n"),
     ok = check_output("./rebar compile -v", should_succeed,
                       [SharedExpected],
-                      ["ERROR: ", "INFO: ", "DEBUG: "]),
+                      [ERROR, INFO, DEBUG]),
     retest:log(info, "Check 'compile -vv' success output~n"),
     ok = check_output("./rebar compile -vv", should_succeed,
-                      [SharedExpected, "DEBUG: "],
-                      ["ERROR: ", "INFO: "]),
+                      [SharedExpected, DEBUG],
+                      [ERROR, INFO]),
     ok.
 
+log_labels() ->
+    {
+      "(\\e\\[1m\\e\\[31mERROR: \\e\\[0m|ERROR: )",
+      "(\\e\\[33mWARN: \\e\\[0m|WARN: )",
+      "(\\e\\[32mINFO: \\e\\[0m|INFO: )",
+      "(\\e\\[34mDEBUG: \\e\\[0m|DEBUG: )"
+    }.
+
 check_output(Cmd, FailureMode, Expected, Unexpected) ->
     case {retest:sh(Cmd), FailureMode} of
         {{error, _}=Error, should_succeed} ->
@@ -47,7 +82,7 @@
     end.
 
 check_output1(Cmd, Captured, Expected, Unexpected) ->
-    ReOpts = [{capture, all, list}],
+    ReOpts = [{capture, all, list}, unicode],
     ExMatches =
         lists:zf(
           fun(Pattern) ->
@@ -72,7 +107,7 @@
                           false;
                       {match, [Match]} ->
                           retest:log(
-                            console,
+                            error,
                             "Unexpected output when running cmd '~s':~n~s~n",
                             [Cmd, Match]),
                           {true, Match}

rebar-2.6.1.tar.gz/inttest/port Added

rebar-2.6.1.tar.gz/inttest/port/c_src Added

rebar-2.6.1.tar.gz/inttest/port/c_src/test1.c Added

rebar-2.6.1.tar.gz/inttest/port/c_src/test1.h Added

rebar-2.6.1.tar.gz/inttest/port/c_src/test2.c Added

rebar-2.6.1.tar.gz/inttest/port/c_src/test2.h Added

rebar-2.6.1.tar.gz/inttest/port/port_rt.erl Added

@@ -0,0 +1,100 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tomas Janousek
+%%
+%% 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(port_rt).
+-export([files/0,
+         run/1]).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [
+     {copy, "../../rebar", "rebar"},
+     {copy, "rebar.config", "rebar.config"},
+     {copy, "c_src", "c_src"},
+     {create, "ebin/foo.app", app(foo, [])}
+    ].
+
+run(_Dir) ->
+    %% wait a bit for new files to have different timestamps
+    wait(),
+    %% test.so is created during first compile
+    ?assertEqual(0, filelib:last_modified("priv/test.so")),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])),
+    TestSo1 = filelib:last_modified("priv/test.so"),
+    ?assert(TestSo1 > 0),
+    wait(),
+    %% nothing happens during second compile
+    ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])),
+    TestSo2 = filelib:last_modified("priv/test.so"),
+    Test1o2 = filelib:last_modified("c_src/test1.o"),
+    Test2o2 = filelib:last_modified("c_src/test2.o"),
+    ?assertEqual(TestSo1, TestSo2),
+    ?assert(TestSo1 >= Test1o2),
+    ?assert(TestSo1 >= Test2o2),
+    wait(),
+    %% when test2.c changes, at least test2.o and test.so are rebuilt
+    ?assertMatch({ok, _}, retest_sh:run("touch c_src/test2.c", [])),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])),
+    TestSo3 = filelib:last_modified("priv/test.so"),
+    Test2o3 = filelib:last_modified("c_src/test2.o"),
+    ?assert(TestSo3 > TestSo2),
+    ?assert(Test2o3 > TestSo2),
+    wait(),
+    %% when test2.h changes, at least test2.o and test.so are rebuilt
+    ?assertMatch({ok, _}, retest_sh:run("touch c_src/test2.h", [])),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])),
+    TestSo4 = filelib:last_modified("priv/test.so"),
+    Test2o4 = filelib:last_modified("c_src/test2.o"),
+    ?assert(TestSo4 > TestSo3),
+    ?assert(Test2o4 > TestSo3),
+    wait(),
+    %% when test1.h changes, everything is rebuilt
+    ?assertMatch({ok, _}, retest_sh:run("touch c_src/test1.h", [])),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])),
+    TestSo5 = filelib:last_modified("priv/test.so"),
+    Test1o5 = filelib:last_modified("c_src/test1.o"),
+    Test2o5 = filelib:last_modified("c_src/test2.o"),
+    ?assert(TestSo5 > TestSo4),
+    ?assert(Test1o5 > TestSo4),
+    ?assert(Test2o5 > TestSo4),
+    ok.
+
+wait() ->
+    timer:sleep(1000).
+
+%%
+%% Generate the contents of a simple .app file
+%%
+app(Name, Modules) ->
+    App = {application, Name,
+           [{description, atom_to_list(Name)},
+            {vsn, "1"},
+            {modules, Modules},
+            {registered, []},
+            {applications, [kernel, stdlib]}]},
+    io_lib:format("~p.\n", [App]).

rebar-2.6.1.tar.gz/inttest/port/rebar.config Added

rebar-2.6.1.tar.gz/inttest/profile Added

rebar-2.6.1.tar.gz/inttest/profile/profile_rt.erl Added

@@ -0,0 +1,192 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tuncer Ayaz
+%%
+%% 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(profile_rt).
+-export([files/0,
+         run/1]).
+
+-include_lib("eunit/include/eunit.hrl").
+
+files() ->
+    [
+     {copy, "../../rebar", "rebar"}
+    ].
+
+run(_Dir) ->
+    Cmd = "./rebar list-deps",
+    FprofFiles = fprof_files(),
+    EflameFiles = ["eflame.trace", "eflame.svg"],
+
+    %% run a simple command (list-deps) without profiling
+    SharedExpected = "==> profile_rt \$list-deps\$",
+    %% run Cmd without profiling
+    retest:log(info, "Check '~s' without profiling~n", [Cmd]),
+    ok = check(Cmd, should_succeed, [SharedExpected], ["Profiling!"],
+               [], FprofFiles ++ EflameFiles),
+
+    %% run Cmd with fprof profiling
+    retest:log(info, "Check '~s' with fprof profiling~n", [Cmd]),
+    ok = check(Cmd ++ " -p", should_succeed,
+               [SharedExpected, "Profiling!", "See fprof\.analysis"],
+               ["See eflame\.svg"],
+               FprofFiles, EflameFiles),
+    delete_files(FprofFiles),
+
+    %% run Cmd with explicitly selected fprof profiling
+    retest:log(info, "Check '~s' with explicitly selected fprof profiling~n",
+               [Cmd]),
+    ok = check(Cmd ++ " -p profiler=fprof", should_succeed,
+               [SharedExpected, "Profiling!", "See fprof\.analysis"],
+               ["See eflame\.svg"],
+               FprofFiles, EflameFiles),
+    delete_files(FprofFiles),
+
+    case code:lib_dir(eflame) of
+        {error, bad_name} ->
+            retest:log(info,
+                       "eflame not found in code path. skip eflame test~n"),
+            ok;
+        _EflameDir ->
+            %% run Cmd with eflame profiling
+            retest:log(info, "Check '~s' with eflame profiling~n", [Cmd]),
+            ok = check(Cmd ++ " -p profiler=eflame", should_succeed,
+                       [SharedExpected, "Profiling!", "See eflame\.svg"],
+                       ["See fprof\.analysis"],
+                       EflameFiles, FprofFiles),
+            delete_files(EflameFiles)
+    end,
+
+    ok.
+
+fprof_files() ->
+    FprofFiles = ["fprof.trace", "fprof.analysis"],
+    CgrindFiles = ["fprof.cgrind"],
+    case os:find_executable("erlgrind") of
+        false ->
+            retest:log(info,
+                       "erlgrind escript not found. skip fprof.cgrind check~n"),
+            FprofFiles;
+        _ErlGrind ->
+            FprofFiles ++ CgrindFiles
+    end.
+
+check(Cmd, FailureMode, ExpectedOutput, UnexpectedOutput,
+      ExpectedFiles, UnexpectedFiles) ->
+    case {retest:sh(Cmd), FailureMode} of
+        {{error, _}=Error, should_succeed} ->
+            retest:log(error, "cmd '~s' failed:~n~p~n", [Cmd, Error]),
+            Error;
+        {{ok, CapturedOutput}, should_succeed} ->
+            JoinedOutput = string:join(CapturedOutput, "\n"),
+            check1(Cmd, JoinedOutput, ExpectedOutput, UnexpectedOutput,
+                   ExpectedFiles, UnexpectedFiles);
+        {{error, {stopped, {_Rc, CapturedOutput}}}, should_fail} ->
+            JoinedOutput = string:join(CapturedOutput, "\n"),
+            check1(Cmd, JoinedOutput, ExpectedOutput, UnexpectedOutput,
+                   ExpectedFiles, UnexpectedFiles)
+    end.
+
+check1(Cmd, CapturedOutput, ExpectedOutput, UnexpectedOutput,
+       ExpectedFiles, UnexpectedFiles) ->
+    ReOpts = [{capture, all, list}],
+    ExMatches =
+        lists:zf(
+          fun(Pattern) ->
+                  case re:run(CapturedOutput, Pattern, ReOpts) of
+                      nomatch ->
+                          retest:log(error,
+                                     "Expected pattern '~s' missing "
+                                     "in the following output:~n"
+                                     "=== BEGIN ===~n~s~n=== END ===~n",
+                                     [Pattern, CapturedOutput]),
+                          {true, Pattern};
+                      {match, _} ->
+                          false
+                  end
+          end, ExpectedOutput),
+
+    UnExMatches =
+        lists:zf(
+          fun(Pattern) ->
+                  case re:run(CapturedOutput, Pattern, ReOpts) of
+                      nomatch ->
+                          false;
+                      {match, [Match]} ->
+                          retest:log(
+                            console,
+                            "Unexpected output when running cmd '~s':~n~s~n",
+                            [Cmd, Match]),
+                          {true, Match}
+                  end
+          end, UnexpectedOutput),
+
+    ExFiles =
+        lists:zf(
+          fun(File) ->
+                  case filelib:is_regular(File) of
+                      true ->
+                          false;
+                      false ->
+                          retest:log(error,
+                                     "Expected file missing: ~s~n", [File]),
+                          {true, File}
+                  end
+          end, ExpectedFiles),
+
+    UnExFiles =
+        lists:zf(
+          fun(File) ->
+                  case filelib:is_regular(File) of
+                      true ->
+                          retest:log(error,
+                                     "Unexpected file found: ~s~n", [File]),
+                          {true, File};
+                      false ->
+                          false
+                  end
+          end, UnexpectedFiles),
+
+    case {ExMatches, UnExMatches, ExFiles, UnExFiles} of
+        {[], [], [], []} ->
+            ok;
+        _ ->
+            error
+    end.
+
+delete_files(Files) ->
+    lists:foreach(fun(File) -> ok = file:delete(File) end, Files).
+
+%%
+%% Generate the contents of a simple .app file
+%%
+app(Name, Modules) ->
+    App = {application, Name,
+           [{description, atom_to_list(Name)},
+            {vsn, "1"},
+            {modules, Modules},
+            {registered, []},
+            {applications, [kernel, stdlib]}]},
+    io_lib:format("~p.\n", [App]).

rebar-2.6.1.tar.gz/inttest/proto_gpb Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/include Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/include/.gitignore Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/mock Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/mock/gpb Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/mock/gpb/src Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/mock/gpb/src/gpb.app.src Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/mock/gpb/src/gpb.erl Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/mock/gpb/src/gpb_compile.erl Added

@@ -0,0 +1,78 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 Tomas Abrahamsson (tomas.abrahamsson@gmail.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(gpb_compile).
+-export([file/2]).
+
+%% Simulate gpb compiling some proto files,
+%% but generate only enough of what's needed for testing -- dummy stuff only.
+%% if a bad.proto file is supplied then gpb fails
+file(Proto, Opts) ->
+    ok = case filename:basename(Proto) of
+            "bad.proto" -> error;
+            _ -> ok
+         end,
+    Prefix = proplists:get_value(module_name_prefix, Opts, ""),
+    Suffix = proplists:get_value(module_name_suffix, Opts, ""),
+    ProtoBase = filename:basename(Proto, ".proto"),
+    ModBase = Prefix ++ ProtoBase ++ Suffix,
+    ErlDest = filename:join(get_erl_outdir(Opts), ModBase ++ ".erl"),
+    HrlDest = filename:join(get_hrl_outdir(Opts), ModBase ++ ".hrl"),
+    ok = file:write_file(ErlDest, erl_text(ModBase)),
+    ok = file:write_file(HrlDest, hrl_text(ModBase)).
+
+erl_text(ModBase) ->
+    io_lib:format(
+      lines(["-module(~p).",
+             "-export([encode_msg/1]).",
+             "-export([decode_msg/2]).",
+             "",
+             "encode_msg(some_dummy_msg) -> <<1,2,3>>.",
+             "",
+             "decode_msg(<<1,2,3>>, _) -> some_dummy_msg."]),
+      [list_to_atom(ModBase)]).
+
+hrl_text(ModBase) ->
+    io_lib:format(
+      lines(["-ifndef(~s_hrl).",
+             "-define(~s_hrl, true).",
+             "",
+             "%% some record definitions would normally go here...",
+             ""
+             "-endif. %% ~s_hrl"]),
+      [ModBase, ModBase, ModBase]).
+
+get_erl_outdir(Opts) ->
+    proplists:get_value(o_erl, Opts, get_outdir(Opts)).
+
+get_hrl_outdir(Opts) ->
+    proplists:get_value(o_hrl, Opts, get_outdir(Opts)).
+
+get_outdir(Opts) ->
+    proplists:get_value(o, Opts, ".").
+
+lines(Lines) ->
+    lists:flatten([[L, $\n] || L <- Lines]).

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/a Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/a/b Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/a/b/test3.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/a/test2.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/bad.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/c Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/c/d Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/c/d/test5.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/c/test4.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto.bad/test.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/a Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/a/b Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/a/b/test3.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/a/test2.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/c Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/c/d Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/c/d/test5.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/c/test4.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto/test.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/proto_gpb_rt.erl Added

@@ -0,0 +1,204 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Luis Rascão (luis.rascao@gmail.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(proto_gpb_rt).
+-export([files/0,
+         run/1]).
+
+-include_lib("eunit/include/eunit.hrl").
+-include_lib("kernel/include/file.hrl").
+-include_lib("deps/retest/include/retest.hrl").
+
+-define(MODULES,
+        [foo,
+         foo_app,
+         foo_sup]).
+
+-define(GENERATED_MODULES,
+        [test_gpb,
+         test2_gpb,
+         test3_gpb,
+         test4_gpb,
+         test5_gpb]).
+
+-define(SOURCE_PROTO_FILES,
+        ["test.proto",
+         "a/test2.proto",
+         "a/b/test3.proto",
+         "c/test4.proto",
+         "c/d/test5.proto"]).
+
+files() ->
+    [
+     {copy, "../../rebar", "rebar"},
+     {copy, "rebar.config", "rebar.config"},
+     {copy, "rebar2.config", "rebar2.config"},
+     {copy, "rebar.bad.config", "rebar.bad.config"},
+     {copy, "include", "include"},
+     {copy, "src", "src"},
+     {copy, "proto", "proto"},
+     {copy, "proto.bad", "proto.bad"},
+     {copy, "mock", "deps"},
+     {create, "ebin/foo.app", app(foo, ?MODULES ++ ?GENERATED_MODULES)}
+    ].
+
+run(_Dir) ->
+    % perform test obtaining the .proto files from src dir
+    ok = run_from_dir(success_expected, "src", "rebar.config"),
+    % perform test obtaining the .proto files from proto dir
+    ok = run_from_dir(success_expected, "proto", "rebar2.config"),
+    % perform a test where a failure is expected
+    ok = run_from_dir(fail_expected, "proto.bad", "rebar.bad.config").
+
+run_from_dir(fail_expected, _ProtoDir, ConfigFile) ->
+    %% we expect a failure to happen, however rebar should not crash;
+    %% We make sure of that by scanning the error.
+    {error, {stopped, {1, Error}}} = retest_sh:run("./rebar --config "
+                                                   ++ ConfigFile
+                                                   ++ " compile",
+                                                   []),
+    %% No matches of the string 'EXIT' should occur, these
+    %% indicate a rebar crash and not a exit with error.
+    0 = string:str(lists:flatten(Error), "'EXIT'"),
+    ok;
+run_from_dir(success_expected, ProtoDir, ConfigFile) ->
+    ?assertMatch({ok, _}, retest_sh:run("./rebar --config "
+                                        ++ ConfigFile
+                                        ++ " clean",
+                                        [])),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar --config "
+                                        ++ ConfigFile
+                                        ++ " compile",
+                                        [])),
+    %% Foo includes test_gpb.hrl,
+    %% So if it compiled, that also means gpb succeeded in
+    %% generating the test_gpb.hrl file, and also that it generated
+    %% the .hrl file was generated before foo was compiled.
+    ok = check_beams_generated(),
+
+    ?DEBUG("Verifying recompilation~n", []),
+    TestErl = hd(generated_erl_files()),
+    TestProto = hd(source_proto_files(ProtoDir)),
+    make_proto_newer_than_erl(TestProto, TestErl),
+    TestMTime1 = read_mtime(TestErl),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar --config "
+                                        ++ ConfigFile
+                                        ++ " compile",
+                                        [])),
+    TestMTime2 = read_mtime(TestErl),
+    ?assert(TestMTime2 > TestMTime1),
+
+    ?DEBUG("Verifying recompilation with no changes~n", []),
+    TestMTime3 = read_mtime(TestErl),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar --config "
+                                        ++ ConfigFile
+                                        ++ " compile",
+                                        [])),
+    TestMTime4 = read_mtime(TestErl),
+    ?assert(TestMTime3 =:= TestMTime4),
+
+    ?DEBUG("Verify cleanup~n", []),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar --config "
+                                        ++ ConfigFile
+                                        ++ " clean",
+                                        [])),
+    ok = check_files_deleted(),
+    ok.
+
+check_beams_generated() ->
+    check(fun filelib:is_regular/1,
+          beam_files()).
+
+check_files_deleted() ->
+    check(fun file_does_not_exist/1,
+          beam_files() ++ generated_erl_files() ++ generated_hrl_files()).
+
+beam_files() ->
+    add_dir("ebin", add_ext(?MODULES, ".beam")).
+
+generated_erl_files() ->
+    add_dir("src", add_ext(?GENERATED_MODULES, ".erl")).
+
+generated_hrl_files() ->
+    add_dir("include", add_ext(?GENERATED_MODULES, ".hrl")).
+
+generated_beam_files() ->
+    add_dir("ebin", add_ext(?GENERATED_MODULES, ".beam")).
+
+source_proto_files(ProtoDir) ->
+    add_dir(ProtoDir, ?SOURCE_PROTO_FILES).
+
+file_does_not_exist(F) ->
+    not filelib:is_regular(F).
+
+add_ext(Modules, Ext) ->
+    [lists:concat([Module, Ext]) || Module <- Modules].
+
+add_dir(Dir, Files) ->
+    [filename:join(Dir, File) || File <- Files].
+
+read_mtime(File) ->
+    {ok, #file_info{mtime=MTime}} = file:read_file_info(File),
+    MTime.
+
+
+make_proto_newer_than_erl(Proto, Erl) ->
+    %% Do this by back-dating the erl file instead of touching the
+    %% proto file.  Do this instead of sleeping for a second to get a
+    %% reliable test.  Sleeping would have been needed sin ce the
+    %% #file_info{} (used by eg. filelib:last_modified) does not have
+    %% sub-second resolution (even though most file systems have).
+    {ok, #file_info{mtime=ProtoMTime}} = file:read_file_info(Proto),
+    {ok, ErlInfo} = file:read_file_info(Erl),
+    OlderMTime = update_seconds_to_datetime(ProtoMTime, -2),
+    OlderErlInfo = ErlInfo#file_info{mtime = OlderMTime},
+    ok = file:write_file_info(Erl, OlderErlInfo).
+
+update_seconds_to_datetime(DT, ToAdd) ->
+    calendar:gregorian_seconds_to_datetime(
+      calendar:datetime_to_gregorian_seconds(DT) + ToAdd).
+
+touch_file(File) ->
+    ?assertMatch({ok, _}, retest_sh:run("touch " ++ File, [])).
+
+check(Check, Files) ->
+    lists:foreach(
+      fun(F) ->
+              ?assertMatch({true, _}, {Check(F), F})
+      end,
+      Files).
+
+%%
+%% Generate the contents of a simple .app file
+%%
+app(Name, Modules) ->
+    App = {application, Name,
+           [{description, atom_to_list(Name)},
+            {vsn, "1"},
+            {modules, Modules},
+            {registered, []},
+            {applications, [kernel, stdlib, gpb]}]},
+    io_lib:format("~p.\n", [App]).

rebar-2.6.1.tar.gz/inttest/proto_gpb/rebar.bad.config Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/rebar.config Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/rebar2.config Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/a Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/a/b Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/a/b/test3.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/a/test2.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/c Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/c/d Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/c/d/test5.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/c/test4.proto Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/foo.erl Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/foo_app.erl Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/foo_sup.erl Added

rebar-2.6.1.tar.gz/inttest/proto_gpb/src/test.proto Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/include Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/include/.gitignore Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/mock Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/mock/protobuffs Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/mock/protobuffs/src Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/mock/protobuffs/src/protobuffs.app.src Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/mock/protobuffs/src/protobuffs.erl Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/mock/protobuffs/src/protobuffs_compile.erl Added

@@ -0,0 +1,68 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 Tomas Abrahamsson (tomas.abrahamsson@gmail.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(protobuffs_compile).
+-export([scan_file/2]).
+
+%% Simulate protobuffs compiling some proto files,
+%% but generate only enough of what's needed for testing -- dummy stuff only.
+scan_file(Proto, _Opts) ->
+    ProtoBase = filename:basename(Proto, ".proto"),
+    ModBase  = ProtoBase ++ "_pb",
+    BeamDest = filename:join(get_beam_outdir(), ModBase ++ ".beam"),
+    HrlDest  = filename:join(get_hrl_outdir(), ModBase ++ ".hrl"),
+    ok = file:write_file(BeamDest, beam_text(ModBase)),
+    ok = file:write_file(HrlDest, hrl_text(ModBase)).
+
+beam_text(ModBase) ->
+    Mod = list_to_atom(ModBase),
+    Forms = [mk_attr(module, Mod)], % just a -module(...). line
+    {ok, Mod, Bin} = compile:forms(Forms),
+    Bin.
+
+mk_attr(AttrName, AttrValue) ->
+    erl_syntax:revert(
+      erl_syntax:attribute(erl_syntax:atom(AttrName),
+                           [erl_syntax:abstract(AttrValue)])).
+
+hrl_text(ModBase) ->
+    io_lib:format(
+      lines(["-ifndef(~s_hrl).",
+             "-define(~s_hrl, true).",
+             "",
+             "%% some record definitions would normally go here...",
+             ""
+             "-endif. %% ~s_hrl"]),
+      [ModBase, ModBase, ModBase]).
+
+get_beam_outdir() ->
+    ".".
+
+get_hrl_outdir() ->
+    ".".
+
+lines(Lines) ->
+    lists:flatten([[L, $\n] || L <- Lines]).

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/proto_protobuffs_rt.erl Added

@@ -0,0 +1,79 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tomas Abrahamsson (tomas.abrahamsson@gmail.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(proto_protobuffs_rt).
+-export([files/0,
+         run/1]).
+
+-include_lib("eunit/include/eunit.hrl").
+
+-define(MODULES,
+        [foo,
+         foo_app,
+         foo_sup,
+         test_pb]).
+
+-define(BEAM_FILES,
+        ["foo.beam",
+         "foo_app.beam",
+         "foo_sup.beam",
+         "test_pb.beam"]).
+
+files() ->
+    [
+     {copy, "../../rebar", "rebar"},
+     {copy, "rebar.config", "rebar.config"},
+     {copy, "include", "include"},
+     {copy, "src", "src"},
+     {copy, "mock", "deps"},
+     {create, "ebin/foo.app", app(foo, ?MODULES)}
+    ].
+
+run(_Dir) ->
+    ?assertMatch({ok, _}, retest_sh:run("./rebar clean", [])),
+    ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])),
+    ok = check_beams_generated(),
+    ok.
+
+check_beams_generated() ->
+    lists:foreach(
+      fun(F) ->
+              File = filename:join("ebin", F),
+              ?assert(filelib:is_regular(File))
+      end,
+      ?BEAM_FILES).
+
+%%
+%% Generate the contents of a simple .app file
+%%
+app(Name, Modules) ->
+    App = {application, Name,
+           [{description, atom_to_list(Name)},
+            {vsn, "1"},
+            {modules, Modules},
+            {registered, []},
+            {applications, [kernel, stdlib, gpb]}]},
+    io_lib:format("~p.\n", [App]).

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/rebar.config Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/src Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/src/foo.erl Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/src/foo_app.erl Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/src/foo_sup.erl Added

rebar-2.6.1.tar.gz/inttest/proto_protobuffs/src/test.proto Added

rebar-2.6.1.tar.gz/inttest/require_vsn Added

rebar-2.6.1.tar.gz/inttest/require_vsn/rebar.config Added

rebar-2.6.1.tar.gz/inttest/require_vsn/require_vsn_rt.erl Added

@@ -0,0 +1,115 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tuncer Ayaz
+%%
+%% 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(require_vsn_rt).
+-export([files/0,
+         run/1]).
+
+files() ->
+    [
+     {copy, "../../rebar", "rebar"},
+     {copy, "rebar.config", "rebar.config"},
+     {create, "ebin/require_vsn.app", app(require_vsn, [])}
+    ].
+
+run(_Dir) ->
+    SharedExpected = "==> require_vsn_rt \$compile\$",
+    %% Provoke ABORT due to failed require vsn check.
+    retest:log(info, "Check require vsn failure~n"),
+    ok = check_output("./rebar compile", should_fail,
+                      [SharedExpected, "ERROR: "],
+                      ["WARN: "]),
+    %% Treat version constraints as warnings.
+    retest:log(info, "Check require vsn success with -k/--keep-going~n"),
+    ok = check_output("./rebar -k compile", should_succeed,
+                      [SharedExpected, "ERROR: "],
+                      ["WARN: "]),
+    ok.
+
+check_output(Cmd, FailureMode, Expected, Unexpected) ->
+    case {retest:sh(Cmd), FailureMode} of
+        {{error, _}=Error, should_succeed} ->
+            retest:log(error, "cmd '~s' failed:~n~p~n", [Cmd, Error]),
+            Error;
+        {{ok, Captured}, should_succeed} ->
+            Joined = string:join(Captured, "\n"),
+            check_output1(Cmd, Joined, Expected, Unexpected);
+        {{error, {stopped, {_Rc, Captured}}}, should_fail} ->
+            Joined = string:join(Captured, "\n"),
+            check_output1(Cmd, Joined, Expected, Unexpected)
+    end.
+
+check_output1(Cmd, Captured, Expected, Unexpected) ->
+    ReOpts = [{capture, all, list}],
+    ExMatches =
+        lists:zf(
+          fun(Pattern) ->
+                  case re:run(Captured, Pattern, ReOpts) of
+                      nomatch ->
+                          retest:log(error,
+                                     "Expected pattern '~s' missing "
+                                     "in the following output:~n"
+                                     "=== BEGIN ===~n~s~n=== END ===~n",
+                                     [Pattern, Captured]),
+                          {true, Pattern};
+                      {match, _} ->
+                          false
+                  end
+          end, Expected),
+
+    UnExMatches =
+        lists:zf(
+          fun(Pattern) ->
+                  case re:run(Captured, Pattern, ReOpts) of
+                      nomatch ->
+                          false;
+                      {match, [Match]} ->
+                          retest:log(
+                            console,
+                            "Unexpected output when running cmd '~s':~n~s~n",
+                            [Cmd, Match]),
+                          {true, Match}
+                  end
+          end, Unexpected),
+
+    case {ExMatches, UnExMatches} of
+        {[], []} ->
+            ok;
+        _ ->
+            error
+    end.
+
+%%
+%% Generate the contents of a simple .app file
+%%
+app(Name, Modules) ->
+    App = {application, Name,
+           [{description, atom_to_list(Name)},
+            {vsn, "1"},
+            {modules, Modules},
+            {registered, []},
+            {applications, [kernel, stdlib]}]},
+    io_lib:format("~p.\n", [App]).

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/rgen1/rgen1_rt.erl -> rebar-2.6.1.tar.gz/inttest/rgen1/rgen1_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/t_custom_config/t_custom_config_rt.erl -> rebar-2.6.1.tar.gz/inttest/t_custom_config/t_custom_config_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/tdeps1/tdeps1_rt.erl -> rebar-2.6.1.tar.gz/inttest/tdeps1/tdeps1_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/tdeps2/tdeps2_rt.erl -> rebar-2.6.1.tar.gz/inttest/tdeps2/tdeps2_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/tdeps3/tdeps3_rt.erl -> rebar-2.6.1.tar.gz/inttest/tdeps3/tdeps3_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/tdeps_update/tdeps_update_rt.erl -> rebar-2.6.1.tar.gz/inttest/tdeps_update/tdeps_update_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/thooks/thooks_rt.erl -> rebar-2.6.1.tar.gz/inttest/thooks/thooks_rt.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/tplugins/tplugins_rt.erl -> rebar-2.6.1.tar.gz/inttest/tplugins/tplugins_rt.erl Changed

rebar-2.6.1.tar.gz/inttest/xref_behavior Added

rebar-2.6.1.tar.gz/inttest/xref_behavior/gen_xref_behavior.erl Added

rebar-2.6.1.tar.gz/inttest/xref_behavior/rebar.config Added

rebar-2.6.1.tar.gz/inttest/xref_behavior/xref_behavior.erl Added

rebar-2.6.1.tar.gz/inttest/xref_behavior/xref_behavior_rt.erl Added

rebar-2.6.1.tar.gz/pr2relnotes.py Added

@@ -0,0 +1,210 @@
+#!/usr/bin/env python
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2015 Jared Morrow (github.com/jaredmorrow)
+#
+# 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.
+
+## Install info
+##   $ virtualenv env
+##   $ source env/bin/activate
+##   $ pip install PyGithub
+##
+## Examples:
+##   Find the differences from last tag to current
+##   $ pr2relnotes.py alpha-6 HEAD
+
+import argparse
+import re
+import os
+import subprocess
+from github import Github
+from github import GithubException
+
+
+def dprint(*args):
+    if VERBOSE:
+        print str(args)
+
+def get_args():
+    """
+    Get command line arguments
+    """
+    parser = argparse.ArgumentParser(description="Find the PR's between two versions")
+    parser.add_argument("old", help = "old version to use")
+    parser.add_argument("new", help = "new version to use")
+    parser.add_argument("-v", "--verbose", help="Enable debug output",
+                        default=False,
+                        action="store_true")
+    parser.add_argument("-f", "--file",
+                        help="Output file to store results (default: tagdiff.md)",
+                        default="tagdiff.md")
+    return parser.parse_args()
+
+def search_prs(log):
+    """
+    Search lines of text for PR numbers
+    """
+    # Find all matches using regex iterator, using the PR # as the group match
+    resultlist = [str(m.group(1)) for m in re.finditer(r"erge pull request #(\d+)", log)]
+    return sorted(resultlist)
+
+def get_env(env):
+    return os.environ[env]
+
+def get_formatted_issue(repo, issue, title, url):
+    """
+    Single place to adjust formatting output of PR data
+    """
+    # Newline support writelines() call which doesn't add newlines
+    # on its own
+    return("* {}/{}: [{}]({})\n".format(repo, issue, title, url))
+
+def gh_get_issue_output(org, repo, issuenum):
+    """
+    Look up PR information using the GitHub api
+    """
+    # Attempt to look up the PR, and don't take down the whole
+    # shebang if a API call fails
+    # This will fail often on forks who don't have the
+    # PRs numbers associated with the forked account
+    # Return empty string on error
+    try:
+        repoObj = gh.get_repo(org + "/" + repo)
+        issue = repoObj.get_issue(int(issuenum))
+        title = issue.title
+        html_url = issue.html_url
+    except GithubException as e:
+        print "Github error({0}): {1}".format(e.status, e.data)
+        return ""
+    except:
+        print "Some github error"
+        return ""
+
+    return(get_formatted_issue(repo, issuenum, title, html_url))
+
+
+def get_org(repourl):
+    """
+    Simple function to parse the organization out of a GitHub URL
+    """
+    dprint("Current repourl to search: " + repourl)
+    # GitHub URLs can be:
+    #    http[s]://www.github.com/org/repo
+    # or           git@github.com:/org/repo
+    pattern = re.compile(r"github.com[/:]+(\w+)/")
+    m = re.search(pattern, repourl)
+    # Fail fast if this is wrong so we can add a pattern to the search
+    if m:
+        return m.group(1)
+    else:
+        raise Exception("Incorrect regex pattern finding repo org")
+
+def get_name(repourl):
+    """
+    Simple function to parse the repository name out of a GitHub URL
+    """
+    dprint("Current repourl to search: " + repourl)
+    repo_pattern = re.compile(r"github.com[/:]\w+/(\w+)")
+    m = re.search(repo_pattern, repourl)
+    if m:
+        return m.group(1)
+    else:
+        raise Exception("Incorrect rexex pattern finding repo url")
+
+def get_repo_url_from_remote():
+    """
+    Function that gets the repository URL from the `git remote` listing
+    """
+    git_remote_bytes = subprocess.check_output(["git", "remote", "-v"])
+    # check_output returns the command results in raw byte format
+    remote_string = git_remote_bytes.decode('utf-8')
+
+    pattern = re.compile(r"github.com[/:]\w+/\w+")
+    m = re.search(pattern, remote_string)
+    if m:
+        return m.group(0)
+    else:
+        raise Exception("Incorrect rexex pattern finding repo url")
+
+def process_log(gitlog, repo_url):
+    """
+    Handles the processing of the gitlog and returns a list
+    of PRs already formatted for output
+    """
+    pr_list = search_prs(gitlog)
+    repoorg = get_org(repo_url)
+    reponame = get_name(repo_url)
+    pr_buffer = []
+    for issue in pr_list:
+            pr_buffer.append(gh_get_issue_output(repoorg, reponame, issue))
+
+    return pr_buffer
+
+def fetch_log(old_ver, new_ver):
+    """
+    Function that processes the git log between the old and new versions
+    """
+    dprint("Current working directory", os.getcwd())
+    gitlogbytes = subprocess.check_output(["git", "log",
+                                           str(old_ver + ".." + new_ver)])
+    return gitlogbytes.decode('utf-8')
+
+
+def compare_versions(repo_url, old_ver, new_ver):
+    # Formatted list of all PRs for all repos
+    pr_out = []
+    gitlog = fetch_log(old_ver, new_ver)
+    pr_out.extend(process_log(gitlog, repo_url))
+    return pr_out
+
+def main():
+    args = get_args()
+
+    # Setup the GitHub object for later use
+    global gh
+    gh = Github(get_env("GHAUTH"))
+
+    if gh == "":
+        raise Exception("Env var GHAUTH must be set to a valid GitHub API key")
+
+    if args.verbose:
+        global VERBOSE
+        VERBOSE=True
+
+    dprint("Inspecting difference in between: ", args.old, " and ", args.new)
+
+    # Find the github URL of the repo we are operating on
+    repo_url = get_repo_url_from_remote()
+
+    # Compare old and new versions
+    pr_list = compare_versions(repo_url, args.old, args.new)
+
+    # Writeout PR listing
+    print "Writing output to file %s" % args.file
+    with open(args.file, 'w') as output:
+        output.writelines(pr_list)
+
+
+if __name__ == "__main__":
+    VERBOSE=False
+    gh=None
+    topdir=os.getcwd()
+    main()

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/priv/shell-completion/bash/rebar -> rebar-2.6.1.tar.gz/priv/shell-completion/bash/rebar Changed

rebar-2.6.1.tar.gz/priv/shell-completion/fish Added

rebar-2.6.1.tar.gz/priv/shell-completion/fish/rebar.fish Added

@@ -0,0 +1,189 @@
+## fish completions for rebar 2.5.0
+
+function __fish_rebar_needs_command
+  set cmd (commandline -opc)
+  if [ (count $cmd) -eq 1 -a $cmd[1] = 'rebar' -o $cmd[1] = './rebar' ]
+    return 0
+  end
+  return 1
+end
+
+function __fish_rebar_using_command
+  set cmd (commandline -opc)
+  if [ (count $cmd) -gt 1 ]
+    if [ $argv[1] = $cmd[2] ]
+      return 0
+    end
+  end
+  return 1
+end
+
+## Rebar Command Output
+## ➜  ~  rebar --version
+## rebar 2.5.0 R16B02 20140716_213805 git 2.5.0-14-g1e7c742
+## ➜  ~  rebar --help
+## Usage: rebar [-h] [-c] [-v <verbose>] [-q <quiet>] [-V] [-f]
+##              [-D <defines>] [-j <jobs>] [-C <config>] [-p] [-k]
+##              [-r <recursive>] [var=value,...] <command,...>
+##
+##   -h, --help        Show the program options
+##   -c, --commands    Show available commands
+##   -v, --verbose     Verbosity level (-v, -vv)
+##   -q, --quiet       Quiet, only print error messages
+##   -V, --version     Show version information
+##   -f, --force       Force
+##   -D                Define compiler macro
+##   -j, --jobs        Number of concurrent workers a command may use.
+##                     Default: 3
+##   -C, --config      Rebar config file to use
+##   -p, --profile     Profile this run of rebar
+##   -k, --keep-going  Keep running after a command fails
+##   -r, --recursive   Apply commands to subdirs and dependencies
+##   var=value         rebar global variables (e.g. force=1)
+##   command           Command to run (e.g. compile)
+##
+## To see a list of built-in commands, execute rebar -c.
+##
+## Type 'rebar help <CMD1> <CMD2>' for help on specific commands.
+
+# general options
+complete -f -c rebar -n 'not __fish_rebar_needs_command' -l help -d 'Display the manual of a rebar command'
+
+## Flags
+complete -c rebar -s h -l help        -d "Show the program options"
+complete -c rebar -s c -l commands    -d "Show available commands"
+complete -c rebar -s v -l verbose     -d "Verbosity level (-v, -vv, -vvv, --verbose 3). Default: 0"
+complete -c rebar -s vv               -d "Verbosity level 2"
+complete -c rebar -s vvv              -d "Verbosity level 2"
+complete -c rebar -s q -l quiet       -d "Quiet, only print error messages"
+complete -c rebar -s V -l version     -d "Show version information"
+complete -c rebar -s f -l force       -d "Force"
+complete -c rebar -s D                -d "Define compiler macro"
+complete -c rebar -s j -l jobs        -d "Number of concurrent workers a command may use. Default: 3"
+complete -c rebar -s C -l config      -d "Rebar config file to use"
+complete -c rebar -s p -l profile     -d "Profile this run of rebar"
+complete -c rebar -s k -l keep-going  -d "Keep running after a command fails"
+complete -c rebar -s r -l recursive   -d "Apply commands to subdirs and dependencies"
+
+
+## Not going to cover abbreviations, since this is for completions anyway :D
+## rebar allows you to abbreviate the command to run:
+## $ rebar co           # same as rebar compile
+## $ rebar eu           # same as rebar eunit
+## $ rebar g-d          # same as rebar get-deps
+## $ rebar x eu         # same as rebar xref eunit
+## $ rebar l-d          # same as rebar list-deps
+## $ rebar l-d l-t      # same as rebar list-deps list-templates
+## $ rebar list-d l-te  # same as rebar list-deps list-templates
+##
+## Core command line options:
+##   apps=app1,app2 (specify apps to process)
+##   skip_apps=app1,app2 (specify apps to skip)
+
+## COMMANDS!
+## ➜  ~  rebar -c
+## clean                                    Clean
+complete -f -c rebar -n '__fish_rebar_needs_command' -a clean -d 'Clean'
+
+## compile                                  Compile sources
+complete -f -c rebar -n '__fish_rebar_needs_command' -a compile -d 'Compile sources'
+
+## escriptize                               Generate escript archive
+complete -f -c rebar -n '__fish_rebar_needs_command' -a escriptize -d 'Generate escript archive'
+
+## create      template= [var=foo,...]      Create skel based on template and vars
+complete -f -c rebar -n '__fish_rebar_needs_command' -a create -d 'Create skel based on template and vars'
+complete -f -c rebar -n '__fish_rebar_using_command create' -a 'template=' -d 'Template name'
+
+## create-app  [appid=myapp]                Create simple app skel
+complete -f -c rebar -n '__fish_rebar_needs_command' -a create-app -d 'Create simple app skel'
+complete -f -c rebar -n '__fish_rebar_using_command create-app' -a 'appid=' -d 'Application name'
+
+## create-lib  [libid=mylib]                Create simple lib skel
+complete -f -c rebar -n '__fish_rebar_needs_command' -a create-lib -d 'Create simple lib skel'
+complete -f -c rebar -n '__fish_rebar_using_command create-lib' -a 'libid=' -d 'Library name'
+
+## create-node [nodeid=mynode]              Create simple node skel
+complete -f -c rebar -n '__fish_rebar_needs_command' -a create-node -d 'Create simple node skel'
+complete -f -c rebar -n '__fish_rebar_using_command create-node' -a 'nodeid=' -d 'Node name'
+
+## list-templates                           List available templates
+complete -f -c rebar -n '__fish_rebar_needs_command' -a list-templates -d 'List available templates'
+
+## doc                                      Generate Erlang program documentation
+complete -f -c rebar -n '__fish_rebar_needs_command' -a doc -d 'Generate Erlang program documentation'
+
+## prepare-deps                             Run 'rebar -r get-deps compile'
+complete -f -c rebar -n '__fish_rebar_needs_command' -a prepare-deps -d 'Prepare Dependencies'
+
+## refresh-deps                             Run 'rebar -r update-deps compile'
+complete -f -c rebar -n '__fish_rebar_needs_command' -a refresh-deps -d 'Refresh Dependencies'
+
+## check-deps                               Display to be fetched dependencies
+complete -f -c rebar -n '__fish_rebar_needs_command' -a check-deps -d 'Display to be fetched dependencies'
+
+## get-deps                                 Fetch dependencies
+complete -f -c rebar -n '__fish_rebar_needs_command' -a get-deps -d 'Fetch dependencies'
+
+## update-deps                              Update fetched dependencies
+complete -f -c rebar -n '__fish_rebar_needs_command' -a update-deps -d 'Update fetched dependencies'
+
+## delete-deps                              Delete fetched dependencies
+complete -f -c rebar -n '__fish_rebar_needs_command' -a delete-deps -d 'Delete fetched dependencies'
+
+## list-deps                                List dependencies
+complete -f -c rebar -n '__fish_rebar_needs_command' -a list-deps -d 'List Dependencies'
+
+## generate    [dump_spec=0/1]              Build release with reltool
+complete -f -c rebar -n '__fish_rebar_needs_command' -a generate -d 'Build release with reltool'
+complete -f -c rebar -n '__fish_rebar_using_command generate' -a 'dump_spec=0 dump_spec=1'
+
+## overlay                                  Run reltool overlays only
+complete -f -c rebar -n '__fish_rebar_needs_command' -a overlay -d 'Run reltool overlays only'
+
+## generate-upgrade  previous_release=path  Build an upgrade package
+complete -f -c rebar -n '__fish_rebar_needs_command' -a generate-upgrade -d 'Build an upgrade package'
+complete -f -c rebar -n '__fish_rebar_using_command generate-upgrade' -a 'previous_release='
+
+## generate-appups   previous_release=path  Generate appup files
+complete -f -c rebar -n '__fish_rebar_needs_command' -a generate-appups -d 'Generate appup files'
+complete -f -c rebar -n '__fish_rebar_using_command generate-appups' -a 'previous_release='
+
+## eunit       [suite[s]=foo]               Run EUnit tests in foo.erl and
+##                                          test/foo_tests.erl
+##             [suite[s]=foo] [test[s]=bar] Run specific EUnit tests [first test
+##                                          name starting with 'bar' in foo.erl
+##                                          and test/foo_tests.erl]
+##             [test[s]=bar]                For every existing suite, run the first
+##                                          test whose name starts with bar and, if
+##                                          no such test exists, run the test whose
+##                                          name starts with bar in the suite's
+##                                          _tests module.
+##             [random_suite_order=true]    Run tests in a random order, either
+##             [random_suite_order=Seed]    with a random seed for the PRNG, or a
+##                                          specific one.
+complete -f -c rebar -n '__fish_rebar_needs_command' -a eunit -d 'Run EUnit tests'
+complete -f -c rebar -n '__fish_rebar_using_command eunit' -a 'suites='
+complete -f -c rebar -n '__fish_rebar_using_command eunit' -a 'tests='
+complete -f -c rebar -n '__fish_rebar_using_command eunit' -a 'random_suite_order='
+
+## ct          [suite[s]=] [case=]          Run common_test suites
+complete -f -c rebar -n '__fish_rebar_needs_command' -a ct -d 'Run common_test suites'
+complete -f -c rebar -n '__fish_rebar_using_command ct' -a 'suites='
+complete -f -c rebar -n '__fish_rebar_using_command ct' -a 'case='
+
+## qc                                       Test QuickCheck properties
+complete -f -c rebar -n '__fish_rebar_needs_command' -a qc -d 'Test QuickCheck properties'
+
+## xref                                     Run cross reference analysis
+complete -f -c rebar -n '__fish_rebar_needs_command' -a xref -d 'Run cross reference analysis'
+
+## shell                                    Start a shell similar to
+##                                          'erl -pa ebin -pa deps/*/ebin'
+complete -f -c rebar -n '__fish_rebar_needs_command' -a shell -d 'Start a shell'
+
+## help                                     Show the program options
+complete -f -c rebar -n '__fish_rebar_needs_command' -a help -d 'Show the program options'
+
+## version                                  Show version information
+complete -f -c rebar -n '__fish_rebar_needs_command' -a version -d 'Show version information'

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/priv/shell-completion/zsh/_rebar -> rebar-2.6.1.tar.gz/priv/shell-completion/zsh/_rebar Changed

@@ -28,13 +28,16 @@
   case $state in
     cmd_and_var)
       _values -S = 'variables' \
+        'dialyze[Analyze the code for discrepancies]' \
+        'build-plt[Build project-specific PLT]' \
+        'check-plt[Check the plt for consistency and rebuild it if it is not up-to-date]' \
         'clean[Clean]' \
         'compile[Compile sources]' \
         'create[Create skel based on template and vars]' \
         'create-app[Create simple app skel]' \
         'create-lib[Create simple lib skel]' \
         'create-node[Create simple node skel]' \
-        'list-template[List avaiavle templates]' \
+        'list-template[List available templates]' \
         'doc[Generate Erlang program documentation]' \
         'check-deps[Display to be fetched dependencies]' \
         'prepare-deps[Fetch and build dependencies]' \
@@ -60,11 +63,14 @@
         'jobs[Number of workers]::workers:(0 1 2 3 4 5 6 7 8 9)' \
         'suites[Common Test suites]::suite name:_path_files -W "(src test)" -g "*.erl(:r)"' \
         'verbose[Verbosity level]::verbosity level:(0 1 2 3)' \
+        'libid[Library id]:' \
         'appid[Application id]:' \
+        'nodeid[Node id]:' \
         'overlay_vars[Overlay variables file]:' \
         'previous_release[Previous release path]:' \
-        'nodeid[Node id]:' \
+        'profiler[Select profiler]::flag:(fprof eflame)' \
         'root_dir[Reltool config root directory]::directory:_files -/' \
+        'shell[Start a shell similar to erl -pa ebin -pa deps/*/ebin]' \
         'skip_deps[Skip deps]::flag:(true false)' \
         'skip_apps[Application names to not process]::flag:(true false)' \
         'target_dir[Target directory]:' \

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/priv/templates/simplenode.install_upgrade.escript -> rebar-2.6.1.tar.gz/priv/templates/simplenode.install_upgrade.escript Changed

@@ -2,51 +2,54 @@
 %%! -noshell -noinput
 %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ft=erlang ts=4 sw=4 et
+%% This file is left for backward-compatibility.
+%% You, probably, shouldn't include it to new projects.
 
--define(TIMEOUT, 60000).
--define(INFO(Fmt,Args), io:format(Fmt,Args)).
-
-%% TODO: This script currently does NOT support slim releases.
-%% Necessary steps to upgrade a slim release are as follows:
-%% 1. unpack relup archive manually
-%% 2. copy releases directory and necessary libraries
-%% 3. using release_hander:set_unpacked/2 .
-%% For more details, see https://github.com/rebar/rebar/pull/52
-%% and https://github.com/rebar/rebar/issues/202
 
 main([NodeName, Cookie, ReleasePackage]) ->
-    TargetNode = start_distribution(NodeName, Cookie),
-    {ok, Vsn} = rpc:call(TargetNode, release_handler, unpack_release,
-                         [ReleasePackage], ?TIMEOUT),
-    ?INFO("Unpacked Release ~p~n", [Vsn]),
-    {ok, OtherVsn, Desc} = rpc:call(TargetNode, release_handler,
-                                    check_install_release, [Vsn], ?TIMEOUT),
-    {ok, OtherVsn, Desc} = rpc:call(TargetNode, release_handler,
-                                    install_release, [Vsn], ?TIMEOUT),
-    ?INFO("Installed Release ~p~n", [Vsn]),
-    ok = rpc:call(TargetNode, release_handler, make_permanent, [Vsn], ?TIMEOUT),
-    ?INFO("Made Release ~p Permanent~n", [Vsn]);
+    io:format("WARNING: 'install_upgrade.escript' is deprecated! "
+              "Use 'nodetool upgrade' instead.~n"),
+    NodeRoot = filename:dirname(filename:dirname(escript:script_name())),
+    NodeTool = which_nodetool(NodeRoot),
+    process_flag(trap_exit, true),
+    Port = erlang:open_port(
+             {spawn_executable, NodeTool},
+             [{args, ["-sname", NodeName,
+                      "-setcookie", Cookie,
+                      "upgrade", ReleasePackage]},
+              binary, exit_status, use_stdio, stderr_to_stdout, hide]),
+    port_loop(Port);
 main(_) ->
-    init:stop(1).
+    halt(1).
 
-start_distribution(NodeName, Cookie) ->
-    MyNode = make_script_node(NodeName),
-    {ok, _Pid} = net_kernel:start([MyNode, shortnames]),
-    erlang:set_cookie(node(), list_to_atom(Cookie)),
-    TargetNode = make_target_node(NodeName),
-    case {net_kernel:hidden_connect_node(TargetNode),
-          net_adm:ping(TargetNode)} of
-        {true, pong} ->
-            ok;
-        {_, pang} ->
-            io:format("Node ~p not responding to pings.\n", [TargetNode]),
-            init:stop(1)
-    end,
-    TargetNode.
 
-make_target_node(Node) ->
-    [_, Host] = string:tokens(atom_to_list(node()), "@"),
-    list_to_atom(lists:concat([Node, "@", Host])).
+which_nodetool(NodeRoot) ->
+    %% ${RELEASE_ROOT}/
+    %%   bin/install_upgrade.escript
+    %%   bin/nodetool ?
+    %%   erts-<erts_ver>/bin/nodetool ?
+    %%   releases/<app_ver>/nodetool ?
+    %%   releases/start_erl.data
+    {ok, Content} = file:read_file(filename:join([NodeRoot, "releases", "start_erl.data"])),
+    [ErtsVsn, AppVsn] = binary:split(Content, <<" ">>),
+    Probes = [
+              filename:join([NodeRoot, "bin", "nodetool"]),
+              filename:join([NodeRoot, <<"erts-", ErtsVsn/binary>>, "bin", "nodetool"]),
+              filename:join([NodeRoot, "releases", AppVsn, "bin", "nodetool"])
+             ],
+    case lists:dropwhile(fun(Path) -> not filelib:is_regular(Path) end, Probes) of
+        [] ->
+            io:format("ERROR: can't find 'nodetool' in ~p.~n", [Probes]),
+            halt(2);
+        [Path | _] ->
+            Path
+    end.
 
-make_script_node(Node) ->
-    list_to_atom(lists:concat([Node, "_upgrader_", os:getpid()])).
+port_loop(Port) ->
+    receive
+        {Port, {data, Data}} ->
+            io:put_chars(Data),
+            port_loop(Port);
+        {Port, {exit_status, Status}} ->
+            halt(Status)
+    end.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/priv/templates/simplenode.nodetool -> rebar-2.6.1.tar.gz/priv/templates/simplenode.nodetool Changed

@@ -95,9 +95,41 @@
                 Other ->
                     io:format("~p\n", [Other])
             end;
+        ["eval", Str0] ->
+            Str = string:strip(Str0, right, $.) ++ ".",
+            Bindings = erl_eval:new_bindings(),
+            case rpc:call(TargetNode,
+                          erl_eval,
+                          exprs,
+                          [parse(Str), Bindings],
+                          60000) of
+                {badrpc, Reason} ->
+                    io:format("RPC to ~p failed: ~p\n", [TargetNode, Reason]),
+                    halt(1);
+                {value, Value, _Bindings} ->
+                    io:format("~p\n", [Value])
+            end;
+        ["upgrade", ReleasePackage] ->
+            %% TODO: This script currently does NOT support slim releases.
+            %% Necessary steps to upgrade a slim release are as follows:
+            %% 1. unpack relup archive manually
+            %% 2. copy releases directory and necessary libraries
+            %% 3. using release_hander:set_unpacked/2 .
+            %% For more details, see https://github.com/rebar/rebar/pull/52
+            %% and https://github.com/rebar/rebar/issues/202
+            {ok, Vsn} = rpc:call(TargetNode, release_handler, unpack_release,
+                                 [ReleasePackage], 60000),
+            io:format("Unpacked Release ~p\n", [Vsn]),
+            {ok, OtherVsn, Desc} = rpc:call(TargetNode, release_handler,
+                                            check_install_release, [Vsn], 60000),
+            {ok, OtherVsn, Desc} = rpc:call(TargetNode, release_handler,
+                                            install_release, [Vsn], 60000),
+            io:format("Installed Release ~p\n", [Vsn]),
+            ok = rpc:call(TargetNode, release_handler, make_permanent, [Vsn], 60000),
+            io:format("Made Release ~p Permanent\n", [Vsn]);
         Other ->
             io:format("Other: ~p\n", [Other]),
-            io:format("Usage: nodetool {chkconfig|getpid|ping|stop|restart|reboot|rpc|rpc_infinity|rpcterms}\n")
+            io:format("Usage: nodetool {chkconfig|getpid|ping|stop|restart|reboot|rpc|rpc_infinity|rpcterms|eval|upgrade}\n")
     end,
     net_kernel:stop().
 
@@ -180,3 +212,8 @@
         {more, Cont1} ->
             consult(Cont1, eof, Acc)
     end.
+
+parse(Str) ->
+    {ok, Tokens, _} = erl_scan:string(Str),
+    {ok, Exprs} = erl_parse:parse_exprs(Tokens),
+    Exprs.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/priv/templates/simplenode.reltool.config -> rebar-2.6.1.tar.gz/priv/templates/simplenode.reltool.config Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/priv/templates/simplenode.runner -> rebar-2.6.1.tar.gz/priv/templates/simplenode.runner Changed

@@ -6,7 +6,8 @@
 if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then
     POSIX_SHELL="true"
     export POSIX_SHELL
-    # To support 'whoami' add /usr/ucb to path
+    # To support 'whoami' on old Solaris systems, add /usr/ucb to path
+    # (New Solaris systems do not have 'whoami')
     PATH=/usr/ucb:$PATH
     export PATH
     exec /usr/bin/ksh $0 "$@"
@@ -25,17 +26,31 @@
 # Note the trailing slash on $PIPE_DIR/
 PIPE_DIR=/tmp/$RUNNER_BASE_DIR/
 RUNNER_USER=
-WHOAMI=$(whoami)
 
 # Make sure this script is running as the appropriate user
-if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
-    type sudo > /dev/null 2>&1
+if [ "$RUNNER_USER" ]; then
+    WHOAMI=$(id -un 2>/dev/null || whoami 2>/dev/null)
     if [ $? -ne 0 ]; then
-        echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
+        echo "Could not determine user name."
         exit 1
     fi
-    echo "Attempting to restart script through sudo -H -u $RUNNER_USER" >&2
-    exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+    if [ "x$WHOAMI" != "x$RUNNER_USER" ]; then
+        # The 'su' command is more portable, but can't be configured as 'sudo'
+        # can to allow non-interactive calls from non-root users.
+        type sudo > /dev/null 2>&1
+        if [ $? -eq 0 ]; then
+            echo "Attempting to restart script through sudo -H -u $RUNNER_USER" >&2
+            exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+        else
+            if [ "x$WHOAMI" != "xroot" ]; then
+                echo "Only root can run $RUNNER_SCRIPT as $RUNNER_USER without requiring a password."
+                exit 1
+            else
+                echo "Attempting to restart script through su $RUNNER_USER" >&2
+                exec su $RUNNER_USER -c $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+            fi
+        fi
+    fi
 fi
 
 # Identify the script name
@@ -293,6 +308,23 @@
         exec $ERTS_PATH/to_erl $PIPE_DIR
         ;;
 
+    eval)
+        # Make sure a node IS running
+        ping_node > /dev/null 2>&1
+        ES=$?
+        if [ "$ES" -ne 0 ]; then
+            echo "Node is not running!"
+            exit $ES
+        fi
+
+        shift
+        $NODETOOL eval "$1"
+        ES_EVAL=$?
+        if [ "$ES_EVAL" -ne 0 ]; then
+            exit $ES_EVAL
+        fi
+        ;;
+
     remote_console)
         # Make sure a node is running
         ping_node
@@ -322,10 +354,7 @@
             exit $ES
         fi
 
-        node_name=`echo $NAME_ARG | awk '{print $2}'`
-        erlang_cookie=`echo $COOKIE_ARG | awk '{print $2}'`
-
-        $ERTS_PATH/escript $RUNNER_BASE_DIR/bin/install_upgrade.escript $node_name $erlang_cookie $2
+        $NODETOOL upgrade $2
         ;;
 
     console|console_clean|console_boot)
@@ -396,7 +425,7 @@
         echo $PID
         ;;
     *)
-        echo "Usage: $SCRIPT {start|start_boot <file>|foreground|stop|restart|reboot|ping|console|getpid|console_clean|console_boot <file>|attach|remote_console|upgrade}"
+        echo "Usage: $SCRIPT {start|start_boot <file>|foreground|stop|restart|reboot|ping|console|getpid|console_clean|console_boot <file>|attach|eval|remote_console|upgrade}"
         exit 1
         ;;
 esac

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/priv/templates/simplenode.windows.runner.cmd -> rebar-2.6.1.tar.gz/priv/templates/simplenode.windows.runner.cmd Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/rebar.config -> rebar-2.6.1.tar.gz/rebar.config Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/rebar.config.sample -> rebar-2.6.1.tar.gz/rebar.config.sample Changed

@@ -89,6 +89,29 @@
 %% Options for the ErlyDTL compiler
 {erlydtl_opts, []}.
 
+%% == Proto compiler ==
+{proto_opts, [
+              {compiler, protobuffs},
+              {src_dirs, ["src"]}
+             ]}.
+%% Available compilers for protocol buffer files (*.proto):
+%%   protobuffs  (default)
+%%   gpb
+%% Optional src_dirs which is a list of directories where
+%% to look for .proto files, default is src
+
+%% Options for the gpb protocol buffer compiler,
+%% if selected by the proto_compiler option
+{gpb_opts, []}.
+
+%% == Diameter compiler ==
+
+%% Diameter files to compile before the rest
+{dia_first_files, []}.
+
+%% Options for the diameter compiler
+{dia_opts, []}.
+
 %% == EUnit ==
 
 %% Options for eunit:test()
@@ -243,3 +266,16 @@
 {xref_queries,
  [{"(XC - UC) || (XU - X - B"
    " - (\"mod\":\".*foo\"/\"4\"))",[]}]}.
+
+%% == Dialyzer ==
+
+{dialyzer,
+ [
+  %% Store PLT locally inside the project in .rebar (Default)
+  {plt_location, local},
+  %% Store PLT in custom directory
+  {plt_location, "custom_dir"},
+  %% Extra apps to include in the PLT
+  {plt_extra_apps, [app1, app2]},
+  {warnings, [unmatched_returns, error_handling]}
+ ]}.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar.erl -> rebar-2.6.1.tar.gz/src/rebar.erl Changed

@@ -104,13 +104,8 @@
 
     case rebar_config:get_xconf(BaseConfig1, enable_profiling, false) of
         true ->
-            io:format("Profiling!\n"),
-            try
-                fprof:apply(fun run_aux/2, [BaseConfig1, Cmds])
-            after
-                ok = fprof:profile(),
-                ok = fprof:analyse([{dest, "fprof.analysis"}])
-            end;
+            ?CONSOLE("Profiling!\n", []),
+            profile(BaseConfig1, Cmds);
         false ->
             run_aux(BaseConfig1, Cmds)
     end.
@@ -160,6 +155,58 @@
     AbsCwd = filename:absname(rebar_utils:get_cwd()),
     rebar_config:set_xconf(BaseConfig1, base_dir, AbsCwd).
 
+profile(BaseConfig1, Commands) ->
+    ?CONSOLE("Please take note that profiler=[fprof|eflame] is preliminary"
+             " and will be~nreplaced with a different command line flag"
+             " in the next release.~n", []),
+    Profiler = rebar_config:get_global(BaseConfig1, profiler, "fprof"),
+    profile(BaseConfig1, Commands, list_to_atom(Profiler)).
+
+profile(Config, Commands, fprof) ->
+    try
+        fprof:apply(fun run_aux/2, [Config, Commands])
+    after
+        ok = fprof:profile(),
+        ok = fprof:analyse([{dest, "fprof.analysis"}]),
+        case rebar_utils:find_executable("erlgrind") of
+            false ->
+                ?CONSOLE(
+                   "See fprof.analysis (generated from fprof.trace)~n", []),
+                ok;
+            ErlGrind ->
+                Cmd = ?FMT("~s fprof.analysis fprof.cgrind", [ErlGrind]),
+                {ok, []} = rebar_utils:sh(Cmd, [{use_stdout, false},
+                                                abort_on_error]),
+                ?CONSOLE("See fprof.analysis (generated from fprof.trace)"
+                         " and fprof.cgrind~n", []),
+                ok
+        end
+    end;
+profile(Config, Commands, eflame) ->
+    case code:lib_dir(eflame) of
+        {error, bad_name} ->
+            ?ABORT("eflame not found in code path~n", []),
+            ok;
+        EflameDir ->
+            Trace = "eflame.trace",
+            try
+                eflame:apply(normal_with_children, Trace,
+                             rebar, run, [Config, Commands])
+            after
+                %% generate flame graph
+                Script = filename:join(EflameDir, "stack_to_flame.sh"),
+                Svg = "eflame.svg",
+                %% stack_to_flame.sh < eflame.trace > eflame.png
+                Cmd = ?FMT("~s < ~s > ~s", [Script, Trace, Svg]),
+                {ok, []} = rebar_utils:sh(Cmd, [{use_stdout, false},
+                                                abort_on_error]),
+                ?CONSOLE("See eflame.svg (generated from eflame.trace)~n", []),
+                ok
+            end
+    end;
+profile(_Config, _Commands, Profiler) ->
+    ?ABORT("Unsupported profiler: ~s~n", [Profiler]).
+
 run_aux(BaseConfig, Commands) ->
     %% Make sure crypto is running
     case crypto:start() of
@@ -167,6 +214,12 @@
         {error,{already_started,crypto}} -> ok
     end,
 
+    %% Make sure memoization server is running
+    case rmemo:start() of
+        {ok, _} -> ok;
+        {error, {already_started, _}} -> ok
+    end,
+
     %% Convert command strings to atoms
     CommandAtoms = [list_to_atom(C) || C <- Commands],
 
@@ -403,12 +456,18 @@
             [random_suite_order=Seed]    with a random seed for the PRNG, or a
                                          specific one.
 
-ct          [suite[s]=] [case=]          Run common_test suites
+ct          [suite[s]= [group[s]= [case[s]=]]] Run common_test suites
 
 qc                                       Test QuickCheck properties
 
 xref                                     Run cross reference analysis
 
+dialyze                                  Analyze the code for discrepancies
+build-plt                                Build project-specific PLT
+check-plt                                Check the PLT for consistency and
+                                         rebuild it if it is not up-to-date
+delete-plt                               Delete project-specific PLT
+
 shell                                    Start a shell similar to
                                          'erl -pa ebin -pa deps/*/ebin'
 
@@ -439,11 +498,18 @@
      {defines,  $D, undefined,  string,    "Define compiler macro"},
      {jobs,     $j, "jobs",     integer,   JobsHelp},
      {config,   $C, "config",   string,    "Rebar config file to use"},
-     {profile,  $p, "profile",  undefined, "Profile this run of rebar"},
+     {profile,  $p, "profile",  undefined,
+      "Profile this run of rebar. Via profiler= you can optionally select "
+      "either fprof (default) or eflame. The result can be found in "
+      "fprof.analysis or eflame.svg."},
      {keep_going, $k, "keep-going", undefined,
       "Keep running after a command fails"},
      {recursive, $r, "recursive", boolean,
-      "Apply commands to subdirs and dependencies"}
+      "Apply all commands recursively. Alternatively, you can selectively"
+      " configure what other commands in addition to the always-recursive"
+      " ones (compile, *-deps) should also be applied recursively."
+      " For example, to make 'eunit' recursive, add {recursive_cmds, [eunit]}"
+      " to rebar.config."}
     ].
 
 %%
@@ -473,7 +539,9 @@
 
 command_names() ->
     [
+     "build-plt",
      "check-deps",
+     "check-plt",
      "clean",
      "compile",
      "create",
@@ -481,7 +549,9 @@
      "create-lib",
      "create-node",
      "ct",
+     "delete-plt",
      "delete-deps",
+     "dialyze",
      "doc",
      "eunit",
      "escriptize",

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_app_utils.erl -> rebar-2.6.1.tar.gz/src/rebar_app_utils.erl Changed

@@ -26,7 +26,8 @@
 %% -------------------------------------------------------------------
 -module(rebar_app_utils).
 
--export([is_app_dir/0, is_app_dir/1,
+-export([is_app_dir/0,
+         is_app_dir/1,
          is_app_src/1,
          app_src_to_app/1,
          app_name/2,
@@ -46,36 +47,46 @@
     is_app_dir(rebar_utils:get_cwd()).
 
 is_app_dir(Dir) ->
-    SrcDir = filename:join([Dir, "src"]),
-    AppSrc = filename:join([SrcDir, "*.app.src"]),
-    case filelib:wildcard(AppSrc) of
-        [AppSrcFile] ->
-            {true, AppSrcFile};
-        [] ->
-            EbinDir = filename:join([Dir, "ebin"]),
-            App = filename:join([EbinDir, "*.app"]),
-            case filelib:wildcard(App) of
-                [AppFile] ->
-                    {true, AppFile};
-                [] ->
-                    false;
-                _ ->
-                    ?ERROR("More than one .app file in ~s~n", [EbinDir]),
-                    false
-            end;
-        _ ->
-            ?ERROR("More than one .app.src file in ~s~n", [SrcDir]),
-            false
-    end.
+	SrcDir = filename:join([Dir, "src"]),
+	AppSrcScript = filename:join([SrcDir, "*.app.src.script"]),
+	AppSrc = filename:join([SrcDir, "*.app.src"]),
+	case {filelib:wildcard(AppSrcScript), filelib:wildcard(AppSrc)} of
+		{[AppSrcScriptFile], _} ->
+			{true, AppSrcScriptFile};
+		{[], [AppSrcFile]} ->
+			{true, AppSrcFile};
+		{[],[]} ->
+			EbinDir = filename:join([Dir, "ebin"]),
+			App = filename:join([EbinDir, "*.app"]),
+			case filelib:wildcard(App) of
+				[AppFile] ->
+					{true, AppFile};
+				[] ->
+					false;
+				_ ->
+					?ERROR("More than one .app file in ~s~n", [EbinDir]),
+					false
+			end;
+		{_, _} ->
+			?ERROR("More than one .app.src file in ~s~n", [SrcDir]),
+			false
+	end.
 
 
 is_app_src(Filename) ->
     %% If removing the extension .app.src yields a shorter name,
     %% this is an .app.src file.
-    Filename =/= filename:rootname(Filename, ".app.src").
+    Filename =/= filename:rootname(Filename, ".app.src") orelse
+        Filename =/= filename:rootname(Filename, ".app.src.script").
 
 app_src_to_app(Filename) ->
-    filename:join("ebin", filename:basename(Filename, ".app.src") ++ ".app").
+    Filebase =  case filename:rootname(Filename, ".app.src") of
+                    Filename ->
+                        filename:basename(Filename, ".app.src.script");
+                    _ ->
+                        filename:basename(Filename, ".app.src")
+                end,
+    filename:join("ebin", Filebase ++ ".app").
 
 app_name(Config, AppFile) ->
     case load_app_file(Config, AppFile) of
@@ -139,13 +150,13 @@
     case rebar_config:get_xconf(Config, {appfile, AppFile}, undefined) of
         undefined ->
             case consult_app_file(Filename) of
-                {ok, [{application, AppName, AppData}]} ->
+                {ok, {application, AppName, AppData}} ->
                     Config1 = rebar_config:set_xconf(Config,
                                                      {appfile, AppFile},
                                                      {AppName, AppData}),
                     {ok, Config1, AppName, AppData};
                 {error, _} = Error ->
-                    Error;
+                    {error, {error, Error}};
                 Other ->
                     {error, {unexpected_terms, Other}}
             end;
@@ -159,11 +170,17 @@
 %% config. However, in the case of *.app, rebar should not manipulate
 %% that file. This enforces that dichotomy between app and app.src.
 consult_app_file(Filename) ->
-    case lists:suffix(".app.src", Filename) of
-        false ->
-            file:consult(Filename);
-        true ->
-            rebar_config:consult_file(Filename)
+    Result = case lists:suffix(".app", Filename) of
+                 true ->
+                     file:consult(Filename);
+                 false ->
+                     rebar_config:consult_file(Filename)
+             end,
+    case Result of
+        {ok, [Term]} ->
+            {ok, Term};
+        _ ->
+            Result
     end.
 
 get_value(Key, AppInfo, AppFile) ->

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_appups.erl -> rebar-2.6.1.tar.gz/src/rebar_appups.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_base_compiler.erl -> rebar-2.6.1.tar.gz/src/rebar_base_compiler.erl Changed

@@ -31,6 +31,7 @@
 -export([run/4,
          run/7,
          run/8,
+         run/5,
          ok_tuple/3,
          error_tuple/5]).
 
@@ -62,23 +63,31 @@
 
 run(Config, FirstFiles, SourceDir, SourceExt, TargetDir, TargetExt,
     Compile3Fn, Opts) ->
-    %% Convert simple extension to proper regex
-    SourceExtRe = "^[^._].*\\" ++ SourceExt ++ [$$],
 
-    Recursive = proplists:get_value(recursive, Opts, true),
     %% Find all possible source files
-    FoundFiles = rebar_utils:find_files(SourceDir, SourceExtRe, Recursive),
+    Recursive = proplists:get_value(recursive, Opts, true),
+    FoundFiles = rebar_utils:find_files_by_ext(SourceDir, SourceExt, Recursive),
+
     %% Remove first files from found files
     RestFiles = [Source || Source <- FoundFiles,
                            not lists:member(Source, FirstFiles)],
 
+    FirstUnits = source_to_unit_each(FirstFiles,
+                                     SourceDir, SourceExt,
+                                     TargetDir, TargetExt),
+    RestUnits = source_to_unit_each(RestFiles,
+                                    SourceDir, SourceExt,
+                                    TargetDir, TargetExt),
+    run(Config, FirstUnits, RestUnits, Compile3Fn, Opts).
+
+%% FirstUnits and RestUnits are lists of tuples: {Source,Target}
+run(Config, FirstUnits, RestUnits, Compile3Fn, Opts) ->
+
     %% Check opts for flag indicating that compile should check lastmod
     CheckLastMod = proplists:get_bool(check_last_mod, Opts),
 
-    run(Config, FirstFiles, RestFiles,
-        fun(S, C) ->
-                Target = target_file(S, SourceDir, SourceExt,
-                                     TargetDir, TargetExt),
+    run(Config, FirstUnits, RestUnits,
+        fun({S, Target}, C) ->
                 simple_compile_wrapper(S, Target, Compile3Fn, C, CheckLastMod)
         end).
 
@@ -103,12 +112,13 @@
             skipped
     end.
 
+source_to_unit_each(Files, SourceDir, SourceExt, TargetDir, TargetExt) ->
+    [{File, target_file(File, SourceDir, SourceExt, TargetDir, TargetExt)}
+     || File <- Files].
+
 target_file(SourceFile, SourceDir, SourceExt, TargetDir, TargetExt) ->
-    %% Remove all leading components of the source dir from the file -- we want
-    %% to maintain the deeper structure (if any) of the source file path
     BaseFile = remove_common_path(SourceFile, SourceDir),
-    filename:join([TargetDir, filename:dirname(BaseFile),
-                   filename:basename(BaseFile, SourceExt) ++ TargetExt]).
+    filename:join([TargetDir, filename:basename(BaseFile, SourceExt) ++ TargetExt]).
 
 
 remove_common_path(Fname, Path) ->
@@ -119,37 +129,36 @@
 remove_common_path1(FilenameParts, _) ->
     filename:join(FilenameParts).
 
-
-compile(Source, Config, CompileFn) ->
-    case CompileFn(Source, Config) of
-        ok ->
-            ok;
-        skipped ->
-            skipped;
-        Error ->
-            Error
-    end.
-
 compile_each([], _Config, _CompileFn) ->
     ok;
-compile_each([Source | Rest], Config, CompileFn) ->
-    case compile(Source, Config, CompileFn) of
+compile_each([Unit | Rest], Config, CompileFn) ->
+    case CompileFn(Unit, Config) of
         ok ->
-            ?CONSOLE("Compiled ~s\n", [Source]);
+            ?CONSOLE("Compiled ~s\n", [unit_source(Unit)]);
         {ok, Warnings} ->
             report(Warnings),
-            ?CONSOLE("Compiled ~s\n", [Source]);
+            ?CONSOLE("Compiled ~s\n", [unit_source(Unit)]);
         skipped ->
-            ?INFO("Skipped ~s\n", [Source]);
+            ?INFO("Skipped ~s\n", [unit_source(Unit)]);
         Error ->
-            ?CONSOLE("Compiling ~s failed:\n",
-                     [maybe_absname(Config, Source)]),
             maybe_report(Error),
+            ?CONSOLE("Compiling ~s failed:\n",
+                     [maybe_absname(Config, unit_source(Unit))]),
             ?DEBUG("Compilation failed: ~p\n", [Error]),
-            ?FAIL
+            case rebar_config:get_xconf(Config, keep_going, false) of
+                false ->
+                    ?FAIL;
+                true ->
+                    ?WARN("Continuing after build error\n", [])
+            end
     end,
     compile_each(Rest, Config, CompileFn).
 
+unit_source({Source, _Target}) ->
+    Source;
+unit_source(Source) ->
+    Source.
+
 compile_queue(_Config, [], []) ->
     ok;
 compile_queue(Config, Pids, Targets) ->
@@ -164,24 +173,30 @@
                     compile_queue(Config, Pids, Rest)
             end;
 
-        {fail, {_, {source, Source}}=Error} ->
-            ?CONSOLE("Compiling ~s failed:\n",
-                     [maybe_absname(Config, Source)]),
+        {fail, {_, {source, Unit}}=Error} ->
             maybe_report(Error),
+            ?CONSOLE("Compiling ~s failed:\n",
+                     [maybe_absname(Config, unit_source(Unit))]),
             ?DEBUG("Worker compilation failed: ~p\n", [Error]),
-            ?FAIL;
+            case rebar_config:get_xconf(Config, keep_going, false) of
+                false ->
+                    ?FAIL;
+                true ->
+                    ?WARN("Continuing after build error\n", []),
+                    compile_queue(Config, Pids, Targets)
+            end;
 
-        {compiled, Source, Warnings} ->
+        {compiled, Unit, Warnings} ->
             report(Warnings),
-            ?CONSOLE("Compiled ~s\n", [Source]),
+            ?CONSOLE("Compiled ~s\n", [unit_source(Unit)]),
             compile_queue(Config, Pids, Targets);
 
-        {compiled, Source} ->
-            ?CONSOLE("Compiled ~s\n", [Source]),
+        {compiled, Unit} ->
+            ?CONSOLE("Compiled ~s\n", [unit_source(Unit)]),
             compile_queue(Config, Pids, Targets);
 
-        {skipped, Source} ->
-            ?INFO("Skipped ~s\n", [Source]),
+        {skipped, Unit} ->
+            ?INFO("Skipped ~s\n", [unit_source(Unit)]),
             compile_queue(Config, Pids, Targets);
 
         {'DOWN', Mref, _, Pid, normal} ->
@@ -198,7 +213,7 @@
     QueuePid ! {next, self()},
     receive
         {compile, Source} ->
-            case catch(compile(Source, Config, CompileFn)) of
+            case catch(CompileFn(Source, Config)) of
                 {ok, Ws} ->
                     QueuePid ! {compiled, Source, Ws},
                     compile_worker(QueuePid, Config, CompileFn);
@@ -210,7 +225,12 @@
                     compile_worker(QueuePid, Config, CompileFn);
                 Error ->
                     QueuePid ! {fail, {{error, Error}, {source, Source}}},
-                    ok
+                    case rebar_config:get_xconf(Config, keep_going, false) of
+                        false ->
+                            ok;
+                        true ->
+                            compile_worker(QueuePid, Config, CompileFn)
+                    end
             end;
 
         empty ->

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_config.erl -> rebar-2.6.1.tar.gz/src/rebar_config.erl Changed

@@ -26,16 +26,29 @@
 %% -------------------------------------------------------------------
 -module(rebar_config).
 
--export([new/0, new/1, base_config/1, consult_file/1,
-         get/3, get_local/3, get_list/3,
+-export([new/0,
+         new/1,
+         base_config/1,
+         consult_file/1,
+         get/3,
+         get_local/3,
+         get_list/3,
          get_all/2,
          set/3,
-         set_global/3, get_global/3,
+         set_global/3,
+         get_global/3,
          is_recursive/1,
-         save_env/3, get_env/2, reset_envs/1,
-         set_skip_dir/2, is_skip_dir/2, reset_skip_dirs/1,
+         save_env/3,
+         get_env/2,
+         reset_envs/1,
+         set_skip_dir/2,
+         is_skip_dir/2,
+         reset_skip_dirs/1,
          clean_config/2,
-         set_xconf/3, get_xconf/2, get_xconf/3, erase_xconf/2]).
+         set_xconf/3,
+         get_xconf/2,
+         get_xconf/3,
+         erase_xconf/2]).
 
 -include("rebar.hrl").
 
@@ -47,6 +60,8 @@
 -type rebar_dict() :: dict().
 -endif.
 
+-type key() :: atom().
+
 -record(config, { dir :: file:filename(),
                   opts = [] :: list(),
                   globals = new_globals() :: rebar_dict(),
@@ -65,13 +80,16 @@
 %% Public API
 %% ===================================================================
 
+-spec base_config(config()) -> config().
 base_config(GlobalConfig) ->
     ConfName = rebar_config:get_global(GlobalConfig, config, ?DEFAULT_NAME),
     new(GlobalConfig, ConfName).
 
+-spec new() -> config().
 new() ->
     #config{dir = rebar_utils:get_cwd()}.
 
+-spec new(file:filename() | config()) -> config().
 new(ConfigFile) when is_list(ConfigFile) ->
     case consult_file(ConfigFile) of
         {ok, Opts} ->
@@ -85,22 +103,28 @@
     new(#config{opts=Opts0, globals=Globals, skip_dirs=SkipDirs, xconf=Xconf},
         ?DEFAULT_NAME).
 
+-spec get(config(), key(), term()) -> term().
 get(Config, Key, Default) ->
     proplists:get_value(Key, Config#config.opts, Default).
 
+-spec get_list(config(), key(), term()) -> term().
 get_list(Config, Key, Default) ->
     get(Config, Key, Default).
 
+-spec get_local(config(), key(), term()) -> term().
 get_local(Config, Key, Default) ->
     proplists:get_value(Key, local_opts(Config#config.opts, []), Default).
 
+-spec get_all(config(), key()) -> list(term()).
 get_all(Config, Key) ->
     proplists:get_all_values(Key, Config#config.opts).
 
+-spec set(config(), key(), term()) -> config().
 set(Config, Key, Value) ->
     Opts = proplists:delete(Key, Config#config.opts),
     Config#config { opts = [{Key, Value} | Opts] }.
 
+-spec set_global(config(), key(), term()) -> config().
 set_global(Config, jobs=Key, Value) when is_list(Value) ->
     set_global(Config, Key, list_to_integer(Value));
 set_global(Config, jobs=Key, Value) when is_integer(Value) ->
@@ -110,6 +134,7 @@
     NewGlobals = dict:store(Key, Value, Config#config.globals),
     Config#config{globals = NewGlobals}.
 
+-spec get_global(config(), key(), term()) -> term().
 get_global(Config, Key, Default) ->
     case dict:find(Key, Config#config.globals) of
         error ->
@@ -118,9 +143,11 @@
             Value
     end.
 
+-spec is_recursive(config()) -> boolean().
 is_recursive(Config) ->
     get_xconf(Config, recursive, false).
 
+-spec consult_file(file:filename()) -> term().
 consult_file(File) ->
     case filename:extension(File) of
         ".script" ->
@@ -136,16 +163,20 @@
             end
     end.
 
+-spec save_env(config(), module(), nonempty_list()) -> config().
 save_env(Config, Mod, Env) ->
     NewEnvs = dict:store(Mod, Env, Config#config.envs),
     Config#config{envs = NewEnvs}.
 
+-spec get_env(config(), module()) -> term().
 get_env(Config, Mod) ->
     dict:fetch(Mod, Config#config.envs).
 
+-spec reset_envs(config()) -> config().
 reset_envs(Config) ->
     Config#config{envs = new_env()}.
 
+-spec set_skip_dir(config(), file:filename()) -> config().
 set_skip_dir(Config, Dir) ->
     OldSkipDirs = Config#config.skip_dirs,
     NewSkipDirs = case is_skip_dir(Config, Dir) of
@@ -157,20 +188,25 @@
                   end,
     Config#config{skip_dirs = NewSkipDirs}.
 
+-spec is_skip_dir(config(), file:filename()) -> boolean().
 is_skip_dir(Config, Dir) ->
     dict:is_key(Dir, Config#config.skip_dirs).
 
+-spec reset_skip_dirs(config()) -> config().
 reset_skip_dirs(Config) ->
     Config#config{skip_dirs = new_skip_dirs()}.
 
+-spec set_xconf(config(), term(), term()) -> config().
 set_xconf(Config, Key, Value) ->
     NewXconf = dict:store(Key, Value, Config#config.xconf),
     Config#config{xconf=NewXconf}.
 
+-spec get_xconf(config(), term()) -> term().
 get_xconf(Config, Key) ->
     {ok, Value} = dict:find(Key, Config#config.xconf),
     Value.
 
+-spec get_xconf(config(), term(), term()) -> term().
 get_xconf(Config, Key, Default) ->
     case dict:find(Key, Config#config.xconf) of
         error ->
@@ -179,11 +215,13 @@
             Value
     end.
 
+-spec erase_xconf(config(), term()) -> config().
 erase_xconf(Config, Key) ->
     NewXconf = dict:erase(Key, Config#config.xconf),
     Config#config{xconf = NewXconf}.
 
 %% TODO: reconsider after config inheritance removal/redesign
+-spec clean_config(config(), config()) -> config().
 clean_config(Old, New) ->
     New#config{opts=Old#config.opts}.
 
@@ -191,6 +229,7 @@
 %% Internal functions
 %% ===================================================================
 
+-spec new(config(), file:filename()) -> config().
 new(ParentConfig, ConfName) ->
     %% Load terms from rebar.config, if it exists
     Dir = rebar_utils:get_cwd(),
@@ -215,15 +254,18 @@
 
     ParentConfig#config{dir = Dir, opts = Opts}.
 
+-spec consult_and_eval(file:filename(), file:filename()) -> {ok, term()}.
 consult_and_eval(File, Script) ->
     ?DEBUG("Evaluating config script ~p~n", [Script]),
     ConfigData = try_consult(File),
     file:script(Script, bs([{'CONFIG', ConfigData}, {'SCRIPT', Script}])).
 
+-spec remove_script_ext(file:filename()) -> file:filename().
 remove_script_ext(F) ->
     "tpircs." ++ Rev = lists:reverse(F),
     lists:reverse(Rev).
 
+-spec try_consult(file:filename()) -> term().
 try_consult(File) ->
     case file:consult(File) of
         {ok, Terms} ->
@@ -235,11 +277,14 @@
             ?ABORT("Failed to read config file ~s: ~p~n", [File, Reason])
     end.
 
+-type bs_vars() :: [{term(), term()}].
+-spec bs(bs_vars()) -> bs_vars().
 bs(Vars) ->
     lists:foldl(fun({K,V}, Bs) ->
                         erl_eval:add_binding(K, V, Bs)
                 end, erl_eval:new_bindings(), Vars).
 
+-spec local_opts(list(), list()) -> list().
 local_opts([], Acc) ->
     lists:reverse(Acc);
 local_opts([local | _Rest], Acc) ->
@@ -247,10 +292,14 @@
 local_opts([Item | Rest], Acc) ->
     local_opts(Rest, [Item | Acc]).
 
+-spec new_globals() -> rebar_dict().
 new_globals() -> dict:new().
 
+-spec new_env() -> rebar_dict().
 new_env() -> dict:new().
 
+-spec new_skip_dirs() -> rebar_dict().
 new_skip_dirs() -> dict:new().
 
+-spec new_xconf() -> rebar_dict().
 new_xconf() -> dict:new().

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_core.erl -> rebar-2.6.1.tar.gz/src/rebar_core.erl Changed

@@ -26,7 +26,8 @@
 %% -------------------------------------------------------------------
 -module(rebar_core).
 
--export([process_commands/2, help/2]).
+-export([process_commands/2,
+         help/2]).
 
 -include("rebar.hrl").
 
@@ -34,6 +35,7 @@
 %% Internal functions
 %% ===================================================================
 
+-spec help(rebar_config:config(), [atom()]) -> ok.
 help(ParentConfig, Commands) ->
     %% get all core modules
     {ok, AnyDirModules} = application:get_env(rebar, any_dir_modules),
@@ -63,6 +65,7 @@
                             end, Modules)
       end, Commands).
 
+-spec process_commands([atom()], rebar_config:config()) -> ok.
 process_commands([], ParentConfig) ->
     AbortTrapped = rebar_config:get_xconf(ParentConfig, abort_trapped, false),
     case {get_operations(ParentConfig), AbortTrapped} of
@@ -315,7 +318,7 @@
                         {ok, Existing} ->
                             ?ABORT("Internal consistency assertion failed.~n"
                                    "sub_dir ~s already associated with ~s.~n"
-                                   "Duplicate sub_dirs or deps entries?",
+                                   "Duplicate sub_dirs or deps entries?~n",
                                    [Dir, Existing])
                     end
             end,

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_cover_utils.erl -> rebar-2.6.1.tar.gz/src/rebar_cover_utils.erl Changed

@@ -54,7 +54,7 @@
     ok = file:close(F).
 
 exit() ->
-   cover:stop().
+    cover:stop().
 
 init(false, _BeamFiles, _TargetDir) ->
     {ok, not_enabled};
@@ -138,6 +138,14 @@
             print_coverage(lists:sort(Coverage));
         false ->
             ok
+    end,
+
+    %% Generate JSON Coverage Data, if configured
+    case rebar_config:get(Config, cover_export_json, false) of
+        true ->
+            export_json_coverage(TargetDir, lists:sort(Coverage));
+        false ->
+            ok
     end.
 
 analyze_mod(Module) ->
@@ -238,11 +246,29 @@
     %% Print the output the console
     ?CONSOLE("~nCode Coverage:~n", []),
     lists:foreach(fun({Mod, C, N}) ->
-                          ?CONSOLE("~*s : ~3s~n",
+                          ?CONSOLE("~*s : ~4s~n",
                                    [Width, Mod, percentage(C, N)])
                   end, Coverage),
     ?CONSOLE("~n~*s : ~s~n", [Width, "Total", TotalCoverage]).
 
+export_json_coverage(TargetDir,Coverage) ->
+    ?CONSOLE("~nCode Coverage export to json~n", []),
+    lists:foreach(fun(ModuleCoverage) ->
+                          export_json_coverage_to_file(
+                            TargetDir,
+                            ModuleCoverage)
+                  end, Coverage).
+
+export_json_coverage_to_file(TargetDir, {Module, Covered, NotCovered}) ->
+    {ok, JsonFile} = file:open(json_file(TargetDir, Module), [write]),
+    io:format(JsonFile,
+              "{\"module\":~p,\"covered\":~p,\"not_covered\":~p}",
+              [atom_to_list(Module), Covered, NotCovered]),
+    ok = file:close(JsonFile).
+
+json_file(TargetDir, Module) ->
+    filename:join([TargetDir, atom_to_list(Module) ++ ".COVER.json"]).
+
 cover_file(Module, TargetDir) ->
     filename:join([TargetDir, atom_to_list(Module) ++ ".COVER.html"]).

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_ct.erl -> rebar-2.6.1.tar.gz/src/rebar_ct.erl Changed

@@ -67,8 +67,16 @@
        "  ~p~n"
        "  ~p~n"
        "Valid command line options:~n"
-       "  suites=foo,bar - run <test>/foo_SUITE and <test>/bar_SUITE~n"
-       "  case=\"mycase\" - run individual test case foo_SUITE:mycase~n",
+       "  suites=Suite1,Suite2,...,SuiteN~n"
+       "      - run Suite1_SUITE, Suite2_SUITE, ..., SuiteN_SUITE~n"
+       "      in the test folder.~n"
+       "  groups=Group1,Group2,...,GroupN~n"
+       "      - run test groups Group1, Group2, ..., GroupN of specified suites.~n"
+       "  cases=Case1,Case2,...,CaseM~n"
+       "      - run test cases Case1, Case2, ..., CaseN of specified suites.~n"
+       "  case=\"mycase\" - run individual test case Suite1_SUITE:mycase.~n"
+       "      This option is deprecated and remains for backward compability.~n"
+       "      It is recommended to use 'cases' instead.~n",
        [
         {ct_dir, "itest"},
         {ct_log_dir, "test/logs"},
@@ -226,9 +234,11 @@
                         filename:join(Cwd, TestDir)]) ++
                       get_cover_config(Config, Cwd) ++
                       get_ct_config_file(TestDir) ++
-                      get_config_file(TestDir) ++
                       get_suites(Config, TestDir) ++
-                      get_case(Config);
+                      get_groups(Config) ++
+                      get_cases(Config) ++
+                      get_extra_params(Config) ++
+                      get_config_file(TestDir);
               SpecFlags ->
                   ?FMT("~s"
                        " -pa ~s"
@@ -242,11 +252,12 @@
                         build_name(Config),
                         LogDir,
                         filename:join(Cwd, TestDir)]) ++
-                      SpecFlags ++ get_cover_config(Config, Cwd)
+                      SpecFlags ++
+                      get_cover_config(Config, Cwd) ++
+                      get_extra_params(Config)
           end,
-    Cmd1 = Cmd ++ get_extra_params(Config),
     RawLog = filename:join(LogDir, "raw.log"),
-    {Cmd1, RawLog}.
+    {Cmd, RawLog}.
 
 build_name(Config) ->
     case rebar_config:get_local(Config, ct_use_short_names, false) of
@@ -291,19 +302,27 @@
 
 collect_glob(Config, Cwd, Glob) ->
     {true, Deps} = rebar_deps:get_deps_dir(Config),
+    DepsDir = filename:basename(Deps),
     CwdParts = filename:split(Cwd),
-    filelib:fold_files(Cwd, Glob, true, fun(F, Acc) ->
-        %% Ignore any specs under the deps/ directory. Do this pulling
-        %% the dirname off the F and then splitting it into a list.
-        Parts = filename:split(filename:dirname(F)),
-        Parts2 = remove_common_prefix(Parts, CwdParts),
-        case lists:member(Deps, Parts2) of
-            true ->
-                Acc;                % There is a directory named "deps" in path
-            false ->
-                [F | Acc]           % No "deps" directory in path
-        end
-    end, []).
+    filelib:fold_files(
+      Cwd,
+      Glob,
+      true,
+      fun(F, Acc) ->
+              %% Ignore any specs under the deps/ directory. Do this pulling
+              %% the dirname off the F and then splitting it into a list.
+              Parts = filename:split(filename:dirname(F)),
+              Parts2 = remove_common_prefix(Parts, CwdParts),
+              case lists:member(DepsDir, Parts2) of
+                  true ->
+                      %% There is a directory named "deps" in path
+                      Acc;
+                  false ->
+                      %% No "deps" directory in path
+                      [F | Acc]
+              end
+      end,
+      []).
 
 remove_common_prefix([H1|T1], [H1|T2]) ->
     remove_common_prefix(T1, T2);
@@ -325,7 +344,7 @@
         false ->
             " ";
         true ->
-            " -config " ++ Config
+            " -erl_args -config " ++ Config
     end.
 
 get_suites(Config, TestDir) ->
@@ -333,17 +352,24 @@
         undefined ->
             " -dir " ++ TestDir;
         Suites ->
-            Suites1 = string:tokens(Suites, ","),
-            Suites2 = [find_suite_path(Suite, TestDir) || Suite <- Suites1],
-            string:join([" -suite"] ++ Suites2, " ")
+            Suites1 = [find_suite_path(Suite, TestDir) || Suite <- Suites],
+            string:join([" -suite"] ++ Suites1, " ")
     end.
 
 get_suites(Config) ->
     case rebar_config:get_global(Config, suites, undefined) of
         undefined ->
-            rebar_config:get_global(Config, suite, undefined); 
+            %% The option 'suite' is deprecated and remains
+            %% for backward compatibility.
+            %% It is recommended to use 'suites' instead.
+            case get_deprecated_global(Config, suite, suites) of
+                undefined ->
+                    undefined;
+                Suite ->
+                    [Suite]
+            end;
         Suites ->
-            Suites
+            string:tokens(Suites, ",")
     end.
 
 find_suite_path(Suite, TestDir) ->
@@ -358,10 +384,40 @@
             Path
     end.
 
-get_case(Config) ->
-    case rebar_config:get_global(Config, 'case', undefined) of
+get_groups(Config) ->
+    case rebar_config:get_global(Config, groups, undefined) of
         undefined ->
-            "";
-        Case ->
-            " -case " ++ Case
+            %% The option 'group' was added only for consistency
+            %% because there are options 'suite' and 'case'.
+            case get_deprecated_global(Config, group, groups) of
+                undefined ->
+                    "";
+                Group ->
+                    " -group " ++ Group
+            end;
+        Groups ->
+            Groups1 = string:tokens(Groups, ","),
+            string:join([" -group"] ++ Groups1, " ")
     end.
+
+get_cases(Config) ->
+    case rebar_config:get_global(Config, cases, undefined) of
+        undefined ->
+            %% The option 'case' is deprecated and remains
+            %% for backward compatibility.
+            %% It is recommended to use 'cases' instead.
+            case get_deprecated_global(Config, 'case', cases) of
+                undefined ->
+                    "";
+                Case ->
+                    " -case " ++ Case
+            end;
+        Cases ->
+            Cases1 = string:tokens(Cases, ","),
+            string:join([" -case"] ++ Cases1, " ")
+    end.
+
+get_deprecated_global(Config, OldOpt, NewOpt) ->
+    rebar_utils:get_deprecated_global(
+      Config, OldOpt, NewOpt, undefined, "in the future").
+

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_deps.erl -> rebar-2.6.1.tar.gz/src/rebar_deps.erl Changed

@@ -307,8 +307,9 @@
 
 get_deps_dir(Config, App) ->
     BaseDir = rebar_utils:base_dir(Config),
-    DepsDir = get_shared_deps_dir(Config, "deps"),
-    {true, filename:join([BaseDir, DepsDir, App])}.
+    DepsDir0 = get_shared_deps_dir(Config, "deps"),
+    DepsDir = filename:dirname(filename:join([BaseDir, DepsDir0, "dummy"])),
+    {true, filename:join([DepsDir, App])}.
 
 dep_dirs(Deps) ->
     [D#dep.dir || D <- Deps].
@@ -457,8 +458,19 @@
                               {AppFile, {expected, App}, {has, OtherApp}}}}}
             end;
         false ->
-            ?WARN("Expected ~s to be an app dir (containing ebin/*.app), "
-                  "but no .app found.\n", [Path]),
+            case filelib:is_dir(Path) of
+                true ->
+                    %% Path is a directory, but it's not an app dir.
+                    ?WARN("Directory expected to be an app dir, but no "
+                          "app file found ~n"
+                          "in ebin/ or src/:~n~s~n",
+                          [Path]);
+                false ->
+                    %% Path is not a directory, so it cannot be an app dir.
+                    %% TODO: maybe we can avoid checking non-existing dirs
+                    ?DEBUG("Directory expected to be an app dir, "
+                           "but it doesn't exist (yet?):~n~s~n", [Path])
+            end,
             {Config, {false, {missing_app_file, Path}}}
     end;
 is_app_available(Config, App, _VsnRegex, Path, _IsRaw = true) ->
@@ -816,5 +828,7 @@
     ?FMT("~p TAG ~s ~s", [App, Tag, Url]);
 format_source(App, {_, Url, Rev}) ->
     ?FMT("~p REV ~s ~s", [App, Rev, Url]);
+format_source(App, {SrcType, Url}) ->
+    ?FMT("~p ~p ~s", [App, SrcType, Url]);
 format_source(App, undefined) ->
     ?FMT("~p", [App]).

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_dia_compiler.erl -> rebar-2.6.1.tar.gz/src/rebar_dia_compiler.erl Changed

@@ -26,7 +26,8 @@
 %% -------------------------------------------------------------------
 -module(rebar_dia_compiler).
 
--export([compile/2, clean/2]).
+-export([compile/2,
+         clean/2]).
 
 %% for internal use only
 -export([info/2]).
@@ -39,12 +40,26 @@
 
 -spec compile(rebar_config:config(), file:filename()) -> 'ok'.
 compile(Config, _AppFile) ->
-    rebar_base_compiler:run(Config, filelib:wildcard("dia/*.dia"),
+    DiaOpts = rebar_config:get(Config, dia_opts, []),
+    IncludeEbin = proplists:get_value(include, DiaOpts, []),
+    DiaFiles = filelib:wildcard("dia/*.dia"),
+    code:add_pathsz(["ebin" | IncludeEbin]),
+    FileSequence = case rebar_config:get(Config, dia_first_files, []) of
+        [] ->
+            DiaFiles;
+        CompileFirst ->
+            CompileFirst ++
+            [F || F <- DiaFiles, not lists:member(F, CompileFirst)]
+    end,
+    rebar_base_compiler:run(Config, FileSequence,
                             "dia", ".dia", "src", ".erl",
                             fun compile_dia/3).
 
 -spec clean(rebar_config:config(), file:filename()) -> 'ok'.
-clean(_Config, _AppFile) ->
+clean(Config, _AppFile) ->
+    DiaOpts = rebar_config:get(Config, dia_opts, []),
+    IncludeEbin = proplists:get_value(include, DiaOpts, []),
+    code:add_pathsz(["ebin" | IncludeEbin]),
     GeneratedFiles = dia_generated_files("dia", "src", "include"),
     ok = rebar_file_utils:delete_each(GeneratedFiles),
     ok.
@@ -63,7 +78,9 @@
        "~s.~n"
        "~n"
        "Valid rebar.config options:~n"
-       "  {dia_opts, []} (see diameter_codegen:from_dict/4 documentation)~n",
+       "  {dia_opts, []} (options from diameter_make:codec/2 supported with~n"
+       "                  exception of inherits)~n"
+       "  {dia_first_files, []} (files in sequence to compile first)~n",
        [Description]).
 
 -spec compile_dia(file:filename(), file:filename(),
@@ -78,6 +95,10 @@
             _ = diameter_codegen:from_dict(FileName, Spec, Opts, erl),
             _ = diameter_codegen:from_dict(FileName, Spec, Opts, hrl),
             HrlFile = filename:join("src", FileName ++ ".hrl"),
+            ErlFile = filename:join("src", FileName ++ ".erl"),
+            ErlCOpts = [{outdir, "ebin"}] ++
+                        rebar_config:get(Config, erl_opts, []),
+            _ = compile:file(ErlFile, ErlCOpts),
             case filelib:is_regular(HrlFile) of
                 true ->
                     ok = rebar_file_utils:mv(HrlFile, "include");
@@ -85,15 +106,26 @@
                     ok
             end;
         {error, Reason} ->
-            ?ERROR("~s~n", [diameter_dict_util:format_error(Reason)])
+            ?ABORT(
+                "Compiling ~s failed: ~s~n",
+                [Source, diameter_dict_util:format_error(Reason)]
+            )
     end.
 
 dia_generated_files(DiaDir, SrcDir, IncDir) ->
     F = fun(File, Acc) ->
-            {ok, Spec} = diameter_dict_util:parse({path, File}, []),
-            FileName = dia_filename(File, Spec),
-            [filename:join([IncDir, FileName ++ ".hrl"]) |
-             filelib:wildcard(filename:join([SrcDir, FileName ++ ".*"]))] ++ Acc
+            case catch diameter_dict_util:parse({path, File}, []) of
+                {ok, Spec} ->
+                    FileName = dia_filename(File, Spec),
+                    [
+                        filename:join([IncDir, FileName ++ ".hrl"]) |
+                        filelib:wildcard(
+                            filename:join([SrcDir, FileName ++ ".*"])
+                        )
+                    ] ++ Acc;
+                _ ->
+                    Acc
+            end
     end,
     lists:foldl(F, [], filelib:wildcard(filename:join([DiaDir, "*.dia"]))).

rebar-2.6.1.tar.gz/src/rebar_dialyzer.erl Added

@@ -0,0 +1,246 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014-2015 Tuncer Ayaz
+%%
+%% 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_dialyzer).
+
+-export([
+         dialyze/2,
+         'build-plt'/2,
+         'check-plt'/2,
+         'delete-plt'/2
+        ]).
+
+%% for internal use only
+-export([info/2]).
+
+-include("rebar.hrl").
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+dialyze(Config, AppFile) ->
+    Opts = opts(Config),
+    {NewConfig, Plt} = plt(Config, AppFile, Opts),
+    ok = check_plt_existence(Plt),
+
+    Args = [
+            {analysis_type, succ_typings},
+            %% http://erlang.org/pipermail/erlang-bugs/2015-February/004781.html
+            %% TODO: remove once the minimum required Erlang/OTP release
+            %% includes a Dialyzer version without the bug, or alternatively
+            %% add a config option to always check the PLT, as this may be
+            %% needed by some users.
+            {check_plt, false},
+            {init_plt, Plt},
+            {files_rec, ["ebin"]},
+            {warnings, warnings(Opts)}
+           ],
+    ?DEBUG("dialyze opts:~n~p~n", [Args]),
+    case run(Args) of
+        [] ->
+            {ok, NewConfig};
+        Ws ->
+            print_warnings(Ws, fullpath),
+            ?FAIL
+    end.
+
+'build-plt'(Config, AppFile) ->
+    Opts = opts(Config),
+    {Config1, AppDirs} = app_dirs(Config, AppFile, Opts),
+    {NewConfig, Plt} = plt(Config1, AppFile, Opts),
+
+    Args = [
+            {analysis_type, plt_build},
+            {output_plt, Plt},
+            {files_rec, AppDirs}
+           ],
+    ?DEBUG("build-plt opts:~n~p~n", [Args]),
+    case run(Args) of
+        [] ->
+            {ok, NewConfig};
+        Ws ->
+            %% As plt_build may raise warnings but still successfully
+            %% create the PLT, we cannot interpret this as failure,
+            %% and therefore all we can do is report warnings.
+            print_warnings(Ws, basename)
+    end.
+
+'check-plt'(Config, AppFile) ->
+    Opts = opts(Config),
+    {NewConfig, Plt} = plt(Config, AppFile, Opts),
+    ok = check_plt_existence(Plt),
+
+    Args = [
+            {analysis_type, plt_check},
+            %% http://erlang.org/pipermail/erlang-bugs/2015-February/004781.html
+            %% Without this, the PLT will be checked twice.
+            %% TODO: remove once the minimum required Erlang/OTP release
+            %% includes a Dialyzer version without the bug.
+            {check_plt, false},
+            {init_plt, Plt}
+           ],
+    ?DEBUG("build-plt opts:~n~p~n", [Args]),
+    case run(Args) of
+        [] ->
+            {ok, NewConfig};
+        Ws ->
+            print_warnings(Ws, basename),
+            ?FAIL
+    end.
+
+'delete-plt'(Config, AppFile) ->
+    Opts = opts(Config),
+    {NewConfig, Plt} = plt(Config, AppFile, Opts),
+    ?DEBUG("Delete PLT '~s'~n", [Plt]),
+    ok = rebar_file_utils:delete_each([Plt]),
+    {ok, NewConfig}.
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
+
+info(help, dialyze) ->
+    info_help("Analyze the code for discrepancies");
+info(help, 'build-plt') ->
+    info_help("Build project-specific PLT");
+info(help, 'check-plt') ->
+    info_help("Check the PLT for consistency and rebuild it if it"
+              " is not up-to-date");
+info(help, 'delete-plt') ->
+    info_help("Delete project-specific PLT").
+
+info_help(Description) ->
+    ?CONSOLE(
+       "~s.~n"
+       "~n"
+       "Valid rebar.config options:~n"
+       "  ~p~n",
+       [
+        Description,
+        {dialyzer,
+         [
+          {plt_location, local},
+          {plt_location, "custom_dir"},
+          {plt_extra_apps, [app1, app2]},
+          {warnings, [unmatched_returns, error_handling]}
+         ]}
+       ]).
+
+opts(Config) ->
+    rebar_config:get_local(Config, dialyzer, []).
+
+plt(Config, AppFile, Opts) ->
+    PltDir = plt_dir(Config, Opts),
+    {NewConfig, RawAppName} = rebar_app_utils:app_name(Config, AppFile),
+    AppName = atom_to_list(RawAppName),
+    OtpRel = rebar_utils:otp_release(),
+    Plt = filename:join([PltDir, AppName ++ "_" ++ OtpRel ++ "_plt"]),
+    ok = filelib:ensure_dir(Plt),
+    {NewConfig, Plt}.
+
+plt_dir(Config, Opts) ->
+    Location = proplists:get_value(plt_location, Opts, local),
+    plt_dir1(Config, Location).
+
+plt_dir1(_Config, Location) when is_list(Location) ->
+    case filelib:is_dir(Location) of
+        false ->
+            ?ABORT("PLT directory does not exist: ~s~n", [Location]);
+        true ->
+            Location
+    end;
+plt_dir1(Config, local) ->
+    BaseDir = rebar_utils:base_dir(Config),
+    filename:join([BaseDir, ".rebar"]).
+
+check_plt_existence(Plt) ->
+    case filelib:is_regular(Plt) of
+        true ->
+            ok;
+        false ->
+            ?ABORT("PLT '~s' does not exist.~n"
+                   "Please run 'rebar build-plt' first.~n", [Plt])
+    end.
+
+%% dialyzer:run/1 wrapper to gracefully fail in case of Dialyzer errors
+run(Opts) ->
+    try dialyzer:run(Opts) of
+        Ws -> Ws
+    catch
+        throw:{dialyzer_error, Reason} ->
+            ?ABORT("Dialyzer error:~n~s~n", [Reason])
+    end.
+
+warnings(Opts) ->
+    proplists:get_value(warnings, Opts, []).
+
+print_warnings(Ws, Option) ->
+    lists:foreach(
+      fun(W) ->
+              ?CONSOLE("~s~n", [format_warning(W, Option)])
+      end,
+      Ws).
+
+format_warning(W, Option) ->
+    case dialyzer:format_warning(W, Option) of
+        ":0: " ++ Unknown ->
+            strip_newline(Unknown);
+        Warning ->
+            strip_newline(Warning)
+    end.
+
+%% Warning may or may not have trailing \n.
+strip_newline(Warning) ->
+    string:strip(Warning, right, $\n).
+
+app_dirs(Config, AppFile, Opts) ->
+    {NewConfig, AppFileApps} = app_file_apps(Config, AppFile),
+    ?DEBUG("app file apps:~n~p~n", [AppFileApps]),
+    Deps = deps_apps(Config),
+    ?DEBUG("deps apps:~n~p~n", [Deps]),
+    ExtraApps = proplists:get_value(plt_extra_apps, Opts, []),
+    ?DEBUG("extra apps:~n~p~n", [ExtraApps]),
+    %% erts is assumed, and has to be present unconditionally.
+    Erts = [erts],
+    Apps = ordsets:from_list(Erts ++ AppFileApps ++ Deps ++ ExtraApps),
+    AppDirs = [app_lib_dir(App) || App <- ordsets:to_list(Apps)],
+    ?DEBUG("app dirs:~n~p~n", [AppDirs]),
+    {NewConfig, AppDirs}.
+
+app_file_apps(Config, AppFile) ->
+    rebar_app_utils:app_applications(Config, AppFile).
+
+deps_apps(Config) ->
+    [element(1, Dep) || Dep <- rebar_config:get_local(Config, deps, [])].
+
+app_lib_dir(App) ->
+    case code:lib_dir(App, ebin) of
+        {error, _}=Err ->
+            ?ABORT("Failed to get ebin dir for app: ~p~n~p~n", [App, Err]);
+        Dir ->
+            Dir
+    end.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_edoc.erl -> rebar-2.6.1.tar.gz/src/rebar_edoc.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_erlc_compiler.erl -> rebar-2.6.1.tar.gz/src/rebar_erlc_compiler.erl Changed

@@ -36,27 +36,17 @@
 -include("rebar.hrl").
 -include_lib("stdlib/include/erl_compile.hrl").
 
--define(ERLCINFO_VSN, 1).
+-define(ERLCINFO_VSN, 2).
 -define(ERLCINFO_FILE, "erlcinfo").
 -type erlc_info_v() :: {digraph:vertex(), term()} | 'false'.
 -type erlc_info_e() :: {digraph:vertex(), digraph:vertex()}.
--type erlc_info() :: {list(erlc_info_v()), list(erlc_info_e())}.
+-type erlc_info() :: {list(erlc_info_v()), list(erlc_info_e()), list(string())}.
 -record(erlcinfo,
         {
           vsn = ?ERLCINFO_VSN :: pos_integer(),
-          info = {[], []} :: erlc_info()
+          info = {[], [], []} :: erlc_info()
         }).
 
--define(RE_PREFIX, "^[^._]").
-
--ifdef(namespaced_types).
-%% digraph:graph() exists starting from Erlang 17.
--type rebar_digraph() :: digraph:graph().
--else.
-%% digraph() has been obsoleted in Erlang 17 and deprecated in 18.
--type rebar_digraph() :: digraph().
--endif.
-
 %% ===================================================================
 %% Public API
 %% ===================================================================
@@ -111,27 +101,27 @@
     doterl_compile(Config, "ebin").
 
 -spec clean(rebar_config:config(), file:filename()) -> 'ok'.
-clean(Config, _AppFile) ->
-    MibFiles = rebar_utils:find_files("mibs", ?RE_PREFIX".*\\.mib\$"),
+clean(_Config, _AppFile) ->
+    MibFiles = rebar_utils:find_files_by_ext("mibs", ".mib"),
     MIBs = [filename:rootname(filename:basename(MIB)) || MIB <- MibFiles],
     rebar_file_utils:delete_each(
       [filename:join(["include",MIB++".hrl"]) || MIB <- MIBs]),
     lists:foreach(fun(F) -> ok = rebar_file_utils:rm_rf(F) end,
                   ["ebin/*.beam", "priv/mibs/*.bin"]),
 
-    YrlFiles = rebar_utils:find_files("src", ?RE_PREFIX".*\\.[x|y]rl\$"),
+    YrlFiles = rebar_utils:find_files_by_ext("src", ".[x|y]rl"),
     rebar_file_utils:delete_each(
       [ binary_to_list(iolist_to_binary(re:replace(F, "\\.[x|y]rl$", ".erl")))
         || F <- YrlFiles ]),
 
     %% Delete the build graph, if any
-    rebar_file_utils:rm_rf(erlcinfo_file(Config)),
+    rebar_file_utils:rm_rf(erlcinfo_file()),
 
     %% Erlang compilation is recursive, so it's possible that we have a nested
     %% 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_by_ext("ebin", ".beam"),
     rebar_file_utils:delete_each(BeamFiles),
     lists:foreach(fun(Dir) -> delete_dir(Dir, dirs(Dir)) end, dirs("ebin")),
     ok.
@@ -142,7 +132,7 @@
 
 test_compile(Config, Cmd, OutDir) ->
     %% Obtain all the test modules for inclusion in the compile stage.
-    TestErls = rebar_utils:find_files("test", ?RE_PREFIX".*\\.erl\$"),
+    TestErls = rebar_utils:find_files_by_ext("test", ".erl"),
 
     ErlOpts = rebar_utils:erl_opts(Config),
     {Config1, ErlOpts1} = test_compile_config_and_opts(Config, ErlOpts, Cmd),
@@ -153,8 +143,7 @@
     SrcDirs = rebar_utils:src_dirs(proplists:append_values(src_dirs, ErlOpts1)),
     SrcErls = lists:foldl(
                 fun(Dir, Acc) ->
-                        Files = rebar_utils:find_files(
-                                  Dir, ?RE_PREFIX".*\\.erl\$"),
+                        Files = rebar_utils:find_files_by_ext(Dir, ".erl"),
                         lists:append(Acc, Files)
                 end, [], SrcDirs),
 
@@ -247,8 +236,10 @@
     Opts = [O || O <- Opts0, O =/= no_debug_info],
     Config4 = rebar_config:set(Config3, erl_opts, Opts),
 
+    FirstErlFiles = rebar_config:get_list(Config4, erl_first_files, []),
     FirstFilesAtom = list_to_atom(Cmd ++ "_first_files"),
-    FirstErls = rebar_config:get_list(Config4, FirstFilesAtom, []),
+    FirstErlsOther = rebar_config:get_list(Config4, FirstFilesAtom, []),
+    FirstErls = FirstErlFiles ++ FirstErlsOther,
     Config5 = rebar_config:set(Config4, erl_first_files, FirstErls),
     {Config5, Opts}.
 
@@ -295,144 +286,125 @@
     doterl_compile(Config, OutDir, [], ErlOpts).
 
 doterl_compile(Config, OutDir, MoreSources, ErlOpts) ->
-    ErlFirstFilesConf = rebar_config:get_list(Config, erl_first_files, []),
     ?DEBUG("erl_opts ~p~n", [ErlOpts]),
     %% Support the src_dirs option allowing multiple directories to
     %% contain erlang source. This might be used, for example, should
     %% eunit tests be separated from the core application source.
     SrcDirs = rebar_utils:src_dirs(proplists:append_values(src_dirs, ErlOpts)),
     AllErlFiles = gather_src(SrcDirs, []) ++ MoreSources,
-    %% NOTE: If and when erl_first_files is not inherited anymore
-    %% (rebar_config:get_local instead of rebar_config:get_list), consider
-    %% logging a warning message for any file listed in erl_first_files which
-    %% wasn't found via gather_src.
-    {ErlFirstFiles, RestErls} =
-        lists:partition(
-          fun(Source) ->
-                  lists:member(Source, ErlFirstFilesConf)
-          end, AllErlFiles),
+
     %% Make sure that ebin/ exists and is on the path
     ok = filelib:ensure_dir(filename:join("ebin", "dummy.beam")),
     CurrPath = code:get_path(),
     true = code:add_path(filename:absname("ebin")),
     OutDir1 = proplists:get_value(outdir, ErlOpts, OutDir),
-    G = init_erlcinfo(Config, AllErlFiles),
-    %% Split RestErls so that files which are depended on are treated
-    %% like erl_first_files.
-    {OtherFirstErls, OtherErls} =
+
+    G = init_erlcinfo(proplists:get_all_values(i, ErlOpts), AllErlFiles),
+    NeededErlFiles = needed_files(G, OutDir1, AllErlFiles),
+    {ErlFirstFiles, ErlOptsFirst} = erl_first_files(Config,
+                                                    ErlOpts,
+                                                    NeededErlFiles),
+    {DepErls, OtherErls} =
         lists:partition(
-          fun(F) ->
-                  Children = get_children(G, F),
-                  log_files(?FMT("Files dependent on ~s", [F]), Children),
-
-                  case erls(Children) of
-                      [] ->
-                          %% There are no files dependent on this file.
-                          false;
-                      _ ->
-                          %% There are some files dependent on the file.
-                          %% Thus the file has higher priority
-                          %% and should be compiled in the first place.
-                          true
-                  end
-          end, RestErls),
-    %% Dependencies of OtherFirstErls that must be compiled first.
-    OtherFirstErlsDeps = lists:flatmap(
-                           fun(Erl) -> erls(get_parents(G, Erl)) end,
-                           OtherFirstErls),
-    %% NOTE: In case the way we retrieve OtherFirstErlsDeps or merge
-    %% it with OtherFirstErls does not result in the correct compile
-    %% priorities, or the method in use proves to be too slow for
-    %% certain projects, consider using a more elaborate method (maybe
-    %% digraph_utils) or alternatively getting and compiling the .erl
-    %% parents of an individual Source in internal_erl_compile. By not
-    %% handling this in internal_erl_compile, we also avoid extra
-    %% needs_compile/2 calls.
-    FirstErls = ErlFirstFiles ++ uo_merge(OtherFirstErlsDeps, OtherFirstErls),
+          fun(Source) ->
+                  digraph:in_degree(G, Source) > 0
+          end,
+          [F || F <- NeededErlFiles, not lists:member(F, ErlFirstFiles)]),
+    DepErlsOrdered = digraph_utils:topsort(digraph_utils:subgraph(G, DepErls)),
+    FirstErls = ErlFirstFiles ++ lists:reverse(DepErlsOrdered),
     ?DEBUG("Files to compile first: ~p~n", [FirstErls]),
+
     rebar_base_compiler:run(
       Config, FirstErls, OtherErls,
       fun(S, C) ->
-              internal_erl_compile(C, S, OutDir1, ErlOpts, G)
+              ErlOpts1 = case lists:member(S, ErlFirstFiles) of
+                             true -> ErlOptsFirst;
+                             false -> ErlOpts
+                         end,
+              internal_erl_compile(C, S, OutDir1, ErlOpts1)
       end),
-    true = code:set_path(CurrPath),
+    true = rebar_utils:cleanup_code_path(CurrPath),
     ok.
 
-%%
-%% Return all .erl files from a list of files
-%%
-erls(Files) ->
-    [Erl || Erl <- Files, filename:extension(Erl) =:= ".erl"].
-
-%%
-%% Return a list without duplicates while preserving order
-%%
-ulist(L) ->
-    ulist(L, []).
-
-ulist([H|T], Acc) ->
-    case lists:member(H, T) of
-        true ->
-            ulist(T, Acc);
-        false ->
-            ulist(T, [H|Acc])
-    end;
-ulist([], Acc) ->
-    lists:reverse(Acc).
-
-%%
-%% Merge two lists without duplicates while preserving order
-%%
-uo_merge(L1, L2) ->
-    lists:foldl(fun(E, Acc) -> u_add_element(E, Acc) end, ulist(L1), L2).
-
-u_add_element(Elem, [Elem|_]=Set) -> Set;
-u_add_element(Elem, [E1|Set])     -> [E1|u_add_element(Elem, Set)];
-u_add_element(Elem, [])           -> [Elem].
-
--spec include_path(file:filename(),
-                   rebar_config:config()) -> [file:filename(), ...].
-include_path(Source, Config) ->
-    ErlOpts = rebar_config:get(Config, erl_opts, []),
-    lists:usort(["include", filename:dirname(Source)]
-                ++ proplists:get_all_values(i, ErlOpts)).
-
--spec needs_compile(file:filename(), file:filename(),
-                    [string()]) -> boolean().
-needs_compile(Source, Target, Parents) ->
-    TargetLastMod = filelib:last_modified(Target),
-    lists:any(fun(I) -> TargetLastMod < filelib:last_modified(I) end,
-              [Source] ++ Parents).
-
-check_erlcinfo(_Config, #erlcinfo{vsn=?ERLCINFO_VSN}) ->
-    ok;
-check_erlcinfo(Config, #erlcinfo{vsn=Vsn}) ->
-    ?ABORT("~s file version is incompatible. expected: ~b got: ~b~n",
-           [erlcinfo_file(Config), ?ERLCINFO_VSN, Vsn]);
-check_erlcinfo(Config, _) ->
-    ?ABORT("~s file is invalid. Please delete before next run.~n",
-           [erlcinfo_file(Config)]).
-
-erlcinfo_file(_Config) ->
+%% Get files which need to be compiled first, i.e. those specified in
+%% erl_first_files and parse_transform options. Also produce specific
+%% erl_opts for these first files, so that yet to be compiled parse
+%% transformations are excluded from it.
+erl_first_files(Config, ErlOpts, NeededErlFiles) ->
+    %% NOTE: rebar_config:get_local perhaps?
+    ErlFirstFilesConf = rebar_config:get_list(Config, erl_first_files, []),
+    NeededSrcDirs = lists:usort(
+                      lists:map(fun filename:dirname/1, NeededErlFiles)),
+    %% NOTE: order of files here is important!
+    ErlFirstFiles = lists:filter(
+                      fun(File) -> lists:member(File, NeededErlFiles) end,
+                      ErlFirstFilesConf),
+    {ParseTransforms, ParseTransformsErls} =
+        lists:unzip(
+          lists:flatmap(
+            fun(PT) ->
+                    PTerls = [filename:join(Dir, module_to_erl(PT))
+                              || Dir <- NeededSrcDirs],
+                    [{PT, PTerl} || PTerl <- PTerls,
+                                    lists:member(PTerl, NeededErlFiles)]
+            end,
+            proplists:get_all_values(parse_transform, ErlOpts))),
+    ErlOptsFirst = lists:filter(
+                     fun ({parse_transform, PT}) ->
+                             not lists:member(PT, ParseTransforms);
+                         (_) -> true
+                     end,
+                     ErlOpts),
+    {ErlFirstFiles ++ ParseTransformsErls, ErlOptsFirst}.
+
+%% Get subset of SourceFiles which need to be recompiled, respecting
+%% dependencies induced by given graph G.
+needed_files(G, OutDir, SourceFiles) ->
+    lists:filter(
+      fun(Source) ->
+              Target = target_base(OutDir, Source) ++ ".beam",
+              digraph:vertex(G, Source) >
+                  {Source, filelib:last_modified(Target)}
+      end, SourceFiles).
+
+target_base(OutDir, Source) ->
+    filename:join(OutDir, filename:basename(Source, ".erl")).
+
+erlcinfo_file() ->
     filename:join([rebar_utils:get_cwd(), ".rebar", ?ERLCINFO_FILE]).
 
-init_erlcinfo(Config, Erls) ->
-    G = restore_erlcinfo(Config),
-    %% Get a unique list of dirs based on the source files' locations.
-    %% This is used for finding files in sub dirs of the configured
-    %% src_dirs. For example, src/sub_dir/foo.erl.
-    Dirs = sets:to_list(lists:foldl(
-                          fun(Erl, Acc) ->
-                                  Dir = filename:dirname(Erl),
-                                  sets:add_element(Dir, Acc)
-                          end, sets:new(), Erls)),
-    Updates = [update_erlcinfo(G, Erl, include_path(Erl, Config) ++ Dirs)
-               || Erl <- Erls],
-    Modified = lists:member(modified, Updates),
-    ok = store_erlcinfo(G, Config, Modified),
+%% Get dependency graph of given Erls files and their dependencies
+%% (header files, parse transforms, behaviours etc.) located in their
+%% directories or given InclDirs. Note that last modification times
+%% stored in vertices already respect
+%% dependencies induced by given graph G.
+init_erlcinfo(InclDirs, Erls) ->
+    G = digraph:new([acyclic]),
+    try restore_erlcinfo(G, InclDirs)
+    catch
+        _:_ ->
+            ?WARN("Failed to restore ~s file. Discarding it.~n",
+                  [erlcinfo_file()]),
+            ok = file:delete(erlcinfo_file())
+    end,
+    Dirs = source_and_include_dirs(InclDirs, Erls),
+    Modified = lists:foldl(update_erlcinfo_fun(G, Dirs), false, Erls),
+    if Modified -> store_erlcinfo(G, InclDirs); not Modified -> ok end,
     G.
 
-update_erlcinfo(G, Source, Dirs) ->
+source_and_include_dirs(InclDirs, Erls) ->
+    SourceDirs = lists:map(fun filename:dirname/1, Erls),
+    lists:usort(["include" | InclDirs ++ SourceDirs]).
+
+update_erlcinfo_fun(G, Dirs) ->
+    fun(Erl, Modified) ->
+            case update_erlcinfo(G, Dirs, Erl) of
+                modified -> true;
+                unmodified -> Modified
+            end
+    end.
+
+update_erlcinfo(G, Dirs, Source) ->
     case digraph:vertex(G, Source) of
         {_, LastUpdated} ->
             case filelib:last_modified(Source) of
@@ -440,83 +412,84 @@
                     %% The file doesn't exist anymore,
                     %% erase it from the graph.
                     %% All the edges will be erased automatically.
+                    ?WARN("File missing. Remove from dep graph:~n~s~n",
+                          [Source]),
                     digraph:del_vertex(G, Source),
                     modified;
                 LastModified when LastUpdated < LastModified ->
-                    modify_erlcinfo(G, Source, Dirs),
-                    modified;
+                    modify_erlcinfo(G, Source, LastModified, Dirs);
                 _ ->
-                    unmodified
+                    Modified = lists:foldl(
+                                 update_erlcinfo_fun(G, Dirs),
+                                 false, digraph:out_neighbours(G, Source)),
+                    MaxModified = update_max_modified_deps(G, Source),
+                    case Modified orelse MaxModified > LastUpdated of
+                        true -> modified;
+                        false -> unmodified
+                    end
             end;
         false ->
-            modify_erlcinfo(G, Source, Dirs),
-            modified
+            modify_erlcinfo(G, Source, filelib:last_modified(Source), Dirs)
     end.
 
-modify_erlcinfo(G, Source, Dirs) ->
+update_max_modified_deps(G, Source) ->
+    MaxModified = lists:max(
+                    lists:map(
+                      fun(File) ->
+                              {_, MaxModified} = digraph:vertex(G, File),
+                              MaxModified
+                      end,
+                      [Source|digraph:out_neighbours(G, Source)])),
+    digraph:add_vertex(G, Source, MaxModified),
+    MaxModified.
+
+modify_erlcinfo(_G, Source, 0, _Dirs) ->
+    ?WARN("modify_erlcinfo: failed to open file:~n~s~n", [Source]),
+    unmodified;
+modify_erlcinfo(G, Source, LastModified, Dirs) ->
     {ok, Fd} = file:open(Source, [read]),
     Incls = parse_attrs(Fd, []),
     AbsIncls = expand_file_names(Incls, Dirs),
     ok = file:close(Fd),
-    LastUpdated = {date(), time()},
-    digraph:add_vertex(G, Source, LastUpdated),
+    digraph:add_vertex(G, Source, LastModified),
+    digraph:del_edges(G, digraph:out_edges(G, Source)),
     lists:foreach(
       fun(Incl) ->
-              update_erlcinfo(G, Incl, Dirs),
+              update_erlcinfo(G, Dirs, Incl),
               digraph:add_edge(G, Source, Incl)
-      end, AbsIncls).
+      end, AbsIncls),
+    modified.
 
-restore_erlcinfo(Config) ->
-    File = erlcinfo_file(Config),
-    G = digraph:new(),
-    case file:read_file(File) of
+restore_erlcinfo(G, InclDirs) ->
+    case file:read_file(erlcinfo_file()) of
         {ok, Data} ->
-            try binary_to_term(Data) of
-                Erlcinfo ->
-                    ok = check_erlcinfo(Config, Erlcinfo),
-                    #erlcinfo{info=ErlcInfo} = Erlcinfo,
-                    {Vs, Es} = ErlcInfo,
-                    lists:foreach(
-                      fun({V, LastUpdated}) ->
-                              digraph:add_vertex(G, V, LastUpdated)
-                      end, Vs),
-                    lists:foreach(
-                      fun({V1, V2}) ->
-                              digraph:add_edge(G, V1, V2)
-                      end, Es)
-            catch
-                error:badarg ->
-                    ?ERROR(
-                       "Failed (binary_to_term) to restore rebar info file."
-                       " Discard file.~n", []),
-                    ok
-            end;
-        _Err ->
+            %% Since externally passed InclDirs can influence erlcinfo
+            %% graph (see modify_erlcinfo), we have to check here that
+            %% they didn't change.
+            #erlcinfo{vsn=?ERLCINFO_VSN, info={Vs, Es, InclDirs}} =
+                binary_to_term(Data),
+            lists:foreach(
+              fun({V, LastUpdated}) ->
+                      digraph:add_vertex(G, V, LastUpdated)
+              end, Vs),
+            lists:foreach(
+              fun({_, V1, V2, _}) ->
+                      digraph:add_edge(G, V1, V2)
+              end, Es);
+        {error, _} ->
             ok
-    end,
-    G.
+    end.
 
-store_erlcinfo(_G, _Config, _Modified = false) ->
-    ok;
-store_erlcinfo(G, Config, _Modified) ->
-    Vs = lists:map(
-           fun(V) ->
-                   digraph:vertex(G, V)
-           end, digraph:vertices(G)),
-    Es = lists:flatmap(
-           fun({V, _}) ->
-                   lists:map(
-                     fun(E) ->
-                             {_, V1, V2, _} = digraph:edge(G, E),
-                             {V1, V2}
-                     end, digraph:out_edges(G, V))
-           end, Vs),
-    File = erlcinfo_file(Config),
+store_erlcinfo(G, InclDirs) ->
+    Vs = lists:map(fun(V) -> digraph:vertex(G, V) end, digraph:vertices(G)),
+    Es = lists:map(fun(E) -> digraph:edge(G, E) end, digraph:edges(G)),
+    File = erlcinfo_file(),
     ok = filelib:ensure_dir(File),
-    Data = term_to_binary(#erlcinfo{info={Vs, Es}}, [{compressed, 9}]),
-    file:write_file(File, Data).
+    Info = #erlcinfo{info={Vs, Es, InclDirs}},
+    Data = term_to_binary(Info, [{compressed, 2}]),
+    ok = file:write_file(File, Data).
 
-%% NOTE: If, for example, one of the entries in Files, refers to
+%% NOTE: If, for example, one of the entries in Files refers to
 %% gen_server.erl, that entry will be dropped. It is dropped because
 %% such an entry usually refers to the beam file, and we don't pass a
 %% list of OTP src dirs for finding gen_server.erl's full path. Also,
@@ -548,46 +521,21 @@
               end
       end, Files).
 
--spec get_parents(rebar_digraph(), file:filename()) -> [file:filename()].
-get_parents(G, Source) ->
-    %% Return all files which the Source depends upon.
-    digraph_utils:reachable_neighbours([Source], G).
-
--spec get_children(rebar_digraph(), file:filename()) -> [file:filename()].
-get_children(G, Source) ->
-    %% Return all files dependent on the Source.
-    digraph_utils:reaching_neighbours([Source], G).
-
--spec internal_erl_compile(rebar_config:config(), file:filename(),
-                           file:filename(), list(),
-                           rebar_digraph()) -> 'ok' | 'skipped'.
-internal_erl_compile(Config, Source, OutDir, ErlOpts, G) ->
-    %% Determine the target name and includes list by inspecting the source file
-    Module = filename:basename(Source, ".erl"),
-    Parents = get_parents(G, Source),
-    log_files(?FMT("Dependencies of ~s", [Source]), Parents),
-
-    %% Construct the target filename
-    Target = filename:join([OutDir | string:tokens(Module, ".")]) ++ ".beam",
-    ok = filelib:ensure_dir(Target),
-
-    %% If the file needs compilation, based on last mod date of includes or
-    %% the target
-    case needs_compile(Source, Target, Parents) of
-        true ->
-            Opts = [{outdir, filename:dirname(Target)}] ++
-                ErlOpts ++ [{i, "include"}, return],
-            case compile:file(Source, Opts) of
-                {ok, _Mod} ->
-                    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)
-            end;
-        false ->
-            skipped
+-spec internal_erl_compile(
+        rebar_config:config(),
+        file:filename(),
+        file:filename(),
+        list()) -> ok | {ok, any()} | {error, any(), any()}.
+internal_erl_compile(Config, Source, OutDir, ErlOpts) ->
+    ok = filelib:ensure_dir(OutDir),
+    Opts = [{outdir, OutDir}] ++ ErlOpts ++ [{i, "include"}, return],
+    case compile:file(Source, Opts) of
+        {ok, _Mod} ->
+            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)
     end.
 
 -spec compile_mib(file:filename(), file:filename(),
@@ -630,7 +578,7 @@
 -spec compile_xrl_yrl(rebar_config:config(), file:filename(),
                       file:filename(), list(), module()) -> 'ok'.
 compile_xrl_yrl(Config, Source, Target, Opts, Mod) ->
-    case needs_compile(Source, Target, []) of
+    case needs_compile(Source, Target) of
         true ->
             case Mod:file(Source, Opts ++ [{return, true}]) of
                 {ok, _} ->
@@ -645,11 +593,14 @@
             skipped
     end.
 
+needs_compile(Source, Target) ->
+    filelib:last_modified(Source) > filelib:last_modified(Target).
+
 gather_src([], Srcs) ->
     Srcs;
 gather_src([Dir|Rest], Srcs) ->
     gather_src(
-      Rest, Srcs ++ rebar_utils:find_files(Dir, ?RE_PREFIX".*\\.erl\$")).
+      Rest, Srcs ++ rebar_utils:find_files_by_ext(Dir, ".erl")).
 
 -spec dirs(file:filename()) -> [file:filename()].
 dirs(Dir) ->
@@ -679,21 +630,15 @@
     end.
 
 process_attr(Form, Includes) ->
-    try
-        AttrName = erl_syntax:atom_value(erl_syntax:attribute_name(Form)),
-        process_attr(AttrName, Form, Includes)
-    catch _:_ ->
-            %% TODO: We should probably try to be more specific here
-            %% and not suppress all errors.
-            Includes
-    end.
+    AttrName = erl_syntax:atom_value(erl_syntax:attribute_name(Form)),
+    process_attr(AttrName, Form, Includes).
 
 process_attr(import, Form, Includes) ->
     case erl_syntax_lib:analyze_import_attribute(Form) of
         {Mod, _Funs} ->
-            [atom_to_list(Mod) ++ ".erl"|Includes];
+            [module_to_erl(Mod)|Includes];
         Mod ->
-            [atom_to_list(Mod) ++ ".erl"|Includes]
+            [module_to_erl(Mod)|Includes]
     end;
 process_attr(file, Form, Includes) ->
     {File, _} = erl_syntax_lib:analyze_file_attribute(Form),
@@ -705,29 +650,35 @@
 process_attr(include_lib, Form, Includes) ->
     [FileNode] = erl_syntax:attribute_arguments(Form),
     RawFile = erl_syntax:string_value(FileNode),
-    File = maybe_expand_include_lib_path(RawFile),
-    [File|Includes];
+    maybe_expand_include_lib_path(RawFile) ++ Includes;
 process_attr(behaviour, Form, Includes) ->
     [FileNode] = erl_syntax:attribute_arguments(Form),
-    File = erl_syntax:atom_name(FileNode) ++ ".erl",
+    File = module_to_erl(erl_syntax:atom_value(FileNode)),
     [File|Includes];
 process_attr(compile, Form, Includes) ->
     [Arg] = erl_syntax:attribute_arguments(Form),
     case erl_syntax:concrete(Arg) of
         {parse_transform, Mod} ->
-            [atom_to_list(Mod) ++ ".erl"|Includes];
+            [module_to_erl(Mod)|Includes];
         {core_transform, Mod} ->
-            [atom_to_list(Mod) ++ ".erl"|Includes];
+            [module_to_erl(Mod)|Includes];
         L when is_list(L) ->
             lists:foldl(
-              fun({parse_transform, M}, Acc) ->
-                      [atom_to_list(M) ++ ".erl"|Acc];
-                 ({core_transform, M}, Acc) ->
-                      [atom_to_list(M) ++ ".erl"|Acc];
+              fun({parse_transform, Mod}, Acc) ->
+                      [module_to_erl(Mod)|Acc];
+                 ({core_transform, Mod}, Acc) ->
+                      [module_to_erl(Mod)|Acc];
                  (_, Acc) ->
                       Acc
-              end, Includes, L)
-    end.
+              end, Includes, L);
+        _ ->
+            Includes
+    end;
+process_attr(_, _Form, Includes) ->
+    Includes.
+
+module_to_erl(Mod) ->
+    atom_to_list(Mod) ++ ".erl".
 
 %% Given the filename from an include_lib attribute, if the path
 %% exists, return unmodified, or else get the absolute ERL_LIBS
@@ -735,7 +686,7 @@
 maybe_expand_include_lib_path(File) ->
     case filelib:is_regular(File) of
         true ->
-            File;
+            [File];
         false ->
             expand_include_lib_path(File)
     end.
@@ -747,11 +698,17 @@
 %% utilize more elaborate logic.
 expand_include_lib_path(File) ->
     File1 = filename:basename(File),
-    Split = filename:split(filename:dirname(File)),
-    Lib = hd(Split),
-    SubDir = filename:join(tl(Split)),
-    Dir = code:lib_dir(list_to_atom(Lib), list_to_atom(SubDir)),
-    filename:join(Dir, File1).
+    [Lib | Parts] = filename:split(filename:dirname(File)),
+    SubDir = case Parts of
+                 [] -> % prevent function clause error
+                     [];
+                 _ ->
+                     filename:join(Parts)
+             end,
+    case code:lib_dir(list_to_atom(Lib), list_to_atom(SubDir)) of
+        {error, bad_name} -> [];
+        Dir -> [filename:join(Dir, File1)]
+    end.
 
 %%
 %% Ensure all files in a list are present and abort if one is missing
@@ -765,13 +722,3 @@
         false -> ?ABORT("File ~p is missing, aborting\n", [File]);
         true -> File
     end.
-
-%% Print prefix followed by list of files. If the list is empty, print
-%% on the same line, otherwise use a separate line.
-log_files(Prefix, Files) ->
-    case Files of
-        [] ->
-            ?DEBUG("~s: ~p~n", [Prefix, Files]);
-        _ ->
-            ?DEBUG("~s:~n~p~n", [Prefix, Files])
-    end.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_erlydtl_compiler.erl -> rebar-2.6.1.tar.gz/src/rebar_erlydtl_compiler.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_eunit.erl -> rebar-2.6.1.tar.gz/src/rebar_eunit.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_file_utils.erl -> rebar-2.6.1.tar.gz/src/rebar_file_utils.erl Changed

@@ -44,7 +44,7 @@
 rm_rf(Target) ->
     case os:type() of
         {unix, _} ->
-            EscTarget = escape_spaces(Target),
+            EscTarget = escape_path(Target),
             {ok, []} = rebar_utils:sh(?FMT("rm -rf ~s", [EscTarget]),
                                       [{use_stdout, false}, abort_on_error]),
             ok;
@@ -63,7 +63,7 @@
 cp_r(Sources, Dest) ->
     case os:type() of
         {unix, _} ->
-            EscSources = [escape_spaces(Src) || Src <- Sources],
+            EscSources = [escape_path(Src) || Src <- Sources],
             SourceStr = string:join(EscSources, " "),
             {ok, []} = rebar_utils:sh(?FMT("cp -R ~s \"~s\"",
                                            [SourceStr, Dest]),
@@ -78,8 +78,8 @@
 mv(Source, Dest) ->
     case os:type() of
         {unix, _} ->
-            EscSource = escape_spaces(Source),
-            EscDest = escape_spaces(Dest),
+            EscSource = escape_path(Source),
+            EscDest = escape_path(Dest),
             {ok, []} = rebar_utils:sh(?FMT("mv ~s ~s", [EscSource, EscDest]),
                                       [{use_stdout, false}, abort_on_error]),
             ok;
@@ -190,5 +190,5 @@
                   end, filelib:wildcard(Source)),
     ok.
 
-escape_spaces(Str) ->
-    re:replace(Str, " ", "\\\\ ", [global, {return, list}]).
+escape_path(Str) ->
+    re:replace(Str, "([ ()?])", "\\\\&", [global, {return, list}]).

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_lfe_compiler.erl -> rebar-2.6.1.tar.gz/src/rebar_lfe_compiler.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_log.erl -> rebar-2.6.1.tar.gz/src/rebar_log.erl Changed

@@ -43,6 +43,9 @@
 %% Public API
 %% ===================================================================
 
+%% TODO: Once we have the new getopt version, use a flag that
+%% takes an optional arg but has a default value and fetch the
+%% setting via rebar_config, after it has been set in rebar:main.
 init(Config) ->
     Verbosity = rebar_config:get_global(Config, verbose, default_level()),
     case valid_level(Verbosity) of
@@ -60,9 +63,10 @@
 
 log(Device, Level, Str, Args) ->
     {ok, LogLevel} = application:get_env(rebar, log_level),
+    {ok, LogColored} = application:get_env(rebar, log_colored),
     case should_log(LogLevel, Level) of
         true ->
-            io:format(Device, log_prefix(Level) ++ Str, Args);
+            io:format(Device, log_prefix(Level, LogColored) ++ Str, Args);
         false ->
             ok
     end.
@@ -90,7 +94,40 @@
 should_log(error, _)     -> false;
 should_log(_, _)         -> false.
 
+log_prefix(Level, uncolored) ->
+    log_prefix(Level);
+log_prefix(Level, colored) ->
+    color_for_level(Level) ++ log_prefix(Level) ++ reset_color().
+
 log_prefix(debug) -> "DEBUG: ";
 log_prefix(info)  -> "INFO:  ";
 log_prefix(warn)  -> "WARN:  ";
 log_prefix(error) -> "ERROR: ".
+
+color_for_level(debug) ->
+    color_foreground(blue);
+color_for_level(info) ->
+    color_foreground(green);
+color_for_level(warn) ->
+    color_foreground(yellow);
+color_for_level(error) ->
+    color_bold() ++ color_foreground(red).
+
+%% -type color() :: 'black' | 'red' | 'green' | 'yellow'
+%%                | 'blue' | 'magenta' | 'cyan' | 'white'.
+%% -spec color_foreground(color()) -> string().
+%%
+%% To silence Dialyzer, disable following colors, because they're
+%% unused as of right now: black, magenta, cyan, white
+%%
+%% color_foreground(black)   -> "\e[30m";
+%% color_foreground(magenta) -> "\e[35m";
+%% color_foreground(cyan)    -> "\e[36m";
+%% color_foreground(white)   -> "\e[37m";
+color_foreground(red)     -> "\e[31m";
+color_foreground(green)   -> "\e[32m";
+color_foreground(yellow)  -> "\e[33m";
+color_foreground(blue)    -> "\e[34m".
+
+color_bold()  -> "\e[1m".
+reset_color() -> "\e[0m".

rebar-2.6.1.tar.gz/src/rebar_otp_appup.erl Added

@@ -0,0 +1,89 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 Luis Rascao (luis.rascao@gmail.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_otp_appup).
+
+-export([compile/2,
+         clean/2]).
+
+%% for internal use only
+-export([info/2]).
+
+-include("rebar.hrl").
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+-spec compile(rebar_config:config(), file:filename()) -> 'ok'.
+compile(Config, _AppFile) ->
+    %% If we get an *.appup.src file, it needs to be pre-processed and
+    %% written out as a ebin/*.appup file.
+    Files = rebar_utils:find_files_by_ext("src", ".appup.src"),
+    Targets = [filename:join("ebin",
+                             filename:rootname(filename:basename(F)))
+               || F <- Files],
+    rebar_base_compiler:run(Config, [],
+                            lists:zip(Files, Targets),
+                            fun preprocess/3,
+                            [{check_last_mod, true}]).
+
+clean(Config, _AppFile) ->
+    Files = rebar_utils:find_files_by_ext("ebin", ".appup"),
+    rebar_file_utils:delete_each([Files]),
+    {ok, Config}.
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
+
+info(help, compile) ->
+    ?CONSOLE("Validate .appup.src file", []);
+info(help, clean) ->
+    ?CONSOLE("Delete .appup file if generated from .appup.src", []).
+
+preprocess(SourceFile, TargetFile, _Config) ->
+    %% Perform basic validation on the appup file
+    %% i.e. if a consult succeeds and basic appup
+    %% structure exists.
+    case rebar_config:consult_file(SourceFile) of
+        %% The .appup syntax is described in
+        %% http://erlang.org/doc/man/appup.html.
+        {ok, [{_Vsn, UpFromVsn, DownToVsn} = AppUp]}
+          when is_list(UpFromVsn), is_list(DownToVsn) ->
+            case file:write_file(
+                   TargetFile,
+                   lists:flatten(io_lib:format("~p.", [AppUp]))) of
+                {error, Reason} ->
+                    ?ABORT("Failed writing to target file ~s due to ~s",
+                           [TargetFile, Reason]);
+                ok -> ok
+            end;
+        {error, Reason} ->
+            ?ABORT("Failed to compile ~s: ~p~n", [SourceFile, Reason]);
+        _ ->
+            ?ABORT("Failed to compile ~s, not an appup~n", [SourceFile])
+    end.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_port_compiler.erl -> rebar-2.6.1.tar.gz/src/rebar_port_compiler.erl Changed

@@ -35,66 +35,16 @@
 
 -include("rebar.hrl").
 
-%% ===================================================================
-%% Public API
-%% ===================================================================
-
-%% Supported configuration variables:
-%%
-%% * port_specs - Erlang list of tuples of the forms
-%%                {ArchRegex, TargetFile, Sources, Options}
-%%                {ArchRegex, TargetFile, Sources}
-%%                {TargetFile, Sources}
-%%
-%% * port_env - Erlang list of key/value pairs which will control
-%%              the environment when running the compiler and linker.
-%%
-%%              By default, the following variables are defined:
-%%              CC       - C compiler
-%%              CXX      - C++ compiler
-%%              CFLAGS   - C compiler
-%%              CXXFLAGS - C++ compiler
-%%              LDFLAGS  - Link flags
-%%              ERL_CFLAGS  - default -I paths for erts and ei
-%%              ERL_LDFLAGS - default -L and -lerl_interface -lei
-%%              DRV_CFLAGS  - flags that will be used for compiling
-%%              DRV_LDFLAGS - flags that will be used for linking
-%%              EXE_CFLAGS  - flags that will be used for compiling
-%%              EXE_LDFLAGS - flags that will be used for linking
-%%              ERL_EI_LIBDIR - ei library directory
-%%              DRV_CXX_TEMPLATE  - C++ command template
-%%              DRV_CC_TEMPLATE   - C command template
-%%              DRV_LINK_TEMPLATE - Linker command template
-%%              EXE_CXX_TEMPLATE  - C++ command template
-%%              EXE_CC_TEMPLATE   - C command template
-%%              EXE_LINK_TEMPLATE - Linker command template
-%%              PORT_IN_FILES - contains a space separated list of input
-%%                   file(s), (used in command template)
-%%              PORT_OUT_FILE - contains the output filename (used in
-%%                   command template)
-%%
-%%              Note that if you wish to extend (vs. replace) these variables,
-%%              you MUST include a shell-style reference in your definition.
-%%              e.g. to extend CFLAGS, do something like:
-%%
-%%              {port_env, [{"CFLAGS", "$CFLAGS -MyOtherOptions"}]}
-%%
-%%              It is also possible to specify platform specific options
-%%              by specifying a triplet where the first string is a regex
-%%              that is checked against Erlang's system architecture string.
-%%              e.g. to specify a CFLAG that only applies to x86_64 on linux
-%%              do:
-%%
-%%              {port_env, [{"x86_64.*-linux", "CFLAGS",
-%%                           "$CFLAGS -X86Options"}]}
-%%
-
 -record(spec, {type::'drv' | 'exe',
                target::file:filename(),
                sources = [] :: [file:filename(), ...],
                objects = [] :: [file:filename(), ...],
                opts = [] ::list() | []}).
 
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
 compile(Config, AppFile) ->
     case get_specs(Config, AppFile) of
         [] ->
@@ -141,7 +91,8 @@
         Specs ->
             lists:foreach(fun(#spec{target=Target, objects=Objects}) ->
                                   rebar_file_utils:delete_each([Target]),
-                                  rebar_file_utils:delete_each(Objects)
+                                  rebar_file_utils:delete_each(Objects),
+                                  rebar_file_utils:delete_each(port_deps(Objects))
                           end, Specs)
     end,
     ok.
@@ -163,12 +114,62 @@
        "~s.~n"
        "~n"
        "Valid rebar.config options:~n"
-       "  ~p~n"
-       "  ~p~n",
+       "port_specs - Erlang list of tuples of the forms~n"
+       "             {ArchRegex, TargetFile, Sources, Options}~n"
+       "             {ArchRegex, TargetFile, Sources}~n"
+       "             {TargetFile, Sources}~n"
+       "~n"
+       "             Examples:~n"
+       "             ~p~n"
+       "~n"
+       "port_env - Erlang list of key/value pairs which will control~n"
+       "           the environment when running the compiler and linker.~n"
+       "           Variables set in the surrounding system shell are taken~n"
+       "           into consideration when expanding port_env.~n"
+       "~n"
+       "           By default, the following variables are defined:~n"
+       "           CC       - C compiler~n"
+       "           CXX      - C++ compiler~n"
+       "           CFLAGS   - C compiler~n"
+       "           CXXFLAGS - C++ compiler~n"
+       "           LDFLAGS  - Link flags~n"
+       "           ERL_CFLAGS  - default -I paths for erts and ei~n"
+       "           ERL_LDFLAGS - default -L and -lerl_interface -lei~n"
+       "           DRV_CFLAGS  - flags that will be used for compiling~n"
+       "           DRV_LDFLAGS - flags that will be used for linking~n"
+       "           EXE_CFLAGS  - flags that will be used for compiling~n"
+       "           EXE_LDFLAGS - flags that will be used for linking~n"
+       "           ERL_EI_LIBDIR - ei library directory~n"
+       "           DRV_CXX_TEMPLATE  - C++ command template~n"
+       "           DRV_CC_TEMPLATE   - C command template~n"
+       "           DRV_LINK_TEMPLATE - Linker command template~n"
+       "           EXE_CXX_TEMPLATE  - C++ command template~n"
+       "           EXE_CC_TEMPLATE   - C command template~n"
+       "           EXE_LINK_TEMPLATE - Linker command template~n"
+       "~n"
+       "           Note that if you wish to extend (vs. replace) these variables,~n"
+       "           you MUST include a shell-style reference in your definition.~n"
+       "           e.g. to extend CFLAGS, do something like:~n"
+       "~n"
+       "           {port_env, [{\"CFLAGS\", \"$CFLAGS -MyOtherOptions\"}]}~n"
+       "~n"
+       "           It is also possible to specify platform specific options~n"
+       "           by specifying a triplet where the first string is a regex~n"
+       "           that is checked against Erlang's system architecture string.~n"
+       "           e.g. to specify a CFLAG that only applies to x86_64 on linux~n"
+       "           do:~n"
+       "           {port_env, [{\"x86_64.*-linux\", \"CFLAGS\",~n"
+       "                        \"$CFLAGS -X86Options\"}]}~n"
+       "~n"
+       "Cross-arch environment variables to configure toolchain:~n"
+       "  REBAR_TARGET_ARCH to set the tool chain name to use~n"
+       "  REBAR_TARGET_ARCH_WORDSIZE (optional - "
+       "if CC fails to determine word size)~n"
+       "  fallback word size is 32~n"
+       "  REBAR_TARGET_ARCH_VSN (optional - "
+       "if a special version of CC/CXX is requested)~n",
        [
         Description,
-        {port_env, [{"CFLAGS", "$CFLAGS -Ifoo"},
-                    {"freebsd", "LDFLAGS", "$LDFLAGS -lfoo"}]},
         {port_specs, [{"priv/so_name.so", ["c_src/*.c"]},
                       {"linux", "priv/hello_linux", ["c_src/hello_linux.c"]},
                       {"linux", "priv/hello_linux", ["c_src/*.c"], [{env, []}]}]}
@@ -182,8 +183,10 @@
 
     %% Get any port-specific envs; use port_env first and then fallback
     %% to port_envs for compatibility
-    RawPortEnv = rebar_config:get_list(Config, port_env,
-                          rebar_config:get_list(Config, port_envs, [])),
+    RawPortEnv = rebar_config:get_list(
+                   Config,
+                   port_env,
+                   rebar_config:get_list(Config, port_envs, [])),
 
     PortEnv = filter_env(RawPortEnv, []),
     Defines = get_defines(Config),
@@ -251,9 +254,28 @@
     end.
 
 needs_compile(Source, Bin) ->
-    %% TODO: Generate depends using gcc -MM so we can also
-    %% check for include changes
-    filelib:last_modified(Bin) < filelib:last_modified(Source).
+    needs_link(Bin, [Source|bin_deps(Bin)]).
+
+%% NOTE: This relies on -MMD being passed to the compiler and returns an
+%% empty list if the .d file is not available.  This means header deps are
+%% ignored on win32.
+bin_deps(Bin) ->
+    [DepFile] = port_deps([Bin]),
+    case file:read_file(DepFile) of
+        {ok, Deps} ->
+            Ds = parse_bin_deps(list_to_binary(Bin), Deps),
+            ?DEBUG("Deps of ~p: ~p\n", [Bin, Ds]),
+            Ds;
+        {error, Err} ->
+            ?DEBUG("Skipping deps parse of ~s: ~p\n", [DepFile, Err]),
+            []
+    end.
+
+parse_bin_deps(Bin, Deps) ->
+    Sz = size(Bin),
+    <<Bin:Sz/binary, ": ", X/binary>> = Deps,
+    Ds = re:split(X, "\\s*\\\\\\R\\s*|\\s+", [{return, binary}]),
+    [D || D <- Ds, D =/= <<>>].
 
 needs_link(SoName, []) ->
     filelib:last_modified(SoName) == 0;
@@ -334,6 +356,9 @@
 port_objects(SourceFiles) ->
     [replace_extension(O, ".o") || O <- SourceFiles].
 
+port_deps(SourceFiles) ->
+    [replace_extension(O, ".d") || O <- SourceFiles].
+
 port_opts(Config, Opts) ->
     [port_opt(Config, O) || O <- Opts].
 
@@ -545,9 +570,21 @@
     end.
 
 default_env() ->
+    Arch = os:getenv("REBAR_TARGET_ARCH"),
+    Vsn = os:getenv("REBAR_TARGET_ARCH_VSN"),
     [
-     {"CC" , "cc"},
-     {"CXX", "c++"},
+     {"CC", get_tool(Arch, Vsn,"gcc", "cc")},
+     {"CXX", get_tool(Arch, Vsn,"g++", "c++")},
+     {"AR", get_tool(Arch, "ar", "ar")},
+     {"AS", get_tool(Arch, "as", "as")},
+     {"CPP", get_tool(Arch, Vsn, "cpp", "cpp")},
+     {"LD", get_tool(Arch, "ld", "ld")},
+     {"RANLIB", get_tool(Arch, Vsn, "ranlib", "ranlib")},
+     {"STRIP", get_tool(Arch, "strip", "strip")},
+     {"NM", get_tool(Arch, "nm", "nm")},
+     {"OBJCOPY", get_tool(Arch, "objcopy", "objcopy")},
+     {"OBJDUMP", get_tool(Arch, "objdump", "objdump")},
+
      {"DRV_CXX_TEMPLATE",
       "$CXX -c $CXXFLAGS $DRV_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
      {"DRV_CC_TEMPLATE",
@@ -560,14 +597,17 @@
       "$CC -c $CFLAGS $EXE_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
      {"EXE_LINK_TEMPLATE",
       "$CC $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS -o $PORT_OUT_FILE"},
-     {"DRV_CFLAGS" , "-g -Wall -fPIC $ERL_CFLAGS"},
+     {"DRV_CFLAGS" , "-g -Wall -fPIC -MMD $ERL_CFLAGS"},
      {"DRV_LDFLAGS", "-shared $ERL_LDFLAGS"},
-     {"EXE_CFLAGS" , "-g -Wall -fPIC $ERL_CFLAGS"},
+     {"EXE_CFLAGS" , "-g -Wall -fPIC -MMD $ERL_CFLAGS"},
      {"EXE_LDFLAGS", "$ERL_LDFLAGS"},
 
-     {"ERL_CFLAGS", lists:concat([" -I\"", erl_interface_dir(include),
-                                  "\" -I\"", filename:join(erts_dir(), "include"),
-                                  "\" "])},
+     {"ERL_CFLAGS", lists:concat(
+                      [
+                       " -I\"", erl_interface_dir(include),
+                       "\" -I\"", filename:join(erts_dir(), "include"),
+                       "\" "
+                      ])},
      {"ERL_EI_LIBDIR", lists:concat(["\"", erl_interface_dir(lib), "\""])},
      {"ERL_LDFLAGS"  , " -L$ERL_EI_LIBDIR -lerl_interface -lei"},
      {"ERLANG_ARCH"  , rebar_utils:wordsize()},
@@ -611,7 +651,17 @@
      {"win32", "EXE_LINK_TEMPLATE",
       "$LINKER $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS /OUT:$PORT_OUT_FILE"},
      %% ERL_CFLAGS are ok as -I even though strictly it should be /I
-     {"win32", "ERL_LDFLAGS", " /LIBPATH:$ERL_EI_LIBDIR erl_interface.lib ei.lib"},
+     {"win32", "ERL_LDFLAGS",
+      " /LIBPATH:$ERL_EI_LIBDIR erl_interface.lib ei.lib"},
      {"win32", "DRV_CFLAGS", "/Zi /Wall $ERL_CFLAGS"},
      {"win32", "DRV_LDFLAGS", "/DLL $ERL_LDFLAGS"}
     ].
+
+get_tool(Arch, Tool, Default) ->
+    get_tool(Arch, false, Tool, Default).
+
+get_tool(false, _, _, Default) -> Default;
+get_tool("", _, _, Default) -> Default;
+get_tool(Arch, false, Tool, _Default) -> Arch++"-"++Tool;
+get_tool(Arch, "", Tool, _Default) -> Arch++"-"++Tool;
+get_tool(Arch, Vsn, Tool, _Default) -> Arch++"-"++Tool++"-"++Vsn.

rebar-2.6.1.tar.gz/src/rebar_proto_compiler.erl Added

@@ -0,0 +1,158 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tomas Abrahamsson (tomas.abrahamsson@gmail.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_proto_compiler).
+
+-export([compile/2,
+         clean/2]).
+
+%% for internal use only
+-export([info/2]).
+
+-include("rebar.hrl").
+
+-record(proto_compiler,
+        {key        :: atom(), % Corresponds to the {proto_compiler,Key}
+         module     :: atom()
+        }).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+find_proto_files(ProtoDirs) ->
+    lists:foldl(fun(ProtoDir, Acc) ->
+                  rebar_utils:find_files_by_ext(ProtoDir, ".proto") ++ Acc
+                end,
+                [], ProtoDirs).
+
+compile(Config, AppFile) ->
+    %% Find a compiler for protocol buffers,
+    %% use that for compiling protocol buffers
+    {CompilerModule, ProtoDirs} = select_proto_compiler_and_dir(Config),
+    case find_proto_files(ProtoDirs) of
+        [] ->
+            ok;
+        Protos ->
+            %% Ask the proto compiler to compile the .proto files.
+            CompilerModule:proto_compile(Config, AppFile, Protos)
+    end.
+
+clean(Config, AppFile) ->
+    %% Find a compiler for protocol buffers,
+    %% use that for clean protocol buffers
+    {CompilerModule, ProtoDirs} = select_proto_compiler_and_dir(Config),
+    %% Get a list of generated .beam and .hrl files and then delete them
+    case find_proto_files(ProtoDirs) of
+        [] ->
+            ok;
+        Protos ->
+            %% Ask the proto compiler to clean the .proto files.
+            CompilerModule:proto_clean(Config, AppFile, Protos)
+    end.
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
+
+info(help, compile) ->
+    info_help("Build protocol buffer (*.proto) sources", compile);
+info(help, clean) ->
+    info_help("Delete protocol buffer (*.proto) build results", clean).
+
+info_help(GeneralDescr, Cmd) ->
+    ?CONSOLE(
+       "~s.~n"
+       ++ "~n"
+       ++ "Valid rebar.config options:~n"
+       ++ " {proto_opts, [~n"
+       ++ "   {compiler, Compiler},~n"
+       ++ "   {src_dirs, [Dir]}~n"
+       ++ " ]}~n"
+       ++ "The following protocol buffer compilers are available:~n"
+       ++ "~s~n",
+       [GeneralDescr, format_proto_compiler_list()]),
+    %% Print info for each proto compiler
+    _ = [begin
+             ?CONSOLE("--- ~p ---~n", [Key]),
+             CompilerModule:proto_info(help, Cmd)
+         end
+         || #proto_compiler{key=Key,
+                            module=CompilerModule} <- find_proto_compilers()],
+    ok.
+
+get_default_compiler() ->
+    protobuffs.
+
+find_proto_compilers() ->
+    {ok, RebarModuleGroups} = application:get_env(rebar, modules),
+    {app_dir, Modules} = lists:keyfind(app_dir, 1, RebarModuleGroups),
+    [#proto_compiler{key = M:key(),
+                     module = M}
+     || M <- Modules,
+        is_proto_compiler_module(M)].
+
+is_proto_compiler_module(Module) ->
+    case code:ensure_loaded(Module) of
+        {module, Module} ->
+            lists:all(fun({Function, Arity}) ->
+                              erlang:function_exported(Module, Function, Arity)
+                      end,
+                      [{key, 0},
+                       {proto_compile, 3},
+                       {proto_clean, 3},
+                       {proto_info, 2}]);
+        _ ->
+            false
+    end.
+
+select_proto_compiler_and_dir(Config) ->
+    Default = get_default_compiler(),
+    ProtoOpts = rebar_config:get_local(Config, proto_opts, []),
+    Key = proplists:get_value(compiler, ProtoOpts, Default),
+    ProtoDirs = proplists:get_value(src_dirs, ProtoOpts, ["src"]),
+    AvailCompilers = find_proto_compilers(),
+    CompilerModule = case lists:keyfind(Key, #proto_compiler.key, AvailCompilers) of
+                      #proto_compiler{module=Module} ->
+                          Module;
+                      false ->
+                          ?ABORT("No such protocol buffer compiler known, '~s'~n"
+                                 ++ "The following are known:~n"
+                                 ++ "~s~n",
+                                 [Key, format_proto_compiler_list()])
+                     end,
+    {CompilerModule, ProtoDirs}.
+
+format_proto_compiler_list() ->
+    Default = get_default_compiler(),
+    Keys = [Key || #proto_compiler{key=Key} <- find_proto_compilers()],
+    Annotations = [if Key == Default -> " (default)";
+                      true -> ""
+                   end
+                   || Key <- Keys],
+    lists:flatten(
+      [?FMT("  ~p~s~n", [Key, Annotation])
+       || {Key, Annotation} <- lists:zip(Keys, Annotations)]).

rebar-2.6.1.tar.gz/src/rebar_proto_gpb_compiler.erl Added

@@ -0,0 +1,142 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Tomas Abrahamsson (tomas.abrahamsson@gmail.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_proto_gpb_compiler).
+
+-export([key/0,
+         proto_compile/3,
+         proto_clean/3]).
+
+%% for internal use only
+-export([proto_info/2]).
+
+-include("rebar.hrl").
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+key() ->
+    gpb.
+
+proto_compile(Config, _AppFile, Files) ->
+    %% Check for gpb library -- if it's not present, fail
+    %% since we have.proto files that need building
+    case gpb_is_present() of
+        true ->
+            GpbOpts = user_gpb_opts(Config),
+            Targets = [filename:join("src", target_filename(F, GpbOpts))
+                       || F <- Files],
+            rebar_base_compiler:run(Config, [],
+                                    lists:zip(Files, Targets),
+                                    fun compile_gpb/3,
+                                    [{check_last_mod, true}]);
+        false ->
+            ?ERROR("The gpb library is not present in code path!\n", []),
+            ?FAIL
+    end.
+
+target_filename(ProtoFileName, GpbOpts) ->
+    ModulePrefix = proplists:get_value(module_name_prefix, GpbOpts, ""),
+    ModuleSuffix = proplists:get_value(module_name_suffix, GpbOpts, ""),
+    Base = filename:basename(ProtoFileName, ".proto"),
+    ModulePrefix ++ Base ++ ModuleSuffix ++ ".erl".
+
+proto_clean(Config, _AppFile, ProtoFiles) ->
+    GpbOpts = user_gpb_opts(Config) ++ default_dest_opts(),
+    rebar_file_utils:delete_each(
+      [beam_file(F, GpbOpts) || F <- ProtoFiles]
+      ++ [erl_file(F, GpbOpts) || F <- ProtoFiles]
+      ++ [hrl_file(F, GpbOpts) || F <- ProtoFiles]),
+    ok.
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
+
+proto_info(help, compile) ->
+    ?CONSOLE(
+       "  gpb_opts is passed as options to gpb_compile:file/2.~n"
+       "  erl_opts is used when compiling the generated erlang files,~n"
+       "    so you might want to add an include path to gpb here,~n"
+       "    for gpb.hrl, or else use the include_as_lib gpb_opts option,~n"
+       "    or the defs_as_proplists gpb_opts option.~n",
+       []);
+proto_info(help, clean) ->
+    ?CONSOLE("", []).
+
+gpb_is_present() ->
+    code:which(gpb) =/= non_existing.
+
+user_gpb_opts(Config) ->
+    rebar_config:get_local(Config, gpb_opts, []).
+
+default_dest_opts() ->
+    [{o_erl, "src"}, {o_hrl, "include"}].
+
+compile_gpb(Source, _Target, Config) ->
+    SourceFullPath = filename:absname(Source),
+    GpbOpts = user_gpb_opts(Config) ++ default_dest_opts()
+        ++ default_include_opts(SourceFullPath),
+    ok = filelib:ensure_dir(filename:join("ebin", "dummy")),
+    ok = filelib:ensure_dir(filename:join("include", "dummy")),
+    case gpb_compile:file(SourceFullPath, GpbOpts) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            ReasonStr = gpb_compile:format_error(Reason),
+            ?ERROR("Failed to compile ~s: ~s~n", [SourceFullPath, ReasonStr]),
+            ?FAIL
+    end.
+
+default_include_opts(SourceFullPath) ->
+    [{i,filename:dirname(SourceFullPath)}].
+
+beam_file(ProtoFile, GpbOpts) ->
+    proto_filename_to_path("ebin", ProtoFile, ".beam", GpbOpts).
+
+erl_file(ProtoFile, GpbOpts) ->
+    ErlOutDir = get_erl_outdir(GpbOpts),
+    proto_filename_to_path(ErlOutDir, ProtoFile, ".erl", GpbOpts).
+
+hrl_file(ProtoFile, GpbOpts) ->
+    HrlOutDir = get_hrl_outdir(GpbOpts),
+    proto_filename_to_path(HrlOutDir, ProtoFile, ".hrl", GpbOpts).
+
+proto_filename_to_path(Dir, ProtoFile, NewExt, GpbOpts) ->
+    BaseNoExt = filename:basename(ProtoFile, ".proto"),
+    Prefix = proplists:get_value(module_name_prefix, GpbOpts, ""),
+    Suffix = proplists:get_value(module_name_suffix, GpbOpts, ""),
+    filename:join([Dir, Prefix ++ BaseNoExt ++ Suffix ++ NewExt]).
+
+get_erl_outdir(Opts) ->
+    proplists:get_value(o_erl, Opts, get_outdir(Opts)).
+
+get_hrl_outdir(Opts) ->
+    proplists:get_value(o_hrl, Opts, get_outdir(Opts)).
+
+get_outdir(Opts) ->
+    proplists:get_value(o, Opts, ".").

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_protobuffs_compiler.erl -> rebar-2.6.1.tar.gz/src/rebar_protobuffs_compiler.erl Changed

@@ -26,11 +26,12 @@
 %% -------------------------------------------------------------------
 -module(rebar_protobuffs_compiler).
 
--export([compile/2,
-         clean/2]).
+-export([key/0,
+         proto_compile/3,
+         proto_clean/3]).
 
 %% for internal use only
--export([info/2]).
+-export([proto_info/2]).
 
 -include("rebar.hrl").
 
@@ -38,58 +39,48 @@
 %% Public API
 %% ===================================================================
 
-compile(Config, _AppFile) ->
-    case rebar_utils:find_files("src", "^[^._].*\\.proto$") of
-        [] ->
-            ok;
-        FoundFiles ->
-            %% Check for protobuffs library -- if it's not present, fail
-            %% since we have.proto files that need building
-            case protobuffs_is_present() of
-                true ->
-                    %% Build a list of output files - { Proto, Beam, Hrl }
-                    Targets = [{Proto, beam_file(Proto), hrl_file(Proto)} ||
-                                  Proto <- FoundFiles],
-
-                    %% Compile each proto file
-                    compile_each(Config, Targets);
-                false ->
-                    ?ERROR("Protobuffs library not present in code path!\n",
-                           []),
-                    ?FAIL
-            end
+key() ->
+    protobuffs.
+
+proto_compile(Config, _AppFile, ProtoFiles) ->
+    %% Check for protobuffs library -- if it's not present, fail
+    %% since we have.proto files that need building
+    case protobuffs_is_present() of
+        true ->
+            %% Build a list of output files - { Proto, Beam, Hrl }
+            Targets = [{Proto, beam_file(Proto), hrl_file(Proto)} ||
+                          Proto <- ProtoFiles],
+
+            %% Compile each proto file
+            compile_each(Config, Targets);
+        false ->
+            ?ERROR("Protobuffs library not present in code path!\n",
+                   []),
+            ?FAIL
     end.
 
-clean(_Config, _AppFile) ->
+proto_clean(_Config, _AppFile, ProtoFiles) ->
     %% Get a list of generated .beam and .hrl files and then delete them
-    Protos = rebar_utils:find_files("src", ".*\\.proto$"),
-    BeamFiles = [fq_beam_file(F) || F <- Protos],
-    HrlFiles = [fq_hrl_file(F) || F <- Protos],
+    BeamFiles = [fq_beam_file(F) || F <- ProtoFiles],
+    HrlFiles = [fq_hrl_file(F) || F <- ProtoFiles],
     Targets = BeamFiles ++ HrlFiles,
-    case Targets of
-        [] ->
-            ok;
-        _ ->
-            delete_each(Targets)
-    end.
+    delete_each(Targets).
 
 %% ===================================================================
 %% Internal functions
 %% ===================================================================
 
-info(help, compile) ->
-    info_help("Build Protobuffs (*.proto) sources");
-info(help, clean) ->
-    info_help("Delete Protobuffs (*.proto) build results").
+proto_info(help, compile) ->
+    info_help();
+proto_info(help, clean) ->
+    info_help().
 
-info_help(Description) ->
+info_help() ->
     ?CONSOLE(
-       "~s.~n"
-       "~n"
        "Valid rebar.config options:~n"
        "  erl_opts is passed as compile_flags to "
        "protobuffs_compile:scan_file/2~n",
-       [Description]).
+       []).
 
 protobuffs_is_present() ->
     code:which(protobuffs_compile) =/= non_existing.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_qc.erl -> rebar-2.6.1.tar.gz/src/rebar_qc.erl Changed

@@ -26,7 +26,10 @@
 %% -------------------------------------------------------------------
 -module(rebar_qc).
 
--export([qc/2, triq/2, eqc/2, clean/2]).
+-export([qc/2,
+         triq/2,
+         eqc/2,
+         clean/2]).
 
 %% for internal use only
 -export([info/2]).
@@ -161,7 +164,7 @@
 
     case CompileOnly of
         "true" ->
-            true = code:set_path(CodePath),
+            true = rebar_utils:cleanup_code_path(CodePath),
             ?CONSOLE("Compiled modules for qc~n", []);
         false ->
             run1(QC, QCOpts, Config, CodePath, SrcErls)
@@ -187,7 +190,7 @@
     rebar_cover_utils:close(CoverLog),
     ok = rebar_cover_utils:exit(),
 
-    true = code:set_path(CodePath),
+    true = rebar_utils:cleanup_code_path(CodePath),
 
     case QCResult of
         [] ->
@@ -208,7 +211,7 @@
 qc_module(QC=eqc, QCOpts, M) -> QC:module(QCOpts, M).
 
 find_prop_mods() ->
-    Beams = rebar_utils:find_files(?QC_DIR, "^[^._].*\\.beam\$"),
+    Beams = rebar_utils:find_files_by_ext(?QC_DIR, ".beam"),
     [M || M <- [rebar_utils:erl_to_mod(Beam) || Beam <- Beams], has_prop(M)].
 
 has_prop(Mod) ->

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_rel_utils.erl -> rebar-2.6.1.tar.gz/src/rebar_rel_utils.erl Changed

@@ -35,6 +35,7 @@
          get_rel_apps/2,
          get_previous_release_path/1,
          get_rel_file_path/2,
+         get_rel_file_path/3,
          load_config/2,
          get_sys_tuple/1,
          get_excl_lib_tuple/1,
@@ -106,9 +107,18 @@
 
 %% Get rel file path from name and path
 get_rel_file_path(Name, Path) ->
-    [RelFile] = filelib:wildcard(filename:join([Path, "releases", "*",
-                                                Name ++ ".rel"])),
-    RelFile.
+    PVer = get_permanent_version(Path),
+    get_rel_file_path(Name, Path, PVer).
+
+get_rel_file_path(Name, Path, Version) ->
+    Dir = filename:join([Path, "releases", Version]),
+    Path1 = filename:join([Dir, Name ++ "_" ++ Version ++".rel"]),
+    Path2 = filename:join([Dir, Name ++ ".rel"]),
+    case {filelib:is_file(Path1), filelib:is_file(Path2)} of
+        {true, _} -> Path1;
+        {_, true} -> Path2;
+        _ -> ?ABORT("can not find .rel file for version ~p~n", [Version])
+    end.
 
 %% Get the previous release path from a global variable
 get_previous_release_path(Config) ->
@@ -128,7 +138,7 @@
         {ok, Terms} ->
             expand_version(Config, Terms, filename:dirname(ReltoolFile));
         Other ->
-            ?ABORT("Failed to load expected config from ~s: ~p\n",
+            ?ABORT("Failed to load expected config from ~s: ~p~n",
                    [ReltoolFile, Other])
     end.
 
@@ -141,7 +151,7 @@
         {sys, _} = SysTuple ->
             SysTuple;
         false ->
-            ?ABORT("Failed to find {sys, [...]} tuple in reltool.config.", [])
+            ?ABORT("Failed to find {sys, [...]} tuple in reltool.config~n", [])
     end.
 
 %%
@@ -244,3 +254,16 @@
     {NewConfig, {rel, Name, VsnString, Apps}};
 expand_rel_version(Config, Other, _Dir) ->
     {Config, Other}.
+
+%% get permanent version from start_erl.data
+get_permanent_version(Path) ->
+    DataFile = filename:join([Path, "releases", "start_erl.data"]),
+    case file:read_file(DataFile) of
+        {ok, DataBin} ->
+            [_, Version] = string:tokens(
+                             string:strip(binary_to_list(DataBin), right, $\n),
+                             " "),
+            Version;
+        {error, enoent} ->
+            ?ABORT("~s is missing~n", [DataFile])
+    end.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_reltool.erl -> rebar-2.6.1.tar.gz/src/rebar_reltool.erl Changed

@@ -117,7 +117,7 @@
             ?ABORT("Reltool support requires the reltool application "
                    "to be installed!", []);
         Path ->
-            ReltoolVsn = filename:basename(Path),
+            ReltoolVsn = reltool_vsn(Path),
             case ReltoolVsn < "reltool-0.5.2" of
                 true ->
                     ?ABORT("Reltool support requires at least reltool-0.5.2; "
@@ -127,6 +127,39 @@
             end
     end.
 
+reltool_vsn(ReltoolPath) ->
+    AppFile = filename:join([ReltoolPath, "ebin", "reltool.app"]),
+    case filelib:is_regular(AppFile) of
+        true ->
+            reltool_vsn_from_app();
+        false ->
+            reltool_vsn_from_path(ReltoolPath)
+    end.
+
+reltool_vsn_from_app() ->
+    ok = case application:load(reltool) of
+             ok ->
+                 ok;
+             {error, {already_loaded, reltool}} ->
+                 ok
+         end,
+    {ok, Vsn} = application:get_key(reltool, vsn),
+    "reltool-" ++ Vsn.
+
+%% NOTE: OTP releases prior to R14B did not install
+%% lib/reltool-x.y.z/ebin/reltool.app. Therefore, if we cannot find the app
+%% file, we have to resort to getting the version string from reltool's lib_dir
+%% path. This usually works, but as reported in
+%% https://github.com/rebar/rebar/issues/415 there can be installations without
+%% version strings in lib_dir paths. Given R13's age and that it's unusual to
+%% have vsn-less lib_dir paths, this shouldn't be a problem.
+%%
+%% TODO: Once we require at least R14B04 (didn't check for existence of
+%% ebin/reltool.app in R14 releases older than R14B04), simplify reltool_vsn/1
+%% to get the version string only from the app key.
+reltool_vsn_from_path(ReltoolPath) ->
+    filename:basename(ReltoolPath).
+
 process_overlay(Config, ReltoolConfig) ->
     TargetDir = rebar_rel_utils:get_target_dir(Config, ReltoolConfig),
 
@@ -163,10 +196,11 @@
 %% providing an additional file on the command-line.
 %%
 overlay_vars(Config, Vars0, ReltoolConfig) ->
-    BaseVars = load_vars_file([proplists:get_value(overlay_vars, ReltoolConfig)]),
+    BaseVars = load_vars_file(
+                 [proplists:get_value(overlay_vars, ReltoolConfig)]),
     OverlayVars = rebar_config:get_global(Config, overlay_vars, []),
     OverrideVars = load_vars_file(string:tokens(OverlayVars, ",")),
-    M = fun merge_overlay_var/3, 
+    M = fun merge_overlay_var/3,
     dict:merge(M, dict:merge(M, Vars0, BaseVars), OverrideVars).
 
 merge_overlay_var(_Key, _Base, Override) -> Override.
@@ -294,7 +328,8 @@
                    {overlay, Overlay} when is_list(Overlay) ->
                        Overlay;
                    false ->
-                       ?INFO("No {overlay, [...]} found in reltool.config.\n", []),
+                       ?INFO("No {overlay, [...]} found in reltool.config.\n",
+                             []),
                        [];
                    _ ->
                        ?ABORT("{overlay, [...]} entry in reltool.config "

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_require_vsn.erl -> rebar-2.6.1.tar.gz/src/rebar_require_vsn.erl Changed

@@ -35,7 +35,7 @@
 
 %% for internal use only
 -export([info/2,
-         version_tuple/2]).
+         version_tuple/3]).
 
 %% ===================================================================
 %% Public API
@@ -71,6 +71,10 @@
        ]).
 
 check_versions(Config) ->
+    ShouldAbort = case rebar_config:get_xconf(Config, keep_going, false) of
+                      true -> keep_going;
+                      false -> abort
+                  end,
     ErtsRegex = rebar_config:get(Config, require_erts_vsn, ".*"),
     ReOpts = [{capture, none}],
     case re:run(erlang:system_info(version), ErtsRegex, ReOpts) of
@@ -78,8 +82,10 @@
             ?DEBUG("Matched required ERTS version: ~s -> ~s\n",
                    [erlang:system_info(version), ErtsRegex]);
         nomatch ->
-            ?ABORT("ERTS version ~s does not match required regex ~s\n",
-                   [erlang:system_info(version), ErtsRegex])
+            maybe_abort(
+              ShouldAbort,
+              "ERTS version ~s does not match required regex ~s\n",
+              [erlang:system_info(version), ErtsRegex])
     end,
 
     OtpRegex = rebar_config:get(Config, require_otp_vsn, ".*"),
@@ -88,15 +94,19 @@
             ?DEBUG("Matched required OTP release: ~s -> ~s\n",
                    [erlang:system_info(otp_release), OtpRegex]);
         nomatch ->
-            ?ABORT("OTP release ~s does not match required regex ~s\n",
-                   [erlang:system_info(otp_release), OtpRegex])
+            maybe_abort(
+              ShouldAbort,
+              "OTP release ~s does not match required regex ~s\n",
+              [erlang:system_info(otp_release), OtpRegex])
     end,
 
     case rebar_config:get(Config, require_min_otp_vsn, undefined) of
         undefined -> ?DEBUG("Min OTP version unconfigured~n", []);
         MinOtpVsn ->
-            {MinMaj, MinMin} = version_tuple(MinOtpVsn, "configured"),
-            {OtpMaj, OtpMin} = version_tuple(erlang:system_info(otp_release),
+            {MinMaj, MinMin} = version_tuple(ShouldAbort, MinOtpVsn,
+                                             "configured"),
+            {OtpMaj, OtpMin} = version_tuple(ShouldAbort,
+                                             erlang:system_info(otp_release),
                                              "OTP Release"),
             case {OtpMaj, OtpMin} >= {MinMaj, MinMin} of
                 true ->
@@ -104,19 +114,27 @@
                            [erlang:system_info(otp_release),
                             MinOtpVsn]);
                 false ->
-                    ?ABORT("OTP release ~s or later is required, you have: ~s~n",
-                           [MinOtpVsn,
-                            erlang:system_info(otp_release)])
+                    maybe_abort(
+                      ShouldAbort,
+                      "OTP release ~s or later is required, you have: ~s~n",
+                      [MinOtpVsn,
+                       erlang:system_info(otp_release)])
             end
     end.
 
-version_tuple(OtpRelease, Type) ->
+version_tuple(ShouldAbort, OtpRelease, Type) ->
     case re:run(OtpRelease, "R?(\\d+)B?-?(\\d+)?", [{capture, all, list}]) of
         {match, [_Full, Maj, Min]} ->
             {list_to_integer(Maj), list_to_integer(Min)};
         {match, [_Full, Maj]} ->
             {list_to_integer(Maj), 0};
         nomatch ->
-            ?ABORT("Cannot parse ~s version string: ~s~n",
-                   [Type, OtpRelease])
+            maybe_abort(ShouldAbort,
+                        "Cannot parse ~s version string: ~s~n",
+                        [Type, OtpRelease])
     end.
+
+maybe_abort(abort, Format, Data) ->
+    ?ABORT(Format, Data);
+maybe_abort(keep_going, Format, Data) ->
+    ?ERROR(Format, Data).

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_templater.erl -> rebar-2.6.1.tar.gz/src/rebar_templater.erl Changed

@@ -242,11 +242,10 @@
 
 find_disk_templates(Config) ->
     OtherTemplates = find_other_templates(Config),
-    HomeFiles = rebar_utils:find_files(filename:join([os:getenv("HOME"),
-                                                      ".rebar", "templates"]),
-                                       ?TEMPLATE_RE),
+    HomeTemplates = filename:join([os:getenv("HOME"), ".rebar", "templates"]),
+    HomeFiles = rebar_utils:find_files_by_ext(HomeTemplates, ".template"),
     Recursive = rebar_config:is_recursive(Config),
-    LocalFiles = rebar_utils:find_files(".", ?TEMPLATE_RE, Recursive),
+    LocalFiles = rebar_utils:find_files_by_ext(".", ".template", Recursive),
     [{file, F} || F <- OtherTemplates ++ HomeFiles ++ LocalFiles].
 
 find_other_templates(Config) ->
@@ -254,7 +253,7 @@
         undefined ->
             [];
         TemplateDir ->
-            rebar_utils:find_files(TemplateDir, ?TEMPLATE_RE)
+            rebar_utils:find_files_by_ext(TemplateDir, ".template")
     end.
 
 select_template([], Template) ->

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_upgrade.erl -> rebar-2.6.1.tar.gz/src/rebar_upgrade.erl Changed

@@ -52,9 +52,10 @@
     OldVerPath = filename:join([TargetParentDir, PrevRelPath]),
 
     %% Run checks to make sure that building a package is possible
-    {NewVerPath, NewName, NewVer} = run_checks(Config, OldVerPath,
-                                               ReltoolConfig),
+    {NewVerPath, NewName, NewVer, OldVer} = run_checks(Config, OldVerPath,
+                                                       ReltoolConfig),
     NameVer = NewName ++ "_" ++ NewVer,
+    OldRelName = get_old_rel_name(OldVerPath, OldVer, NewName),
 
     %% Save the code path prior to doing anything
     OrigPath = code:get_path(),
@@ -63,7 +64,7 @@
     ok = setup(OldVerPath, NewVerPath, NewName, NewVer, NameVer),
 
     %% Build the package
-    run_systools(NameVer, NewName),
+    run_systools(NameVer, OldRelName),
 
     %% Boot file changes
     {ok, _} = boot_files(TargetDir, NewVer, NewName),
@@ -75,7 +76,7 @@
     ok = cleanup(NameVer),
 
     %% Restore original path
-    true = code:set_path(OrigPath),
+    true = rebar_utils:cleanup_code_path(OrigPath),
 
     {ok, Config}.
 
@@ -122,7 +123,7 @@
         rebar_utils:prop_check(Ver == NewVer,
                                "Reltool and .rel versions do not match~n", []),
 
-    {NewVerPath, NewName, NewVer}.
+    {NewVerPath, NewName, NewVer, OldVer}.
 
 setup(OldVerPath, NewVerPath, NewName, NewVer, NameVer) ->
     Src = filename:join([NewVerPath, "releases",
@@ -139,9 +140,9 @@
                                                          "lib", "*", "ebin"]))
                         ])).
 
-run_systools(NewVer, Name) ->
+run_systools(NewVer, OldRelName) ->
     Opts = [silent],
-    NameList = [Name],
+    NameList = [OldRelName],
     case systools:make_relup(NewVer, NameList, NameList, Opts) of
         {error, _, Msg} ->
             ?ABORT("Systools [systools:make_relup/4] aborted with: ~p~n",
@@ -264,3 +265,7 @@
         Error ->
             Error
     end.
+
+get_old_rel_name(OldVerPath, OldVer, Name) ->
+    OldRelFile = rebar_rel_utils:get_rel_file_path(Name, OldVerPath, OldVer),
+    filename:basename(OldRelFile, ".rel").

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_utils.erl -> rebar-2.6.1.tar.gz/src/rebar_utils.erl Changed

@@ -34,6 +34,8 @@
          sh_send/3,
          find_files/2,
          find_files/3,
+         find_files_by_ext/2,
+         find_files_by_ext/3,
          now_str/0,
          ensure_dir/1,
          beam_to_mod/2,
@@ -64,11 +66,15 @@
          base_dir/1,
          processing_base_dir/1,
          processing_base_dir/2,
-         patch_env/2]).
+         patch_env/2,
+         cleanup_code_path/1
+        ]).
 
 %% for internal use only
 -export([otp_release/0]).
 
+-dialyzer({no_missing_calls, escript_foldl/3}).
+
 -include("rebar.hrl").
 
 %% ====================================================================
@@ -86,20 +92,24 @@
         nomatch ->
             false
     end.
-
+%%
+%% REBAR_TARGET_ARCH, if used, should be set to the "standard"
+%% target string. That is a prefix for binutils tools.
+%% "x86_64-linux-gnu" or "arm-linux-gnueabi" are good candidates
+%% ${REBAR_TARGET_ARCH}-gcc, ${REBAR_TARGET_ARCH}-ld ...
+%%
 get_arch() ->
-    Words = wordsize(),
-    otp_release() ++ "-"
-        ++ erlang:system_info(system_architecture) ++ "-" ++ Words.
+    Arch = os:getenv("REBAR_TARGET_ARCH"),
+    Words = wordsize(Arch),
+    otp_release() ++ "-" ++ get_system_arch(Arch) ++ "-" ++ Words.
+
+get_system_arch(Arch) when Arch =:= false; Arch =:= "" ->
+    erlang:system_info(system_architecture);
+get_system_arch(Arch) ->
+    Arch.
 
 wordsize() ->
-    try erlang:system_info({wordsize, external}) of
-        Val ->
-            integer_to_list(8 * Val)
-    catch
-        error:badarg ->
-            integer_to_list(8 * erlang:system_info(wordsize))
-    end.
+    wordsize(os:getenv("REBAR_TARGET_ARCH")).
 
 sh_send(Command0, String, Options0) ->
     ?INFO("sh_send info:\n\tcwd: ~p\n\tcmd: ~s < ~s\n",
@@ -159,6 +169,28 @@
     filelib:fold_files(Dir, Regex, Recursive,
                        fun(F, Acc) -> [F | Acc] end, []).
 
+%% Find files by extension, for example ".erl", avoiding resource fork
+%% files in OS X.  Such files are named for example src/._xyz.erl
+%% Such files may also appear with network filesystems on OS X.
+%%
+%% The Ext is really a regexp, with any leading dot implicitly
+%% escaped, and anchored at the end of the string.
+%%
+find_files_by_ext(Dir, Ext) ->
+    find_files_by_ext(Dir, Ext, true).
+
+find_files_by_ext(Dir, Ext, Recursive) ->
+    %% Convert simple extension to proper regex
+    EscapeDot = case Ext of
+                    "." ++ _ ->
+                        "\\";
+                    _ ->
+                        %% allow for other suffixes, such as _pb.erl
+                        ""
+                end,
+    ExtRe = "^[^._].*" ++ EscapeDot ++ Ext ++ [$$],
+    find_files(Dir, ExtRe, Recursive).
+
 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",
@@ -210,9 +242,11 @@
 
 %% Convert all the entries in the code path to absolute paths.
 expand_code_path() ->
-    CodePath = lists:foldl(fun(Path, Acc) ->
-                                   [filename:absname(Path) | Acc]
-                           end, [], code:get_path()),
+    CodePath = lists:foldl(
+                 fun(Path, Acc) ->
+                         Path1 = rmemo:call(filename, absname, [Path]),
+                         [Path1 | Acc]
+                 end, [], code:get_path()),
     code:set_path(lists:reverse(CodePath)).
 
 %%
@@ -229,8 +263,8 @@
             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]),
+            %% Given variable "FOO", match $FOO\W | $FOOeol | ${FOO}.
+            RegEx = io_lib:format("\\\$(~s(\\W|$)|{~s})", [VarName, VarName]),
             re:replace(InStr, RegEx, [VarValue, "\\2"], ReOpts)
     end.
 
@@ -376,20 +410,47 @@
 %% ====================================================================
 
 otp_release() ->
-    otp_release1(erlang:system_info(otp_release)).
+    rmemo:call(fun otp_release_1/1, [(erlang:system_info(otp_release))]).
 
 %% If OTP <= R16, otp_release is already what we want.
-otp_release1([$R,N|_]=Rel) when is_integer(N) ->
+otp_release_1([$R,N|_]=Rel) when is_integer(N) ->
     Rel;
 %% If OTP >= 17.x, erlang:system_info(otp_release) returns just the
 %% major version number, we have to read the full version from
 %% a file. See http://www.erlang.org/doc/system_principles/versions.html
-%% Read vsn string from the 'OTP_VERSION' file and return as list without
-%% the "\n".
-otp_release1(Rel) ->
-    File = filename:join([code:root_dir(), "releases", Rel, "OTP_VERSION"]),
-    {ok, Vsn} = file:read_file(File),
+otp_release_1(Rel) ->
+    Files = [
+             filename:join([code:root_dir(), "releases", Rel, "OTP_VERSION"]),
+             filename:join([code:root_dir(), "OTP_VERSION"])
+            ],
+
+    %% It's possible that none of the above files exist on the filesystem, in
+    %% which case, we're just going to rely on the provided "Rel" (which should
+    %% just be the value of `erlang:system_info(otp_release)`).
+    case read_otp_version_files(Files) of
+        undefined ->
+            warn_missing_otp_version_file(Rel),
+            Rel;
+        Vsn ->
+            Vsn
+    end.
+
+warn_missing_otp_version_file(Rel) ->
+    ?WARN("No OTP_VERSION file found. Using version string ~p.~n", [Rel]).
+
+%% Try to open each file path provided, and if any of them exist on the
+%% filesystem, read their contents and return the value of the first one found.
+read_otp_version_files([]) ->
+    undefined;
+read_otp_version_files([File | Rest]) ->
+    case file:read_file(File) of
+        {ok, Vsn} -> normalize_otp_version(Vsn);
+        {error, enoent} -> read_otp_version_files(Rest)
+    end.
 
+%% Takes the Version binary as read from the OTP_VERSION file and strips any
+%% trailing "**" and trailing "\n", returning the string as a list.
+normalize_otp_version(Vsn) ->
     %% It's fine to rely on the binary module here because we can
     %% be sure that it's available when the otp_release string does
     %% not begin with $R.
@@ -603,3 +664,159 @@
     end;
 filter_defines([Opt | Rest], Acc) ->
     filter_defines(Rest, [Opt | Acc]).
+
+cleanup_code_path(OrigPath) ->
+    CurrentPath = code:get_path(),
+    AddedPaths = CurrentPath -- OrigPath,
+    %% If someone has removed paths, it's hard to get them back into
+    %% the right order, but since this is currently rare, we can just
+    %% fall back to code:set_path/1.
+    case CurrentPath -- AddedPaths of
+        OrigPath ->
+            _ = [code:del_path(Path) || Path <- AddedPaths],
+            true;
+        _ ->
+            code:set_path(OrigPath)
+    end.
+
+wordsize(Arch) when Arch =:= false; Arch =:= "" ->
+    native_wordsize();
+wordsize(Arch) ->
+    AllArchs = [
+                {"i686","32"},
+                {"i386","32"},
+                {"arm","32"},
+                {"aarch64", "64"},
+                {"x86_64","64"}
+               ],
+    case match_wordsize(Arch, AllArchs) of
+        false ->
+            case cross_wordsize(Arch) of
+                "" ->
+                    env_wordsize(os:getenv("REBAR_TARGET_ARCH_WORDSIZE"));
+                WordSize ->
+                    WordSize
+            end;
+        {_, Wordsize} ->
+            Wordsize
+    end.
+
+match_wordsize(Arch, [V={Match,_Bits}|Vs]) ->
+    case re:run(Arch, Match, [{capture, none}]) of
+        match ->
+            V;
+        nomatch ->
+            match_wordsize(Arch, Vs)
+    end;
+match_wordsize(_Arch, []) ->
+    false.
+
+env_wordsize(Wordsize) when Wordsize =:= false;
+                            Wordsize =:= "" ->
+    ?WARN("REBAR_TARGET_ARCH_WORDSIZE not set, assuming 32\n", []),
+    "32";
+env_wordsize(Wordsize) ->
+    case Wordsize of
+        "16" -> Wordsize;
+        "32" -> Wordsize;
+        "64" -> Wordsize;
+        _ ->
+            ?WARN("REBAR_TARGET_ARCH_WORDSIZE bad value: ~p\n", [Wordsize]),
+            "32"
+    end.
+
+%%
+%% Find out the word size of the target by using Arch-gcc
+%%
+cross_wordsize(Arch) ->
+    cross_sizeof(Arch, "void*").
+
+%%
+%% Find the size of target Type using a specially crafted C file
+%% that will report an error on the line of the byte size of the type.
+%%
+cross_sizeof(Arch, Type) ->
+    Compiler = if Arch =:= "" -> "cc";
+                  true -> Arch ++ "-gcc"
+               end,
+    TempFile = mktempfile(".c"),
+    ok = file:write_file(TempFile,
+                         <<"int t01 [1 - 2*(((long) (sizeof (TYPE))) == 1)];\n"
+                           "int t02 [1 - 2*(((long) (sizeof (TYPE))) == 2)];\n"
+                           "int t03 [1 - 2*(((long) (sizeof (TYPE))) == 3)];\n"
+                           "int t04 [1 - 2*(((long) (sizeof (TYPE))) == 4)];\n"
+                           "int t05 [1 - 2*(((long) (sizeof (TYPE))) == 5)];\n"
+                           "int t06 [1 - 2*(((long) (sizeof (TYPE))) == 6)];\n"
+                           "int t07 [1 - 2*(((long) (sizeof (TYPE))) == 7)];\n"
+                           "int t08 [1 - 2*(((long) (sizeof (TYPE))) == 8)];\n"
+                           "int t09 [1 - 2*(((long) (sizeof (TYPE))) == 9)];\n"
+                           "int t10 [1 - 2*(((long) (sizeof (TYPE))) == 10)];\n"
+                           "int t11 [1 - 2*(((long) (sizeof (TYPE))) == 11)];\n"
+                           "int t12 [1 - 2*(((long) (sizeof (TYPE))) == 12)];\n"
+                           "int t13 [1 - 2*(((long) (sizeof (TYPE))) == 13)];\n"
+                           "int t14 [1 - 2*(((long) (sizeof (TYPE))) == 14)];\n"
+                           "int t15 [1 - 2*(((long) (sizeof (TYPE))) == 15)];\n"
+                           "int t16 [1 - 2*(((long) (sizeof (TYPE))) == 16)];\n"
+                         >>),
+    Cmd = Compiler ++ " -DTYPE=\""++Type++"\" " ++ TempFile,
+    ShOpts = [{use_stdout, false}, return_on_error],
+    {ok, Res} = sh(Cmd, ShOpts),
+    ok = file:delete(TempFile),
+    case string:tokens(Res, ":") of
+        [_, Ln | _] ->
+            try list_to_integer(Ln) of
+                NumBytes -> integer_to_list(NumBytes*8)
+            catch
+                error:_ ->
+                    ""
+            end;
+        _ ->
+            ""
+    end.
+
+mktempfile(Suffix) ->
+    {A,B,C} = rebar_now(),
+    Dir = temp_dir(),
+    File = "rebar_"++os:getpid()++
+        integer_to_list(A)++"_"++
+        integer_to_list(B)++"_"++
+        integer_to_list(C)++Suffix,
+    filename:join(Dir, File).
+
+temp_dir() ->
+    case os:type() of
+        {win32, _} -> windows_temp_dir();
+        _ -> "/tmp"
+    end.
+
+windows_temp_dir() ->
+    case os:getenv("TEMP") of
+        false ->
+            case os:getenv("TMP") of
+                false -> "C:/WINDOWS/TEMP";
+                TMP -> TMP
+            end;
+        TEMP -> TEMP
+    end.
+
+rebar_now() ->
+    case erlang:function_exported(erlang, timestamp, 0) of
+        true ->
+            erlang:timestamp();
+        false ->
+            %% erlang:now/0 was deprecated in 18.0. One solution to avoid the
+            %% deprecation warning is to use
+            %% -compile({nowarn_deprecated_function, [{erlang, now, 0}]}), but
+            %% that would raise a warning in versions older than 18.0.  Calling
+            %% erlang:now/0 via apply/3 avoids that.
+            apply(erlang, now, [])
+    end.
+
+native_wordsize() ->
+    try erlang:system_info({wordsize, external}) of
+        Val ->
+            integer_to_list(8 * Val)
+    catch
+        error:badarg ->
+            integer_to_list(8 * erlang:system_info(wordsize))
+    end.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/src/rebar_xref.erl -> rebar-2.6.1.tar.gz/src/rebar_xref.erl Changed

@@ -59,6 +59,11 @@
     OrigPath = code:get_path(),
     true = code:add_path(rebar_utils:ebin_dir()),
 
+    %% Add extra paths to code path to, for example, be used
+    %%   when behaviour modules are defined
+    [code:add_path(Path)
+     || Path <- rebar_config:get(Config, xref_extra_paths, [])],
+
     %% Get list of xref checks we want to run
     ConfXrefChecks = rebar_config:get(Config, xref_checks,
                                       [exports_not_used,
@@ -80,14 +85,19 @@
     QueryNoWarn = lists:all(fun check_query/1, QueryChecks),
 
     %% Restore the original code path
-    true = code:set_path(OrigPath),
+    true = rebar_utils:cleanup_code_path(OrigPath),
 
     %% Stop xref
     stopped = xref:stop(xref),
 
     case lists:member(false, [XrefNoWarn, QueryNoWarn]) of
         true ->
-            ?FAIL;
+            case rebar_config:get_xconf(Config, keep_going, false) of
+                false ->
+                    ?FAIL;
+                true ->
+                    ok
+            end;
         false ->
             ok
     end.
@@ -182,7 +192,8 @@
     lists:flatmap(fun({K, L}) when Key =:= K -> L; (_) -> [] end, List).
 
 get_behaviour_callbacks(exports_not_used, Attributes) ->
-    [B:behaviour_info(callbacks) || B <- keyall(behaviour, Attributes)];
+    [B:behaviour_info(callbacks) ||
+        B <- keyall(behaviour, Attributes) ++ keyall(behavior, Attributes)];
 get_behaviour_callbacks(_XrefCheck, _Attributes) ->
     [].

rebar-2.6.1.tar.gz/src/rmemo.erl Added

@@ -0,0 +1,290 @@
+%%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%%% ex: ft=erlang ts=4 sw=4 et
+%%%
+%%%-------------------------------------------------------------------
+%%% @author Tuncer Ayaz
+%%% @copyright 2015, Tuncer Ayaz
+%%% @doc
+%%% memoization server
+%%% @end
+%%%-------------------------------------------------------------------
+%%%
+%%% Copyright (c) 2015 Tuncer Ayaz
+%%%
+%%% Permission to use, copy, modify, and/or distribute this software
+%%% for any purpose with or without fee is hereby granted, provided
+%%% that the above copyright notice and this permission notice appear
+%%% in all copies.
+%%%
+%%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+%%% WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+%%% WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+%%% AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+%%% CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+%%% LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+%%% NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+%%% CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+%% rebar-specific modifications:
+%% 1. rename to rmemo.erl
+%% 2. add support for R13 (see ets_tab/0)
+
+-module(rmemo).
+
+-behaviour(gen_server).
+
+%% API
+-export(
+   [
+    start/0,
+    start_link/0,
+    stop/0,
+    call/2,
+    call/3
+   ]).
+
+%% gen_server callbacks
+-export(
+   [
+    init/1,
+    handle_call/3,
+    handle_cast/2,
+    handle_info/2,
+    terminate/2,
+    code_change/3
+   ]).
+
+-define(SERVER, ?MODULE).
+-define(TABLE, ?MODULE).
+
+-record(state,
+        {
+          ets_tab :: ets:tab()
+        }).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+
+%%--------------------------------------------------------------------
+%% @doc
+%% Start the server
+%% @end
+%%--------------------------------------------------------------------
+-type reason() :: term().
+-type error() :: {error, reason()}.
+-type start_res() :: {ok, pid()} | 'ignore' | error().
+-spec start() -> start_res().
+start() ->
+    gen_server:start({local, ?SERVER}, ?MODULE, [], []).
+
+%%--------------------------------------------------------------------
+%% @doc
+%% Start the server
+%% @end
+%%--------------------------------------------------------------------
+-type start_link_res() :: start_res().
+-spec start_link() -> start_link_res().
+start_link() ->
+    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
+
+%%--------------------------------------------------------------------
+%% @doc
+%% Stop the server
+%% @end
+%%--------------------------------------------------------------------
+stop() ->
+    gen_server:cast(?SERVER, stop).
+
+%%--------------------------------------------------------------------
+%% @doc
+%% Call function and memoize result
+%%
+%% Instead of
+%%
+%% <code>Res = Fun(A1, A2, [List1])</code>
+%%
+%% you call
+%%
+%% <code>Res = memo:call(Fun, [A1, A2, [List1]])</code>
+%%
+%% or instead of
+%%
+%% <code>
+%% Res = mod:expensive_function(A1, A2, [List1])
+%% </code>
+%%
+%% you call
+%%
+%% <code>
+%% Res = memo:call(fun mod:expensive_function/3, [A1, A2, [List1]])
+%% </code>
+%%
+%% and any subsequent call will fetch the cached result and avoid the
+%% computation.
+%%
+%% This is of course only useful for expensive computations that are
+%% known to produce the same result given same arguments. It's worth
+%% mentioning that your call should be side-effect free, as naturally
+%% those won't be replayed.
+%%
+%% @end
+%%--------------------------------------------------------------------
+-type fun_args() :: list().
+-spec call(fun(), fun_args()) -> term().
+call(F, A) ->
+    call_1({F, A}).
+
+%%--------------------------------------------------------------------
+%% @doc
+%% Call function and memoize result
+%%
+%% Instead of
+%%
+%% <code>Res = mod:expensive_function(A1, A2, [List1])</code>
+%%
+%% you call
+%%
+%% <code>Res = memo:call(mod, expensive_function, [A1, A2, [List1]])</code>
+%%
+%% and any subsequent call will fetch the cached result and avoid the
+%% computation.
+%%
+%% This is of course only useful for expensive computations that are
+%% known to produce the same result given same arguments. It's worth
+%% mentioning that your call should be side-effect free, as naturally
+%% those won't be replayed.%%
+%%
+%% @end
+%%--------------------------------------------------------------------
+%% fun() is not just the name of a fun, so we define an alias for
+%% atom() for call(M, F, A).
+-type fun_name() :: atom().
+-spec call(module(), fun_name(), fun_args()) -> term().
+call(M, F, A) when is_list(A) ->
+    call_1({M, F, A}).
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% Initialize the server
+%% @end
+%%--------------------------------------------------------------------
+init(_) ->
+    {ok,
+     #state{
+        ets_tab = ets_tab()
+       }
+    }.
+
+-spec ets_tab() -> ets:tab().
+ets_tab() ->
+    Concurrency =
+        %% read_concurrency was added in R14. If we're running R13,
+        %% do not try to use it.
+        case erlang:system_info(version) =< "5.8.3" of
+            true ->
+                [];
+            false ->
+                [{read_concurrency, true}]
+        end,
+    ets:new(
+      ?TABLE,
+      [
+       named_table,
+       protected,
+       set
+      ]
+      ++ Concurrency
+     ).
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% Handle call messages
+%% @end
+%%--------------------------------------------------------------------
+handle_call({save, Key, Res}, _From, State) ->
+    {reply, save(Key, Res), State};
+handle_call(_Request, _From, State) ->
+    {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% Handle cast messages
+%% @end
+%%--------------------------------------------------------------------
+handle_cast(stop, State) ->
+    {stop, normal, State};
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% Handle all non call/cast messages
+%% @end
+%%--------------------------------------------------------------------
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% This function is called by a gen_server when it is about to
+%% terminate. It should be the opposite of Module:init/1 and do any
+%% necessary cleaning up. When it returns, the gen_server terminates
+%% with Reason. The return value is ignored.
+%% @end
+%%--------------------------------------------------------------------
+terminate(_Reason, _State) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% Convert process state when code is changed
+%% @end
+%%--------------------------------------------------------------------
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================
+
+-type call() :: {module(), fun_name(), fun_args()} | {fun(), fun_args()}.
+-spec call_1(call()) -> term().
+call_1(Call) ->
+    Key = key(Call),
+    case ets:lookup(?TABLE, Key) of
+        [] ->
+            Res = apply(Call),
+            true = gen_server:call(?SERVER, {save, Key, Res}, infinity),
+            Res;
+        [{Key, Mem}] ->
+            Mem
+    end.
+
+-type key_args() :: call().
+-type key() :: non_neg_integer().
+-spec key(key_args()) -> key().
+key(Call) ->
+    erlang:phash2(Call).
+
+-spec apply(call()) -> term().
+apply({F, A}) ->
+    erlang:apply(F, A);
+apply({M, F, A}) ->
+    erlang:apply(M, F, A).
+
+-type val() :: term().
+-spec save(key(), val()) -> true.
+save(K, V) ->
+    ets:insert(?TABLE, {K, V}).

rebar-2.6.1.tar.gz/test/rebar_compiler_tests.erl Added

@@ -0,0 +1,192 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2014 Vlad Dumitrescu (vladdu55@gmail.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.
+%% -------------------------------------------------------------------
+%% @author Vlad Dumitrescu <vladdu55@gmail.com>
+%% @author Chris Bernard <cebernard@gmail.com>
+%% @doc This tests functionality provided by the rebar command 'compile'.
+%% -------------------------------------------------------------------
+-module(rebar_compiler_tests).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+%% Assuming this test is run inside the rebar 'eunit'
+%% command, the current working directory will be '.eunit'
+-define(REBAR_SCRIPT, "../rebar").
+
+-define(TMP_DIR, "tmp_eunit/").
+
+%% ====================================================================
+%% Rebar compiler tests
+%% ====================================================================
+
+keep_going_test_() ->
+    {"Ensure compiler keeps going after finding errors, when --keep-going is requested",
+     setup,
+     fun() ->
+             setup_basic_project(),
+             rebar("-k compile")
+     end,
+     fun teardown/1,
+     fun(RebarOut)->
+             [
+              {"Continue after error",
+               ?_assert(string:str(RebarOut, "Continuing after build error") =/= 0)},
+              ?_assert(string:str(RebarOut, "ERROR: compile failed") == 0)
+             ] ++ assert_files_in("ebin", ["ebin/myapp_mymod2.beam"])
+     end
+    }.
+
+keep_going_firstfiles_test_() ->
+    {"Ensure compiler keeps going after finding errors in erl_first_files, when --keep-going is requested",
+     setup,
+     fun() ->
+             setup_basic_project(),
+             setup_rebar_config(),
+             rebar("-k compile")
+     end,
+     fun teardown/1,
+     fun(RebarOut)->
+             [
+              {"Continue after error",
+               ?_assert(string:str(RebarOut, "Continuing after build error") =/= 0)},
+              ?_assert(string:str(RebarOut, "ERROR: compile failed") == 0)
+             ] ++ assert_files_in("ebin", ["ebin/myapp_mymod2.beam"])
+     end
+    }.
+
+not_keep_going_test_() ->
+    {"Ensure compiler stops after finding errors",
+     setup,
+     fun() ->
+             setup_basic_project(),
+             setup_rebar_config(),
+             rebar("compile")
+     end,
+     fun teardown/1,
+     fun(RebarOut)->
+             [
+              {"Exit after error",
+               ?_assert(string:str(RebarOut, "ERROR: compile failed") =/= 0)}
+             ] ++ assert_files_not_in("ebin", ["ebin/myapp_mymod2.beam"])
+     end
+    }.
+
+%% ====================================================================
+%% Setup and Teardown
+%% ====================================================================
+
+-define(rebar_config,
+        ["{erl_first_files, [\"src/myapp_mymod1.erl\"]}."
+        ]).
+
+%% this file has a syntax error
+-define(myapp_mymod1,
+        ["-module(myapp_mymod1).\n",
+         "-export([myfunc/0]).\n",
+         "my func() -> [4], ok.\n"]).
+
+-define(myapp_mymod2,
+        ["-module(myapp_mymod2).\n",
+         "-export([myfunc/0]).\n",
+         "myfunc() -> [4], ok.\n"]).
+
+
+make_tmp_dir() ->
+    case file:make_dir(?TMP_DIR) of
+        ok ->
+            ok;
+        {error, eexist} ->
+            remove_tmp_dir(),
+            make_tmp_dir();
+        Error ->
+            throw(Error)
+    end.
+
+setup_environment() ->
+    ok = make_tmp_dir(),
+    prepare_rebar_script(),
+    ok = file:set_cwd(?TMP_DIR).
+
+setup_rebar_config() ->
+    ok = file:write_file("rebar.config", ?rebar_config).
+
+setup_basic_project() ->
+    setup_environment(),
+    rebar("create-app appid=myapp"),
+    ok = file:make_dir("ebin"),
+    ok = file:write_file("src/myapp_mymod1.erl", ?myapp_mymod1),
+    ok = file:write_file("src/myapp_mymod2.erl", ?myapp_mymod2).
+
+teardown(_) ->
+    ok = file:set_cwd(".."),
+    ok = remove_tmp_dir().
+
+remove_tmp_dir() ->
+    remove_tmp_dir(arg_for_eunit).
+
+remove_tmp_dir(_) ->
+    ok = rebar_file_utils:rm_rf(?TMP_DIR).
+
+%% ====================================================================
+%% Helper Functions
+%% ====================================================================
+
+prepare_rebar_script() ->
+    Rebar = ?TMP_DIR ++ "rebar",
+    {ok, _} = file:copy(?REBAR_SCRIPT, Rebar),
+    case os:type() of
+        {unix, _} ->
+            [] = os:cmd("chmod u+x " ++ Rebar);
+        {win32, _} ->
+            {ok, _} = file:copy(?REBAR_SCRIPT ++ ".cmd",
+                                ?TMP_DIR ++ "rebar.cmd")
+    end.
+
+rebar() ->
+    rebar([]).
+
+rebar(Args) when is_list(Args) ->
+    Out = os:cmd(filename:nativename("./rebar") ++ " " ++ Args),
+    %% ?debugMsg("**** Begin"), ?debugMsg(Out), ?debugMsg("**** End"),
+    Out.
+
+assert_dirs_in(Name, [Dir|T]) ->
+    [{Name ++ " has directory: " ++ Dir, ?_assert(filelib:is_dir(Dir))} |
+         assert_dirs_in(Name, T)];
+assert_dirs_in(_, []) -> [].
+
+assert_files_in(Name, [File|T]) ->
+    [{Name ++ " has file: " ++ File, ?_assert(filelib:is_regular(File))} |
+         assert_files_in(Name, T)];
+assert_files_in(_, []) -> [].
+
+assert_files_not_in(Name, [File|T]) ->
+    [{Name ++ " does not have file: " ++ File,
+      ?_assertNot(filelib:is_regular(File))} | assert_files_not_in(Name, T)];
+assert_files_not_in(_, []) -> [].
+

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/test/rebar_eunit_tests.erl -> rebar-2.6.1.tar.gz/test/rebar_eunit_tests.erl Changed

@@ -131,7 +131,7 @@
 
                {"Selected suite's generator test raises an error",
                 ?_assert(string:str(RebarOut,
-                                    "assertEqual_failed") =/= 0)},
+                                    "assertEqual") =/= 0)},
 
                {"Selected suite tests is run once",
                 ?_assert(string:str(RebarOut, "Failed: 1.") =/= 0)}]
@@ -231,7 +231,21 @@
                 [?_assert(string:str(RebarOut,
                                      "Failed: 1.  Skipped: 0.  Passed: 1")
                           =/= 0)]}]
-      end}].
+      end},
+     {"Ensure EUnit runs a test with eunit_first_files",
+      setup,
+      fun() ->
+              setup_eunit_first_files(),
+              rebar("eunit")
+      end,
+      fun teardown/1,
+      fun(RebarOut) ->
+              [
+               {"Don't pass tests without erl_first_file",
+                [?_assert(string:str(RebarOut,
+                                     "Test passed.") =/= 0)]}]
+      end}
+    ].
 
 cover_test_() ->
     {"Ensure Cover runs with tests in a test dir and no defined suite",
@@ -325,6 +339,62 @@
                          ["test/myapp_mymod_tests.erl",
                           "src/myapp_mymod.erl"])}.
 
+code_path_test_() ->
+    [{"Ensuring that fast code path cleanup is correct for adds",
+      setup, fun make_tmp_dir/0,
+      fun(_) -> remove_tmp_dir() end,
+      fun() ->
+              OPath = code:get_path(),
+              PathZ = ?TMP_DIR ++ "some_path",
+              PathA = ?TMP_DIR ++ "some_other_path",
+              ok = file:make_dir(PathZ),
+              ok = file:make_dir(PathA),
+              true = code:add_pathz(PathZ),
+              true = code:add_patha(PathA),
+              %% make sure that they've been added
+              ?assertEqual([PathA] ++ OPath ++ [PathZ],
+                           code:get_path()),
+              true = rebar_utils:cleanup_code_path(OPath),
+              ?assertEqual(OPath, code:get_path())
+      end},
+     {"Ensuring that fast code path cleanup is correct for removes",
+      setup, fun make_tmp_dir/0,
+      fun(_) -> remove_tmp_dir() end,
+      fun() ->
+              OPath = code:get_path(),
+              Path1 = lists:nth(10, OPath),
+              Path2 = lists:nth(11, OPath),
+              true = code:del_path(Path1),
+              true = code:del_path(Path2),
+              %% make sure that they've been added
+              ?assertEqual(OPath -- [Path1, Path2],
+                           code:get_path()),
+              true = rebar_utils:cleanup_code_path(OPath),
+              ?assertEqual(OPath, code:get_path())
+      end},
+     {"Ensuring that fast code path cleanup is equivalent for adds",
+      setup, fun make_tmp_dir/0,
+      fun(_) -> remove_tmp_dir() end,
+      fun() ->
+              OPath = code:get_path(),
+              PathZ = ?TMP_DIR ++ "some_path",
+              PathA = ?TMP_DIR ++ "some_other_path",
+              ok = file:make_dir(PathZ),
+              ok = file:make_dir(PathA),
+              true = code:add_pathz(PathZ),
+              true = code:add_patha(PathA),
+              %% make sure that they've been added
+              ?assertEqual([PathA] ++ OPath ++ [PathZ],
+                           code:get_path()),
+              true = rebar_utils:cleanup_code_path(OPath),
+              CleanedPath = code:get_path(),
+              true = code:add_pathz(PathZ),
+              true = code:add_patha(PathA),
+              true = code:set_path(OPath),
+              ?assertEqual(CleanedPath, code:get_path())
+      end}].
+
+
 %% ====================================================================
 %% Setup and Teardown
 %% ====================================================================
@@ -364,6 +434,19 @@
          "myfunc3() -> ok.\n",
          "mygenerator_test_() -> [?_assertEqual(true, false)].\n"]).
 
+-define(myapp_mymod4,
+        ["-module(myapp_mymod4).\n",
+         "-compile({parse_transform, myapp_mymod4_parse_transform}).\n",
+         "-include_lib(\"eunit/include/eunit.hrl\").\n",
+         "-export([ok/0]).\n",
+         "pt_test() -> ?assert(myapp_mymod4:ok()).\n"]).
+
+-define(myapp_mymod4_parse_transform,
+        ["-module(myapp_mymod4_parse_transform).\n",
+         "-export([parse_transform/2]).\n",
+         "parse_transform(Forms, _Options) ->\n",
+         "Forms ++ [{function,29,ok,0,[{clause,9,[],[],[{atom,9,true}]}]}].\n"]).
+
 -define(mysuite,
         ["-module(mysuite).\n",
          "-export([all_test_/0]).\n",
@@ -406,6 +489,15 @@
     ok = file:write_file("src/myapp_mymod2.erl", ?myapp_mymod2),
     ok = file:write_file("src/myapp_mymod3.erl", ?myapp_mymod3).
 
+setup_eunit_first_files() ->
+    setup_environment(),
+    rebar("create-app appid=myapp"),
+    ok = file:write_file("src/myapp_mymod4.erl", ?myapp_mymod4),
+    ok = file:write_file("src/myapp_mymod4_parse_transform.erl",
+                ?myapp_mymod4_parse_transform),
+    ok = file:write_file("rebar.config",
+        "{erl_first_files, [\"src/myapp_mymod4_parse_transform.erl\"]}.\n").
+
 setup_cover_project() ->
     setup_basic_project(),
     ok = file:write_file("rebar.config", "{cover_enabled, true}.\n").

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/test/rebar_file_utils_tests.erl -> rebar-2.6.1.tar.gz/test/rebar_file_utils_tests.erl Changed

@@ -35,9 +35,14 @@
 -include_lib("eunit/include/eunit.hrl").
 
 -define(TMP_DIR, "tmp_file_utils").
--define(DIR_TREE, [{d,"source",[{f,"file1"},
-                                {f,"file2"}]},
-                   {d,"dest",[]}]).
+
+-define(SRC, "source dir?").
+-define(DST, "dest (dir)").
+-define(FILE1, "file 1").
+-define(FILE2, "file(2)").
+-define(DIR_TREE, [{d,?SRC,[{f,?FILE1},
+                            {f,?FILE2}]},
+                   {d,?DST,[]}]).
 -define(FILE_CONTENT, <<"1234567890">>).
 
 %% ====================================================================
@@ -57,7 +62,7 @@
              rebar_file_utils:delete_each(file_list())
      end,
      fun teardown/1,
-     [assert_files_not_in("source", file_list())]}.
+     [assert_files_not_in(?SRC, file_list())]}.
 
 %% ====================================================================
 %% rm_rf tests
@@ -68,20 +73,20 @@
      setup,
      fun() ->
              setup(),
-             rebar_file_utils:rm_rf(filename:join([?TMP_DIR,"source","file*"]))
+             rebar_file_utils:rm_rf(filename:join([?TMP_DIR,?SRC,"file*"]))
      end,
      fun teardown/1,
-     [assert_files_not_in("source", file_list())]}.
+     [assert_files_not_in(?SRC, file_list())]}.
 
 rm_rf_dir_test_() ->
     {"rm_rf removes directory tree",
      setup,
      fun() ->
              setup(),
-             rebar_file_utils:rm_rf(filename:join([?TMP_DIR,"source"]))
+             rebar_file_utils:rm_rf(filename:join([?TMP_DIR,?SRC]))
      end,
      fun teardown/1,
-     [?_assertNot(filelib:is_dir(filename:join([?TMP_DIR,"source"])))]}.
+     [?_assertNot(filelib:is_dir(filename:join([?TMP_DIR,?SRC])))]}.
 
 %% ====================================================================
 %% cp_r tests
@@ -92,47 +97,47 @@
      setup,
      fun() ->
              setup(),
-             rebar_file_utils:cp_r([filename:join([?TMP_DIR,"source","file1"])],
-                                   filename:join([?TMP_DIR,"dest","new_file"]))
+             rebar_file_utils:cp_r([filename:join([?TMP_DIR,?SRC,?FILE1])],
+                                   filename:join([?TMP_DIR,?DST,"new_file"]))
      end,
      fun teardown/1,
-     [?_assert(filelib:is_regular(filename:join([?TMP_DIR,"dest","new_file"])))]}.
+     [?_assert(filelib:is_regular(filename:join([?TMP_DIR,?DST,"new_file"])))]}.
 
 cp_r_file_to_dir_test_() ->
     {"cp_r copies a file to directory",
      setup,
      fun() ->
              setup(),
-             rebar_file_utils:cp_r([filename:join([?TMP_DIR,"source","file1"])],
-                                   filename:join([?TMP_DIR,"dest"]))
+             rebar_file_utils:cp_r([filename:join([?TMP_DIR,?SRC,?FILE1])],
+                                   filename:join([?TMP_DIR,?DST]))
      end,
      fun teardown/1,
-     [?_assert(filelib:is_regular(filename:join([?TMP_DIR,"dest","file1"])))]}.
+     [?_assert(filelib:is_regular(filename:join([?TMP_DIR,?DST,?FILE1])))]}.
 
 cp_r_dir_to_dir_test_() ->
     {"cp_r copies a directory to directory",
      setup,
      fun() ->
              setup(),
-             rebar_file_utils:cp_r([filename:join([?TMP_DIR,"source"])],
-                                   filename:join([?TMP_DIR,"dest"]))
+             rebar_file_utils:cp_r([filename:join([?TMP_DIR,?SRC])],
+                                   filename:join([?TMP_DIR,?DST]))
      end,
      fun teardown/1,
-     [?_assert(filelib:is_dir(filename:join([?TMP_DIR,"dest","source"]))),
+     [?_assert(filelib:is_dir(filename:join([?TMP_DIR,?DST,?SRC]))),
       assert_files_in("dest/source",
-                      [filename:join([?TMP_DIR,"dest","source",F]) ||
-                          F <- ["file1","file2"]])]}.
+                      [filename:join([?TMP_DIR,?DST,?SRC,F]) ||
+                          F <- [?FILE1,?FILE2]])]}.
 
 cp_r_wildcard_file_to_dir_test_() ->
     {"cp_r copies wildcard files to directory",
      setup,
      fun() ->
              setup(),
-             rebar_file_utils:cp_r([filename:join([?TMP_DIR,"source","*1"])],
-                                   filename:join([?TMP_DIR,"dest"]))
+             rebar_file_utils:cp_r([filename:join([?TMP_DIR,?SRC,"*1"])],
+                                   filename:join([?TMP_DIR,?DST]))
      end,
      fun teardown/1,
-     [?_assert(filelib:is_regular(filename:join([?TMP_DIR,"dest","file1"])))]}.
+     [?_assert(filelib:is_regular(filename:join([?TMP_DIR,?DST,?FILE1])))]}.
 
 cp_r_wildcard_dir_to_dir_test_() ->
     {"cp_r copies wildcard directory to directory",
@@ -140,45 +145,45 @@
      fun() ->
              setup(),
              rebar_file_utils:cp_r([filename:join([?TMP_DIR,"sour*"])],
-                                   filename:join([?TMP_DIR,"dest"]))
+                                   filename:join([?TMP_DIR,?DST]))
      end,
      fun teardown/1,
-     [?_assert(filelib:is_dir(filename:join([?TMP_DIR,"dest","source"]))),
+     [?_assert(filelib:is_dir(filename:join([?TMP_DIR,?DST,?SRC]))),
       assert_files_in("dest/source",
-                      [filename:join([?TMP_DIR,"dest","source",F]) ||
-                          F <- ["file1","file2"]])]}.
+                      [filename:join([?TMP_DIR,?DST,?SRC,F]) ||
+                          F <- [?FILE1,?FILE2]])]}.
 
 cp_r_overwrite_file_test_() ->
     {"cp_r overwrites destination file",
      setup,
      fun() ->
              setup(),
-             ok = file:write_file(filename:join([?TMP_DIR,"dest","file1"]),
+             ok = file:write_file(filename:join([?TMP_DIR,?DST,?FILE1]),
                                   <<"test">>),
-             rebar_file_utils:cp_r([filename:join([?TMP_DIR,"source","file1"])],
-                                   filename:join([?TMP_DIR,"dest"]))
+             rebar_file_utils:cp_r([filename:join([?TMP_DIR,?SRC,?FILE1])],
+                                   filename:join([?TMP_DIR,?DST]))
      end,
      fun teardown/1,
      [?_assertMatch({ok,?FILE_CONTENT},
                     file:read_file(
-                      filename:join([?TMP_DIR,"dest","file1"])))]}.
+                      filename:join([?TMP_DIR,?DST,?FILE1])))]}.
 
 cp_r_overwrite_dir_test_() ->
     {"cp_r overwrites destination file (xcopy case on win32)",
      setup,
      fun() ->
              setup(),
-             ok = file:make_dir(filename:join([?TMP_DIR,"dest","source"])),
+             ok = file:make_dir(filename:join([?TMP_DIR,?DST,?SRC])),
              ok = file:write_file(
-                    filename:join([?TMP_DIR,"dest","source","file1"]),
+                    filename:join([?TMP_DIR,?DST,?SRC,?FILE1]),
                     <<"test">>),
-             rebar_file_utils:cp_r([filename:join([?TMP_DIR,"source"])],
-                                   filename:join([?TMP_DIR,"dest"]))
+             rebar_file_utils:cp_r([filename:join([?TMP_DIR,?SRC])],
+                                   filename:join([?TMP_DIR,?DST]))
      end,
      fun teardown/1,
      [?_assertMatch({ok,?FILE_CONTENT},
                     file:read_file(
-                      filename:join([?TMP_DIR,"dest","source","file1"])))]}.
+                      filename:join([?TMP_DIR,?DST,?SRC,?FILE1])))]}.
 
 cp_r_overwrite_file_fail_test_() ->
     {"cp_r fails to fs permission errors (file:copy/2 case on win32)",
@@ -186,15 +191,15 @@
      fun() ->
              setup(),
              ok = file:write_file(
-                    filename:join([?TMP_DIR,"dest","file1"]),<<"test">>),
+                    filename:join([?TMP_DIR,?DST,?FILE1]),<<"test">>),
              ok = file:change_mode(
-                    filename:join([?TMP_DIR,"dest","file1"]),0)
+                    filename:join([?TMP_DIR,?DST,?FILE1]),0)
      end,
      fun teardown/1,
      [?_assertThrow(rebar_abort,
                     rebar_file_utils:cp_r(
-                      [filename:join([?TMP_DIR,"source","file1"])],
-                      filename:join([?TMP_DIR,"dest"])))]}.
+                      [filename:join([?TMP_DIR,?SRC,?FILE1])],
+                      filename:join([?TMP_DIR,?DST])))]}.
 
 cp_r_overwrite_dir_fail_test_() ->
     {"cp_r fails to fs permission error (xcopy case on win32)",
@@ -202,50 +207,49 @@
      fun() ->
              setup(),
              ok = file:make_dir(
-                    filename:join([?TMP_DIR,"dest","source"])),
+                    filename:join([?TMP_DIR,?DST,?SRC])),
              ok = file:write_file(
-                    filename:join([?TMP_DIR,"dest","source","file1"]),
+                    filename:join([?TMP_DIR,?DST,?SRC,?FILE1]),
                     <<"test">>),
              ok = file:change_mode(
-                    filename:join([?TMP_DIR,"dest","source","file1"]),0)
+                    filename:join([?TMP_DIR,?DST,?SRC,?FILE1]),0)
      end,
      fun teardown/1,
      [?_assertThrow(rebar_abort,
                     rebar_file_utils:cp_r(
-                      [filename:join([?TMP_DIR,"source"])],
-                      filename:join([?TMP_DIR,"dest"])))]}.
+                      [filename:join([?TMP_DIR,?SRC])],
+                      filename:join([?TMP_DIR,?DST])))]}.
 
 mv_file_test_() ->
     {"move a file to folder",
      setup,
      fun() ->
              setup(),
-             rebar_file_utils:mv(filename:join([?TMP_DIR,"source","file1"]),
-                                 filename:join([?TMP_DIR,"dest"]))
+             rebar_file_utils:mv(filename:join([?TMP_DIR,?SRC,?FILE1]),
+                                 filename:join([?TMP_DIR,?DST]))
      end,
      fun teardown/1,
-     [?_assert(filelib:is_regular(filename:join([?TMP_DIR,"dest","file1"]))),
+     [?_assert(filelib:is_regular(filename:join([?TMP_DIR,?DST,?FILE1]))),
       ?_assertNot(filelib:is_regular(
-                    filename:join([?TMP_DIR,"source","file1"])))]}.
+                    filename:join([?TMP_DIR,?SRC,?FILE1])))]}.
 
 %% ====================================================================
 %% Utilities
 %% ====================================================================
 
 file_list() ->
-    [filename:join([?TMP_DIR,"source",F]) || F <- ["file1","file2"]].
+    [filename:join([?TMP_DIR,?SRC,F]) || F <- [?FILE1,?FILE2]].
 
 %% ====================================================================
 %% Setup and Teardown
 %% ====================================================================
 
 setup() ->
-    file:make_dir(?TMP_DIR),
     make_dir_tree(?TMP_DIR,?DIR_TREE).
 
 make_dir_tree(Parent, [{d,Dir,Contents} | Rest]) ->
     NewDir = filename:join(Parent,Dir),
-    ok = file:make_dir(NewDir),
+    ok = filelib:ensure_dir(filename:join(NewDir, "tmp")),
     ok = make_dir_tree(NewDir,Contents),
     ok = make_dir_tree(Parent,Rest);
 make_dir_tree(Parent, [{f,File} | Rest]) ->

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/test/rebar_require_vsn_tests.erl -> rebar-2.6.1.tar.gz/test/rebar_require_vsn_tests.erl Changed

@@ -1,3 +1,5 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
 -module(rebar_require_vsn_tests).
 
 -compile(export_all).
@@ -6,18 +8,21 @@
 
 version_tuple_test_() ->
     [%% typical cases
-     ?_assert(rebar_require_vsn:version_tuple("R15B", "eunit") =:= {15, 0}),
-     ?_assert(rebar_require_vsn:version_tuple("R15B01", "eunit") =:= {15, 1}),
-     ?_assert(rebar_require_vsn:version_tuple("R15B02", "eunit") =:= {15, 2}),
-     ?_assert(rebar_require_vsn:version_tuple("R15B03-1", "eunit") =:= {15, 3}),
-     ?_assert(rebar_require_vsn:version_tuple("R15B03", "eunit") =:= {15, 3}),
-     ?_assert(rebar_require_vsn:version_tuple("R16B", "eunit") =:= {16, 0}),
-     ?_assert(rebar_require_vsn:version_tuple("R16B01", "eunit") =:= {16, 1}),
-     ?_assert(rebar_require_vsn:version_tuple("R16B02", "eunit") =:= {16, 2}),
-     ?_assert(rebar_require_vsn:version_tuple("R16B03", "eunit") =:= {16, 3}),
-     ?_assert(rebar_require_vsn:version_tuple("R16B03-1", "eunit") =:= {16, 3}),
-     ?_assert(rebar_require_vsn:version_tuple("17", "eunit") =:= {17, 0}),
+     ?_assert(check("R15B", "eunit") =:= {15, 0}),
+     ?_assert(check("R15B01", "eunit") =:= {15, 1}),
+     ?_assert(check("R15B02", "eunit") =:= {15, 2}),
+     ?_assert(check("R15B03-1", "eunit") =:= {15, 3}),
+     ?_assert(check("R15B03", "eunit") =:= {15, 3}),
+     ?_assert(check("R16B", "eunit") =:= {16, 0}),
+     ?_assert(check("R16B01", "eunit") =:= {16, 1}),
+     ?_assert(check("R16B02", "eunit") =:= {16, 2}),
+     ?_assert(check("R16B03", "eunit") =:= {16, 3}),
+     ?_assert(check("R16B03-1", "eunit") =:= {16, 3}),
+     ?_assert(check("17", "eunit") =:= {17, 0}),
      %% error cases
-     ?_assertException(throw, rebar_abort, rebar_require_vsn:version_tuple("", "eunit")),
-     ?_assertException(throw, rebar_abort, rebar_require_vsn:version_tuple("abc", "eunit"))
+     ?_assertException(throw, rebar_abort, check("", "eunit")),
+     ?_assertException(throw, rebar_abort, check("abc", "eunit"))
     ].
+
+check(OtpRelease, Type) ->
+    rebar_require_vsn:version_tuple(abort, OtpRelease, Type).

rebar-2.6.1.tar.gz/test/rebar_utils_tests.erl Added

@@ -0,0 +1,50 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+%% -------------------------------------------------------------------
+%%
+%% rebar: Erlang Build Tools
+%%
+%% Copyright (c) 2015 Mark Anderson <mark@chef.io>
+%%
+%% 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.
+%% -------------------------------------------------------------------
+%% @author Mark Anderson <mark@chef.io>
+%% @doc Tests functionality of rebar_utils module.
+%% @copyright 2015 Mark Anderson
+%% -------------------------------------------------------------------
+-module(rebar_utils_tests).
+
+-compile(export_all).
+
+-include_lib("eunit/include/eunit.hrl").
+
+expand_env_variable_test_() ->
+    [{"Ensure that variable expansion handles nonwhitespace",
+      fun() ->
+              Test = "$V $V/ $Vw",
+              ?assertEqual("Val Val/ $Vw",
+                           rebar_utils:expand_env_variable(Test, "V", "Val") )
+      end},
+     {"Ensure that variable expansion with braces works",
+      fun() ->
+              Test = "${V} ${V}/ ${V}w ${Vw}",
+              ?assertEqual("Val Val/ Valw ${Vw}",
+                           rebar_utils:expand_env_variable(Test, "V", "Val") )
+      end}].
+

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/test/rebar_xref_eunit.erl -> rebar-2.6.1.tar.gz/test/rebar_xref_eunit.erl Changed

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/test/upgrade_project/README.md -> rebar-2.6.1.tar.gz/test/upgrade_project/README.md Changed

@@ -1,7 +1,9 @@
 #### Building version 0.1
     rebar compile
+    cd rel
     rebar generate
-    mv rel/dummy rel/dummy_0.1
+    mv dummy dummy_0.1
+    cd ..
     rebar clean
     # start the release:
     cd rel/dummy_0.1
@@ -20,15 +22,17 @@
     $EDITOR rel/reltool.config
 
     rebar compile
+    cd rel
     rebar generate
     # previous_release path is relative to your rel directory
     rebar generate-appups previous_release=dummy_0.1
     rebar generate-upgrade previous_release=dummy_0.1
-    tar -zvtf rel/dummy_0.2.tar.gz
+    tar -zvtf dummy_0.2.tar.gz
+    mv dummy dummy_0.2
 
 
 #### Deploying with release_handler
-    mv rel/dummy_0.2.tar.gz rel/dummy_0.1/releases/
+    mv dummy_0.2.tar.gz dummy_0.1/releases/
 
     # Now use release_handler in the running erlang console for the deploy:
 
@@ -38,3 +42,9 @@
 
     erl> release_handler:which_releases().
     erl> dummy_server:get_state().
+
+#### Building version 0.3
+    rm -r rel/dummy
+
+    # Now repeat steps in 'Building version 0.2' and 'Deploying with release_handler'
+    # while replacing '0.2' by '0.3' and '0.1' by '0.2'.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/test/upgrade_project/rel/files/dummy -> rebar-2.6.1.tar.gz/test/upgrade_project/rel/files/dummy Changed

@@ -6,9 +6,6 @@
 if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then
     POSIX_SHELL="true"
     export POSIX_SHELL
-    # To support 'whoami' add /usr/ucb to path
-    PATH=/usr/ucb:$PATH
-    export PATH
     exec /usr/bin/ksh $0 "$@"
 fi
 
@@ -24,7 +21,7 @@
 # Note the trailing slash on $PIPE_DIR/
 PIPE_DIR=/tmp/$RUNNER_BASE_DIR/
 RUNNER_USER=
-WHOAMI=$(whoami)
+WHOAMI=$(id -un)
 
 # Make sure this script is running as the appropriate user
 if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
@@ -234,6 +231,23 @@
         exec $ERTS_PATH/to_erl $PIPE_DIR
         ;;
 
+    eval)
+        # Make sure a node IS running
+        ping_node > /dev/null 2>&1
+        ES=$?
+        if [ "$ES" -ne 0 ]; then
+            echo "Node is not running!"
+            exit $ES
+        fi
+
+        shift
+        $NODETOOL eval "$1"
+        ES_EVAL=$?
+        if [ "$ES_EVAL" -ne 0 ]; then
+            exit $ES_EVAL
+        fi
+        ;;
+
     remote_console)
         # Make sure a node is running
         ping_node
@@ -263,10 +277,7 @@
             exit $ES
         fi
 
-        node_name=`echo $NAME_ARG | awk '{print $2}'`
-        erlang_cookie=`echo $COOKIE_ARG | awk '{print $2}'`
-
-        $ERTS_PATH/escript $RUNNER_BASE_DIR/bin/install_upgrade.escript $node_name $erlang_cookie $2
+        $NODETOOL upgrade $2
         ;;
 
     console|console_clean|console_boot)
@@ -339,7 +350,7 @@
         echo $PID
         ;;
     *)
-        echo "Usage: $SCRIPT {start|start_boot <file>|foreground|stop|restart|reboot|ping|console|getpid|console_clean|console_boot <file>|attach|remote_console|upgrade}"
+        echo "Usage: $SCRIPT {start|start_boot <file>|foreground|stop|restart|reboot|ping|console|getpid|console_clean|console_boot <file>|attach|eval|remote_console|upgrade}"
         exit 1
         ;;
 esac

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/test/upgrade_project/rel/files/nodetool -> rebar-2.6.1.tar.gz/test/upgrade_project/rel/files/nodetool Changed

@@ -95,9 +95,23 @@
                 Other ->
                     io:format("~p\n", [Other])
             end;
+        ["eval", Str0] ->
+            Str = string:strip(Str0, right, $.) ++ ".",
+            Bindings = erl_eval:new_bindings(),
+            case rpc:call(TargetNode,
+                          erl_eval,
+                          exprs,
+                          [parse(Str), Bindings],
+                          60000) of
+                {badrpc, Reason} ->
+                    io:format("RPC to ~p failed: ~p\n", [TargetNode, Reason]),
+                    halt(1);
+                {value, Value, _Bindings} ->
+                    io:format("~p\n", [Value])
+            end;
         Other ->
             io:format("Other: ~p\n", [Other]),
-            io:format("Usage: nodetool {chkconfig|getpid|ping|stop|restart|reboot|rpc|rpc_infinity|rpcterms}\n")
+            io:format("Usage: nodetool {chkconfig|getpid|ping|stop|restart|reboot|rpc|rpc_infinity|rpcterms|eval}\n")
     end,
     net_kernel:stop().
 
@@ -180,3 +194,8 @@
         {more, Cont1} ->
             consult(Cont1, eof, Acc)
     end.
+
+parse(Str) ->
+    {ok, Tokens, _} = erl_scan:string(Str),
+    {ok, Exprs} = erl_parse:parse_exprs(Tokens),
+    Exprs.

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/NOTES.org Deleted

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/dialyzer_reference Deleted

rebar-rebar-2.5.1-0-ge9f62c4.tar.gz/inttest/erlc/src/._do_not_compile.erl Deleted

Overview

Request 1675 (accepted)

Request History