Non puoi selezionare più di 25 argomenti Gli argomenti devono iniziare con una lettera o un numero, possono includere trattini ('-') e possono essere lunghi fino a 35 caratteri.

93 righe
3.5 KiB

support for hex v2, multiple repository fetching, private organizations (#1884) * update to hex_core for hex-v2 repo support (#1865) * update to hex_core for hex-v2 repo support This patch adds only single repo hex-v2 support through hex_core. Packages no longer filtered out by buildtool metadata and the package index is updated per-package instead of fetched as one large ets dump. * tell travis to also build hex_core branch * support list of repos for hex packages (#1866) * support list of repos for hex packages repos are defined under the hex key in rebar configs. They can be defined at the top level of a project or globally, but not in profiles and the repos configured in dependencies are also ignored. Searching for packages involves first checking for a match in the local repo index cache, in the order repos are defined. If not found each repo is checked through the hex api for any known versions of the package and the first repo with a version that fits the constraint is used. * add {repos, replace, []} for overriding the global & default repos * add hex auth handling for repos (#1874) auth token are kept in a hex.config file that is modified by the rebar3 hex plugin. Repo names that have a : separating a parent and child are considered organizations. The parent repo's auth will be included with the child. So an organization named hexpm:rebar3_test will include any hexpm auth tokens found in the rebar3_test organization's configuration. * move packages to top level of of hexpm cache dir (#1876) * move packages to top level of of hexpm cache dir * append organization name to parent's repo_url when parsing repos * only eval config scripts and apply overrides once per app (#1879) * only eval config scripts and apply overrides once per app * move new resource behaviour to rebar_resource_v2 and keep v1 * cleanup use of rebar_resource module and unused functions * cleanup error messages and unused code * when discovering apps support mix packages as unbuilt apps (#1882) * use hex_core tarball unpacking support in pkg resource (#1883) * use hex_core tarball unpacking support in pkg resource * ignore etag if package doesn't exist and delete if checksum fails * add back tests for bad package checksums * improve bad registry checksum error message
6 anni fa
support for hex v2, multiple repository fetching, private organizations (#1884) * update to hex_core for hex-v2 repo support (#1865) * update to hex_core for hex-v2 repo support This patch adds only single repo hex-v2 support through hex_core. Packages no longer filtered out by buildtool metadata and the package index is updated per-package instead of fetched as one large ets dump. * tell travis to also build hex_core branch * support list of repos for hex packages (#1866) * support list of repos for hex packages repos are defined under the hex key in rebar configs. They can be defined at the top level of a project or globally, but not in profiles and the repos configured in dependencies are also ignored. Searching for packages involves first checking for a match in the local repo index cache, in the order repos are defined. If not found each repo is checked through the hex api for any known versions of the package and the first repo with a version that fits the constraint is used. * add {repos, replace, []} for overriding the global & default repos * add hex auth handling for repos (#1874) auth token are kept in a hex.config file that is modified by the rebar3 hex plugin. Repo names that have a : separating a parent and child are considered organizations. The parent repo's auth will be included with the child. So an organization named hexpm:rebar3_test will include any hexpm auth tokens found in the rebar3_test organization's configuration. * move packages to top level of of hexpm cache dir (#1876) * move packages to top level of of hexpm cache dir * append organization name to parent's repo_url when parsing repos * only eval config scripts and apply overrides once per app (#1879) * only eval config scripts and apply overrides once per app * move new resource behaviour to rebar_resource_v2 and keep v1 * cleanup use of rebar_resource module and unused functions * cleanup error messages and unused code * when discovering apps support mix packages as unbuilt apps (#1882) * use hex_core tarball unpacking support in pkg resource (#1883) * use hex_core tarball unpacking support in pkg resource * ignore etag if package doesn't exist and delete if checksum fails * add back tests for bad package checksums * improve bad registry checksum error message
6 anni fa
Reorder rebar3 tree output on umbrella apps This change makes it so umbrella projects get ordered in a way more in-line with what we do with non-umbrellas. For example, a non-umbrella app (rebar3 itself) gives output like: └─ rebar─3.8.0+build.4270.refaece1d7 (project app) ├─ bbmustache─1.6.0 (hex package) ├─ certifi─2.3.1 (hex package) ├─ cf─0.2.2 (hex package) ├─ cth_readable─1.4.2 (hex package) ├─ erlware_commons─1.3.1 (hex package) ├─ eunit_formatters─0.5.0 (hex package) ├─ getopt─1.0.1 (hex package) ├─ hex_core─0.4.0 (hex package) ├─ parse_trans─3.3.0 (hex package) ├─ providers─1.7.0 (hex package) ├─ relx─3.28.0 (hex package) └─ ssl_verify_fun─1.1.3 (hex package) The current (prior to this patch) output for an umbrella project looks like this: ├─ bootstrap─0.0.2 (git repo) ├─ dirmon─0.1.0 (project app) ├─ fake─0.1.0 (project app) ├─ file_monitor─0.1 (git repo) ├─ peeranha─0.1.0 (git repo) │ ├─ gproc─0.5 (git repo) │ ├─ interclock─0.1.2 (git repo) │ │ ├─ bitcask─1.7.0 (git repo) │ │ │ └─ lager─2.1.1 (hex package) │ │ │ └─ goldrush─0.1.6 (hex package) │ │ └─ itc─1.0.0 (git repo) │ └─ merklet─1.0.0 (git repo) ├─ recon─2.2.2 (git repo) └─ uuid─1.5.0 (git repo) └─ quickrand─1.5.0 (git repo) Which kind of looks odd because the layout represents the dependencies of deps as declared by the rebar3 config files, but mix up the project apps as dependencies. This turns out to break expectations, and some external tools (such as Blackduck's dep detection -- see https://github.com/blackducksoftware/hub-detect/blob/d8a0f2281a056aec04e3f8aecd22bbbe9a2a6f3e/hub-detect/src/main/groovy/com/blackducksoftware/integration/hub/detect/detector/hex/Rebar3TreeParser.java) which were developed with regular apps in mind, but not umbrellas. This PR changes things by reordering all project apps at the root level and putting them first, and then indenting all deps below them. The same app now looks like: ├─ dirmon─0.1.0 (project app) └─ fake─0.1.0 (project app) ├─ bootstrap─0.0.2 (git repo) ├─ file_monitor─0.1 (git repo) ├─ peeranha─0.1.0 (git repo) │ ├─ gproc─0.5 (git repo) │ ├─ interclock─0.1.2 (git repo) │ │ ├─ bitcask─1.7.0 (git repo) │ │ │ └─ lager─2.1.1 (hex package) │ │ │ └─ goldrush─0.1.6 (hex package) │ │ └─ itc─1.0.0 (git repo) │ └─ merklet─1.0.0 (git repo) ├─ recon─2.2.2 (git repo) └─ uuid─1.5.0 (git repo) └─ quickrand─1.5.0 (git repo) Now the project apps are back at the top, and all the dependencies follow at one level of indentation below. There is no recorded change for single-app projects.
6 anni fa
9 anni fa
9 anni fa
9 anni fa
  1. -module(rebar_prv_deps_tree).
  2. -behaviour(provider).
  3. -export([init/1,
  4. do/1,
  5. format_error/1]).
  6. -include("rebar.hrl").
  7. -define(PROVIDER, tree).
  8. -define(DEPS, [lock]).
  9. -spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
  10. init(State) ->
  11. State1 = rebar_state:add_provider(
  12. State,
  13. providers:create([{name, ?PROVIDER},
  14. {module, ?MODULE},
  15. {bare, true},
  16. {deps, ?DEPS},
  17. {example, "rebar3 tree"},
  18. {short_desc, "Print dependency tree."},
  19. {desc, ""},
  20. {opts, [{verbose, $v, "verbose", undefined, "Print repo and branch/tag/ref for git and hg deps"}]}])),
  21. {ok, State1}.
  22. -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
  23. do(State) ->
  24. {Args, _} = rebar_state:command_parsed_args(State),
  25. Verbose = proplists:get_value(verbose, Args, false),
  26. print_deps_tree(rebar_state:all_deps(State), Verbose, State),
  27. {ok, State}.
  28. -spec format_error(any()) -> iolist().
  29. format_error(Reason) ->
  30. io_lib:format("~p", [Reason]).
  31. %% Internal functions
  32. print_deps_tree(SrcDeps, Verbose, State) ->
  33. D = lists:foldl(fun(App, Dict) ->
  34. Name = rebar_app_info:name(App),
  35. Vsn = rebar_app_info:original_vsn(App),
  36. Vsn1 = rebar_utils:vcs_vsn(App, Vsn, State),
  37. Source = rebar_app_info:source(App),
  38. Parent = rebar_app_info:parent(App),
  39. dict:append_list(Parent, [{Name, Vsn1, Source}], Dict)
  40. end, dict:new(), SrcDeps),
  41. ProjectAppNames = [{rebar_app_info:name(App)
  42. ,rebar_utils:vcs_vsn(App, rebar_app_info:original_vsn(App), State)
  43. ,project} || App <- rebar_state:project_apps(State)],
  44. case dict:find(root, D) of
  45. {ok, Children} ->
  46. print_children("", lists:keysort(1, ProjectAppNames), D, Verbose),
  47. print_children(" ", lists:keysort(1, Children), D, Verbose);
  48. error ->
  49. print_children("", lists:keysort(1, ProjectAppNames), D, Verbose)
  50. end.
  51. print_children(_, [], _, _) ->
  52. ok;
  53. print_children(Prefix, [{Name, Vsn, Source} | Rest], Dict, Verbose) ->
  54. Prefix1 = case Rest of
  55. [] ->
  56. io:format("~ts~ts", [Prefix, <<226,148,148,226,148,128,32>>]), %Binary for └─ utf8%
  57. [Prefix, " "];
  58. _ ->
  59. io:format("~ts~ts", [Prefix, <<226,148,156,226,148,128,32>>]), %Binary for ├─ utf8%
  60. [Prefix, <<226,148,130,32,32>>] %Binary for │ utf8%
  61. end,
  62. io:format("~ts~ts~ts (~ts)~n", [Name, <<226,148,128>>, Vsn, type(Source, Verbose)]), %Binary for ─ utf8%
  63. case dict:find(Name, Dict) of
  64. {ok, Children} ->
  65. print_children(Prefix1, lists:keysort(1, Children), Dict, Verbose),
  66. print_children(Prefix, Rest, Dict, Verbose);
  67. error ->
  68. print_children(Prefix, Rest, Dict, Verbose)
  69. end.
  70. type(project, _) ->
  71. "project app";
  72. type(checkout, _) ->
  73. "checkout app";
  74. type(Source, Verbose) when is_tuple(Source) ->
  75. case {element(1, Source), Verbose} of
  76. {pkg, _} ->
  77. "hex package";
  78. {Other, false} ->
  79. io_lib:format("~ts repo", [Other]);
  80. {_, true} ->
  81. io_lib:format("~ts", [element(2, Source)])
  82. end.