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
@@ -12,15 +12,11 @@ autoload :OpenSSL, 'openssl'
12
12
  # servers you wish to talk to. For each host:port you communicate with a
13
13
  # single persistent connection is created.
14
14
  #
15
- # Multiple Bundler::Persistent::Net::HTTP::Persistent objects will share the same set of
16
- # connections.
15
+ # Connections will be shared across threads through a connection pool to
16
+ # increase reuse of connections.
17
17
  #
18
- # For each thread you start a new connection will be created. A
19
- # Bundler::Persistent::Net::HTTP::Persistent connection will not be shared across threads.
20
- #
21
- # You can shut down the HTTP connections when done by calling #shutdown. You
22
- # should name your Bundler::Persistent::Net::HTTP::Persistent object if you intend to call this
23
- # method.
18
+ # You can shut down any remaining HTTP connections when done by calling
19
+ # #shutdown.
24
20
  #
25
21
  # Example:
26
22
  #
@@ -28,7 +24,7 @@ autoload :OpenSSL, 'openssl'
28
24
  #
29
25
  # uri = Bundler::URI 'http://example.com/awesome/web/service'
30
26
  #
31
- # http = Bundler::Persistent::Net::HTTP::Persistent.new name: 'my_app_name'
27
+ # http = Bundler::Persistent::Net::HTTP::Persistent.new
32
28
  #
33
29
  # # perform a GET
34
30
  # response = http.request uri
@@ -50,14 +46,14 @@ autoload :OpenSSL, 'openssl'
50
46
  # to use Bundler::URI#request_uri not Bundler::URI#path. The request_uri contains the query
51
47
  # params which are sent in the body for other requests.
52
48
  #
53
- # == SSL
49
+ # == TLS/SSL
54
50
  #
55
- # SSL connections are automatically created depending upon the scheme of the
56
- # Bundler::URI. SSL connections are automatically verified against the default
51
+ # TLS connections are automatically created depending upon the scheme of the
52
+ # Bundler::URI. TLS connections are automatically verified against the default
57
53
  # certificate store for your computer. You can override this by changing
58
54
  # verify_mode or by specifying an alternate cert_store.
59
55
  #
60
- # Here are the SSL settings, see the individual methods for documentation:
56
+ # Here are the TLS settings, see the individual methods for documentation:
61
57
  #
62
58
  # #certificate :: This client's certificate
63
59
  # #ca_file :: The certificate-authorities
@@ -67,7 +63,7 @@ autoload :OpenSSL, 'openssl'
67
63
  # #private_key :: The client's SSL private key
68
64
  # #reuse_ssl_sessions :: Reuse a previously opened SSL session for a new
69
65
  # connection
70
- # #ssl_timeout :: SSL session lifetime
66
+ # #ssl_timeout :: Session lifetime
71
67
  # #ssl_version :: Which specific SSL version to use
72
68
  # #verify_callback :: For server certificate verification
73
69
  # #verify_depth :: Depth of certificate verification
@@ -96,14 +92,15 @@ autoload :OpenSSL, 'openssl'
96
92
  #
97
93
  # === Segregation
98
94
  #
99
- # By providing an application name to ::new you can separate your connections
100
- # from the connections of other applications.
95
+ # Each Bundler::Persistent::Net::HTTP::Persistent instance has its own pool of connections. There
96
+ # is no sharing with other instances (as was true in earlier versions).
101
97
  #
102
98
  # === Idle Timeout
103
99
  #
104
- # If a connection hasn't been used for this number of seconds it will automatically be
105
- # reset upon the next use to avoid attempting to send to a closed connection.
106
- # The default value is 5 seconds. nil means no timeout. Set through #idle_timeout.
100
+ # If a connection hasn't been used for this number of seconds it will
101
+ # automatically be reset upon the next use to avoid attempting to send to a
102
+ # closed connection. The default value is 5 seconds. nil means no timeout.
103
+ # Set through #idle_timeout.
107
104
  #
108
105
  # Reducing this value may help avoid the "too many connection resets" error
109
106
  # when sending non-idempotent requests while increasing this value will cause
@@ -118,8 +115,9 @@ autoload :OpenSSL, 'openssl'
118
115
  #
119
116
  # The number of requests that should be made before opening a new connection.
120
117
  # Typically many keep-alive capable servers tune this to 100 or less, so the
121
- # 101st request will fail with ECONNRESET. If unset (default), this value has no
122
- # effect, if set, connections will be reset on the request after max_requests.
118
+ # 101st request will fail with ECONNRESET. If unset (default), this value has
119
+ # no effect, if set, connections will be reset on the request after
120
+ # max_requests.
123
121
  #
124
122
  # === Open Timeout
125
123
  #
@@ -131,45 +129,6 @@ autoload :OpenSSL, 'openssl'
131
129
  # Socket options may be set on newly-created connections. See #socket_options
132
130
  # for details.
133
131
  #
134
- # === Non-Idempotent Requests
135
- #
136
- # By default non-idempotent requests will not be retried per RFC 2616. By
137
- # setting retry_change_requests to true requests will automatically be retried
138
- # once.
139
- #
140
- # Only do this when you know that retrying a POST or other non-idempotent
141
- # request is safe for your application and will not create duplicate
142
- # resources.
143
- #
144
- # The recommended way to handle non-idempotent requests is the following:
145
- #
146
- # require 'bundler/vendor/net-http-persistent/lib/net/http/persistent'
147
- #
148
- # uri = Bundler::URI 'http://example.com/awesome/web/service'
149
- # post_uri = uri + 'create'
150
- #
151
- # http = Bundler::Persistent::Net::HTTP::Persistent.new name: 'my_app_name'
152
- #
153
- # post = Net::HTTP::Post.new post_uri.path
154
- # # ... fill in POST request
155
- #
156
- # begin
157
- # response = http.request post_uri, post
158
- # rescue Bundler::Persistent::Net::HTTP::Persistent::Error
159
- #
160
- # # POST failed, make a new request to verify the server did not process
161
- # # the request
162
- # exists_uri = uri + '...'
163
- # response = http.get exists_uri
164
- #
165
- # # Retry if it failed
166
- # retry if response.code == '404'
167
- # end
168
- #
169
- # The method of determining if the resource was created or not is unique to
170
- # the particular service you are using. Of course, you will want to add
171
- # protection from infinite looping.
172
- #
173
132
  # === Connection Termination
174
133
  #
175
134
  # If you are done using the Bundler::Persistent::Net::HTTP::Persistent instance you may shut down
@@ -195,33 +154,27 @@ class Bundler::Persistent::Net::HTTP::Persistent
195
154
  HAVE_OPENSSL = defined? OpenSSL::SSL # :nodoc:
196
155
 
197
156
  ##
198
- # The default connection pool size is 1/4 the allowed open files.
157
+ # The default connection pool size is 1/4 the allowed open files
158
+ # (<code>ulimit -n</code>) or 256 if your OS does not support file handle
159
+ # limits (typically windows).
199
160
 
200
- if Gem.win_platform? then
201
- DEFAULT_POOL_SIZE = 256
161
+ if Process.const_defined? :RLIMIT_NOFILE
162
+ open_file_limits = Process.getrlimit(Process::RLIMIT_NOFILE)
163
+
164
+ # Under JRuby on Windows Process responds to `getrlimit` but returns something that does not match docs
165
+ if open_file_limits.respond_to?(:first)
166
+ DEFAULT_POOL_SIZE = open_file_limits.first / 4
167
+ else
168
+ DEFAULT_POOL_SIZE = 256
169
+ end
202
170
  else
203
- DEFAULT_POOL_SIZE = Process.getrlimit(Process::RLIMIT_NOFILE).first / 4
171
+ DEFAULT_POOL_SIZE = 256
204
172
  end
205
173
 
206
174
  ##
207
175
  # The version of Bundler::Persistent::Net::HTTP::Persistent you are using
208
176
 
209
- VERSION = '3.1.0'
210
-
211
- ##
212
- # Exceptions rescued for automatic retry on ruby 2.0.0. This overlaps with
213
- # the exception list for ruby 1.x.
214
-
215
- RETRIED_EXCEPTIONS = [ # :nodoc:
216
- (Net::ReadTimeout if Net.const_defined? :ReadTimeout),
217
- IOError,
218
- EOFError,
219
- Errno::ECONNRESET,
220
- Errno::ECONNABORTED,
221
- Errno::EPIPE,
222
- (OpenSSL::SSL::SSLError if HAVE_OPENSSL),
223
- Timeout::Error,
224
- ].compact
177
+ VERSION = '4.0.0'
225
178
 
226
179
  ##
227
180
  # Error class for errors raised by Bundler::Persistent::Net::HTTP::Persistent. Various
@@ -348,6 +301,13 @@ class Bundler::Persistent::Net::HTTP::Persistent
348
301
 
349
302
  attr_accessor :max_requests
350
303
 
304
+ ##
305
+ # Number of retries to perform if a request fails.
306
+ #
307
+ # See also #max_retries=, Net::HTTP#max_retries=.
308
+
309
+ attr_reader :max_retries
310
+
351
311
  ##
352
312
  # The value sent in the Keep-Alive header. Defaults to 30. Not needed for
353
313
  # HTTP/1.1 servers.
@@ -360,8 +320,7 @@ class Bundler::Persistent::Net::HTTP::Persistent
360
320
  attr_accessor :keep_alive
361
321
 
362
322
  ##
363
- # A name for this connection. Allows you to keep your connections apart
364
- # from everybody else's.
323
+ # The name for this collection of persistent connections.
365
324
 
366
325
  attr_reader :name
367
326
 
@@ -490,23 +449,11 @@ class Bundler::Persistent::Net::HTTP::Persistent
490
449
 
491
450
  attr_reader :verify_mode
492
451
 
493
- ##
494
- # Enable retries of non-idempotent requests that change data (e.g. POST
495
- # requests) when the server has disconnected.
496
- #
497
- # This will in the worst case lead to multiple requests with the same data,
498
- # but it may be useful for some applications. Take care when enabling
499
- # this option to ensure it is safe to POST or perform other non-idempotent
500
- # requests to the server.
501
-
502
- attr_accessor :retry_change_requests
503
-
504
452
  ##
505
453
  # Creates a new Bundler::Persistent::Net::HTTP::Persistent.
506
454
  #
507
- # Set +name+ to keep your connections apart from everybody else's. Not
508
- # required currently, but highly recommended. Your library name should be
509
- # good enough. This parameter will be required in a future version.
455
+ # Set a +name+ for fun. Your library name should be good enough, but this
456
+ # otherwise has no purpose.
510
457
  #
511
458
  # +proxy+ may be set to a Bundler::URI::HTTP or :ENV to pick up proxy options from
512
459
  # the environment. See proxy_from_env for details.
@@ -519,8 +466,9 @@ class Bundler::Persistent::Net::HTTP::Persistent
519
466
  # proxy.password = 'hunter2'
520
467
  #
521
468
  # Set +pool_size+ to limit the maximum number of connections allowed.
522
- # Defaults to 1/4 the number of allowed file handles. You can have no more
523
- # than this many threads with active HTTP transactions.
469
+ # Defaults to 1/4 the number of allowed file handles or 256 if your OS does
470
+ # not support a limit on allowed file handles. You can have no more than
471
+ # this many threads with active HTTP transactions.
524
472
 
525
473
  def initialize name: nil, proxy: nil, pool_size: DEFAULT_POOL_SIZE
526
474
  @name = name
@@ -537,6 +485,7 @@ class Bundler::Persistent::Net::HTTP::Persistent
537
485
  @write_timeout = nil
538
486
  @idle_timeout = 5
539
487
  @max_requests = nil
488
+ @max_retries = 1
540
489
  @socket_options = []
541
490
  @ssl_generation = 0 # incremented when SSL session variables change
542
491
 
@@ -568,8 +517,6 @@ class Bundler::Persistent::Net::HTTP::Persistent
568
517
  @reuse_ssl_sessions = OpenSSL::SSL.const_defined? :Session
569
518
  end
570
519
 
571
- @retry_change_requests = false
572
-
573
520
  self.proxy = proxy if proxy
574
521
  end
575
522
 
@@ -630,7 +577,9 @@ class Bundler::Persistent::Net::HTTP::Persistent
630
577
 
631
578
  net_http_args = [uri.hostname, uri.port]
632
579
 
633
- if @proxy_uri and not proxy_bypass? uri.hostname, uri.port then
580
+ # I'm unsure if uri.host or uri.hostname should be checked against
581
+ # the proxy bypass list.
582
+ if @proxy_uri and not proxy_bypass? uri.host, uri.port then
634
583
  net_http_args.concat @proxy_args
635
584
  else
636
585
  net_http_args.concat [nil, nil, nil, nil]
@@ -650,9 +599,11 @@ class Bundler::Persistent::Net::HTTP::Persistent
650
599
  reset connection
651
600
  end
652
601
 
653
- http.read_timeout = @read_timeout if @read_timeout
654
- http.write_timeout = @write_timeout if @write_timeout && http.respond_to?(:write_timeout=)
655
- http.keep_alive_timeout = @idle_timeout if @idle_timeout
602
+ http.keep_alive_timeout = @idle_timeout if @idle_timeout
603
+ http.max_retries = @max_retries if http.respond_to?(:max_retries=)
604
+ http.read_timeout = @read_timeout if @read_timeout
605
+ http.write_timeout = @write_timeout if
606
+ @write_timeout && http.respond_to?(:write_timeout=)
656
607
 
657
608
  return yield connection
658
609
  rescue Errno::ECONNREFUSED
@@ -670,27 +621,14 @@ class Bundler::Persistent::Net::HTTP::Persistent
670
621
  end
671
622
 
672
623
  ##
673
- # Returns an error message containing the number of requests performed on
674
- # this connection
675
-
676
- def error_message connection
677
- connection.requests -= 1 # fixup
678
-
679
- age = Time.now - connection.last_use
680
-
681
- "after #{connection.requests} requests on #{connection.http.object_id}, " \
682
- "last used #{age} seconds ago"
683
- end
684
-
685
- ##
686
- # Bundler::URI::escape wrapper
624
+ # CGI::escape wrapper
687
625
 
688
626
  def escape str
689
627
  CGI.escape str if str
690
628
  end
691
629
 
692
630
  ##
693
- # Bundler::URI::unescape wrapper
631
+ # CGI::unescape wrapper
694
632
 
695
633
  def unescape str
696
634
  CGI.unescape str if str
@@ -733,6 +671,7 @@ class Bundler::Persistent::Net::HTTP::Persistent
733
671
  def finish connection
734
672
  connection.finish
735
673
 
674
+ connection.http.instance_variable_set :@last_communicated, nil
736
675
  connection.http.instance_variable_set :@ssl_session, nil unless
737
676
  @reuse_ssl_sessions
738
677
  end
@@ -741,31 +680,31 @@ class Bundler::Persistent::Net::HTTP::Persistent
741
680
  # Returns the HTTP protocol version for +uri+
742
681
 
743
682
  def http_version uri
744
- @http_versions["#{uri.host}:#{uri.port}"]
683
+ @http_versions["#{uri.hostname}:#{uri.port}"]
745
684
  end
746
685
 
747
686
  ##
748
- # Is +req+ idempotent according to RFC 2616?
687
+ # Adds "http://" to the String +uri+ if it is missing.
749
688
 
750
- def idempotent? req
751
- case req.method
752
- when 'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PUT', 'TRACE' then
753
- true
754
- end
689
+ def normalize_uri uri
690
+ (uri =~ /^https?:/) ? uri : "http://#{uri}"
755
691
  end
756
692
 
757
693
  ##
758
- # Is the request +req+ idempotent or is retry_change_requests allowed.
694
+ # Set the maximum number of retries for a request.
695
+ #
696
+ # Defaults to one retry.
697
+ #
698
+ # Set this to 0 to disable retries.
759
699
 
760
- def can_retry? req
761
- @retry_change_requests && !idempotent?(req)
762
- end
700
+ def max_retries= retries
701
+ retries = retries.to_int
763
702
 
764
- ##
765
- # Adds "http://" to the String +uri+ if it is missing.
703
+ raise ArgumentError, "max_retries must be positive" if retries < 0
766
704
 
767
- def normalize_uri uri
768
- (uri =~ /^https?:/) ? uri : "http://#{uri}"
705
+ @max_retries = retries
706
+
707
+ reconnect
769
708
  end
770
709
 
771
710
  ##
@@ -806,7 +745,7 @@ class Bundler::Persistent::Net::HTTP::Persistent
806
745
 
807
746
  if @proxy_uri then
808
747
  @proxy_args = [
809
- @proxy_uri.host,
748
+ @proxy_uri.hostname,
810
749
  @proxy_uri.port,
811
750
  unescape(@proxy_uri.user),
812
751
  unescape(@proxy_uri.password),
@@ -881,14 +820,15 @@ class Bundler::Persistent::Net::HTTP::Persistent
881
820
  end
882
821
 
883
822
  ##
884
- # Forces reconnection of HTTP connections.
823
+ # Forces reconnection of all HTTP connections, including TLS/SSL
824
+ # connections.
885
825
 
886
826
  def reconnect
887
827
  @generation += 1
888
828
  end
889
829
 
890
830
  ##
891
- # Forces reconnection of SSL connections.
831
+ # Forces reconnection of only TLS/SSL connections.
892
832
 
893
833
  def reconnect_ssl
894
834
  @ssl_generation += 1
@@ -921,14 +861,8 @@ class Bundler::Persistent::Net::HTTP::Persistent
921
861
  # the response will not have been read).
922
862
  #
923
863
  # +req+ must be a Net::HTTPGenericRequest subclass (see Net::HTTP for a list).
924
- #
925
- # If there is an error and the request is idempotent according to RFC 2616
926
- # it will be retried automatically.
927
864
 
928
865
  def request uri, req = nil, &block
929
- retried = false
930
- bad_response = false
931
-
932
866
  uri = Bundler::URI uri
933
867
  req = request_setup req || uri
934
868
  response = nil
@@ -942,37 +876,12 @@ class Bundler::Persistent::Net::HTTP::Persistent
942
876
  response = http.request req, &block
943
877
 
944
878
  if req.connection_close? or
945
- (response.http_version <= '1.0' and
879
+ (response.http_version <= '1.0' and
946
880
  not response.connection_keep_alive?) or
947
- response.connection_close? then
881
+ response.connection_close? then
948
882
  finish connection
949
883
  end
950
- rescue Net::HTTPBadResponse => e
951
- message = error_message connection
952
-
953
- finish connection
954
-
955
- raise Error, "too many bad responses #{message}" if
956
- bad_response or not can_retry? req
957
-
958
- bad_response = true
959
- retry
960
- rescue *RETRIED_EXCEPTIONS => e
961
- request_failed e, req, connection if
962
- retried or not can_retry? req
963
-
964
- reset connection
965
-
966
- retried = true
967
- retry
968
- rescue Errno::EINVAL, Errno::ETIMEDOUT => e # not retried on ruby 2
969
- request_failed e, req, connection if retried or not can_retry? req
970
-
971
- reset connection
972
-
973
- retried = true
974
- retry
975
- rescue Exception => e
884
+ rescue Exception # make sure to close the connection when it was interrupted
976
885
  finish connection
977
886
 
978
887
  raise
@@ -981,26 +890,11 @@ class Bundler::Persistent::Net::HTTP::Persistent
981
890
  end
982
891
  end
983
892
 
984
- @http_versions["#{uri.host}:#{uri.port}"] ||= response.http_version
893
+ @http_versions["#{uri.hostname}:#{uri.port}"] ||= response.http_version
985
894
 
986
895
  response
987
896
  end
988
897
 
989
- ##
990
- # Raises an Error for +exception+ which resulted from attempting the request
991
- # +req+ on the +connection+.
992
- #
993
- # Finishes the +connection+.
994
-
995
- def request_failed exception, req, connection # :nodoc:
996
- due_to = "(due to #{exception.message} - #{exception.class})"
997
- message = "too many connection resets #{due_to} #{error_message connection}"
998
-
999
- finish connection
1000
-
1001
- raise Error, message, exception.backtrace
1002
- end
1003
-
1004
898
  ##
1005
899
  # Creates a GET request if +req_or_uri+ is a Bundler::URI and adds headers to the
1006
900
  # request.
@@ -1008,7 +902,7 @@ class Bundler::Persistent::Net::HTTP::Persistent
1008
902
  # Returns the request.
1009
903
 
1010
904
  def request_setup req_or_uri # :nodoc:
1011
- req = if Bundler::URI === req_or_uri then
905
+ req = if req_or_uri.respond_to? 'request_uri' then
1012
906
  Net::HTTP::Get.new req_or_uri.request_uri
1013
907
  else
1014
908
  req_or_uri
@@ -1172,7 +1066,6 @@ application:
1172
1066
 
1173
1067
  reconnect_ssl
1174
1068
  end
1175
-
1176
1069
  end
1177
1070
 
1178
1071
  require_relative 'persistent/connection'