rubygems-update 3.1.4 → 3.2.14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (576) hide show
  1. checksums.yaml +4 -4
  2. data/{History.txt → CHANGELOG.md} +791 -492
  3. data/CODE_OF_CONDUCT.md +55 -19
  4. data/CONTRIBUTING.md +24 -10
  5. data/Manifest.txt +77 -104
  6. data/POLICIES.md +6 -12
  7. data/README.md +1 -1
  8. data/Rakefile +75 -101
  9. data/bin/update_rubygems +1 -1
  10. data/bundler/CHANGELOG.md +1717 -1426
  11. data/bundler/README.md +6 -8
  12. data/bundler/UPGRADING.md +18 -32
  13. data/bundler/bundler.gemspec +4 -4
  14. data/bundler/exe/bundle +3 -0
  15. data/bundler/lib/bundler.rb +33 -9
  16. data/bundler/lib/bundler/build_metadata.rb +4 -12
  17. data/bundler/lib/bundler/cli.rb +56 -21
  18. data/bundler/lib/bundler/cli/add.rb +1 -1
  19. data/bundler/lib/bundler/cli/binstubs.rb +6 -2
  20. data/bundler/lib/bundler/cli/cache.rb +2 -7
  21. data/bundler/lib/bundler/cli/clean.rb +1 -1
  22. data/bundler/lib/bundler/cli/common.rb +14 -0
  23. data/bundler/lib/bundler/cli/console.rb +1 -1
  24. data/bundler/lib/bundler/cli/doctor.rb +1 -1
  25. data/bundler/lib/bundler/cli/exec.rb +4 -4
  26. data/bundler/lib/bundler/cli/fund.rb +36 -0
  27. data/bundler/lib/bundler/cli/gem.rb +121 -28
  28. data/bundler/lib/bundler/cli/info.rb +15 -4
  29. data/bundler/lib/bundler/cli/init.rb +2 -2
  30. data/bundler/lib/bundler/cli/inject.rb +1 -1
  31. data/bundler/lib/bundler/cli/install.rb +13 -11
  32. data/bundler/lib/bundler/cli/issue.rb +2 -2
  33. data/bundler/lib/bundler/cli/list.rb +12 -10
  34. data/bundler/lib/bundler/cli/outdated.rb +87 -66
  35. data/bundler/lib/bundler/cli/plugin.rb +10 -0
  36. data/bundler/lib/bundler/cli/pristine.rb +5 -0
  37. data/bundler/lib/bundler/cli/show.rb +1 -1
  38. data/bundler/lib/bundler/cli/update.rb +3 -1
  39. data/bundler/lib/bundler/compact_index_client.rb +1 -1
  40. data/bundler/lib/bundler/compact_index_client/cache.rb +6 -14
  41. data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
  42. data/bundler/lib/bundler/compact_index_client/updater.rb +6 -14
  43. data/bundler/lib/bundler/definition.rb +115 -123
  44. data/bundler/lib/bundler/dep_proxy.rb +16 -9
  45. data/bundler/lib/bundler/dependency.rb +3 -10
  46. data/bundler/lib/bundler/dsl.rb +40 -33
  47. data/bundler/lib/bundler/endpoint_specification.rb +1 -1
  48. data/bundler/lib/bundler/env.rb +1 -1
  49. data/bundler/lib/bundler/environment_preserver.rb +26 -2
  50. data/bundler/lib/bundler/errors.rb +1 -0
  51. data/bundler/lib/bundler/feature_flag.rb +0 -4
  52. data/bundler/lib/bundler/fetcher.rb +4 -4
  53. data/bundler/lib/bundler/fetcher/base.rb +1 -1
  54. data/bundler/lib/bundler/fetcher/compact_index.rb +1 -1
  55. data/bundler/lib/bundler/fetcher/downloader.rb +1 -1
  56. data/bundler/lib/bundler/fetcher/index.rb +3 -4
  57. data/bundler/lib/bundler/friendly_errors.rb +22 -13
  58. data/bundler/lib/bundler/gem_helper.rb +35 -18
  59. data/bundler/lib/bundler/gem_helpers.rb +36 -25
  60. data/bundler/lib/bundler/gem_version_promoter.rb +4 -4
  61. data/bundler/lib/bundler/graph.rb +1 -1
  62. data/bundler/lib/bundler/index.rb +12 -7
  63. data/bundler/lib/bundler/injector.rb +22 -4
  64. data/bundler/lib/bundler/inline.rb +2 -1
  65. data/bundler/lib/bundler/installer.rb +37 -49
  66. data/bundler/lib/bundler/installer/gem_installer.rb +3 -3
  67. data/bundler/lib/bundler/installer/parallel_installer.rb +16 -18
  68. data/bundler/lib/bundler/installer/standalone.rb +17 -2
  69. data/bundler/lib/bundler/lazy_specification.rb +40 -25
  70. data/bundler/lib/bundler/lockfile_generator.rb +1 -1
  71. data/bundler/lib/bundler/lockfile_parser.rb +4 -14
  72. data/bundler/lib/bundler/man/.document +1 -0
  73. data/bundler/{man → lib/bundler/man}/bundle-add.1 +1 -1
  74. data/bundler/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +0 -0
  75. data/bundler/{man → lib/bundler/man}/bundle-binstubs.1 +5 -3
  76. data/bundler/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
  77. data/bundler/{man → lib/bundler/man}/bundle-cache.1 +1 -1
  78. data/bundler/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +0 -0
  79. data/bundler/{man → lib/bundler/man}/bundle-check.1 +1 -1
  80. data/bundler/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
  81. data/bundler/{man → lib/bundler/man}/bundle-clean.1 +1 -1
  82. data/bundler/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +0 -0
  83. data/bundler/{man → lib/bundler/man}/bundle-config.1 +22 -31
  84. data/bundler/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +30 -40
  85. data/bundler/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
  86. data/bundler/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
  87. data/bundler/{man → lib/bundler/man}/bundle-exec.1 +1 -1
  88. data/bundler/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +0 -0
  89. data/bundler/{man → lib/bundler/man}/bundle-gem.1 +25 -3
  90. data/bundler/{man/bundle-gem.ronn → lib/bundler/man/bundle-gem.1.ronn} +30 -7
  91. data/bundler/{man → lib/bundler/man}/bundle-info.1 +1 -1
  92. data/bundler/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
  93. data/bundler/{man → lib/bundler/man}/bundle-init.1 +1 -1
  94. data/bundler/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +0 -0
  95. data/bundler/{man → lib/bundler/man}/bundle-inject.1 +1 -1
  96. data/bundler/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +0 -0
  97. data/bundler/{man → lib/bundler/man}/bundle-install.1 +30 -3
  98. data/bundler/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +25 -3
  99. data/bundler/{man → lib/bundler/man}/bundle-list.1 +7 -7
  100. data/bundler/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
  101. data/bundler/{man → lib/bundler/man}/bundle-lock.1 +1 -1
  102. data/bundler/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
  103. data/bundler/{man → lib/bundler/man}/bundle-open.1 +1 -1
  104. data/bundler/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
  105. data/bundler/{man → lib/bundler/man}/bundle-outdated.1 +1 -1
  106. data/bundler/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +0 -0
  107. data/bundler/{man → lib/bundler/man}/bundle-platform.1 +1 -1
  108. data/bundler/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +0 -0
  109. data/bundler/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
  110. data/bundler/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
  111. data/bundler/{man → lib/bundler/man}/bundle-remove.1 +1 -1
  112. data/bundler/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
  113. data/bundler/{man → lib/bundler/man}/bundle-show.1 +1 -1
  114. data/bundler/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
  115. data/bundler/{man → lib/bundler/man}/bundle-update.1 +1 -1
  116. data/bundler/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +0 -0
  117. data/bundler/{man → lib/bundler/man}/bundle-viz.1 +1 -1
  118. data/bundler/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +0 -0
  119. data/bundler/{man → lib/bundler/man}/bundle.1 +1 -1
  120. data/bundler/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +0 -0
  121. data/bundler/{man → lib/bundler/man}/gemfile.5 +4 -4
  122. data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +4 -4
  123. data/bundler/{man → lib/bundler/man}/index.txt +0 -0
  124. data/bundler/lib/bundler/mirror.rb +2 -2
  125. data/bundler/lib/bundler/plugin.rb +31 -5
  126. data/bundler/lib/bundler/plugin/api/source.rb +8 -1
  127. data/bundler/lib/bundler/plugin/dsl.rb +1 -1
  128. data/bundler/lib/bundler/plugin/index.rb +10 -1
  129. data/bundler/lib/bundler/plugin/installer.rb +9 -11
  130. data/bundler/lib/bundler/plugin/installer/rubygems.rb +1 -1
  131. data/bundler/lib/bundler/plugin/source_list.rb +5 -1
  132. data/bundler/lib/bundler/psyched_yaml.rb +0 -15
  133. data/bundler/lib/bundler/remote_specification.rb +5 -2
  134. data/bundler/lib/bundler/resolver.rb +133 -77
  135. data/bundler/lib/bundler/resolver/spec_group.rb +75 -48
  136. data/bundler/lib/bundler/retry.rb +1 -1
  137. data/bundler/lib/bundler/ruby_version.rb +1 -1
  138. data/bundler/lib/bundler/rubygems_ext.rb +69 -9
  139. data/bundler/lib/bundler/rubygems_gem_installer.rb +50 -9
  140. data/bundler/lib/bundler/rubygems_integration.rb +25 -60
  141. data/bundler/lib/bundler/runtime.rb +4 -14
  142. data/bundler/lib/bundler/settings.rb +50 -47
  143. data/bundler/lib/bundler/shared_helpers.rb +3 -3
  144. data/bundler/lib/bundler/similarity_detector.rb +1 -1
  145. data/bundler/lib/bundler/source.rb +7 -1
  146. data/bundler/lib/bundler/source/git.rb +24 -22
  147. data/bundler/lib/bundler/source/git/git_proxy.rb +82 -80
  148. data/bundler/lib/bundler/source/metadata.rb +0 -4
  149. data/bundler/lib/bundler/source/path.rb +7 -3
  150. data/bundler/lib/bundler/source/path/installer.rb +10 -10
  151. data/bundler/lib/bundler/source/rubygems.rb +43 -22
  152. data/bundler/lib/bundler/source/rubygems/remote.rb +1 -1
  153. data/bundler/lib/bundler/source_list.rb +30 -25
  154. data/bundler/lib/bundler/spec_set.rb +14 -13
  155. data/bundler/lib/bundler/stub_specification.rb +25 -7
  156. data/bundler/lib/bundler/templates/newgem/CHANGELOG.md.tt +5 -0
  157. data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
  158. data/bundler/lib/bundler/templates/newgem/Gemfile.tt +9 -1
  159. data/bundler/lib/bundler/templates/newgem/README.md.tt +6 -5
  160. data/bundler/lib/bundler/templates/newgem/Rakefile.tt +19 -5
  161. data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -0
  162. data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
  163. data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
  164. data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +18 -0
  165. data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -0
  166. data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
  167. data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
  168. data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +15 -7
  169. data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +13 -0
  170. data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
  171. data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
  172. data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
  173. data/bundler/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
  174. data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
  175. data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
  176. data/bundler/lib/bundler/ui/shell.rb +5 -5
  177. data/bundler/lib/bundler/uri_credentials_filter.rb +3 -1
  178. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -1
  179. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +7 -0
  180. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +34 -2
  181. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +2 -2
  182. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +11 -5
  183. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +3 -3
  184. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
  185. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +11 -0
  186. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +49 -47
  187. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +82 -189
  188. data/bundler/lib/bundler/vendor/thor/lib/thor.rb +5 -13
  189. data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +1 -1
  190. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
  191. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +4 -2
  192. data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
  193. data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +1 -1
  194. data/bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +5 -1
  195. data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +9 -8
  196. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +5 -2
  197. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +5 -1
  198. data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
  199. data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +154 -0
  200. data/bundler/lib/bundler/vendored_persistent.rb +0 -7
  201. data/bundler/lib/bundler/vendored_tmpdir.rb +4 -0
  202. data/bundler/lib/bundler/version.rb +1 -1
  203. data/bundler/lib/bundler/worker.rb +1 -1
  204. data/bundler/lib/bundler/yaml_serializer.rb +1 -1
  205. data/lib/rubygems.rb +84 -160
  206. data/lib/rubygems/available_set.rb +4 -6
  207. data/lib/rubygems/basic_specification.rb +11 -9
  208. data/lib/rubygems/bundler_version_finder.rb +14 -9
  209. data/lib/rubygems/command.rb +17 -16
  210. data/lib/rubygems/command_manager.rb +5 -6
  211. data/lib/rubygems/commands/build_command.rb +40 -20
  212. data/lib/rubygems/commands/cert_command.rb +2 -10
  213. data/lib/rubygems/commands/check_command.rb +0 -2
  214. data/lib/rubygems/commands/cleanup_command.rb +11 -7
  215. data/lib/rubygems/commands/contents_command.rb +4 -6
  216. data/lib/rubygems/commands/dependency_command.rb +6 -8
  217. data/lib/rubygems/commands/environment_command.rb +1 -3
  218. data/lib/rubygems/commands/fetch_command.rb +2 -4
  219. data/lib/rubygems/commands/generate_index_command.rb +0 -2
  220. data/lib/rubygems/commands/help_command.rb +3 -3
  221. data/lib/rubygems/commands/info_command.rb +8 -5
  222. data/lib/rubygems/commands/install_command.rb +3 -5
  223. data/lib/rubygems/commands/list_command.rb +8 -7
  224. data/lib/rubygems/commands/lock_command.rb +1 -3
  225. data/lib/rubygems/commands/mirror_command.rb +0 -2
  226. data/lib/rubygems/commands/open_command.rb +0 -4
  227. data/lib/rubygems/commands/outdated_command.rb +0 -2
  228. data/lib/rubygems/commands/owner_command.rb +9 -4
  229. data/lib/rubygems/commands/pristine_command.rb +11 -5
  230. data/lib/rubygems/commands/push_command.rb +10 -47
  231. data/lib/rubygems/commands/query_command.rb +14 -344
  232. data/lib/rubygems/commands/rdoc_command.rb +0 -2
  233. data/lib/rubygems/commands/search_command.rb +7 -7
  234. data/lib/rubygems/commands/server_command.rb +3 -1
  235. data/lib/rubygems/commands/setup_command.rb +101 -74
  236. data/lib/rubygems/commands/signin_command.rb +0 -2
  237. data/lib/rubygems/commands/signout_command.rb +0 -2
  238. data/lib/rubygems/commands/sources_command.rb +6 -4
  239. data/lib/rubygems/commands/specification_command.rb +8 -4
  240. data/lib/rubygems/commands/stale_command.rb +1 -3
  241. data/lib/rubygems/commands/uninstall_command.rb +1 -3
  242. data/lib/rubygems/commands/unpack_command.rb +1 -3
  243. data/lib/rubygems/commands/update_command.rb +59 -14
  244. data/lib/rubygems/commands/which_command.rb +0 -2
  245. data/lib/rubygems/commands/yank_command.rb +4 -7
  246. data/lib/rubygems/config_file.rb +20 -4
  247. data/lib/rubygems/core_ext/kernel_require.rb +29 -36
  248. data/lib/rubygems/core_ext/kernel_warn.rb +12 -13
  249. data/lib/rubygems/core_ext/tcpsocket_init.rb +52 -0
  250. data/lib/rubygems/defaults.rb +101 -7
  251. data/lib/rubygems/dependency.rb +8 -9
  252. data/lib/rubygems/dependency_installer.rb +6 -78
  253. data/lib/rubygems/dependency_list.rb +7 -9
  254. data/lib/rubygems/deprecate.rb +46 -1
  255. data/lib/rubygems/doctor.rb +4 -4
  256. data/lib/rubygems/errors.rb +3 -14
  257. data/lib/rubygems/exceptions.rb +2 -33
  258. data/lib/rubygems/ext.rb +6 -6
  259. data/lib/rubygems/ext/build_error.rb +2 -0
  260. data/lib/rubygems/ext/builder.rb +19 -39
  261. data/lib/rubygems/ext/cmake_builder.rb +6 -9
  262. data/lib/rubygems/ext/configure_builder.rb +5 -8
  263. data/lib/rubygems/ext/ext_conf_builder.rb +21 -19
  264. data/lib/rubygems/ext/rake_builder.rb +4 -6
  265. data/lib/rubygems/gem_runner.rb +3 -10
  266. data/lib/rubygems/gemcutter_utilities.rb +102 -21
  267. data/lib/rubygems/indexer.rb +1 -22
  268. data/lib/rubygems/install_update_options.rb +7 -7
  269. data/lib/rubygems/installer.rb +59 -80
  270. data/lib/rubygems/installer_test_case.rb +25 -11
  271. data/lib/rubygems/installer_uninstaller_utils.rb +29 -0
  272. data/lib/rubygems/local_remote_options.rb +1 -1
  273. data/lib/rubygems/mock_gem_ui.rb +0 -6
  274. data/lib/rubygems/name_tuple.rb +3 -7
  275. data/lib/rubygems/openssl.rb +7 -0
  276. data/lib/rubygems/package.rb +14 -25
  277. data/lib/rubygems/package/digest_io.rb +0 -2
  278. data/lib/rubygems/package/file_source.rb +0 -2
  279. data/lib/rubygems/package/io_source.rb +0 -2
  280. data/lib/rubygems/package/old.rb +1 -3
  281. data/lib/rubygems/package/tar_header.rb +4 -6
  282. data/lib/rubygems/package/tar_reader.rb +0 -3
  283. data/lib/rubygems/package/tar_reader/entry.rb +0 -3
  284. data/lib/rubygems/package/tar_test_case.rb +2 -4
  285. data/lib/rubygems/package/tar_writer.rb +2 -12
  286. data/lib/rubygems/package_task.rb +1 -7
  287. data/lib/rubygems/path_support.rb +1 -3
  288. data/lib/rubygems/platform.rb +21 -16
  289. data/lib/rubygems/psych_tree.rb +0 -2
  290. data/lib/rubygems/query_utils.rb +353 -0
  291. data/lib/rubygems/rdoc.rb +0 -12
  292. data/lib/rubygems/remote_fetcher.rb +18 -37
  293. data/lib/rubygems/request.rb +4 -11
  294. data/lib/rubygems/request/connection_pools.rb +1 -5
  295. data/lib/rubygems/request/http_pool.rb +0 -2
  296. data/lib/rubygems/request/https_pool.rb +0 -2
  297. data/lib/rubygems/request_set.rb +7 -20
  298. data/lib/rubygems/request_set/gem_dependency_api.rb +5 -7
  299. data/lib/rubygems/request_set/lockfile.rb +8 -12
  300. data/lib/rubygems/request_set/lockfile/parser.rb +0 -2
  301. data/lib/rubygems/request_set/lockfile/tokenizer.rb +1 -3
  302. data/lib/rubygems/requirement.rb +21 -22
  303. data/lib/rubygems/resolver.rb +14 -12
  304. data/lib/rubygems/resolver/activation_request.rb +9 -3
  305. data/lib/rubygems/resolver/api_set.rb +30 -23
  306. data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
  307. data/lib/rubygems/resolver/api_specification.rb +23 -9
  308. data/lib/rubygems/resolver/best_set.rb +2 -4
  309. data/lib/rubygems/resolver/composed_set.rb +3 -5
  310. data/lib/rubygems/resolver/conflict.rb +2 -4
  311. data/lib/rubygems/resolver/current_set.rb +0 -2
  312. data/lib/rubygems/resolver/dependency_request.rb +1 -3
  313. data/lib/rubygems/resolver/git_set.rb +0 -2
  314. data/lib/rubygems/resolver/git_specification.rb +0 -2
  315. data/lib/rubygems/resolver/index_set.rb +1 -3
  316. data/lib/rubygems/resolver/index_specification.rb +32 -2
  317. data/lib/rubygems/resolver/installed_specification.rb +0 -2
  318. data/lib/rubygems/resolver/installer_set.rb +60 -13
  319. data/lib/rubygems/resolver/local_specification.rb +0 -2
  320. data/lib/rubygems/resolver/lock_set.rb +2 -4
  321. data/lib/rubygems/resolver/lock_specification.rb +0 -2
  322. data/lib/rubygems/resolver/molinillo/lib/molinillo.rb +6 -5
  323. data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
  324. data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +8 -0
  325. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +39 -6
  326. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
  327. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +2 -1
  328. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +2 -1
  329. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +2 -1
  330. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +2 -1
  331. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb +7 -6
  332. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb +2 -1
  333. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb +4 -3
  334. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +51 -12
  335. data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +76 -8
  336. data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +2 -1
  337. data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb +12 -0
  338. data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +3 -1
  339. data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +510 -165
  340. data/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb +3 -2
  341. data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb +8 -4
  342. data/lib/rubygems/resolver/requirement_list.rb +0 -2
  343. data/lib/rubygems/resolver/set.rb +0 -2
  344. data/lib/rubygems/resolver/source_set.rb +0 -2
  345. data/lib/rubygems/resolver/spec_specification.rb +14 -2
  346. data/lib/rubygems/resolver/specification.rb +13 -3
  347. data/lib/rubygems/resolver/stats.rb +0 -2
  348. data/lib/rubygems/resolver/vendor_set.rb +0 -2
  349. data/lib/rubygems/resolver/vendor_specification.rb +0 -2
  350. data/lib/rubygems/s3_uri_signer.rb +2 -8
  351. data/lib/rubygems/safe_yaml.rb +4 -4
  352. data/lib/rubygems/security.rb +27 -34
  353. data/lib/rubygems/security/policy.rb +4 -8
  354. data/lib/rubygems/security/signer.rb +5 -7
  355. data/lib/rubygems/security/trust_dir.rb +1 -3
  356. data/lib/rubygems/server.rb +15 -12
  357. data/lib/rubygems/source.rb +23 -12
  358. data/lib/rubygems/source/git.rb +7 -8
  359. data/lib/rubygems/source/installed.rb +0 -2
  360. data/lib/rubygems/source/local.rb +2 -4
  361. data/lib/rubygems/source/lock.rb +0 -2
  362. data/lib/rubygems/source/specific_file.rb +0 -2
  363. data/lib/rubygems/source/vendor.rb +0 -2
  364. data/lib/rubygems/source_list.rb +4 -7
  365. data/lib/rubygems/spec_fetcher.rb +19 -18
  366. data/lib/rubygems/specification.rb +120 -131
  367. data/lib/rubygems/specification_policy.rb +79 -29
  368. data/lib/rubygems/ssl_certs/{index.rubygems.org → rubygems.org}/GlobalSignRootCA.pem +0 -0
  369. data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +21 -0
  370. data/lib/rubygems/stub_specification.rb +1 -5
  371. data/lib/rubygems/syck_hack.rb +0 -2
  372. data/lib/rubygems/test_case.rb +98 -129
  373. data/lib/rubygems/test_utilities.rb +12 -19
  374. data/lib/rubygems/uninstaller.rb +35 -16
  375. data/lib/rubygems/uri_formatter.rb +2 -3
  376. data/lib/rubygems/uri_parser.rb +0 -2
  377. data/lib/rubygems/user_interaction.rb +1 -26
  378. data/lib/rubygems/util.rb +8 -2
  379. data/lib/rubygems/util/licenses.rb +4 -6
  380. data/lib/rubygems/util/list.rb +0 -2
  381. data/lib/rubygems/validator.rb +1 -3
  382. data/lib/rubygems/version.rb +4 -6
  383. data/lib/rubygems/version_option.rb +6 -0
  384. data/rubygems-update.gemspec +3 -3
  385. data/setup.rb +2 -7
  386. data/test/rubygems/data/null-required-ruby-version.gemspec.rz +0 -0
  387. data/test/rubygems/data/null-required-rubygems-version.gemspec.rz +0 -0
  388. data/test/rubygems/plugin/load/rubygems_plugin.rb +0 -2
  389. data/test/rubygems/rubygems/commands/crash_command.rb +0 -2
  390. data/test/rubygems/rubygems_plugin.rb +0 -2
  391. data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
  392. data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +0 -2
  393. data/test/rubygems/test_bundled_ca.rb +42 -45
  394. data/test/rubygems/test_config.rb +0 -2
  395. data/test/rubygems/test_deprecate.rb +40 -7
  396. data/test/rubygems/test_gem.rb +167 -87
  397. data/test/rubygems/test_gem_available_set.rb +3 -5
  398. data/test/rubygems/test_gem_bundler_version_finder.rb +19 -3
  399. data/test/rubygems/test_gem_command.rb +24 -7
  400. data/test/rubygems/test_gem_command_manager.rb +36 -5
  401. data/test/rubygems/test_gem_commands_build_command.rb +233 -15
  402. data/test/rubygems/test_gem_commands_cert_command.rb +4 -6
  403. data/test/rubygems/test_gem_commands_check_command.rb +0 -2
  404. data/test/rubygems/test_gem_commands_cleanup_command.rb +14 -5
  405. data/test/rubygems/test_gem_commands_contents_command.rb +50 -19
  406. data/test/rubygems/test_gem_commands_dependency_command.rb +0 -2
  407. data/test/rubygems/test_gem_commands_environment_command.rb +21 -23
  408. data/test/rubygems/test_gem_commands_fetch_command.rb +0 -2
  409. data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -7
  410. data/test/rubygems/test_gem_commands_help_command.rb +15 -4
  411. data/test/rubygems/test_gem_commands_info_command.rb +6 -8
  412. data/test/rubygems/test_gem_commands_install_command.rb +163 -34
  413. data/test/rubygems/test_gem_commands_list_command.rb +0 -2
  414. data/test/rubygems/test_gem_commands_lock_command.rb +0 -2
  415. data/test/rubygems/test_gem_commands_mirror.rb +1 -3
  416. data/test/rubygems/test_gem_commands_open_command.rb +4 -6
  417. data/test/rubygems/test_gem_commands_outdated_command.rb +17 -1
  418. data/test/rubygems/test_gem_commands_owner_command.rb +59 -5
  419. data/test/rubygems/test_gem_commands_pristine_command.rb +43 -12
  420. data/test/rubygems/test_gem_commands_push_command.rb +77 -9
  421. data/test/rubygems/test_gem_commands_query_command.rb +12 -12
  422. data/test/rubygems/test_gem_commands_search_command.rb +0 -2
  423. data/test/rubygems/test_gem_commands_server_command.rb +0 -2
  424. data/test/rubygems/test_gem_commands_setup_command.rb +160 -135
  425. data/test/rubygems/test_gem_commands_signin_command.rb +33 -9
  426. data/test/rubygems/test_gem_commands_signout_command.rb +0 -7
  427. data/test/rubygems/test_gem_commands_sources_command.rb +60 -2
  428. data/test/rubygems/test_gem_commands_specification_command.rb +46 -20
  429. data/test/rubygems/test_gem_commands_stale_command.rb +0 -2
  430. data/test/rubygems/test_gem_commands_uninstall_command.rb +1 -3
  431. data/test/rubygems/test_gem_commands_unpack_command.rb +0 -2
  432. data/test/rubygems/test_gem_commands_update_command.rb +116 -7
  433. data/test/rubygems/test_gem_commands_which_command.rb +3 -5
  434. data/test/rubygems/test_gem_commands_yank_command.rb +44 -8
  435. data/test/rubygems/test_gem_config_file.rb +17 -12
  436. data/test/rubygems/test_gem_dependency.rb +0 -2
  437. data/test/rubygems/test_gem_dependency_installer.rb +133 -247
  438. data/test/rubygems/test_gem_dependency_list.rb +10 -12
  439. data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -3
  440. data/test/rubygems/test_gem_doctor.rb +28 -2
  441. data/test/rubygems/test_gem_ext_builder.rb +50 -47
  442. data/test/rubygems/test_gem_ext_cmake_builder.rb +16 -25
  443. data/test/rubygems/test_gem_ext_configure_builder.rb +6 -22
  444. data/test/rubygems/test_gem_ext_ext_conf_builder.rb +9 -29
  445. data/test/rubygems/test_gem_ext_rake_builder.rb +39 -24
  446. data/test/rubygems/test_gem_gem_runner.rb +44 -1
  447. data/test/rubygems/test_gem_gemcutter_utilities.rb +8 -5
  448. data/test/rubygems/test_gem_impossible_dependencies_error.rb +0 -2
  449. data/test/rubygems/test_gem_indexer.rb +9 -15
  450. data/test/rubygems/test_gem_install_update_options.rb +14 -4
  451. data/test/rubygems/test_gem_installer.rb +260 -115
  452. data/test/rubygems/test_gem_local_remote_options.rb +0 -2
  453. data/test/rubygems/test_gem_name_tuple.rb +0 -2
  454. data/test/rubygems/test_gem_package.rb +38 -31
  455. data/test/rubygems/test_gem_package_old.rb +4 -6
  456. data/test/rubygems/test_gem_package_tar_header.rb +18 -1
  457. data/test/rubygems/test_gem_package_tar_reader.rb +0 -2
  458. data/test/rubygems/test_gem_package_tar_reader_entry.rb +0 -2
  459. data/test/rubygems/test_gem_package_tar_writer.rb +4 -6
  460. data/test/rubygems/test_gem_package_task.rb +46 -13
  461. data/test/rubygems/test_gem_path_support.rb +0 -2
  462. data/test/rubygems/test_gem_platform.rb +71 -6
  463. data/test/rubygems/test_gem_rdoc.rb +0 -2
  464. data/test/rubygems/test_gem_remote_fetcher.rb +213 -212
  465. data/test/rubygems/test_gem_request.rb +13 -17
  466. data/test/rubygems/test_gem_request_connection_pools.rb +0 -4
  467. data/test/rubygems/test_gem_request_set.rb +20 -22
  468. data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -5
  469. data/test/rubygems/test_gem_request_set_lockfile.rb +4 -6
  470. data/test/rubygems/test_gem_request_set_lockfile_parser.rb +9 -11
  471. data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +118 -120
  472. data/test/rubygems/test_gem_requirement.rb +43 -3
  473. data/test/rubygems/test_gem_resolver.rb +6 -8
  474. data/test/rubygems/test_gem_resolver_activation_request.rb +0 -2
  475. data/test/rubygems/test_gem_resolver_api_set.rb +60 -59
  476. data/test/rubygems/test_gem_resolver_api_specification.rb +3 -5
  477. data/test/rubygems/test_gem_resolver_best_set.rb +27 -6
  478. data/test/rubygems/test_gem_resolver_composed_set.rb +0 -2
  479. data/test/rubygems/test_gem_resolver_conflict.rb +1 -3
  480. data/test/rubygems/test_gem_resolver_dependency_request.rb +0 -2
  481. data/test/rubygems/test_gem_resolver_git_set.rb +0 -2
  482. data/test/rubygems/test_gem_resolver_git_specification.rb +0 -2
  483. data/test/rubygems/test_gem_resolver_index_set.rb +2 -4
  484. data/test/rubygems/test_gem_resolver_index_specification.rb +0 -2
  485. data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -2
  486. data/test/rubygems/test_gem_resolver_installer_set.rb +7 -9
  487. data/test/rubygems/test_gem_resolver_local_specification.rb +0 -2
  488. data/test/rubygems/test_gem_resolver_lock_set.rb +3 -5
  489. data/test/rubygems/test_gem_resolver_lock_specification.rb +0 -2
  490. data/test/rubygems/test_gem_resolver_requirement_list.rb +0 -2
  491. data/test/rubygems/test_gem_resolver_specification.rb +0 -4
  492. data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -3
  493. data/test/rubygems/test_gem_resolver_vendor_specification.rb +0 -2
  494. data/test/rubygems/test_gem_security.rb +22 -24
  495. data/test/rubygems/test_gem_security_policy.rb +7 -12
  496. data/test/rubygems/test_gem_security_signer.rb +10 -12
  497. data/test/rubygems/test_gem_security_trust_dir.rb +4 -6
  498. data/test/rubygems/test_gem_server.rb +10 -14
  499. data/test/rubygems/test_gem_silent_ui.rb +0 -2
  500. data/test/rubygems/test_gem_source.rb +19 -18
  501. data/test/rubygems/test_gem_source_fetch_problem.rb +0 -2
  502. data/test/rubygems/test_gem_source_git.rb +12 -13
  503. data/test/rubygems/test_gem_source_installed.rb +7 -9
  504. data/test/rubygems/test_gem_source_list.rb +1 -2
  505. data/test/rubygems/test_gem_source_local.rb +8 -10
  506. data/test/rubygems/test_gem_source_lock.rb +10 -12
  507. data/test/rubygems/test_gem_source_specific_file.rb +7 -9
  508. data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
  509. data/test/rubygems/test_gem_source_vendor.rb +7 -9
  510. data/test/rubygems/test_gem_spec_fetcher.rb +11 -4
  511. data/test/rubygems/test_gem_specification.rb +171 -139
  512. data/test/rubygems/test_gem_stream_ui.rb +3 -3
  513. data/test/rubygems/test_gem_stub_specification.rb +4 -6
  514. data/test/rubygems/test_gem_text.rb +1 -3
  515. data/test/rubygems/test_gem_uninstaller.rb +134 -12
  516. data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +0 -2
  517. data/test/rubygems/test_gem_uri_formatter.rb +0 -2
  518. data/test/rubygems/test_gem_util.rb +11 -11
  519. data/test/rubygems/test_gem_validator.rb +1 -3
  520. data/test/rubygems/test_gem_version.rb +1 -3
  521. data/test/rubygems/test_gem_version_option.rb +1 -3
  522. data/test/rubygems/test_kernel.rb +25 -10
  523. data/test/rubygems/test_project_sanity.rb +7 -2
  524. data/test/rubygems/test_remote_fetch_error.rb +0 -2
  525. data/test/rubygems/test_require.rb +291 -56
  526. data/test/test_changelog_generator.rb +17 -0
  527. metadata +84 -136
  528. data/.bundle/config +0 -2
  529. data/.rubocop.yml +0 -91
  530. data/Gemfile +0 -8
  531. data/Gemfile.lock +0 -43
  532. data/bundler/CODE_OF_CONDUCT.md +0 -136
  533. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
  534. data/bundler/man/bundle-add.1.txt +0 -58
  535. data/bundler/man/bundle-binstubs.1.txt +0 -48
  536. data/bundler/man/bundle-cache.1.txt +0 -78
  537. data/bundler/man/bundle-check.1.txt +0 -33
  538. data/bundler/man/bundle-clean.1.txt +0 -26
  539. data/bundler/man/bundle-config.1.txt +0 -528
  540. data/bundler/man/bundle-doctor.1.txt +0 -44
  541. data/bundler/man/bundle-exec.1.txt +0 -178
  542. data/bundler/man/bundle-gem.1.txt +0 -91
  543. data/bundler/man/bundle-info.1.txt +0 -21
  544. data/bundler/man/bundle-init.1.txt +0 -34
  545. data/bundler/man/bundle-inject.1.txt +0 -32
  546. data/bundler/man/bundle-install.1.txt +0 -401
  547. data/bundler/man/bundle-list.1.txt +0 -43
  548. data/bundler/man/bundle-lock.1.txt +0 -93
  549. data/bundler/man/bundle-open.1.txt +0 -29
  550. data/bundler/man/bundle-outdated.1.txt +0 -131
  551. data/bundler/man/bundle-platform.1.txt +0 -57
  552. data/bundler/man/bundle-pristine.1.txt +0 -44
  553. data/bundler/man/bundle-remove.1.txt +0 -34
  554. data/bundler/man/bundle-show.1.txt +0 -27
  555. data/bundler/man/bundle-update.1.txt +0 -390
  556. data/bundler/man/bundle-viz.1.txt +0 -39
  557. data/bundler/man/bundle.1.txt +0 -116
  558. data/bundler/man/gemfile.5.txt +0 -649
  559. data/lib/rubygems/source_local.rb +0 -7
  560. data/lib/rubygems/source_specific_file.rb +0 -6
  561. data/lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
  562. data/lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
  563. data/lib/ubygems.rb +0 -14
  564. data/tmp/.keep +0 -0
  565. data/util/CL2notes +0 -55
  566. data/util/bisect +0 -10
  567. data/util/ci.sh +0 -62
  568. data/util/cops/deprecations.rb +0 -52
  569. data/util/create_certs.rb +0 -171
  570. data/util/create_certs.sh +0 -27
  571. data/util/create_encrypted_key.rb +0 -16
  572. data/util/generate_spdx_license_list.rb +0 -63
  573. data/util/patch_with_prs.rb +0 -77
  574. data/util/rubocop +0 -8
  575. data/util/update_bundled_ca_certificates.rb +0 -139
  576. data/util/update_changelog.rb +0 -64
@@ -2,12 +2,14 @@
2
2
 
3
3
  module Bundler
4
4
  module URICredentialsFilter
5
- module_function
5
+ module_function
6
6
 
7
7
  def credential_filtered_uri(uri_to_anonymize)
8
8
  return uri_to_anonymize if uri_to_anonymize.nil?
9
9
  uri = uri_to_anonymize.dup
10
10
  if uri.is_a?(String)
11
+ return uri if File.exist?(uri)
12
+
11
13
  require_relative "vendored_uri"
12
14
  uri = Bundler::URI(uri)
13
15
  end
@@ -1,6 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative 'molinillo/compatibility'
4
3
  require_relative 'molinillo/gem_metadata'
5
4
  require_relative 'molinillo/errors'
6
5
  require_relative 'molinillo/resolver'
@@ -26,6 +26,13 @@ module Bundler::Molinillo
26
26
  end
27
27
  end
28
28
 
29
+ # (see Bundler::Molinillo::SpecificationProvider#dependencies_equal?)
30
+ def dependencies_equal?(dependencies, other_dependencies)
31
+ with_no_such_dependency_error_handling do
32
+ specification_provider.dependencies_equal?(dependencies, other_dependencies)
33
+ end
34
+ end
35
+
29
36
  # (see Bundler::Molinillo::SpecificationProvider#name_for)
30
37
  def name_for(dependency)
31
38
  with_no_such_dependency_error_handling do
@@ -1,6 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'set'
4
3
  require 'tsort'
5
4
 
6
5
  require_relative 'dependency_graph/log'
@@ -124,6 +123,7 @@ module Bundler::Molinillo
124
123
  dot.join("\n")
125
124
  end
126
125
 
126
+ # @param [DependencyGraph] other
127
127
  # @return [Boolean] whether the two dependency graphs are equal, determined
128
128
  # by a recursive traversal of each {#root_vertices} and its
129
129
  # {Vertex#successors}
@@ -190,7 +190,7 @@ module Bundler::Molinillo
190
190
  # @return [Edge] the added edge
191
191
  def add_edge(origin, destination, requirement)
192
192
  if destination.path_to?(origin)
193
- raise CircularDependencyError.new([origin, destination])
193
+ raise CircularDependencyError.new(path(destination, origin))
194
194
  end
195
195
  add_edge_no_circular(origin, destination, requirement)
196
196
  end
@@ -219,5 +219,37 @@ module Bundler::Molinillo
219
219
  def add_edge_no_circular(origin, destination, requirement)
220
220
  log.add_edge_no_circular(self, origin.name, destination.name, requirement)
221
221
  end
222
+
223
+ # Returns the path between two vertices
224
+ # @raise [ArgumentError] if there is no path between the vertices
225
+ # @param [Vertex] from
226
+ # @param [Vertex] to
227
+ # @return [Array<Vertex>] the shortest path from `from` to `to`
228
+ def path(from, to)
229
+ distances = Hash.new(vertices.size + 1)
230
+ distances[from.name] = 0
231
+ predecessors = {}
232
+ each do |vertex|
233
+ vertex.successors.each do |successor|
234
+ if distances[successor.name] > distances[vertex.name] + 1
235
+ distances[successor.name] = distances[vertex.name] + 1
236
+ predecessors[successor] = vertex
237
+ end
238
+ end
239
+ end
240
+
241
+ path = [to]
242
+ while before = predecessors[to]
243
+ path << before
244
+ to = before
245
+ break if to == from
246
+ end
247
+
248
+ unless path.last.equal?(from)
249
+ raise ArgumentError, "There is no path from #{from.name} to #{to.name}"
250
+ end
251
+
252
+ path.reverse
253
+ end
222
254
  end
223
255
  end
@@ -14,11 +14,11 @@ module Bundler::Molinillo
14
14
  end
15
15
 
16
16
  # (see Action#up)
17
- def up(_graph)
17
+ def up(graph)
18
18
  end
19
19
 
20
20
  # (see Action#down)
21
- def down(_graph)
21
+ def down(graph)
22
22
  end
23
23
 
24
24
  # @!group Tag
@@ -59,7 +59,7 @@ module Bundler::Molinillo
59
59
  # @param [Set<Vertex>] vertices the set to add the predecessors to
60
60
  # @return [Set<Vertex>] the vertices of {#graph} where `self` is a
61
61
  # {#descendent?}
62
- def _recursive_predecessors(vertices = Set.new)
62
+ def _recursive_predecessors(vertices = new_vertex_set)
63
63
  incoming_edges.each do |edge|
64
64
  vertex = edge.origin
65
65
  next unless vertices.add?(vertex)
@@ -85,7 +85,7 @@ module Bundler::Molinillo
85
85
  # @param [Set<Vertex>] vertices the set to add the successors to
86
86
  # @return [Set<Vertex>] the vertices of {#graph} where `self` is an
87
87
  # {#ancestor?}
88
- def _recursive_successors(vertices = Set.new)
88
+ def _recursive_successors(vertices = new_vertex_set)
89
89
  outgoing_edges.each do |edge|
90
90
  vertex = edge.destination
91
91
  next unless vertices.add?(vertex)
@@ -128,7 +128,7 @@ module Bundler::Molinillo
128
128
 
129
129
  # Is there a path from `self` to `other` following edges in the
130
130
  # dependency graph?
131
- # @return true iff there is a path following edges within this {#graph}
131
+ # @return whether there is a path following edges within this {#graph}
132
132
  def path_to?(other)
133
133
  _path_to?(other)
134
134
  end
@@ -138,7 +138,7 @@ module Bundler::Molinillo
138
138
  # @param [Vertex] other the vertex to check if there's a path to
139
139
  # @param [Set<Vertex>] visited the vertices of {#graph} that have been visited
140
140
  # @return [Boolean] whether there is a path to `other` from `self`
141
- def _path_to?(other, visited = Set.new)
141
+ def _path_to?(other, visited = new_vertex_set)
142
142
  return false unless visited.add?(self)
143
143
  return true if equal?(other)
144
144
  successors.any? { |v| v._path_to?(other, visited) }
@@ -147,12 +147,18 @@ module Bundler::Molinillo
147
147
 
148
148
  # Is there a path from `other` to `self` following edges in the
149
149
  # dependency graph?
150
- # @return true iff there is a path following edges within this {#graph}
150
+ # @return whether there is a path following edges within this {#graph}
151
151
  def ancestor?(other)
152
152
  other.path_to?(self)
153
153
  end
154
154
 
155
155
  alias is_reachable_from? ancestor?
156
+
157
+ def new_vertex_set
158
+ require 'set'
159
+ Set.new
160
+ end
161
+ private :new_vertex_set
156
162
  end
157
163
  end
158
164
  end
@@ -34,7 +34,7 @@ module Bundler::Molinillo
34
34
 
35
35
  # An error caused by attempting to fulfil a dependency that was circular
36
36
  #
37
- # @note This exception will be thrown iff a {Vertex} is added to a
37
+ # @note This exception will be thrown if and only if a {Vertex} is added to a
38
38
  # {DependencyGraph} that has a {DependencyGraph::Vertex#path_to?} an
39
39
  # existing {DependencyGraph::Vertex}
40
40
  class CircularDependencyError < ResolverError
@@ -65,7 +65,7 @@ module Bundler::Molinillo
65
65
  # @param [SpecificationProvider] specification_provider see {#specification_provider}
66
66
  def initialize(conflicts, specification_provider)
67
67
  pairs = []
68
- Compatibility.flat_map(conflicts.values.flatten, &:requirements).each do |conflicting|
68
+ conflicts.values.flat_map(&:requirements).each do |conflicting|
69
69
  conflicting.each do |source, conflict_requirements|
70
70
  conflict_requirements.each do |c|
71
71
  pairs << [c, source]
@@ -121,7 +121,7 @@ module Bundler::Molinillo
121
121
  t = ''.dup
122
122
  depth = 2
123
123
  tree.each do |req|
124
- t << ' ' * depth << req.to_s
124
+ t << ' ' * depth << printable_requirement.call(req)
125
125
  unless tree.last == req
126
126
  if spec = conflict.activated_by_name[name_for(req)]
127
127
  t << %( was resolved to #{version_for_spec.call(spec)}, which)
@@ -2,5 +2,5 @@
2
2
 
3
3
  module Bundler::Molinillo
4
4
  # The version of Bundler::Molinillo.
5
- VERSION = '0.6.6'.freeze
5
+ VERSION = '0.7.0'.freeze
6
6
  end
@@ -45,6 +45,17 @@ module Bundler::Molinillo
45
45
  true
46
46
  end
47
47
 
48
+ # Determines whether two arrays of dependencies are equal, and thus can be
49
+ # grouped.
50
+ #
51
+ # @param [Array<Object>] dependencies
52
+ # @param [Array<Object>] other_dependencies
53
+ # @return [Boolean] whether `dependencies` and `other_dependencies` should
54
+ # be considered equal.
55
+ def dependencies_equal?(dependencies, other_dependencies)
56
+ dependencies == other_dependencies
57
+ end
58
+
48
59
  # Returns the name for the given `dependency`.
49
60
  # @note This method should be 'pure', i.e. the return value should depend
50
61
  # only on the `dependency` parameter.
@@ -207,7 +207,7 @@ module Bundler::Molinillo
207
207
  def start_resolution
208
208
  @started_at = Time.now
209
209
 
210
- handle_missing_or_push_dependency_state(initial_state)
210
+ push_initial_state
211
211
 
212
212
  debug { "Starting resolution (#{@started_at})\nUser-requested dependencies: #{original_requested}" }
213
213
  resolver_ui.before_resolution
@@ -273,10 +273,10 @@ module Bundler::Molinillo
273
273
  states.last
274
274
  end
275
275
 
276
- # Creates the initial state for the resolution, based upon the
276
+ # Creates and pushes the initial state for the resolution, based upon the
277
277
  # {#requested} dependencies
278
- # @return [DependencyState] the initial state for the resolution
279
- def initial_state
278
+ # @return [void]
279
+ def push_initial_state
280
280
  graph = DependencyGraph.new.tap do |dg|
281
281
  original_requested.each do |requested|
282
282
  vertex = dg.add_vertex(name_for(requested), nil, true)
@@ -285,18 +285,7 @@ module Bundler::Molinillo
285
285
  dg.tag(:initial_state)
286
286
  end
287
287
 
288
- requirements = sort_dependencies(original_requested, graph, {})
289
- initial_requirement = requirements.shift
290
- DependencyState.new(
291
- initial_requirement && name_for(initial_requirement),
292
- requirements,
293
- graph,
294
- initial_requirement,
295
- possibilities_for_requirement(initial_requirement, graph),
296
- 0,
297
- {},
298
- []
299
- )
288
+ push_state_for_requirements(original_requested, true, graph)
300
289
  end
301
290
 
302
291
  # Unwinds the states stack because a conflict has been encountered
@@ -340,11 +329,11 @@ module Bundler::Molinillo
340
329
 
341
330
  # Look for past conflicts that could be unwound to affect the
342
331
  # requirement tree for the current conflict
332
+ all_reqs = last_detail_for_current_unwind.all_requirements
333
+ all_reqs_size = all_reqs.size
343
334
  relevant_unused_unwinds = unused_unwind_options.select do |alternative|
344
- intersecting_requirements =
345
- last_detail_for_current_unwind.all_requirements &
346
- alternative.requirements_unwound_to_instead
347
- next if intersecting_requirements.empty?
335
+ diff_reqs = all_reqs - alternative.requirements_unwound_to_instead
336
+ next if diff_reqs.size == all_reqs_size
348
337
  # Find the highest index unwind whilst looping through
349
338
  current_detail = alternative if alternative > current_detail
350
339
  alternative
@@ -355,13 +344,17 @@ module Bundler::Molinillo
355
344
  state.unused_unwind_options += unwind_details.reject { |detail| detail.state_index == -1 }
356
345
 
357
346
  # Update the requirements_unwound_to_instead on any relevant unused unwinds
358
- relevant_unused_unwinds.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
359
- unwind_details.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
347
+ relevant_unused_unwinds.each do |d|
348
+ (d.requirements_unwound_to_instead << current_detail.state_requirement).uniq!
349
+ end
350
+ unwind_details.each do |d|
351
+ (d.requirements_unwound_to_instead << current_detail.state_requirement).uniq!
352
+ end
360
353
 
361
354
  current_detail
362
355
  end
363
356
 
364
- # @param [Array<Object>] array of requirements that combine to create a conflict
357
+ # @param [Array<Object>] binding_requirements array of requirements that combine to create a conflict
365
358
  # @return [Array<UnwindDetails>] array of UnwindDetails that have a chance
366
359
  # of resolving the passed requirements
367
360
  def unwind_options_for_requirements(binding_requirements)
@@ -429,7 +422,7 @@ module Bundler::Molinillo
429
422
  end
430
423
 
431
424
  # @param [DependencyState] state
432
- # @param [Array] array of requirements
425
+ # @param [Array] binding_requirements array of requirements
433
426
  # @return [Boolean] whether or not the given state has any possibilities
434
427
  # that could satisfy the given requirements
435
428
  def conflict_fixing_possibilities?(state, binding_requirements)
@@ -444,7 +437,8 @@ module Bundler::Molinillo
444
437
 
445
438
  # Filter's a state's possibilities to remove any that would not fix the
446
439
  # conflict we've just rewound from
447
- # @param [UnwindDetails] details of the conflict just unwound from
440
+ # @param [UnwindDetails] unwind_details details of the conflict just
441
+ # unwound from
448
442
  # @return [void]
449
443
  def filter_possibilities_after_unwind(unwind_details)
450
444
  return unless state && !state.possibilities.empty?
@@ -458,7 +452,7 @@ module Bundler::Molinillo
458
452
 
459
453
  # Filter's a state's possibilities to remove any that would not satisfy
460
454
  # the requirements in the conflict we've just rewound from
461
- # @param [UnwindDetails] details of the conflict just unwound from
455
+ # @param [UnwindDetails] unwind_details details of the conflict just unwound from
462
456
  # @return [void]
463
457
  def filter_possibilities_for_primary_unwind(unwind_details)
464
458
  unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
@@ -491,7 +485,7 @@ module Bundler::Molinillo
491
485
 
492
486
  # Filter's a state's possibilities to remove any that would (eventually)
493
487
  # create a requirement in the conflict we've just rewound from
494
- # @param [UnwindDetails] details of the conflict just unwound from
488
+ # @param [UnwindDetails] unwind_details details of the conflict just unwound from
495
489
  # @return [void]
496
490
  def filter_possibilities_for_parent_unwind(unwind_details)
497
491
  unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
@@ -500,7 +494,7 @@ module Bundler::Molinillo
500
494
  primary_unwinds = unwinds_to_state.select(&:unwinding_to_primary_requirement?).uniq
501
495
  parent_unwinds = unwinds_to_state.uniq - primary_unwinds
502
496
 
503
- allowed_possibility_sets = Compatibility.flat_map(primary_unwinds) do |unwind|
497
+ allowed_possibility_sets = primary_unwinds.flat_map do |unwind|
504
498
  states[unwind.state_index].possibilities.select do |possibility_set|
505
499
  possibility_set.possibilities.any? do |poss|
506
500
  possibility_satisfies_requirements?(poss, unwind.conflicting_requirements)
@@ -508,7 +502,7 @@ module Bundler::Molinillo
508
502
  end
509
503
  end
510
504
 
511
- requirements_to_avoid = Compatibility.flat_map(parent_unwinds, &:sub_dependencies_to_avoid)
505
+ requirements_to_avoid = parent_unwinds.flat_map(&:sub_dependencies_to_avoid)
512
506
 
513
507
  state.possibilities.reject! do |possibility_set|
514
508
  !allowed_possibility_sets.include?(possibility_set) &&
@@ -524,12 +518,12 @@ module Bundler::Molinillo
524
518
 
525
519
  possible_binding_requirements = conflict.requirements.values.flatten(1).uniq
526
520
 
527
- # When theres a `CircularDependency` error the conflicting requirement
528
- # (the one causing the circular) wont be `conflict.requirement`
529
- # (which wont be for the right state, because we wont have created it,
530
- # because its circular).
531
- # We need to make sure we have that requirement in the conflicts list,
532
- # otherwise we wont be able to unwind properly, so we just return all
521
+ # When there's a `CircularDependency` error the conflicting requirement
522
+ # (the one causing the circular) won't be `conflict.requirement`
523
+ # (which won't be for the right state, because we won't have created it,
524
+ # because it's circular).
525
+ # We need to make sure we have that requirement in the conflict's list,
526
+ # otherwise we won't be able to unwind properly, so we just return all
533
527
  # the requirements for the conflict.
534
528
  return possible_binding_requirements if conflict.underlying_error
535
529
 
@@ -558,8 +552,8 @@ module Bundler::Molinillo
558
552
  end
559
553
 
560
554
  # @param [Object] requirement we wish to check
561
- # @param [Array] array of requirements
562
- # @param [Array] array of possibilities the requirements will be used to filter
555
+ # @param [Array] possible_binding_requirements array of requirements
556
+ # @param [Array] possibilities array of possibilities the requirements will be used to filter
563
557
  # @return [Boolean] whether or not the given requirement is required to filter
564
558
  # out all elements of the array of possibilities.
565
559
  def binding_requirement_in_set?(requirement, possible_binding_requirements, possibilities)
@@ -568,6 +562,7 @@ module Bundler::Molinillo
568
562
  end
569
563
  end
570
564
 
565
+ # @param [Object] requirement
571
566
  # @return [Object] the requirement that led to `requirement` being added
572
567
  # to the list of requirements.
573
568
  def parent_of(requirement)
@@ -577,6 +572,7 @@ module Bundler::Molinillo
577
572
  parent_state.requirement
578
573
  end
579
574
 
575
+ # @param [String] name
580
576
  # @return [Object] the requirement that led to a version of a possibility
581
577
  # with the given name being activated.
582
578
  def requirement_for_existing_name(name)
@@ -585,6 +581,7 @@ module Bundler::Molinillo
585
581
  states.find { |s| s.name == name }.requirement
586
582
  end
587
583
 
584
+ # @param [Object] requirement
588
585
  # @return [ResolutionState] the state whose `requirement` is the given
589
586
  # `requirement`.
590
587
  def find_state_for(requirement)
@@ -592,6 +589,7 @@ module Bundler::Molinillo
592
589
  states.find { |i| requirement == i.requirement }
593
590
  end
594
591
 
592
+ # @param [Object] underlying_error
595
593
  # @return [Conflict] a {Conflict} that reflects the failure to activate
596
594
  # the {#possibility} in conjunction with the current {#state}
597
595
  def create_conflict(underlying_error = nil)
@@ -628,6 +626,7 @@ module Bundler::Molinillo
628
626
  vertex.requirements.map { |r| requirement_tree_for(r) }
629
627
  end
630
628
 
629
+ # @param [Object] requirement
631
630
  # @return [Array<Object>] the list of requirements that led to
632
631
  # `requirement` being required.
633
632
  def requirement_tree_for(requirement)
@@ -673,9 +672,8 @@ module Bundler::Molinillo
673
672
  attempt_to_filter_existing_spec(existing_vertex)
674
673
  else
675
674
  latest = possibility.latest_version
676
- # use reject!(!satisfied) for 1.8.7 compatibility
677
- possibility.possibilities.reject! do |possibility|
678
- !requirement_satisfied_by?(requirement, activated, possibility)
675
+ possibility.possibilities.select! do |possibility|
676
+ requirement_satisfied_by?(requirement, activated, possibility)
679
677
  end
680
678
  if possibility.latest_version.nil?
681
679
  # ensure there's a possibility for better error messages
@@ -705,7 +703,7 @@ module Bundler::Molinillo
705
703
 
706
704
  # Generates a filtered version of the existing vertex's `PossibilitySet` using the
707
705
  # current state's `requirement`
708
- # @param [Object] existing vertex
706
+ # @param [Object] vertex existing vertex
709
707
  # @return [PossibilitySet] filtered possibility set
710
708
  def filtered_possibility_set(vertex)
711
709
  PossibilitySet.new(vertex.payload.dependencies, vertex.payload.possibilities & possibility.possibilities)
@@ -730,7 +728,7 @@ module Bundler::Molinillo
730
728
  end
731
729
 
732
730
  # Requires the dependencies that the recently activated spec has
733
- # @param [Object] activated_possibility the PossibilitySet that has just been
731
+ # @param [Object] possibility_set the PossibilitySet that has just been
734
732
  # activated
735
733
  # @return [void]
736
734
  def require_nested_dependencies_for(possibility_set)
@@ -749,6 +747,8 @@ module Bundler::Molinillo
749
747
  # Pushes a new {DependencyState} that encapsulates both existing and new
750
748
  # requirements
751
749
  # @param [Array] new_requirements
750
+ # @param [Boolean] requires_sort
751
+ # @param [Object] new_activated
752
752
  # @return [void]
753
753
  def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated)
754
754
  new_requirements = sort_dependencies(new_requirements.uniq, new_activated, conflicts) if requires_sort
@@ -767,7 +767,8 @@ module Bundler::Molinillo
767
767
 
768
768
  # Checks a proposed requirement with any existing locked requirement
769
769
  # before generating an array of possibilities for it.
770
- # @param [Object] the proposed requirement
770
+ # @param [Object] requirement the proposed requirement
771
+ # @param [Object] activated
771
772
  # @return [Array] possibilities
772
773
  def possibilities_for_requirement(requirement, activated = self.activated)
773
774
  return [] unless requirement
@@ -778,7 +779,8 @@ module Bundler::Molinillo
778
779
  group_possibilities(search_for(requirement))
779
780
  end
780
781
 
781
- # @param [Object] the proposed requirement
782
+ # @param [Object] requirement the proposed requirement
783
+ # @param [Object] activated
782
784
  # @return [Array] possibility set containing only the locked requirement, if any
783
785
  def locked_requirement_possibility_set(requirement, activated = self.activated)
784
786
  all_possibilities = search_for(requirement)
@@ -797,15 +799,15 @@ module Bundler::Molinillo
797
799
  # Build an array of PossibilitySets, with each element representing a group of
798
800
  # dependency versions that all have the same sub-dependency version constraints
799
801
  # and are contiguous.
800
- # @param [Array] an array of possibilities
801
- # @return [Array] an array of possibility sets
802
+ # @param [Array] possibilities an array of possibilities
803
+ # @return [Array<PossibilitySet>] an array of possibility sets
802
804
  def group_possibilities(possibilities)
803
805
  possibility_sets = []
804
806
  current_possibility_set = nil
805
807
 
806
808
  possibilities.reverse_each do |possibility|
807
809
  dependencies = dependencies_for(possibility)
808
- if current_possibility_set && current_possibility_set.dependencies == dependencies
810
+ if current_possibility_set && dependencies_equal?(current_possibility_set.dependencies, dependencies)
809
811
  current_possibility_set.possibilities.unshift(possibility)
810
812
  else
811
813
  possibility_sets.unshift(PossibilitySet.new(dependencies, [possibility]))