rubygems-update 3.3.26 → 3.4.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (554) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1334 -1088
  3. data/CONTRIBUTING.md +31 -8
  4. data/Manifest.txt +49 -35
  5. data/POLICIES.md +15 -13
  6. data/README.md +19 -6
  7. data/bundler/CHANGELOG.md +290 -1
  8. data/bundler/README.md +3 -6
  9. data/bundler/UPGRADING.md +1 -1
  10. data/bundler/bundler.gemspec +2 -2
  11. data/bundler/exe/bundle +5 -16
  12. data/bundler/lib/bundler/build_metadata.rb +2 -2
  13. data/bundler/lib/bundler/cli/add.rb +1 -1
  14. data/bundler/lib/bundler/cli/binstubs.rb +5 -1
  15. data/bundler/lib/bundler/cli/check.rb +1 -1
  16. data/bundler/lib/bundler/cli/common.rb +1 -0
  17. data/bundler/lib/bundler/cli/console.rb +2 -2
  18. data/bundler/lib/bundler/cli/doctor.rb +4 -6
  19. data/bundler/lib/bundler/cli/gem.rb +62 -40
  20. data/bundler/lib/bundler/cli/init.rb +2 -2
  21. data/bundler/lib/bundler/cli/install.rb +2 -3
  22. data/bundler/lib/bundler/cli/lock.rb +8 -5
  23. data/bundler/lib/bundler/cli/open.rb +6 -4
  24. data/bundler/lib/bundler/cli/outdated.rb +1 -3
  25. data/bundler/lib/bundler/cli/viz.rb +1 -1
  26. data/bundler/lib/bundler/cli.rb +45 -2
  27. data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
  28. data/bundler/lib/bundler/compact_index_client/updater.rb +40 -39
  29. data/bundler/lib/bundler/constants.rb +1 -1
  30. data/bundler/lib/bundler/current_ruby.rb +2 -0
  31. data/bundler/lib/bundler/definition.rb +163 -82
  32. data/bundler/lib/bundler/dependency.rb +13 -12
  33. data/bundler/lib/bundler/digest.rb +1 -1
  34. data/bundler/lib/bundler/dsl.rb +3 -3
  35. data/bundler/lib/bundler/endpoint_specification.rb +0 -4
  36. data/bundler/lib/bundler/env.rb +1 -1
  37. data/bundler/lib/bundler/environment_preserver.rb +3 -2
  38. data/bundler/lib/bundler/errors.rb +1 -11
  39. data/bundler/lib/bundler/feature_flag.rb +0 -1
  40. data/bundler/lib/bundler/fetcher/compact_index.rb +9 -11
  41. data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
  42. data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
  43. data/bundler/lib/bundler/fetcher.rb +4 -8
  44. data/bundler/lib/bundler/force_platform.rb +18 -0
  45. data/bundler/lib/bundler/friendly_errors.rb +0 -3
  46. data/bundler/lib/bundler/gem_version_promoter.rb +52 -86
  47. data/bundler/lib/bundler/graph.rb +3 -3
  48. data/bundler/lib/bundler/index.rb +7 -15
  49. data/bundler/lib/bundler/injector.rb +2 -2
  50. data/bundler/lib/bundler/inline.rb +8 -10
  51. data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
  52. data/bundler/lib/bundler/installer/standalone.rb +12 -8
  53. data/bundler/lib/bundler/installer.rb +10 -24
  54. data/bundler/lib/bundler/lazy_specification.rb +42 -42
  55. data/bundler/lib/bundler/lockfile_generator.rb +2 -2
  56. data/bundler/lib/bundler/lockfile_parser.rb +17 -16
  57. data/bundler/lib/bundler/man/bundle-add.1 +1 -1
  58. data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
  59. data/bundler/lib/bundler/man/bundle-cache.1 +3 -3
  60. data/bundler/lib/bundler/man/bundle-cache.1.ronn +2 -2
  61. data/bundler/lib/bundler/man/bundle-check.1 +1 -1
  62. data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
  63. data/bundler/lib/bundler/man/bundle-config.1 +2 -5
  64. data/bundler/lib/bundler/man/bundle-config.1.ronn +1 -4
  65. data/bundler/lib/bundler/man/bundle-console.1 +1 -1
  66. data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
  67. data/bundler/lib/bundler/man/bundle-exec.1 +5 -5
  68. data/bundler/lib/bundler/man/bundle-exec.1.ronn +5 -5
  69. data/bundler/lib/bundler/man/bundle-gem.1 +27 -37
  70. data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -5
  71. data/bundler/lib/bundler/man/bundle-help.1 +1 -1
  72. data/bundler/lib/bundler/man/bundle-info.1 +1 -1
  73. data/bundler/lib/bundler/man/bundle-init.1 +5 -1
  74. data/bundler/lib/bundler/man/bundle-init.1.ronn +2 -0
  75. data/bundler/lib/bundler/man/bundle-inject.1 +1 -1
  76. data/bundler/lib/bundler/man/bundle-install.1 +1 -30
  77. data/bundler/lib/bundler/man/bundle-install.1.ronn +0 -29
  78. data/bundler/lib/bundler/man/bundle-list.1 +1 -1
  79. data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
  80. data/bundler/lib/bundler/man/bundle-open.1 +22 -2
  81. data/bundler/lib/bundler/man/bundle-open.1.ronn +9 -1
  82. data/bundler/lib/bundler/man/bundle-outdated.1 +13 -9
  83. data/bundler/lib/bundler/man/bundle-outdated.1.ronn +12 -9
  84. data/bundler/lib/bundler/man/bundle-platform.1 +2 -2
  85. data/bundler/lib/bundler/man/bundle-platform.1.ronn +1 -1
  86. data/bundler/lib/bundler/man/bundle-plugin.1 +1 -1
  87. data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
  88. data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
  89. data/bundler/lib/bundler/man/bundle-show.1 +1 -1
  90. data/bundler/lib/bundler/man/bundle-update.1 +1 -1
  91. data/bundler/lib/bundler/man/bundle-version.1 +1 -1
  92. data/bundler/lib/bundler/man/bundle-viz.1 +1 -1
  93. data/bundler/lib/bundler/man/bundle.1 +1 -1
  94. data/bundler/lib/bundler/man/gemfile.5 +2 -2
  95. data/bundler/lib/bundler/man/gemfile.5.ronn +1 -1
  96. data/bundler/lib/bundler/mirror.rb +5 -7
  97. data/bundler/lib/bundler/plugin/index.rb +4 -4
  98. data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -4
  99. data/bundler/lib/bundler/plugin/installer.rb +5 -2
  100. data/bundler/lib/bundler/plugin.rb +1 -1
  101. data/bundler/lib/bundler/remote_specification.rb +2 -6
  102. data/bundler/lib/bundler/resolver/base.rb +72 -15
  103. data/bundler/lib/bundler/resolver/candidate.rb +94 -0
  104. data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
  105. data/bundler/lib/bundler/resolver/package.rb +72 -0
  106. data/bundler/lib/bundler/resolver/root.rb +25 -0
  107. data/bundler/lib/bundler/resolver/spec_group.rb +26 -36
  108. data/bundler/lib/bundler/resolver.rb +324 -277
  109. data/bundler/lib/bundler/ruby_version.rb +1 -1
  110. data/bundler/lib/bundler/rubygems_ext.rb +16 -9
  111. data/bundler/lib/bundler/rubygems_gem_installer.rb +4 -2
  112. data/bundler/lib/bundler/rubygems_integration.rb +10 -14
  113. data/bundler/lib/bundler/runtime.rb +2 -6
  114. data/bundler/lib/bundler/safe_marshal.rb +31 -0
  115. data/bundler/lib/bundler/settings.rb +4 -10
  116. data/bundler/lib/bundler/setup.rb +4 -1
  117. data/bundler/lib/bundler/shared_helpers.rb +2 -1
  118. data/bundler/lib/bundler/source/git/git_proxy.rb +237 -74
  119. data/bundler/lib/bundler/source/git.rb +48 -30
  120. data/bundler/lib/bundler/source/metadata.rb +0 -1
  121. data/bundler/lib/bundler/source/path/installer.rb +1 -22
  122. data/bundler/lib/bundler/source/path.rb +6 -6
  123. data/bundler/lib/bundler/source/rubygems.rb +26 -81
  124. data/bundler/lib/bundler/source.rb +1 -1
  125. data/bundler/lib/bundler/source_list.rb +8 -2
  126. data/bundler/lib/bundler/spec_set.rb +22 -14
  127. data/bundler/lib/bundler/templates/Executable +1 -1
  128. data/bundler/lib/bundler/templates/Executable.bundler +5 -10
  129. data/bundler/lib/bundler/templates/Executable.standalone +2 -0
  130. data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
  131. data/bundler/lib/bundler/templates/newgem/Gemfile.tt +3 -0
  132. data/bundler/lib/bundler/templates/newgem/README.md.tt +6 -4
  133. data/bundler/lib/bundler/templates/newgem/Rakefile.tt +12 -1
  134. data/bundler/lib/bundler/templates/newgem/bin/console.tt +0 -4
  135. data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
  136. data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
  137. data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
  138. data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
  139. data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
  140. data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
  141. data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +10 -0
  142. data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
  143. data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +8 -0
  144. data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +9 -2
  145. data/bundler/lib/bundler/ui/shell.rb +35 -12
  146. data/bundler/lib/bundler/ui/silent.rb +21 -5
  147. data/bundler/lib/bundler/uri_normalizer.rb +23 -0
  148. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
  149. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
  150. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
  151. data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1351 -409
  152. data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
  153. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
  154. data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
  155. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
  156. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
  157. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
  158. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
  159. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
  160. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
  161. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
  162. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
  163. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
  164. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
  165. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
  166. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
  167. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
  168. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
  169. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
  170. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
  171. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
  172. data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
  173. data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
  174. data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
  175. data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
  176. data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
  177. data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
  178. data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
  179. data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
  180. data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
  181. data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +15 -9
  182. data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -6
  183. data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
  184. data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
  185. data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
  186. data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -2
  187. data/bundler/lib/bundler/vendored_persistent.rb +1 -33
  188. data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
  189. data/bundler/lib/bundler/version.rb +5 -1
  190. data/bundler/lib/bundler/worker.rb +5 -7
  191. data/bundler/lib/bundler.rb +21 -72
  192. data/{bin → exe}/gem +3 -4
  193. data/{bin → exe}/update_rubygems +8 -6
  194. data/lib/rubygems/available_set.rb +1 -0
  195. data/lib/rubygems/basic_specification.rb +1 -0
  196. data/lib/rubygems/bundler_version_finder.rb +1 -1
  197. data/lib/rubygems/command.rb +16 -7
  198. data/lib/rubygems/command_manager.rb +23 -8
  199. data/lib/rubygems/commands/build_command.rb +4 -0
  200. data/lib/rubygems/commands/cert_command.rb +1 -0
  201. data/lib/rubygems/commands/check_command.rb +1 -0
  202. data/lib/rubygems/commands/cleanup_command.rb +1 -0
  203. data/lib/rubygems/commands/contents_command.rb +1 -0
  204. data/lib/rubygems/commands/dependency_command.rb +1 -0
  205. data/lib/rubygems/commands/environment_command.rb +1 -0
  206. data/lib/rubygems/commands/exec_command.rb +249 -0
  207. data/lib/rubygems/commands/fetch_command.rb +2 -1
  208. data/lib/rubygems/commands/generate_index_command.rb +1 -0
  209. data/lib/rubygems/commands/help_command.rb +4 -3
  210. data/lib/rubygems/commands/install_command.rb +8 -3
  211. data/lib/rubygems/commands/list_command.rb +1 -0
  212. data/lib/rubygems/commands/lock_command.rb +1 -0
  213. data/lib/rubygems/commands/mirror_command.rb +1 -0
  214. data/lib/rubygems/commands/open_command.rb +1 -0
  215. data/lib/rubygems/commands/outdated_command.rb +1 -0
  216. data/lib/rubygems/commands/owner_command.rb +6 -3
  217. data/lib/rubygems/commands/pristine_command.rb +10 -0
  218. data/lib/rubygems/commands/push_command.rb +1 -0
  219. data/lib/rubygems/commands/query_command.rb +1 -0
  220. data/lib/rubygems/commands/rdoc_command.rb +4 -2
  221. data/lib/rubygems/commands/search_command.rb +1 -0
  222. data/lib/rubygems/commands/server_command.rb +1 -0
  223. data/lib/rubygems/commands/setup_command.rb +4 -3
  224. data/lib/rubygems/commands/signin_command.rb +1 -0
  225. data/lib/rubygems/commands/signout_command.rb +1 -0
  226. data/lib/rubygems/commands/sources_command.rb +1 -0
  227. data/lib/rubygems/commands/specification_command.rb +1 -0
  228. data/lib/rubygems/commands/stale_command.rb +1 -0
  229. data/lib/rubygems/commands/uninstall_command.rb +4 -0
  230. data/lib/rubygems/commands/unpack_command.rb +2 -1
  231. data/lib/rubygems/commands/update_command.rb +2 -7
  232. data/lib/rubygems/commands/which_command.rb +1 -0
  233. data/lib/rubygems/commands/yank_command.rb +1 -0
  234. data/lib/rubygems/config_file.rb +34 -0
  235. data/lib/rubygems/core_ext/kernel_gem.rb +0 -5
  236. data/lib/rubygems/core_ext/kernel_require.rb +108 -114
  237. data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
  238. data/lib/rubygems/core_ext/tcpsocket_init.rb +2 -0
  239. data/lib/rubygems/defaults.rb +17 -2
  240. data/lib/rubygems/dependency.rb +6 -2
  241. data/lib/rubygems/dependency_installer.rb +25 -24
  242. data/lib/rubygems/dependency_list.rb +1 -0
  243. data/lib/rubygems/deprecate.rb +3 -2
  244. data/lib/rubygems/doctor.rb +1 -0
  245. data/lib/rubygems/errors.rb +1 -0
  246. data/lib/rubygems/exceptions.rb +11 -3
  247. data/lib/rubygems/ext/build_error.rb +1 -0
  248. data/lib/rubygems/ext/builder.rb +23 -7
  249. data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +9 -5
  250. data/lib/rubygems/ext/cargo_builder.rb +145 -110
  251. data/lib/rubygems/ext/configure_builder.rb +1 -0
  252. data/lib/rubygems/ext/ext_conf_builder.rb +4 -2
  253. data/lib/rubygems/ext/rake_builder.rb +5 -3
  254. data/lib/rubygems/ext.rb +1 -0
  255. data/lib/rubygems/gem_runner.rb +1 -0
  256. data/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb +163 -0
  257. data/lib/rubygems/gemcutter_utilities/webauthn_listener.rb +105 -0
  258. data/lib/rubygems/gemcutter_utilities/webauthn_poller.rb +78 -0
  259. data/lib/rubygems/gemcutter_utilities.rb +53 -6
  260. data/lib/rubygems/indexer.rb +2 -1
  261. data/lib/rubygems/install_default_message.rb +1 -0
  262. data/lib/rubygems/install_message.rb +1 -0
  263. data/lib/rubygems/install_update_options.rb +1 -0
  264. data/lib/rubygems/installer.rb +22 -6
  265. data/lib/rubygems/local_remote_options.rb +1 -0
  266. data/lib/rubygems/mock_gem_ui.rb +1 -0
  267. data/lib/rubygems/name_tuple.rb +1 -0
  268. data/lib/rubygems/optparse/lib/optparse.rb +20 -15
  269. data/lib/rubygems/package/digest_io.rb +1 -0
  270. data/lib/rubygems/package/file_source.rb +1 -0
  271. data/lib/rubygems/package/io_source.rb +1 -0
  272. data/lib/rubygems/package/old.rb +1 -0
  273. data/lib/rubygems/package/source.rb +1 -0
  274. data/lib/rubygems/package/tar_header.rb +13 -12
  275. data/lib/rubygems/package/tar_reader/entry.rb +89 -7
  276. data/lib/rubygems/package/tar_reader.rb +1 -28
  277. data/lib/rubygems/package/tar_writer.rb +1 -0
  278. data/lib/rubygems/package.rb +1 -0
  279. data/lib/rubygems/package_task.rb +1 -0
  280. data/lib/rubygems/path_support.rb +1 -0
  281. data/lib/rubygems/platform.rb +4 -5
  282. data/lib/rubygems/psych_tree.rb +1 -0
  283. data/lib/rubygems/rdoc.rb +1 -0
  284. data/lib/rubygems/remote_fetcher.rb +1 -0
  285. data/lib/rubygems/request/http_pool.rb +1 -0
  286. data/lib/rubygems/request/https_pool.rb +1 -0
  287. data/lib/rubygems/request.rb +1 -0
  288. data/lib/rubygems/request_set/gem_dependency_api.rb +105 -105
  289. data/lib/rubygems/request_set/lockfile/parser.rb +1 -0
  290. data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
  291. data/lib/rubygems/request_set/lockfile.rb +1 -0
  292. data/lib/rubygems/request_set.rb +3 -2
  293. data/lib/rubygems/requirement.rb +9 -8
  294. data/lib/rubygems/resolver/activation_request.rb +1 -0
  295. data/lib/rubygems/resolver/api_set.rb +1 -0
  296. data/lib/rubygems/resolver/api_specification.rb +1 -0
  297. data/lib/rubygems/resolver/best_set.rb +1 -0
  298. data/lib/rubygems/resolver/composed_set.rb +1 -0
  299. data/lib/rubygems/resolver/conflict.rb +1 -0
  300. data/lib/rubygems/resolver/current_set.rb +1 -0
  301. data/lib/rubygems/resolver/dependency_request.rb +1 -0
  302. data/lib/rubygems/resolver/git_set.rb +1 -0
  303. data/lib/rubygems/resolver/git_specification.rb +1 -0
  304. data/lib/rubygems/resolver/index_set.rb +1 -0
  305. data/lib/rubygems/resolver/index_specification.rb +1 -0
  306. data/lib/rubygems/resolver/installed_specification.rb +1 -0
  307. data/lib/rubygems/resolver/installer_set.rb +5 -2
  308. data/lib/rubygems/resolver/local_specification.rb +1 -0
  309. data/lib/rubygems/resolver/lock_set.rb +1 -0
  310. data/lib/rubygems/resolver/lock_specification.rb +1 -0
  311. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +1 -1
  312. data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
  313. data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
  314. data/lib/rubygems/resolver/molinillo.rb +1 -0
  315. data/lib/rubygems/resolver/requirement_list.rb +1 -0
  316. data/lib/rubygems/resolver/set.rb +1 -0
  317. data/lib/rubygems/resolver/source_set.rb +2 -0
  318. data/lib/rubygems/resolver/spec_specification.rb +1 -0
  319. data/lib/rubygems/resolver/specification.rb +1 -0
  320. data/lib/rubygems/resolver/stats.rb +2 -1
  321. data/lib/rubygems/resolver/vendor_set.rb +1 -0
  322. data/lib/rubygems/resolver/vendor_specification.rb +1 -0
  323. data/lib/rubygems/resolver.rb +1 -0
  324. data/lib/rubygems/s3_uri_signer.rb +4 -2
  325. data/lib/rubygems/safe_yaml.rb +2 -0
  326. data/lib/rubygems/security/policies.rb +41 -40
  327. data/lib/rubygems/security/policy.rb +1 -0
  328. data/lib/rubygems/security/signer.rb +1 -0
  329. data/lib/rubygems/security/trust_dir.rb +2 -1
  330. data/lib/rubygems/security.rb +4 -16
  331. data/lib/rubygems/security_option.rb +1 -0
  332. data/lib/rubygems/shellwords.rb +3 -0
  333. data/lib/rubygems/source/git.rb +1 -1
  334. data/lib/rubygems/source/installed.rb +1 -0
  335. data/lib/rubygems/source/local.rb +1 -0
  336. data/lib/rubygems/source/lock.rb +1 -0
  337. data/lib/rubygems/source/specific_file.rb +1 -0
  338. data/lib/rubygems/source/vendor.rb +1 -0
  339. data/lib/rubygems/source.rb +2 -2
  340. data/lib/rubygems/spec_fetcher.rb +1 -0
  341. data/lib/rubygems/specification.rb +58 -52
  342. data/lib/rubygems/specification_policy.rb +21 -0
  343. data/lib/rubygems/stub_specification.rb +10 -8
  344. data/lib/rubygems/text.rb +2 -2
  345. data/lib/rubygems/tsort/lib/tsort.rb +308 -310
  346. data/lib/rubygems/uninstaller.rb +1 -0
  347. data/lib/rubygems/update_suggestion.rb +69 -0
  348. data/lib/rubygems/user_interaction.rb +2 -0
  349. data/lib/rubygems/util/licenses.rb +3 -2
  350. data/lib/rubygems/util/list.rb +1 -0
  351. data/lib/rubygems/util.rb +2 -5
  352. data/lib/rubygems/validator.rb +2 -1
  353. data/lib/rubygems/version.rb +2 -2
  354. data/lib/rubygems/version_option.rb +1 -0
  355. data/lib/rubygems.rb +32 -11
  356. data/rubygems-update.gemspec +6 -4
  357. data/setup.rb +1 -0
  358. data/test/rubygems/bad_rake.rb +1 -0
  359. data/test/rubygems/bundler_test_gem.rb +421 -0
  360. data/test/rubygems/fake_certlib/openssl.rb +1 -0
  361. data/test/rubygems/good_rake.rb +1 -0
  362. data/test/rubygems/helper.rb +23 -6
  363. data/test/rubygems/installer_test_case.rb +1 -0
  364. data/test/rubygems/multifactor_auth_utilities.rb +111 -0
  365. data/test/rubygems/package/tar_test_case.rb +51 -15
  366. data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -0
  367. data/test/rubygems/plugin/load/rubygems_plugin.rb +1 -0
  368. data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -0
  369. data/test/rubygems/rubygems/commands/crash_command.rb +1 -0
  370. data/test/rubygems/rubygems_plugin.rb +1 -0
  371. data/test/rubygems/simple_gem.rb +2 -1
  372. data/test/rubygems/specifications/bar-0.0.2.gemspec +2 -0
  373. data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +2 -0
  374. data/test/rubygems/test_bundled_ca.rb +3 -2
  375. data/test/rubygems/test_config.rb +2 -1
  376. data/test/rubygems/test_deprecate.rb +2 -1
  377. data/test/rubygems/test_exit.rb +7 -1
  378. data/test/rubygems/test_gem.rb +41 -421
  379. data/test/rubygems/test_gem_available_set.rb +1 -0
  380. data/test/rubygems/test_gem_bundler_version_finder.rb +5 -3
  381. data/test/rubygems/test_gem_command.rb +1 -0
  382. data/test/rubygems/test_gem_command_manager.rb +67 -1
  383. data/test/rubygems/test_gem_commands_build_command.rb +11 -0
  384. data/test/rubygems/test_gem_commands_cert_command.rb +1 -0
  385. data/test/rubygems/test_gem_commands_check_command.rb +1 -0
  386. data/test/rubygems/test_gem_commands_cleanup_command.rb +1 -0
  387. data/test/rubygems/test_gem_commands_contents_command.rb +1 -0
  388. data/test/rubygems/test_gem_commands_dependency_command.rb +1 -0
  389. data/test/rubygems/test_gem_commands_environment_command.rb +1 -0
  390. data/test/rubygems/test_gem_commands_exec_command.rb +853 -0
  391. data/test/rubygems/test_gem_commands_fetch_command.rb +1 -0
  392. data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -0
  393. data/test/rubygems/test_gem_commands_help_command.rb +1 -0
  394. data/test/rubygems/test_gem_commands_info_command.rb +1 -0
  395. data/test/rubygems/test_gem_commands_install_command.rb +21 -1
  396. data/test/rubygems/test_gem_commands_list_command.rb +1 -0
  397. data/test/rubygems/test_gem_commands_lock_command.rb +1 -0
  398. data/test/rubygems/test_gem_commands_mirror.rb +1 -0
  399. data/test/rubygems/test_gem_commands_open_command.rb +1 -0
  400. data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
  401. data/test/rubygems/test_gem_commands_owner_command.rb +103 -7
  402. data/test/rubygems/test_gem_commands_pristine_command.rb +50 -1
  403. data/test/rubygems/test_gem_commands_push_command.rb +110 -6
  404. data/test/rubygems/test_gem_commands_query_command.rb +1 -0
  405. data/test/rubygems/test_gem_commands_search_command.rb +1 -0
  406. data/test/rubygems/test_gem_commands_server_command.rb +1 -0
  407. data/test/rubygems/test_gem_commands_setup_command.rb +4 -11
  408. data/test/rubygems/test_gem_commands_signin_command.rb +1 -0
  409. data/test/rubygems/test_gem_commands_sources_command.rb +1 -0
  410. data/test/rubygems/test_gem_commands_specification_command.rb +1 -0
  411. data/test/rubygems/test_gem_commands_stale_command.rb +1 -0
  412. data/test/rubygems/test_gem_commands_uninstall_command.rb +32 -14
  413. data/test/rubygems/test_gem_commands_unpack_command.rb +1 -0
  414. data/test/rubygems/test_gem_commands_update_command.rb +7 -6
  415. data/test/rubygems/test_gem_commands_which_command.rb +1 -0
  416. data/test/rubygems/test_gem_commands_yank_command.rb +120 -1
  417. data/test/rubygems/test_gem_config_file.rb +2 -1
  418. data/test/rubygems/test_gem_dependency.rb +3 -0
  419. data/test/rubygems/test_gem_dependency_installer.rb +35 -0
  420. data/test/rubygems/test_gem_dependency_list.rb +1 -0
  421. data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -0
  422. data/test/rubygems/test_gem_doctor.rb +1 -0
  423. data/test/rubygems/test_gem_ext_builder.rb +7 -8
  424. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +4 -4
  425. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{Cargo.lock → ext/custom_name_lib/Cargo.lock} +22 -32
  426. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{Cargo.toml → ext/custom_name_lib/Cargo.toml} +1 -1
  427. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/{src → ext/custom_name_lib/src}/lib.rs +1 -1
  428. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +3 -0
  429. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +36 -32
  430. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +1 -1
  431. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +2 -0
  432. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +12 -0
  433. data/test/rubygems/test_gem_ext_cargo_builder.rb +33 -44
  434. data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +17 -16
  435. data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +5 -20
  436. data/test/rubygems/test_gem_ext_cmake_builder.rb +1 -0
  437. data/test/rubygems/test_gem_ext_configure_builder.rb +1 -0
  438. data/test/rubygems/test_gem_ext_rake_builder.rb +1 -0
  439. data/test/rubygems/test_gem_gem_runner.rb +8 -2
  440. data/test/rubygems/test_gem_gemcutter_utilities.rb +130 -48
  441. data/test/rubygems/test_gem_impossible_dependencies_error.rb +1 -0
  442. data/test/rubygems/test_gem_indexer.rb +40 -20
  443. data/test/rubygems/test_gem_install_update_options.rb +1 -0
  444. data/test/rubygems/test_gem_installer.rb +120 -5
  445. data/test/rubygems/test_gem_local_remote_options.rb +1 -0
  446. data/test/rubygems/test_gem_name_tuple.rb +1 -0
  447. data/test/rubygems/test_gem_package.rb +0 -25
  448. data/test/rubygems/test_gem_package_old.rb +1 -0
  449. data/test/rubygems/test_gem_package_tar_header.rb +14 -13
  450. data/test/rubygems/test_gem_package_tar_reader.rb +49 -1
  451. data/test/rubygems/test_gem_package_tar_reader_entry.rb +152 -6
  452. data/test/rubygems/test_gem_package_tar_writer.rb +1 -0
  453. data/test/rubygems/test_gem_package_task.rb +1 -0
  454. data/test/rubygems/test_gem_path_support.rb +1 -0
  455. data/test/rubygems/test_gem_platform.rb +60 -60
  456. data/test/rubygems/test_gem_rdoc.rb +1 -0
  457. data/test/rubygems/test_gem_remote_fetcher.rb +6 -5
  458. data/test/rubygems/test_gem_request.rb +10 -4
  459. data/test/rubygems/test_gem_request_connection_pools.rb +1 -0
  460. data/test/rubygems/test_gem_request_set.rb +3 -2
  461. data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +11 -10
  462. data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
  463. data/test/rubygems/test_gem_request_set_lockfile_parser.rb +7 -6
  464. data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +1 -0
  465. data/test/rubygems/test_gem_requirement.rb +2 -1
  466. data/test/rubygems/test_gem_resolver.rb +1 -0
  467. data/test/rubygems/test_gem_resolver_activation_request.rb +1 -0
  468. data/test/rubygems/test_gem_resolver_api_set.rb +13 -12
  469. data/test/rubygems/test_gem_resolver_api_specification.rb +20 -19
  470. data/test/rubygems/test_gem_resolver_best_set.rb +1 -0
  471. data/test/rubygems/test_gem_resolver_composed_set.rb +1 -0
  472. data/test/rubygems/test_gem_resolver_conflict.rb +1 -0
  473. data/test/rubygems/test_gem_resolver_dependency_request.rb +1 -0
  474. data/test/rubygems/test_gem_resolver_git_set.rb +10 -9
  475. data/test/rubygems/test_gem_resolver_git_specification.rb +3 -2
  476. data/test/rubygems/test_gem_resolver_index_set.rb +1 -0
  477. data/test/rubygems/test_gem_resolver_index_specification.rb +1 -0
  478. data/test/rubygems/test_gem_resolver_installed_specification.rb +1 -0
  479. data/test/rubygems/test_gem_resolver_installer_set.rb +1 -0
  480. data/test/rubygems/test_gem_resolver_local_specification.rb +1 -0
  481. data/test/rubygems/test_gem_resolver_lock_set.rb +1 -0
  482. data/test/rubygems/test_gem_resolver_lock_specification.rb +1 -0
  483. data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -0
  484. data/test/rubygems/test_gem_resolver_specification.rb +1 -0
  485. data/test/rubygems/test_gem_resolver_vendor_set.rb +1 -0
  486. data/test/rubygems/test_gem_resolver_vendor_specification.rb +1 -0
  487. data/test/rubygems/test_gem_security.rb +1 -0
  488. data/test/rubygems/test_gem_security_policy.rb +10 -10
  489. data/test/rubygems/test_gem_security_signer.rb +1 -0
  490. data/test/rubygems/test_gem_security_trust_dir.rb +3 -2
  491. data/test/rubygems/test_gem_silent_ui.rb +1 -0
  492. data/test/rubygems/test_gem_source.rb +2 -1
  493. data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
  494. data/test/rubygems/test_gem_source_git.rb +14 -12
  495. data/test/rubygems/test_gem_source_installed.rb +2 -1
  496. data/test/rubygems/test_gem_source_list.rb +1 -0
  497. data/test/rubygems/test_gem_source_local.rb +1 -0
  498. data/test/rubygems/test_gem_source_lock.rb +4 -3
  499. data/test/rubygems/test_gem_source_specific_file.rb +1 -0
  500. data/test/rubygems/test_gem_source_subpath_problem.rb +1 -0
  501. data/test/rubygems/test_gem_source_vendor.rb +2 -1
  502. data/test/rubygems/test_gem_spec_fetcher.rb +1 -0
  503. data/test/rubygems/test_gem_specification.rb +95 -39
  504. data/test/rubygems/test_gem_stream_ui.rb +34 -3
  505. data/test/rubygems/test_gem_stub_specification.rb +1 -0
  506. data/test/rubygems/test_gem_text.rb +1 -0
  507. data/test/rubygems/test_gem_uninstaller.rb +6 -5
  508. data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +1 -0
  509. data/test/rubygems/test_gem_update_suggestion.rb +209 -0
  510. data/test/rubygems/test_gem_uri.rb +2 -0
  511. data/test/rubygems/test_gem_uri_formatter.rb +1 -0
  512. data/test/rubygems/test_gem_util.rb +1 -0
  513. data/test/rubygems/test_gem_version.rb +3 -2
  514. data/test/rubygems/test_gem_version_option.rb +1 -0
  515. data/test/rubygems/test_kernel.rb +12 -17
  516. data/test/rubygems/test_project_sanity.rb +32 -3
  517. data/test/rubygems/test_remote_fetch_error.rb +2 -1
  518. data/test/rubygems/test_require.rb +70 -55
  519. data/test/rubygems/test_rubygems.rb +2 -0
  520. data/test/rubygems/test_webauthn_listener.rb +143 -0
  521. data/test/rubygems/test_webauthn_listener_response.rb +93 -0
  522. data/test/rubygems/test_webauthn_poller.rb +124 -0
  523. data/test/rubygems/utilities.rb +45 -3
  524. data/test/test_changelog_generator.rb +1 -1
  525. metadata +59 -43
  526. data/bundler/lib/bundler/templates/gems.rb +0 -5
  527. data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
  528. data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
  529. data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
  530. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
  531. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
  532. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
  533. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
  534. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
  535. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
  536. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
  537. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
  538. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
  539. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
  540. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
  541. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
  542. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -149
  543. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
  544. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
  545. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
  546. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
  547. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
  548. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
  549. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
  550. data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
  551. data/bundler/lib/bundler/vendored_molinillo.rb +0 -4
  552. data/bundler/lib/bundler/version_ranges.rb +0 -122
  553. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb +0 -21
  554. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb +0 -21
@@ -121,334 +121,332 @@
121
121
  # <em>SIAM Journal on Computing</em>, Vol. 1, No. 2, pp. 146-160, June 1972.
122
122
  #
123
123
 
124
- module Gem
125
- module TSort
126
- class Cyclic < StandardError
127
- end
128
-
129
- # Returns a topologically sorted array of nodes.
130
- # The array is sorted from children to parents, i.e.
131
- # the first element has no child and the last node has no parent.
132
- #
133
- # If there is a cycle, Gem::TSort::Cyclic is raised.
134
- #
135
- # class G
136
- # include Gem::TSort
137
- # def initialize(g)
138
- # @g = g
139
- # end
140
- # def tsort_each_child(n, &b) @g[n].each(&b) end
141
- # def tsort_each_node(&b) @g.each_key(&b) end
142
- # end
143
- #
144
- # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
145
- # p graph.tsort #=> [4, 2, 3, 1]
146
- #
147
- # graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
148
- # p graph.tsort # raises Gem::TSort::Cyclic
149
- #
150
- def tsort
151
- each_node = method(:tsort_each_node)
152
- each_child = method(:tsort_each_child)
153
- Gem::TSort.tsort(each_node, each_child)
154
- end
124
+ module Gem::TSort
125
+ class Cyclic < StandardError
126
+ end
155
127
 
156
- # Returns a topologically sorted array of nodes.
157
- # The array is sorted from children to parents, i.e.
158
- # the first element has no child and the last node has no parent.
159
- #
160
- # The graph is represented by _each_node_ and _each_child_.
161
- # _each_node_ should have +call+ method which yields for each node in the graph.
162
- # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
163
- #
164
- # If there is a cycle, Gem::TSort::Cyclic is raised.
165
- #
166
- # g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
167
- # each_node = lambda {|&b| g.each_key(&b) }
168
- # each_child = lambda {|n, &b| g[n].each(&b) }
169
- # p Gem::TSort.tsort(each_node, each_child) #=> [4, 2, 3, 1]
170
- #
171
- # g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
172
- # each_node = lambda {|&b| g.each_key(&b) }
173
- # each_child = lambda {|n, &b| g[n].each(&b) }
174
- # p Gem::TSort.tsort(each_node, each_child) # raises Gem::TSort::Cyclic
175
- #
176
- def TSort.tsort(each_node, each_child)
177
- Gem::TSort.tsort_each(each_node, each_child).to_a
178
- end
128
+ # Returns a topologically sorted array of nodes.
129
+ # The array is sorted from children to parents, i.e.
130
+ # the first element has no child and the last node has no parent.
131
+ #
132
+ # If there is a cycle, Gem::TSort::Cyclic is raised.
133
+ #
134
+ # class G
135
+ # include Gem::TSort
136
+ # def initialize(g)
137
+ # @g = g
138
+ # end
139
+ # def tsort_each_child(n, &b) @g[n].each(&b) end
140
+ # def tsort_each_node(&b) @g.each_key(&b) end
141
+ # end
142
+ #
143
+ # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
144
+ # p graph.tsort #=> [4, 2, 3, 1]
145
+ #
146
+ # graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
147
+ # p graph.tsort # raises Gem::TSort::Cyclic
148
+ #
149
+ def tsort
150
+ each_node = method(:tsort_each_node)
151
+ each_child = method(:tsort_each_child)
152
+ Gem::TSort.tsort(each_node, each_child)
153
+ end
179
154
 
180
- # The iterator version of the #tsort method.
181
- # <tt><em>obj</em>.tsort_each</tt> is similar to <tt><em>obj</em>.tsort.each</tt>, but
182
- # modification of _obj_ during the iteration may lead to unexpected results.
183
- #
184
- # #tsort_each returns +nil+.
185
- # If there is a cycle, Gem::TSort::Cyclic is raised.
186
- #
187
- # class G
188
- # include Gem::TSort
189
- # def initialize(g)
190
- # @g = g
191
- # end
192
- # def tsort_each_child(n, &b) @g[n].each(&b) end
193
- # def tsort_each_node(&b) @g.each_key(&b) end
194
- # end
195
- #
196
- # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
197
- # graph.tsort_each {|n| p n }
198
- # #=> 4
199
- # # 2
200
- # # 3
201
- # # 1
202
- #
203
- def tsort_each(&block) # :yields: node
204
- each_node = method(:tsort_each_node)
205
- each_child = method(:tsort_each_child)
206
- Gem::TSort.tsort_each(each_node, each_child, &block)
207
- end
155
+ # Returns a topologically sorted array of nodes.
156
+ # The array is sorted from children to parents, i.e.
157
+ # the first element has no child and the last node has no parent.
158
+ #
159
+ # The graph is represented by _each_node_ and _each_child_.
160
+ # _each_node_ should have +call+ method which yields for each node in the graph.
161
+ # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
162
+ #
163
+ # If there is a cycle, Gem::TSort::Cyclic is raised.
164
+ #
165
+ # g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
166
+ # each_node = lambda {|&b| g.each_key(&b) }
167
+ # each_child = lambda {|n, &b| g[n].each(&b) }
168
+ # p Gem::TSort.tsort(each_node, each_child) #=> [4, 2, 3, 1]
169
+ #
170
+ # g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
171
+ # each_node = lambda {|&b| g.each_key(&b) }
172
+ # each_child = lambda {|n, &b| g[n].each(&b) }
173
+ # p Gem::TSort.tsort(each_node, each_child) # raises Gem::TSort::Cyclic
174
+ #
175
+ def self.tsort(each_node, each_child)
176
+ tsort_each(each_node, each_child).to_a
177
+ end
208
178
 
209
- # The iterator version of the Gem::TSort.tsort method.
210
- #
211
- # The graph is represented by _each_node_ and _each_child_.
212
- # _each_node_ should have +call+ method which yields for each node in the graph.
213
- # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
214
- #
215
- # g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
216
- # each_node = lambda {|&b| g.each_key(&b) }
217
- # each_child = lambda {|n, &b| g[n].each(&b) }
218
- # Gem::TSort.tsort_each(each_node, each_child) {|n| p n }
219
- # #=> 4
220
- # # 2
221
- # # 3
222
- # # 1
223
- #
224
- def TSort.tsort_each(each_node, each_child) # :yields: node
225
- return to_enum(__method__, each_node, each_child) unless block_given?
179
+ # The iterator version of the #tsort method.
180
+ # <tt><em>obj</em>.tsort_each</tt> is similar to <tt><em>obj</em>.tsort.each</tt>, but
181
+ # modification of _obj_ during the iteration may lead to unexpected results.
182
+ #
183
+ # #tsort_each returns +nil+.
184
+ # If there is a cycle, Gem::TSort::Cyclic is raised.
185
+ #
186
+ # class G
187
+ # include Gem::TSort
188
+ # def initialize(g)
189
+ # @g = g
190
+ # end
191
+ # def tsort_each_child(n, &b) @g[n].each(&b) end
192
+ # def tsort_each_node(&b) @g.each_key(&b) end
193
+ # end
194
+ #
195
+ # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
196
+ # graph.tsort_each {|n| p n }
197
+ # #=> 4
198
+ # # 2
199
+ # # 3
200
+ # # 1
201
+ #
202
+ def tsort_each(&block) # :yields: node
203
+ each_node = method(:tsort_each_node)
204
+ each_child = method(:tsort_each_child)
205
+ Gem::TSort.tsort_each(each_node, each_child, &block)
206
+ end
226
207
 
227
- Gem::TSort.each_strongly_connected_component(each_node, each_child) {|component|
228
- if component.size == 1
229
- yield component.first
230
- else
231
- raise Cyclic.new("topological sort failed: #{component.inspect}")
232
- end
233
- }
234
- end
208
+ # The iterator version of the Gem::TSort.tsort method.
209
+ #
210
+ # The graph is represented by _each_node_ and _each_child_.
211
+ # _each_node_ should have +call+ method which yields for each node in the graph.
212
+ # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
213
+ #
214
+ # g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
215
+ # each_node = lambda {|&b| g.each_key(&b) }
216
+ # each_child = lambda {|n, &b| g[n].each(&b) }
217
+ # Gem::TSort.tsort_each(each_node, each_child) {|n| p n }
218
+ # #=> 4
219
+ # # 2
220
+ # # 3
221
+ # # 1
222
+ #
223
+ def self.tsort_each(each_node, each_child) # :yields: node
224
+ return to_enum(__method__, each_node, each_child) unless block_given?
235
225
 
236
- # Returns strongly connected components as an array of arrays of nodes.
237
- # The array is sorted from children to parents.
238
- # Each elements of the array represents a strongly connected component.
239
- #
240
- # class G
241
- # include Gem::TSort
242
- # def initialize(g)
243
- # @g = g
244
- # end
245
- # def tsort_each_child(n, &b) @g[n].each(&b) end
246
- # def tsort_each_node(&b) @g.each_key(&b) end
247
- # end
248
- #
249
- # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
250
- # p graph.strongly_connected_components #=> [[4], [2], [3], [1]]
251
- #
252
- # graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
253
- # p graph.strongly_connected_components #=> [[4], [2, 3], [1]]
254
- #
255
- def strongly_connected_components
256
- each_node = method(:tsort_each_node)
257
- each_child = method(:tsort_each_child)
258
- Gem::TSort.strongly_connected_components(each_node, each_child)
259
- end
226
+ each_strongly_connected_component(each_node, each_child) {|component|
227
+ if component.size == 1
228
+ yield component.first
229
+ else
230
+ raise Cyclic.new("topological sort failed: #{component.inspect}")
231
+ end
232
+ }
233
+ end
260
234
 
261
- # Returns strongly connected components as an array of arrays of nodes.
262
- # The array is sorted from children to parents.
263
- # Each elements of the array represents a strongly connected component.
264
- #
265
- # The graph is represented by _each_node_ and _each_child_.
266
- # _each_node_ should have +call+ method which yields for each node in the graph.
267
- # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
268
- #
269
- # g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
270
- # each_node = lambda {|&b| g.each_key(&b) }
271
- # each_child = lambda {|n, &b| g[n].each(&b) }
272
- # p Gem::TSort.strongly_connected_components(each_node, each_child)
273
- # #=> [[4], [2], [3], [1]]
274
- #
275
- # g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
276
- # each_node = lambda {|&b| g.each_key(&b) }
277
- # each_child = lambda {|n, &b| g[n].each(&b) }
278
- # p Gem::TSort.strongly_connected_components(each_node, each_child)
279
- # #=> [[4], [2, 3], [1]]
280
- #
281
- def TSort.strongly_connected_components(each_node, each_child)
282
- Gem::TSort.each_strongly_connected_component(each_node, each_child).to_a
283
- end
235
+ # Returns strongly connected components as an array of arrays of nodes.
236
+ # The array is sorted from children to parents.
237
+ # Each elements of the array represents a strongly connected component.
238
+ #
239
+ # class G
240
+ # include Gem::TSort
241
+ # def initialize(g)
242
+ # @g = g
243
+ # end
244
+ # def tsort_each_child(n, &b) @g[n].each(&b) end
245
+ # def tsort_each_node(&b) @g.each_key(&b) end
246
+ # end
247
+ #
248
+ # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
249
+ # p graph.strongly_connected_components #=> [[4], [2], [3], [1]]
250
+ #
251
+ # graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
252
+ # p graph.strongly_connected_components #=> [[4], [2, 3], [1]]
253
+ #
254
+ def strongly_connected_components
255
+ each_node = method(:tsort_each_node)
256
+ each_child = method(:tsort_each_child)
257
+ Gem::TSort.strongly_connected_components(each_node, each_child)
258
+ end
284
259
 
285
- # The iterator version of the #strongly_connected_components method.
286
- # <tt><em>obj</em>.each_strongly_connected_component</tt> is similar to
287
- # <tt><em>obj</em>.strongly_connected_components.each</tt>, but
288
- # modification of _obj_ during the iteration may lead to unexpected results.
289
- #
290
- # #each_strongly_connected_component returns +nil+.
291
- #
292
- # class G
293
- # include Gem::TSort
294
- # def initialize(g)
295
- # @g = g
296
- # end
297
- # def tsort_each_child(n, &b) @g[n].each(&b) end
298
- # def tsort_each_node(&b) @g.each_key(&b) end
299
- # end
300
- #
301
- # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
302
- # graph.each_strongly_connected_component {|scc| p scc }
303
- # #=> [4]
304
- # # [2]
305
- # # [3]
306
- # # [1]
307
- #
308
- # graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
309
- # graph.each_strongly_connected_component {|scc| p scc }
310
- # #=> [4]
311
- # # [2, 3]
312
- # # [1]
313
- #
314
- def each_strongly_connected_component(&block) # :yields: nodes
315
- each_node = method(:tsort_each_node)
316
- each_child = method(:tsort_each_child)
317
- Gem::TSort.each_strongly_connected_component(each_node, each_child, &block)
318
- end
260
+ # Returns strongly connected components as an array of arrays of nodes.
261
+ # The array is sorted from children to parents.
262
+ # Each elements of the array represents a strongly connected component.
263
+ #
264
+ # The graph is represented by _each_node_ and _each_child_.
265
+ # _each_node_ should have +call+ method which yields for each node in the graph.
266
+ # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
267
+ #
268
+ # g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
269
+ # each_node = lambda {|&b| g.each_key(&b) }
270
+ # each_child = lambda {|n, &b| g[n].each(&b) }
271
+ # p Gem::TSort.strongly_connected_components(each_node, each_child)
272
+ # #=> [[4], [2], [3], [1]]
273
+ #
274
+ # g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
275
+ # each_node = lambda {|&b| g.each_key(&b) }
276
+ # each_child = lambda {|n, &b| g[n].each(&b) }
277
+ # p Gem::TSort.strongly_connected_components(each_node, each_child)
278
+ # #=> [[4], [2, 3], [1]]
279
+ #
280
+ def self.strongly_connected_components(each_node, each_child)
281
+ each_strongly_connected_component(each_node, each_child).to_a
282
+ end
319
283
 
320
- # The iterator version of the Gem::TSort.strongly_connected_components method.
321
- #
322
- # The graph is represented by _each_node_ and _each_child_.
323
- # _each_node_ should have +call+ method which yields for each node in the graph.
324
- # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
325
- #
326
- # g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
327
- # each_node = lambda {|&b| g.each_key(&b) }
328
- # each_child = lambda {|n, &b| g[n].each(&b) }
329
- # Gem::TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
330
- # #=> [4]
331
- # # [2]
332
- # # [3]
333
- # # [1]
334
- #
335
- # g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
336
- # each_node = lambda {|&b| g.each_key(&b) }
337
- # each_child = lambda {|n, &b| g[n].each(&b) }
338
- # Gem::TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
339
- # #=> [4]
340
- # # [2, 3]
341
- # # [1]
342
- #
343
- def TSort.each_strongly_connected_component(each_node, each_child) # :yields: nodes
344
- return to_enum(__method__, each_node, each_child) unless block_given?
284
+ # The iterator version of the #strongly_connected_components method.
285
+ # <tt><em>obj</em>.each_strongly_connected_component</tt> is similar to
286
+ # <tt><em>obj</em>.strongly_connected_components.each</tt>, but
287
+ # modification of _obj_ during the iteration may lead to unexpected results.
288
+ #
289
+ # #each_strongly_connected_component returns +nil+.
290
+ #
291
+ # class G
292
+ # include Gem::TSort
293
+ # def initialize(g)
294
+ # @g = g
295
+ # end
296
+ # def tsort_each_child(n, &b) @g[n].each(&b) end
297
+ # def tsort_each_node(&b) @g.each_key(&b) end
298
+ # end
299
+ #
300
+ # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
301
+ # graph.each_strongly_connected_component {|scc| p scc }
302
+ # #=> [4]
303
+ # # [2]
304
+ # # [3]
305
+ # # [1]
306
+ #
307
+ # graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
308
+ # graph.each_strongly_connected_component {|scc| p scc }
309
+ # #=> [4]
310
+ # # [2, 3]
311
+ # # [1]
312
+ #
313
+ def each_strongly_connected_component(&block) # :yields: nodes
314
+ each_node = method(:tsort_each_node)
315
+ each_child = method(:tsort_each_child)
316
+ Gem::TSort.each_strongly_connected_component(each_node, each_child, &block)
317
+ end
345
318
 
346
- id_map = {}
347
- stack = []
348
- each_node.call {|node|
349
- unless id_map.include? node
350
- Gem::TSort.each_strongly_connected_component_from(node, each_child, id_map, stack) {|c|
351
- yield c
352
- }
353
- end
354
- }
355
- nil
356
- end
319
+ # The iterator version of the Gem::TSort.strongly_connected_components method.
320
+ #
321
+ # The graph is represented by _each_node_ and _each_child_.
322
+ # _each_node_ should have +call+ method which yields for each node in the graph.
323
+ # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
324
+ #
325
+ # g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
326
+ # each_node = lambda {|&b| g.each_key(&b) }
327
+ # each_child = lambda {|n, &b| g[n].each(&b) }
328
+ # Gem::TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
329
+ # #=> [4]
330
+ # # [2]
331
+ # # [3]
332
+ # # [1]
333
+ #
334
+ # g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
335
+ # each_node = lambda {|&b| g.each_key(&b) }
336
+ # each_child = lambda {|n, &b| g[n].each(&b) }
337
+ # Gem::TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
338
+ # #=> [4]
339
+ # # [2, 3]
340
+ # # [1]
341
+ #
342
+ def self.each_strongly_connected_component(each_node, each_child) # :yields: nodes
343
+ return to_enum(__method__, each_node, each_child) unless block_given?
357
344
 
358
- # Iterates over strongly connected component in the subgraph reachable from
359
- # _node_.
360
- #
361
- # Return value is unspecified.
362
- #
363
- # #each_strongly_connected_component_from doesn't call #tsort_each_node.
364
- #
365
- # class G
366
- # include Gem::TSort
367
- # def initialize(g)
368
- # @g = g
369
- # end
370
- # def tsort_each_child(n, &b) @g[n].each(&b) end
371
- # def tsort_each_node(&b) @g.each_key(&b) end
372
- # end
373
- #
374
- # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
375
- # graph.each_strongly_connected_component_from(2) {|scc| p scc }
376
- # #=> [4]
377
- # # [2]
378
- #
379
- # graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
380
- # graph.each_strongly_connected_component_from(2) {|scc| p scc }
381
- # #=> [4]
382
- # # [2, 3]
383
- #
384
- def each_strongly_connected_component_from(node, id_map={}, stack=[], &block) # :yields: nodes
385
- Gem::TSort.each_strongly_connected_component_from(node, method(:tsort_each_child), id_map, stack, &block)
386
- end
345
+ id_map = {}
346
+ stack = []
347
+ each_node.call {|node|
348
+ unless id_map.include? node
349
+ each_strongly_connected_component_from(node, each_child, id_map, stack) {|c|
350
+ yield c
351
+ }
352
+ end
353
+ }
354
+ nil
355
+ end
387
356
 
388
- # Iterates over strongly connected components in a graph.
389
- # The graph is represented by _node_ and _each_child_.
390
- #
391
- # _node_ is the first node.
392
- # _each_child_ should have +call+ method which takes a node argument
393
- # and yields for each child node.
394
- #
395
- # Return value is unspecified.
396
- #
397
- # #Gem::TSort.each_strongly_connected_component_from is a class method and
398
- # it doesn't need a class to represent a graph which includes Gem::TSort.
399
- #
400
- # graph = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
401
- # each_child = lambda {|n, &b| graph[n].each(&b) }
402
- # Gem::TSort.each_strongly_connected_component_from(1, each_child) {|scc|
403
- # p scc
404
- # }
405
- # #=> [4]
406
- # # [2, 3]
407
- # # [1]
408
- #
409
- def TSort.each_strongly_connected_component_from(node, each_child, id_map={}, stack=[]) # :yields: nodes
410
- return to_enum(__method__, node, each_child, id_map, stack) unless block_given?
357
+ # Iterates over strongly connected component in the subgraph reachable from
358
+ # _node_.
359
+ #
360
+ # Return value is unspecified.
361
+ #
362
+ # #each_strongly_connected_component_from doesn't call #tsort_each_node.
363
+ #
364
+ # class G
365
+ # include Gem::TSort
366
+ # def initialize(g)
367
+ # @g = g
368
+ # end
369
+ # def tsort_each_child(n, &b) @g[n].each(&b) end
370
+ # def tsort_each_node(&b) @g.each_key(&b) end
371
+ # end
372
+ #
373
+ # graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
374
+ # graph.each_strongly_connected_component_from(2) {|scc| p scc }
375
+ # #=> [4]
376
+ # # [2]
377
+ #
378
+ # graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
379
+ # graph.each_strongly_connected_component_from(2) {|scc| p scc }
380
+ # #=> [4]
381
+ # # [2, 3]
382
+ #
383
+ def each_strongly_connected_component_from(node, id_map={}, stack=[], &block) # :yields: nodes
384
+ Gem::TSort.each_strongly_connected_component_from(node, method(:tsort_each_child), id_map, stack, &block)
385
+ end
411
386
 
412
- minimum_id = node_id = id_map[node] = id_map.size
413
- stack_length = stack.length
414
- stack << node
387
+ # Iterates over strongly connected components in a graph.
388
+ # The graph is represented by _node_ and _each_child_.
389
+ #
390
+ # _node_ is the first node.
391
+ # _each_child_ should have +call+ method which takes a node argument
392
+ # and yields for each child node.
393
+ #
394
+ # Return value is unspecified.
395
+ #
396
+ # #Gem::TSort.each_strongly_connected_component_from is a class method and
397
+ # it doesn't need a class to represent a graph which includes Gem::TSort.
398
+ #
399
+ # graph = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
400
+ # each_child = lambda {|n, &b| graph[n].each(&b) }
401
+ # Gem::TSort.each_strongly_connected_component_from(1, each_child) {|scc|
402
+ # p scc
403
+ # }
404
+ # #=> [4]
405
+ # # [2, 3]
406
+ # # [1]
407
+ #
408
+ def self.each_strongly_connected_component_from(node, each_child, id_map={}, stack=[]) # :yields: nodes
409
+ return to_enum(__method__, node, each_child, id_map, stack) unless block_given?
415
410
 
416
- each_child.call(node) {|child|
417
- if id_map.include? child
418
- child_id = id_map[child]
419
- minimum_id = child_id if child_id && child_id < minimum_id
420
- else
421
- sub_minimum_id =
422
- Gem::TSort.each_strongly_connected_component_from(child, each_child, id_map, stack) {|c|
423
- yield c
424
- }
425
- minimum_id = sub_minimum_id if sub_minimum_id < minimum_id
426
- end
427
- }
411
+ minimum_id = node_id = id_map[node] = id_map.size
412
+ stack_length = stack.length
413
+ stack << node
428
414
 
429
- if node_id == minimum_id
430
- component = stack.slice!(stack_length .. -1)
431
- component.each {|n| id_map[n] = nil}
432
- yield component
415
+ each_child.call(node) {|child|
416
+ if id_map.include? child
417
+ child_id = id_map[child]
418
+ minimum_id = child_id if child_id && child_id < minimum_id
419
+ else
420
+ sub_minimum_id =
421
+ each_strongly_connected_component_from(child, each_child, id_map, stack) {|c|
422
+ yield c
423
+ }
424
+ minimum_id = sub_minimum_id if sub_minimum_id < minimum_id
433
425
  end
426
+ }
434
427
 
435
- minimum_id
428
+ if node_id == minimum_id
429
+ component = stack.slice!(stack_length .. -1)
430
+ component.each {|n| id_map[n] = nil}
431
+ yield component
436
432
  end
437
433
 
438
- # Should be implemented by a extended class.
439
- #
440
- # #tsort_each_node is used to iterate for all nodes over a graph.
441
- #
442
- def tsort_each_node # :yields: node
443
- raise NotImplementedError.new
444
- end
434
+ minimum_id
435
+ end
445
436
 
446
- # Should be implemented by a extended class.
447
- #
448
- # #tsort_each_child is used to iterate for child nodes of _node_.
449
- #
450
- def tsort_each_child(node) # :yields: child
451
- raise NotImplementedError.new
452
- end
437
+ # Should be implemented by a extended class.
438
+ #
439
+ # #tsort_each_node is used to iterate for all nodes over a graph.
440
+ #
441
+ def tsort_each_node # :yields: node
442
+ raise NotImplementedError.new
443
+ end
444
+
445
+ # Should be implemented by a extended class.
446
+ #
447
+ # #tsort_each_child is used to iterate for child nodes of _node_.
448
+ #
449
+ def tsort_each_child(node) # :yields: child
450
+ raise NotImplementedError.new
453
451
  end
454
452
  end
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+
2
3
  #--
3
4
  # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
4
5
  # All rights reserved.