16 files changed, 254 insertions, 43 deletions
diff --git a/src/rebar.app.src b/src/rebar.app.src
index 655506e..4d1dfd7 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -23,7 +23,7 @@
                   erlware_commons,
                   providers,
                   bbmustache,
-          ssl_verify_hostname,
+                  ssl_verify_hostname,
                   relx,
                   inets]},
   {env, [
@@ -49,6 +49,8 @@
                      rebar_prv_eunit,
                      rebar_prv_help,
                      rebar_prv_install_deps,
+                     rebar_prv_local_install,
+                     rebar_prv_local_upgrade,
                      rebar_prv_lock,
                      rebar_prv_new,
                      rebar_prv_packages,
diff --git a/src/rebar3.erl b/src/rebar3.erl
index 5233f8e..aae9ec0 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -26,7 +26,8 @@
 %% -------------------------------------------------------------------
 -module(rebar3).
 
--export([main/1,
+-export([main/0,
+         main/1,
          run/1,
          run/2,
          global_option_spec_list/0,
@@ -42,6 +43,12 @@
 %% Public API
 %% ====================================================================
 
+%% For running with:
+%% erl +sbtu +A0 -noinput -mode minimal -boot start_clean -s rebar3 main -extra "$@"
+main() ->
+    List = init:get_plain_arguments(),
+    main(List).
+
 %% escript Entry point
 -spec main(list()) -> no_return().
 main(Args) ->
@@ -146,7 +153,14 @@ init_config() ->
     %% resources out of the escript
     State1 = try
                  ScriptName = filename:absname(escript:script_name()),
-                 rebar_state:escript_path(State, ScriptName)
+                 %% Running with 'erl -s rebar3 main' still sets a name for some reason
+                 %% so verify it is a real file
+                 case filelib:is_regular(ScriptName) of
+                     true ->
+                         rebar_state:escript_path(State, ScriptName);
+                     false ->
+                         State
+                 end
              catch
                  _:_ ->
                      State
diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl
index 008abc5..602fd42 100644
--- a/src/rebar_app_utils.erl
+++ b/src/rebar_app_utils.erl
@@ -90,7 +90,7 @@ validate_application_info(AppInfo, AppDetail) ->
             end
     end.
 
--spec parse_deps(binary(), list(), rebar_state:t(), list(), integer()) -> {[rebar_app_info:t()], [tuple()]}.
+-spec parse_deps(binary(), list(), rebar_state:t(), list(), integer()) -> [rebar_app_info:t()].
 parse_deps(DepsDir, Deps, State, Locks, Level) ->
     parse_deps(root, DepsDir, Deps, State, Locks, Level).
 
@@ -149,7 +149,7 @@ dep_to_app(Parent, DepsDir, Name, Vsn, Source, IsLock, State) ->
     CheckoutsDir = ec_cnv:to_list(rebar_dir:checkouts_dir(State, Name)),
     AppInfo = case rebar_app_info:discover(CheckoutsDir) of
                         {ok, App} ->
-                            rebar_app_info:is_checkout(App, true);
+                            rebar_app_info:source(rebar_app_info:is_checkout(App, true), checkout);
                         not_found ->
                             Dir = ec_cnv:to_list(filename:join(DepsDir, Name)),
                             {ok, AppInfo0} =
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index b9b8b2e..44072e8 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -64,7 +64,7 @@ consult_file_(File) ->
     case filename:extension(File) of
         ".script" ->
             {ok, Terms} = consult_and_eval(remove_script_ext(File), File),
-            [Terms];
+            Terms;
         _ ->
             Script = File ++ ".script",
             case filelib:is_regular(Script) of
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index 0fc5455..54faea4 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -28,7 +28,7 @@
 
 -export([compile/1,
          compile/3,
-         clean/2]).
+         clean/1]).
 
 -include("rebar.hrl").
 -include_lib("stdlib/include/erl_compile.hrl").
@@ -104,8 +104,8 @@ compile(Opts, Dir, OutDir) ->
                             fun compile_mib/3),
     doterl_compile(Opts, Dir, OutDir).
 
--spec clean(rebar_dict(), file:filename()) -> 'ok'.
-clean(_Opts, AppDir) ->
+-spec clean(file:filename()) -> 'ok'.
+clean(AppDir) ->
     MibFiles = rebar_utils:find_files(filename:join(AppDir, "mibs"), ?RE_PREFIX".*\\.mib\$"),
     MIBs = [filename:rootname(filename:basename(MIB)) || MIB <- MibFiles],
     rebar_file_utils:delete_each(
diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
index 4ac0a1d..f456587 100644
--- a/src/rebar_pkg_resource.erl
+++ b/src/rebar_pkg_resource.erl
@@ -9,7 +9,9 @@
         ,needs_update/2
         ,make_vsn/1]).
 
--export([ssl_opts/1]).
+-export([request/2
+        ,etag/1
+        ,ssl_opts/1]).
 
 -include("rebar.hrl").
 -include_lib("public_key/include/OTP-PUB-KEY.hrl").
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index 80f62f5..f2d3977 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -26,7 +26,7 @@ project_apps_install(State) ->
                         lists:foldl(fun(AppInfo, StateAcc2) ->
                                             C = rebar_config:consult(rebar_app_info:dir(AppInfo)),
                                             AppInfo0 = rebar_app_info:update_opts(AppInfo, rebar_app_info:opts(AppInfo), C),
-                                            Plugins2 = rebar_state:get(AppInfo0, {plugins, Profile}, []),
+                                            Plugins2 = rebar_app_info:get(AppInfo0, {plugins, Profile}, []),
                                             handle_plugins(Profile, Plugins2, StateAcc2)
                                     end, StateAcc1, ProjectApps)
                 end, State, Profiles).
diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl
index 8bdea4d..a2b537a 100644
--- a/src/rebar_prv_clean.erl
+++ b/src/rebar_prv_clean.erl
@@ -66,7 +66,7 @@ clean_apps(State, Providers, Apps) ->
          ?INFO("Cleaning out ~s...", [rebar_app_info:name(AppInfo)]),
          AppDir = rebar_app_info:dir(AppInfo),
          AppInfo1 = rebar_hooks:run_all_hooks(AppDir, pre, ?PROVIDER, Providers, AppInfo, State),
-         rebar_erlc_compiler:clean(State, rebar_app_info:out_dir(AppInfo1)),
+         rebar_erlc_compiler:clean(rebar_app_info:out_dir(AppInfo1)),
          rebar_hooks:run_all_hooks(AppDir, post, ?PROVIDER, Providers, AppInfo1, State)
      end || AppInfo <- Apps].
 
diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl
index b24ce04..9155d3b 100644
--- a/src/rebar_prv_common_test.erl
+++ b/src/rebar_prv_common_test.erl
@@ -43,12 +43,12 @@ do(State) ->
     %% Run ct provider prehooks
     Providers = rebar_state:providers(State),
     Cwd = rebar_dir:get_cwd(),
-    rebar_hooks:run_all_hooks(Cwd, pre, ?PROVIDER, Providers, element(2,rebar_app_info:new(noen)), State),
+    rebar_hooks:run_all_hooks(Cwd, pre, ?PROVIDER, Providers, State),
 
     try run_test(State) of
         {ok, State1} = Result ->
             %% Run ct provider posthooks
-            rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, element(2,rebar_app_info:new(noen)), State1),
+            rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, State1),
             rebar_utils:cleanup_code_path(rebar_state:code_paths(State, default)),
             Result;
         ?PRV_ERROR(_) = Error ->
@@ -91,6 +91,7 @@ run_test(State) ->
 
 run_test(State, Opts) ->
     {RawOpts, _} = rebar_state:command_parsed_args(State),
+    ok = rebar_prv_cover:maybe_cover_compile(State, apps),
     Result = case proplists:get_value(verbose, RawOpts, false) of
         true  -> run_test_verbose(Opts);
         false -> run_test_quiet(Opts)
diff --git a/src/rebar_prv_cover.erl b/src/rebar_prv_cover.erl
index 8c26521..fc7457e 100644
--- a/src/rebar_prv_cover.erl
+++ b/src/rebar_prv_cover.erl
@@ -44,12 +44,12 @@ do(State) ->
 
 -spec maybe_cover_compile(rebar_state:t()) -> ok.
 maybe_cover_compile(State) ->
-    maybe_cover_compile(State, []).
+    maybe_cover_compile(State, apps).
 
--spec maybe_cover_compile(rebar_state:t(), [file:name()]) -> ok.
-maybe_cover_compile(State, ExtraDirs) ->
+-spec maybe_cover_compile(rebar_state:t(), [file:name()] | apps) -> ok.
+maybe_cover_compile(State, Dirs) ->
     case rebar_state:get(State, cover_enabled, false) of
-        true  -> cover_compile(State, ExtraDirs);
+        true  -> cover_compile(State, Dirs);
         false -> ok
     end.
 
@@ -275,17 +275,23 @@ strip_coverdir(File) ->
     filename:join(lists:reverse(lists:sublist(lists:reverse(filename:split(File)),
                                               2))).
 
-cover_compile(State, ExtraDirs) ->
+cover_compile(State, apps) ->
+    Apps = filter_checkouts(rebar_state:project_apps(State)),
+    AppDirs = app_ebin_dirs(Apps, []),
+    cover_compile(State, AppDirs);
+cover_compile(State, Dirs) ->
     %% start the cover server if necessary
     {ok, CoverPid} = start_cover(),
     %% redirect cover output
     true = redirect_cover_output(State, CoverPid),
-    %% cover compile the modules we just compiled
-    Apps = filter_checkouts(rebar_state:project_apps(State)),
-    CompileResult = compile_beam_directories(Apps, []) ++
-                    compile_extras(ExtraDirs, []),
+    CompileResult = compile(Dirs, []),
     %% print any warnings about modules that failed to cover compile
-    lists:foreach(fun print_cover_warnings/1, CompileResult).
+    lists:foreach(fun print_cover_warnings/1, lists:flatten(CompileResult)).
+
+compile([], Acc) -> lists:reverse(Acc);
+compile([Dir|Rest], Acc) ->
+    Result = cover:compile_beam_directory(Dir),
+    compile(Rest, [Result|Acc]).
 
 filter_checkouts(Apps) -> filter_checkouts(Apps, []).
 
@@ -296,16 +302,9 @@ filter_checkouts([App|Rest], Acc) ->
         false -> filter_checkouts(Rest, [App|Acc])
     end.
 
-compile_beam_directories([], Acc) -> Acc;
-compile_beam_directories([App|Rest], Acc) ->
-    Result = cover:compile_beam_directory(filename:join([rebar_app_info:out_dir(App),
-                                                        "ebin"])),
-    compile_beam_directories(Rest, Acc ++ Result).
-
-compile_extras([], Acc) -> Acc;
-compile_extras([Dir|Rest], Acc) ->
-    Result = cover:compile_beam_directory(Dir),
-    compile_extras(Rest, Acc ++ Result).
+app_ebin_dirs([], Acc) -> Acc;
+app_ebin_dirs([App|Rest], Acc) ->
+    app_ebin_dirs(Rest, [rebar_app_info:ebin_dir(App)|Acc]).
 
 start_cover() ->
     case cover:start() of
diff --git a/src/rebar_prv_deps_tree.erl b/src/rebar_prv_deps_tree.erl
index 5986521..04c4837 100644
--- a/src/rebar_prv_deps_tree.erl
+++ b/src/rebar_prv_deps_tree.erl
@@ -39,15 +39,18 @@ format_error(Reason) ->
 %% Internal functions
 
 print_deps_tree(SrcDeps, Verbose, State) ->
+    Resources = rebar_state:resources(State),
     D = lists:foldl(fun(App, Dict) ->
                             Name = rebar_app_info:name(App),
                             Vsn = rebar_app_info:original_vsn(App),
+                            AppDir = rebar_app_info:dir(App),
+                            Vsn1 = rebar_utils:vcs_vsn(Vsn, AppDir, Resources),
                             Source  = rebar_app_info:source(App),
                             Parent = rebar_app_info:parent(App),
-                            dict:append_list(Parent, [{Name, Vsn, Source}], Dict)
+                            dict:append_list(Parent, [{Name, Vsn1, Source}], Dict)
                     end, dict:new(), SrcDeps),
     ProjectAppNames = [{rebar_app_info:name(App)
-                       ,rebar_app_info:original_vsn(App)
+                       ,rebar_utils:vcs_vsn(rebar_app_info:original_vsn(App), rebar_app_info:dir(App), Resources)
                        ,project} || App <- rebar_state:project_apps(State)],
     io:setopts([{encoding, unicode}]),
     case dict:find(root, D) of
@@ -80,6 +83,8 @@ print_children(Prefix, [{Name, Vsn, Source} | Rest], Dict, Verbose) ->
 
 type(project, _) ->
     "project app";
+type(checkout, _) ->
+    "checkout app";
 type(Source, Verbose) when is_tuple(Source) ->
     case {element(1, Source), Verbose} of
         {pkg, _} ->
diff --git a/src/rebar_prv_dialyzer.erl b/src/rebar_prv_dialyzer.erl
index 0fc1d7d..ef14b81 100644
--- a/src/rebar_prv_dialyzer.erl
+++ b/src/rebar_prv_dialyzer.erl
@@ -322,7 +322,7 @@ get_base_plt(State) ->
     Name = plt_name(Prefix),
     case get_config(State, base_plt_location, global) of
         global ->
-            GlobalCacheDir = rebar_dir:global_cache_dir(State),
+            GlobalCacheDir = rebar_dir:global_cache_dir(rebar_state:opts(State)),
             filename:join(GlobalCacheDir, Name);
         Dir ->
             filename:join(Dir, Name)
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 6c39423..b6b36e2 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -249,7 +249,7 @@ update_unseen_dep(AppInfo, Profile, Level, Deps, Apps, State, Upgrade, Seen, Loc
     AppInfo3 = rebar_app_info:dep_level(AppInfo2, Level),
     {NewDeps ++ Deps, [AppInfo3 | Apps], State2, NewSeen}.
 
--spec handle_dep(rebar_state:t(), atom(), file:filename_all(), rebar_app_info:t(), list(), integer()) -> {rebar_app_info:t(), [rebar_app_info:t()], [pkg_dep()], [integer()], rebar_state:t()}.
+-spec handle_dep(rebar_state:t(), atom(), file:filename_all(), rebar_app_info:t(), list(), integer()) -> {rebar_app_info:t(), [rebar_app_info:t()], rebar_state:t()}.
 handle_dep(State, Profile, DepsDir, AppInfo, Locks, Level) ->
     Profiles = rebar_state:current_profiles(State),
     Name = rebar_app_info:name(AppInfo),
diff --git a/src/rebar_prv_local_install.erl b/src/rebar_prv_local_install.erl
new file mode 100644
index 0000000..bf536d0
--- /dev/null
+++ b/src/rebar_prv_local_install.erl
@@ -0,0 +1,96 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+
+-module(rebar_prv_local_install).
+
+-behaviour(provider).
+
+-export([init/1,
+         do/1,
+         format_error/1]).
+
+-export([extract_escript/2]).
+
+-include("rebar.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-define(PROVIDER, install).
+-define(NAMESPACE, unstable).
+-define(DEPS, []).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+    State1 =
+        rebar_state:add_provider(State,
+                                providers:create([{name, ?PROVIDER},
+                                                  {module, ?MODULE},
+                                                  {bare, true},
+                                                  {namespace, ?NAMESPACE},
+                                                  {deps, ?DEPS},
+                                                  {example, "rebar3 unstable install"},
+                                                  {short_desc, "Extract libs from rebar3 escript along with a run script."},
+                                                  {desc, ""},
+                                                  {opts, []}])),
+    {ok, State1}.
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+    case os:type() of
+        {win32, _} ->
+            ?ERROR("Sorry, this feature is not yet available on Windows.", []),
+            {ok, State};
+        _ ->
+            case rebar_state:escript_path(State) of
+                undefined ->
+                    ?INFO("Already running from an unpacked rebar3. Nothing to do...", []),
+                    {ok, State};
+                ScriptPath ->
+                    extract_escript(State, ScriptPath)
+            end
+    end.
+
+-spec format_error(any()) -> iolist().
+format_error(Reason) ->
+    io_lib:format("~p", [Reason]).
+
+bin_contents(OutputDir) ->
+    <<"
+#!/usr/bin/env sh
+
+erl -pa ", (ec_cnv:to_binary(OutputDir))/binary,"/*/ebin +sbtu +A0  -noshell -boot start_clean -s rebar3 main -extra \"$@\"
+">>.
+
+extract_escript(State, ScriptPath) ->
+    {ok, Escript} = escript:extract(ScriptPath, []),
+    {archive, Archive} = lists:keyfind(archive, 1, Escript),
+
+    %% Extract contents of Archive to ~/.cache/rebar3/lib
+    %% And add a rebar3 bin script to ~/.cache/rebar3/bin
+    Opts = rebar_state:opts(State),
+    OutputDir = filename:join(rebar_dir:global_cache_dir(Opts), "lib"),
+    filelib:ensure_dir(filename:join(OutputDir, "empty")),
+
+    ?INFO("Extracting rebar3 libs to ~s...", [OutputDir]),
+    zip:extract(Archive, [{cwd, OutputDir}]),
+
+    BinDir = filename:join(rebar_dir:global_cache_dir(Opts), "bin"),
+    BinFile = filename:join(BinDir, "rebar3"),
+    filelib:ensure_dir(BinFile),
+
+    {ok, #file_info{mode = _,
+                    uid = Uid,
+                    gid = Gid}} = file:read_file_info(ScriptPath, [mode, uid, gid]),
+
+    ?INFO("Writing rebar3 run script ~s...", [BinFile]),
+    file:write_file(BinFile, bin_contents(OutputDir)),
+    ok = file:write_file_info(BinFile, #file_info{mode=33277,
+                                                  uid=Uid,
+                                                  gid=Gid}),
+
+    ?INFO("Add to $PATH for use: export PATH=$PATH:~s", [BinDir]),
+
+    {ok, State}.
diff --git a/src/rebar_prv_local_upgrade.erl b/src/rebar_prv_local_upgrade.erl
new file mode 100644
index 0000000..bdfc232
--- /dev/null
+++ b/src/rebar_prv_local_upgrade.erl
@@ -0,0 +1,94 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 et
+
+-module(rebar_prv_local_upgrade).
+
+-behaviour(provider).
+
+-export([init/1,
+         do/1,
+         format_error/1]).
+
+-include("rebar.hrl").
+-include_lib("providers/include/providers.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-define(PROVIDER, upgrade).
+-define(NAMESPACE, unstable).
+-define(DEPS, []).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+    State1 =
+        rebar_state:add_provider(State,
+                                providers:create([{name, ?PROVIDER},
+                                                  {module, ?MODULE},
+                                                  {bare, true},
+                                                  {namespace, ?NAMESPACE},
+                                                  {deps, ?DEPS},
+                                                  {example, "rebar3 unstable upgrade"},
+                                                  {short_desc, "Download latest rebar3 escript and extract."},
+                                                  {desc, ""},
+                                                  {opts, []}])),
+    {ok, State1}.
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+    case os:type() of
+        {win32, _} ->
+            ?ERROR("Sorry, this feature is not yet available on Windows.", []),
+            {ok, State};
+        _ ->
+            Md5 = case rebar_state:escript_path(State) of
+                      undefined ->
+                          false;
+                      ScriptPath ->
+                          get_md5(ScriptPath)
+                  end,
+
+            case maybe_fetch_rebar3(Md5) of
+                {saved, TmpRebar3} ->
+                    rebar_prv_local_install:extract_escript(State, TmpRebar3);
+                up_to_date ->
+                    {ok, State};
+                Error ->
+                    Error
+            end
+    end.
+
+-spec format_error(any()) -> iolist().
+format_error(bad_checksum) ->
+    "Not updating rebar3, the checksum of download did not match the one provided by s3.";
+format_error(Reason) ->
+    io_lib:format("~p", [Reason]).
+
+%% Internal
+
+get_md5(Rebar3Path) ->
+    {ok, Rebar3File} = file:read_file(Rebar3Path),
+    Digest = crypto:hash(md5, Rebar3File),
+    DigestHex = lists:flatten([io_lib:format("~2.16.0B", [X]) || X <- binary_to_list(Digest)]),
+    string:to_lower(DigestHex).
+
+maybe_fetch_rebar3(Rebar3Md5) ->
+    TmpDir = ec_file:insecure_mkdtemp(),
+    TmpFile = filename:join(TmpDir, "rebar3"),
+    case rebar_pkg_resource:request("https://s3.amazonaws.com/rebar3/rebar3", Rebar3Md5) of
+        {ok, Binary, ETag} ->
+            file:write_file(TmpFile, Binary),
+            case rebar_pkg_resource:etag(TmpFile) of
+                ETag ->
+                    {saved, TmpFile};
+                _ ->
+                    ?PRV_ERROR(bad_checksum)
+            end;
+        error ->
+            ?ERROR("Unable to fetch latest rebar3 escript. Please try again later.", []);
+        _ ->
+            ?CONSOLE("No upgrade available", []),
+            up_to_date
+    end.
diff --git a/src/rebar_prv_path.erl b/src/rebar_prv_path.erl
index 2a59ae4..37c9834 100644
--- a/src/rebar_prv_path.erl
+++ b/src/rebar_prv_path.erl
@@ -40,10 +40,8 @@ do(State) ->
     Paths = lists:filter(fun({app, _}) -> false; ({separator, _}) -> false; (_) -> true end, RawOpts),
     %% if no paths requested in opts print the base_dir instead
     P = case Paths of [] -> [{ebin, true}]; _ -> Paths end,
-    case paths(P, Apps, State, []) of
-        ok             -> {ok, State};
-        {error, Error} -> {error, Error}
-    end.
+    paths(P, Apps, State, []),
+    {ok, State}.
 
 -spec format_error(any()) -> iolist().
 format_error(Reason) ->
@@ -124,4 +122,4 @@ help(lib)       -> "Return the `lib' path of the current profile.";
 help(priv)      -> "Return the `priv' path of the current profile's applications.";
 help(separator) -> "In case of multiple return paths, the separator character to use to join them.";
 help(src)       -> "Return the `src' path of the current profile's applications.";
-help(rel)       -> "Return the `rel' path of the current profile.".
-\ No newline at end of file
+help(rel)       -> "Return the `rel' path of the current profile.".