bundler 2.3.12 → 2.4.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (236) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +535 -1
  3. data/README.md +3 -6
  4. data/bundler.gemspec +8 -10
  5. data/exe/bundle +5 -16
  6. data/lib/bundler/build_metadata.rb +2 -2
  7. data/lib/bundler/cli/add.rb +1 -1
  8. data/lib/bundler/cli/binstubs.rb +5 -1
  9. data/lib/bundler/cli/check.rb +1 -1
  10. data/lib/bundler/cli/common.rb +3 -1
  11. data/lib/bundler/cli/console.rb +2 -2
  12. data/lib/bundler/cli/doctor.rb +4 -6
  13. data/lib/bundler/cli/gem.rb +62 -40
  14. data/lib/bundler/cli/init.rb +6 -2
  15. data/lib/bundler/cli/install.rb +7 -5
  16. data/lib/bundler/cli/lock.rb +8 -5
  17. data/lib/bundler/cli/open.rb +6 -4
  18. data/lib/bundler/cli/outdated.rb +13 -6
  19. data/lib/bundler/cli/platform.rb +1 -1
  20. data/lib/bundler/cli/viz.rb +1 -1
  21. data/lib/bundler/cli.rb +53 -7
  22. data/lib/bundler/compact_index_client/cache.rb +1 -1
  23. data/lib/bundler/compact_index_client/updater.rb +53 -39
  24. data/lib/bundler/constants.rb +1 -1
  25. data/lib/bundler/current_ruby.rb +17 -6
  26. data/lib/bundler/definition.rb +277 -139
  27. data/lib/bundler/dependency.rb +21 -84
  28. data/lib/bundler/digest.rb +1 -1
  29. data/lib/bundler/dsl.rb +13 -18
  30. data/lib/bundler/endpoint_specification.rb +2 -10
  31. data/lib/bundler/env.rb +1 -1
  32. data/lib/bundler/environment_preserver.rb +3 -2
  33. data/lib/bundler/errors.rb +15 -15
  34. data/lib/bundler/feature_flag.rb +0 -2
  35. data/lib/bundler/fetcher/base.rb +6 -8
  36. data/lib/bundler/fetcher/compact_index.rb +9 -11
  37. data/lib/bundler/fetcher/dependency.rb +2 -6
  38. data/lib/bundler/fetcher/downloader.rb +2 -5
  39. data/lib/bundler/fetcher.rb +14 -14
  40. data/lib/bundler/force_platform.rb +18 -0
  41. data/lib/bundler/friendly_errors.rb +21 -7
  42. data/lib/bundler/gem_helpers.rb +9 -2
  43. data/lib/bundler/gem_version_promoter.rb +53 -98
  44. data/lib/bundler/graph.rb +3 -3
  45. data/lib/bundler/index.rb +13 -51
  46. data/lib/bundler/injector.rb +9 -4
  47. data/lib/bundler/inline.rb +9 -21
  48. data/lib/bundler/installer/gem_installer.rb +14 -1
  49. data/lib/bundler/installer/parallel_installer.rb +3 -33
  50. data/lib/bundler/installer/standalone.rb +42 -11
  51. data/lib/bundler/installer.rb +19 -40
  52. data/lib/bundler/lazy_specification.rb +55 -54
  53. data/lib/bundler/lockfile_generator.rb +3 -3
  54. data/lib/bundler/lockfile_parser.rb +21 -16
  55. data/lib/bundler/man/bundle-add.1 +13 -5
  56. data/lib/bundler/man/bundle-add.1.ronn +10 -4
  57. data/lib/bundler/man/bundle-binstubs.1 +1 -1
  58. data/lib/bundler/man/bundle-cache.1 +9 -3
  59. data/lib/bundler/man/bundle-cache.1.ronn +9 -2
  60. data/lib/bundler/man/bundle-check.1 +1 -1
  61. data/lib/bundler/man/bundle-clean.1 +2 -2
  62. data/lib/bundler/man/bundle-clean.1.ronn +1 -1
  63. data/lib/bundler/man/bundle-config.1 +26 -10
  64. data/lib/bundler/man/bundle-config.1.ronn +17 -10
  65. data/lib/bundler/man/bundle-console.1 +53 -0
  66. data/lib/bundler/man/bundle-console.1.ronn +44 -0
  67. data/lib/bundler/man/bundle-doctor.1 +1 -1
  68. data/lib/bundler/man/bundle-exec.1 +6 -6
  69. data/lib/bundler/man/bundle-exec.1.ronn +6 -6
  70. data/lib/bundler/man/bundle-gem.1 +27 -37
  71. data/lib/bundler/man/bundle-gem.1.ronn +5 -5
  72. data/lib/bundler/man/bundle-help.1 +13 -0
  73. data/lib/bundler/man/bundle-help.1.ronn +12 -0
  74. data/lib/bundler/man/bundle-info.1 +1 -1
  75. data/lib/bundler/man/bundle-init.1 +5 -1
  76. data/lib/bundler/man/bundle-init.1.ronn +2 -0
  77. data/lib/bundler/man/bundle-inject.1 +5 -2
  78. data/lib/bundler/man/bundle-inject.1.ronn +3 -1
  79. data/lib/bundler/man/bundle-install.1 +5 -30
  80. data/lib/bundler/man/bundle-install.1.ronn +6 -29
  81. data/lib/bundler/man/bundle-list.1 +1 -1
  82. data/lib/bundler/man/bundle-lock.1 +1 -1
  83. data/lib/bundler/man/bundle-open.1 +22 -2
  84. data/lib/bundler/man/bundle-open.1.ronn +9 -1
  85. data/lib/bundler/man/bundle-outdated.1 +13 -9
  86. data/lib/bundler/man/bundle-outdated.1.ronn +12 -9
  87. data/lib/bundler/man/bundle-platform.1 +16 -6
  88. data/lib/bundler/man/bundle-platform.1.ronn +14 -7
  89. data/lib/bundler/man/bundle-plugin.1 +81 -0
  90. data/lib/bundler/man/bundle-plugin.1.ronn +59 -0
  91. data/lib/bundler/man/bundle-pristine.1 +1 -1
  92. data/lib/bundler/man/bundle-remove.1 +1 -1
  93. data/lib/bundler/man/bundle-show.1 +1 -1
  94. data/lib/bundler/man/bundle-update.1 +1 -1
  95. data/lib/bundler/man/bundle-version.1 +35 -0
  96. data/lib/bundler/man/bundle-version.1.ronn +24 -0
  97. data/lib/bundler/man/bundle-viz.1 +4 -1
  98. data/lib/bundler/man/bundle-viz.1.ronn +2 -0
  99. data/lib/bundler/man/bundle.1 +15 -10
  100. data/lib/bundler/man/bundle.1.ronn +12 -7
  101. data/lib/bundler/man/gemfile.5 +93 -82
  102. data/lib/bundler/man/gemfile.5.ronn +99 -86
  103. data/lib/bundler/man/index.txt +4 -0
  104. data/lib/bundler/match_metadata.rb +13 -0
  105. data/lib/bundler/match_platform.rb +0 -1
  106. data/lib/bundler/match_remote_metadata.rb +29 -0
  107. data/lib/bundler/mirror.rb +5 -7
  108. data/lib/bundler/plugin/api/source.rb +3 -3
  109. data/lib/bundler/plugin/index.rb +4 -4
  110. data/lib/bundler/plugin/installer/git.rb +0 -4
  111. data/lib/bundler/plugin/installer/rubygems.rb +0 -8
  112. data/lib/bundler/plugin/installer.rb +5 -2
  113. data/lib/bundler/plugin.rb +3 -1
  114. data/lib/bundler/process_lock.rb +1 -1
  115. data/lib/bundler/remote_specification.rb +7 -12
  116. data/lib/bundler/resolver/base.rb +107 -0
  117. data/lib/bundler/resolver/candidate.rb +94 -0
  118. data/lib/bundler/resolver/incompatibility.rb +15 -0
  119. data/lib/bundler/resolver/package.rb +72 -0
  120. data/lib/bundler/resolver/root.rb +25 -0
  121. data/lib/bundler/resolver/spec_group.rb +42 -70
  122. data/lib/bundler/resolver.rb +333 -326
  123. data/lib/bundler/ruby_dsl.rb +1 -1
  124. data/lib/bundler/ruby_version.rb +6 -6
  125. data/lib/bundler/rubygems_ext.rb +107 -15
  126. data/lib/bundler/rubygems_gem_installer.rb +32 -20
  127. data/lib/bundler/rubygems_integration.rb +13 -35
  128. data/lib/bundler/runtime.rb +2 -7
  129. data/lib/bundler/safe_marshal.rb +31 -0
  130. data/lib/bundler/settings.rb +6 -12
  131. data/lib/bundler/setup.rb +4 -1
  132. data/lib/bundler/shared_helpers.rb +8 -8
  133. data/lib/bundler/source/git/git_proxy.rb +237 -74
  134. data/lib/bundler/source/git.rb +54 -38
  135. data/lib/bundler/source/metadata.rb +1 -2
  136. data/lib/bundler/source/path/installer.rb +1 -22
  137. data/lib/bundler/source/path.rb +7 -7
  138. data/lib/bundler/source/rubygems.rb +85 -128
  139. data/lib/bundler/source.rb +4 -5
  140. data/lib/bundler/source_list.rb +12 -2
  141. data/lib/bundler/spec_set.rb +62 -34
  142. data/lib/bundler/stub_specification.rb +5 -3
  143. data/lib/bundler/templates/Executable +1 -1
  144. data/lib/bundler/templates/Executable.bundler +5 -10
  145. data/lib/bundler/templates/Executable.standalone +2 -0
  146. data/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
  147. data/lib/bundler/templates/newgem/Gemfile.tt +3 -0
  148. data/lib/bundler/templates/newgem/README.md.tt +6 -4
  149. data/lib/bundler/templates/newgem/Rakefile.tt +12 -1
  150. data/lib/bundler/templates/newgem/bin/console.tt +0 -4
  151. data/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
  152. data/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
  153. data/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
  154. data/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
  155. data/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
  156. data/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
  157. data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +10 -0
  158. data/lib/bundler/templates/newgem/gitignore.tt +3 -0
  159. data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
  160. data/lib/bundler/templates/newgem/newgem.gemspec.tt +9 -2
  161. data/lib/bundler/ui/shell.rb +35 -12
  162. data/lib/bundler/ui/silent.rb +21 -5
  163. data/lib/bundler/uri_normalizer.rb +23 -0
  164. data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
  165. data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
  166. data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
  167. data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1351 -409
  168. data/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
  169. data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
  170. data/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
  171. data/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
  172. data/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
  173. data/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
  174. data/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
  175. data/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
  176. data/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
  177. data/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
  178. data/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
  179. data/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
  180. data/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
  181. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
  182. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
  183. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
  184. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
  185. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
  186. data/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
  187. data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
  188. data/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
  189. data/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
  190. data/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
  191. data/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
  192. data/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
  193. data/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
  194. data/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
  195. data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
  196. data/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
  197. data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +15 -9
  198. data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -6
  199. data/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
  200. data/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
  201. data/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
  202. data/lib/bundler/vendor/uri/lib/uri.rb +3 -2
  203. data/lib/bundler/vendored_persistent.rb +1 -33
  204. data/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
  205. data/lib/bundler/version.rb +5 -1
  206. data/lib/bundler/worker.rb +5 -7
  207. data/lib/bundler.rb +36 -77
  208. metadata +47 -35
  209. data/lib/bundler/dep_proxy.rb +0 -55
  210. data/lib/bundler/templates/gems.rb +0 -5
  211. data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
  212. data/lib/bundler/templates/newgem/travis.yml.tt +0 -6
  213. data/lib/bundler/vendor/molinillo/LICENSE +0 -9
  214. data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
  215. data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
  216. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
  217. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
  218. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
  219. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
  220. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
  221. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
  222. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
  223. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
  224. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
  225. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
  226. data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -149
  227. data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
  228. data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
  229. data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
  230. data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
  231. data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
  232. data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
  233. data/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
  234. data/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
  235. data/lib/bundler/vendored_molinillo.rb +0 -4
  236. data/lib/bundler/version_ranges.rb +0 -122
@@ -1,67 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Bundler::Molinillo
4
- # Conveys information about the resolution process to a user.
5
- module UI
6
- # The {IO} object that should be used to print output. `STDOUT`, by default.
7
- #
8
- # @return [IO]
9
- def output
10
- STDOUT
11
- end
12
-
13
- # Called roughly every {#progress_rate}, this method should convey progress
14
- # to the user.
15
- #
16
- # @return [void]
17
- def indicate_progress
18
- output.print '.' unless debug?
19
- end
20
-
21
- # How often progress should be conveyed to the user via
22
- # {#indicate_progress}, in seconds. A third of a second, by default.
23
- #
24
- # @return [Float]
25
- def progress_rate
26
- 0.33
27
- end
28
-
29
- # Called before resolution begins.
30
- #
31
- # @return [void]
32
- def before_resolution
33
- output.print 'Resolving dependencies...'
34
- end
35
-
36
- # Called after resolution ends (either successfully or with an error).
37
- # By default, prints a newline.
38
- #
39
- # @return [void]
40
- def after_resolution
41
- output.puts
42
- end
43
-
44
- # Conveys debug information to the user.
45
- #
46
- # @param [Integer] depth the current depth of the resolution process.
47
- # @return [void]
48
- def debug(depth = 0)
49
- if debug?
50
- debug_info = yield
51
- debug_info = debug_info.inspect unless debug_info.is_a?(String)
52
- debug_info = debug_info.split("\n").map { |s| ":#{depth.to_s.rjust 4}: #{s}" }
53
- output.puts debug_info
54
- end
55
- end
56
-
57
- # Whether or not debug messages should be printed.
58
- # By default, whether or not the `MOLINILLO_DEBUG` environment variable is
59
- # set.
60
- #
61
- # @return [Boolean]
62
- def debug?
63
- return @debug_mode if defined?(@debug_mode)
64
- @debug_mode = ENV['MOLINILLO_DEBUG']
65
- end
66
- end
67
- end