Merge pull request #579 from carlosedp/add-proxy

Add proxy support to bootstrap and rebar3. Enhancement #561.

1 files changed, 67 insertions, 1 deletions

diff --git a/test/rebar_deps_SUITE.erl b/test/rebar_deps_SUITE.erl
index afd487e..73c4980 100644
--- a/test/rebar_deps_SUITE.erl
+++ b/test/rebar_deps_SUITE.erl
@@ -3,7 +3,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
-all() -> [sub_app_deps, newly_added_dep, {group, git}, {group, pkg}].
+all() -> [sub_app_deps, newly_added_dep, http_proxy_settings, https_proxy_settings, {group, git}, {group, pkg}].
 
 groups() ->
     [{all, [], [flat, pick_highest_left, pick_highest_right,
@@ -33,6 +33,47 @@ init_per_testcase(newly_added_dep, Config) ->
     rebar_test_utils:init_rebar_state(Config);
 init_per_testcase(sub_app_deps, Config) ->
     rebar_test_utils:init_rebar_state(Config);
+init_per_testcase(http_proxy_settings, Config) ->
+    %% Create private rebar.config
+    Priv = ?config(priv_dir, Config),
+    GlobalDir = filename:join(Priv, "global"),
+    GlobalConfigDir = filename:join([GlobalDir, ".config", "rebar3"]),
+    GlobalConfig = filename:join([GlobalDir, ".config", "rebar3", "rebar.config"]),
+
+    meck:new(rebar_dir, [passthrough]),
+    meck:expect(rebar_dir, global_config, fun() -> GlobalConfig end),
+    meck:expect(rebar_dir, global_cache_dir, fun(_) -> GlobalDir end),
+
+    %% Insert proxy variables into config
+    rebar_test_utils:create_config(GlobalConfigDir,
+                                   [{http_proxy, "http://localhost:1234"}
+    ]),
+    rebar_test_utils:init_rebar_state(Config);
+init_per_testcase(https_proxy_settings, Config) ->
+    SupportsHttpsProxy = case erlang:system_info(otp_release) of
+        "R16"++_ -> true;
+        "R"++_ -> false;
+        _ -> true % 17 and up don't have a "R" in the version
+    end,
+    if not SupportsHttpsProxy ->
+            {skip, https_proxy_unsupported_before_R16};
+       SupportsHttpsProxy ->
+            %% Create private rebar.config
+            Priv = ?config(priv_dir, Config),
+            GlobalDir = filename:join(Priv, "global"),
+            GlobalConfigDir = filename:join([GlobalDir, ".config", "rebar3"]),
+            GlobalConfig = filename:join([GlobalDir, ".config", "rebar3", "rebar.config"]),
+
+            meck:new(rebar_dir, [passthrough]),
+            meck:expect(rebar_dir, global_config, fun() -> GlobalConfig end),
+            meck:expect(rebar_dir, global_cache_dir, fun(_) -> GlobalDir end),
+
+            %% Insert proxy variables into config
+            rebar_test_utils:create_config(GlobalConfigDir,
+                                           [{https_proxy, "http://localhost:1234"}
+            ]),
+            rebar_test_utils:init_rebar_state(Config)
+    end;
 init_per_testcase(Case, Config) ->
     {Deps, Warnings, Expect} = deps(Case),
     Expected = case Expect of
@@ -45,6 +86,12 @@ init_per_testcase(Case, Config) ->
      {warnings, Warnings}
     | setup_project(Case, Config, rebar_test_utils:expand_deps(DepsType, Deps))].
 
+end_per_testcase(https_proxy_settings, Config) ->
+    meck:unload(rebar_dir),
+    Config;
+end_per_testcase(http_proxy_settings, Config) ->
+    meck:unload(rebar_dir),
+    Config;
 end_per_testcase(_, Config) ->
     meck:unload(),
     Config.
@@ -223,6 +270,25 @@ newly_added_dep(Config) ->
       {ok, [{app, Name}, {dep, "a"}, {dep, "b", "1.0.0"}, {dep, "c", "1.0.0"}]}).
 
 
+http_proxy_settings(_Config) ->
+    %% Load config
+    rebar_utils:set_httpc_options(),
+    rebar3:init_config(),
+
+    %% Assert variable is right
+    ?assertEqual({ok,{{"localhost", 1234}, []}},
+                 httpc:get_option(proxy, rebar)).
+
+https_proxy_settings(_Config) ->
+    %% Load config
+    rebar_utils:set_httpc_options(),
+    rebar3:init_config(),
+
+    %% Assert variable is right
+    ?assertEqual({ok,{{"localhost", 1234}, []}},
+                 httpc:get_option(https_proxy, rebar)).
+
+
 run(Config) ->
     {ok, RebarConfig} = file:consult(?config(rebarconfig, Config)),
     rebar_test_utils:run_and_check(