rubygems-update 3.1.1 → 3.2.0.rc.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (518) hide show
  1. checksums.yaml +4 -4
  2. data/CODE_OF_CONDUCT.md +55 -19
  3. data/CONTRIBUTING.md +25 -11
  4. data/History.txt +389 -144
  5. data/Manifest.txt +37 -73
  6. data/POLICIES.md +2 -9
  7. data/README.md +5 -5
  8. data/Rakefile +47 -82
  9. data/bin/update_rubygems +2 -2
  10. data/bundler/CHANGELOG.md +1546 -1414
  11. data/bundler/README.md +6 -8
  12. data/bundler/UPGRADING.md +18 -32
  13. data/bundler/bundler.gemspec +3 -3
  14. data/bundler/exe/bundle +3 -0
  15. data/bundler/lib/bundler.rb +21 -7
  16. data/bundler/lib/bundler/build_metadata.rb +4 -12
  17. data/bundler/lib/bundler/cli.rb +54 -20
  18. data/bundler/lib/bundler/cli/add.rb +1 -1
  19. data/bundler/lib/bundler/cli/cache.rb +1 -7
  20. data/bundler/lib/bundler/cli/clean.rb +1 -1
  21. data/bundler/lib/bundler/cli/common.rb +14 -0
  22. data/bundler/lib/bundler/cli/console.rb +1 -1
  23. data/bundler/lib/bundler/cli/doctor.rb +1 -1
  24. data/bundler/lib/bundler/cli/exec.rb +4 -13
  25. data/bundler/lib/bundler/cli/fund.rb +36 -0
  26. data/bundler/lib/bundler/cli/gem.rb +84 -11
  27. data/bundler/lib/bundler/cli/info.rb +15 -4
  28. data/bundler/lib/bundler/cli/init.rb +2 -2
  29. data/bundler/lib/bundler/cli/inject.rb +1 -1
  30. data/bundler/lib/bundler/cli/install.rb +12 -18
  31. data/bundler/lib/bundler/cli/issue.rb +2 -2
  32. data/bundler/lib/bundler/cli/list.rb +12 -10
  33. data/bundler/lib/bundler/cli/outdated.rb +89 -66
  34. data/bundler/lib/bundler/cli/plugin.rb +10 -0
  35. data/bundler/lib/bundler/cli/pristine.rb +5 -0
  36. data/bundler/lib/bundler/cli/show.rb +1 -1
  37. data/bundler/lib/bundler/cli/update.rb +2 -0
  38. data/bundler/lib/bundler/compact_index_client.rb +1 -1
  39. data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
  40. data/bundler/lib/bundler/definition.rb +51 -60
  41. data/bundler/lib/bundler/dep_proxy.rb +1 -1
  42. data/bundler/lib/bundler/dependency.rb +0 -9
  43. data/bundler/lib/bundler/dsl.rb +5 -9
  44. data/bundler/lib/bundler/endpoint_specification.rb +1 -1
  45. data/bundler/lib/bundler/environment_preserver.rb +26 -2
  46. data/bundler/lib/bundler/errors.rb +1 -0
  47. data/bundler/lib/bundler/feature_flag.rb +0 -2
  48. data/bundler/lib/bundler/fetcher.rb +4 -3
  49. data/bundler/lib/bundler/fetcher/base.rb +1 -1
  50. data/bundler/lib/bundler/fetcher/compact_index.rb +1 -1
  51. data/bundler/lib/bundler/fetcher/downloader.rb +1 -1
  52. data/bundler/lib/bundler/fetcher/index.rb +1 -1
  53. data/bundler/lib/bundler/friendly_errors.rb +7 -13
  54. data/bundler/lib/bundler/gem_helper.rb +33 -19
  55. data/bundler/lib/bundler/gem_helpers.rb +6 -1
  56. data/bundler/lib/bundler/gem_version_promoter.rb +2 -2
  57. data/bundler/lib/bundler/graph.rb +1 -1
  58. data/bundler/lib/bundler/index.rb +1 -1
  59. data/bundler/lib/bundler/injector.rb +15 -4
  60. data/bundler/lib/bundler/inline.rb +2 -2
  61. data/bundler/lib/bundler/installer.rb +30 -29
  62. data/bundler/lib/bundler/installer/gem_installer.rb +3 -3
  63. data/bundler/lib/bundler/installer/parallel_installer.rb +10 -10
  64. data/bundler/lib/bundler/installer/standalone.rb +2 -2
  65. data/bundler/lib/bundler/lazy_specification.rb +19 -6
  66. data/bundler/lib/bundler/lockfile_generator.rb +1 -1
  67. data/bundler/lib/bundler/lockfile_parser.rb +1 -1
  68. data/bundler/lib/bundler/mirror.rb +2 -2
  69. data/bundler/lib/bundler/plugin.rb +30 -5
  70. data/bundler/lib/bundler/plugin/index.rb +10 -1
  71. data/bundler/lib/bundler/plugin/installer.rb +1 -1
  72. data/bundler/lib/bundler/plugin/installer/rubygems.rb +1 -1
  73. data/bundler/lib/bundler/plugin/source_list.rb +1 -1
  74. data/bundler/lib/bundler/psyched_yaml.rb +0 -15
  75. data/bundler/lib/bundler/remote_specification.rb +5 -2
  76. data/bundler/lib/bundler/resolver.rb +32 -9
  77. data/bundler/lib/bundler/resolver/spec_group.rb +27 -6
  78. data/bundler/lib/bundler/retry.rb +1 -1
  79. data/bundler/lib/bundler/ruby_version.rb +1 -1
  80. data/bundler/lib/bundler/rubygems_ext.rb +53 -9
  81. data/bundler/lib/bundler/rubygems_gem_installer.rb +3 -9
  82. data/bundler/lib/bundler/rubygems_integration.rb +31 -54
  83. data/bundler/lib/bundler/runtime.rb +4 -14
  84. data/bundler/lib/bundler/settings.rb +49 -45
  85. data/bundler/lib/bundler/setup.rb +5 -0
  86. data/bundler/lib/bundler/shared_helpers.rb +2 -2
  87. data/bundler/lib/bundler/similarity_detector.rb +1 -1
  88. data/bundler/lib/bundler/source.rb +1 -1
  89. data/bundler/lib/bundler/source/git.rb +5 -5
  90. data/bundler/lib/bundler/source/git/git_proxy.rb +56 -59
  91. data/bundler/lib/bundler/source/path.rb +7 -3
  92. data/bundler/lib/bundler/source/path/installer.rb +8 -10
  93. data/bundler/lib/bundler/source/rubygems.rb +13 -16
  94. data/bundler/lib/bundler/source/rubygems/remote.rb +1 -1
  95. data/bundler/lib/bundler/source_list.rb +2 -2
  96. data/bundler/lib/bundler/spec_set.rb +1 -1
  97. data/bundler/lib/bundler/stub_specification.rb +17 -5
  98. data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
  99. data/bundler/lib/bundler/templates/newgem/Gemfile.tt +9 -1
  100. data/bundler/lib/bundler/templates/newgem/README.md.tt +1 -1
  101. data/bundler/lib/bundler/templates/newgem/Rakefile.tt +19 -5
  102. data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -0
  103. data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
  104. data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
  105. data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +18 -0
  106. data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -0
  107. data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +2 -0
  108. data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
  109. data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +8 -6
  110. data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +10 -0
  111. data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
  112. data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
  113. data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
  114. data/bundler/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
  115. data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
  116. data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
  117. data/bundler/lib/bundler/ui/shell.rb +5 -5
  118. data/bundler/lib/bundler/uri_credentials_filter.rb +1 -1
  119. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +79 -212
  120. data/bundler/lib/bundler/vendor/thor/lib/thor.rb +0 -7
  121. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
  122. data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
  123. data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
  124. data/bundler/lib/bundler/vendored_persistent.rb +0 -7
  125. data/bundler/lib/bundler/version.rb +1 -1
  126. data/bundler/lib/bundler/worker.rb +1 -1
  127. data/bundler/lib/bundler/yaml_serializer.rb +1 -1
  128. data/bundler/man/bundle-add.1 +1 -1
  129. data/bundler/man/{bundle-add.ronn → bundle-add.1.ronn} +0 -0
  130. data/bundler/man/bundle-binstubs.1 +5 -3
  131. data/bundler/man/{bundle-binstubs.ronn → bundle-binstubs.1.ronn} +2 -4
  132. data/bundler/man/bundle-cache.1 +1 -1
  133. data/bundler/man/{bundle-cache.ronn → bundle-cache.1.ronn} +0 -0
  134. data/bundler/man/bundle-check.1 +1 -1
  135. data/bundler/man/{bundle-check.ronn → bundle-check.1.ronn} +0 -0
  136. data/bundler/man/bundle-clean.1 +1 -1
  137. data/bundler/man/{bundle-clean.ronn → bundle-clean.1.ronn} +0 -0
  138. data/bundler/man/bundle-config.1 +16 -22
  139. data/bundler/man/{bundle-config.ronn → bundle-config.1.ronn} +19 -22
  140. data/bundler/man/bundle-doctor.1 +1 -1
  141. data/bundler/man/{bundle-doctor.ronn → bundle-doctor.1.ronn} +0 -0
  142. data/bundler/man/bundle-exec.1 +1 -1
  143. data/bundler/man/{bundle-exec.ronn → bundle-exec.1.ronn} +0 -0
  144. data/bundler/man/bundle-gem.1 +25 -3
  145. data/bundler/man/{bundle-gem.ronn → bundle-gem.1.ronn} +30 -7
  146. data/bundler/man/bundle-info.1 +1 -1
  147. data/bundler/man/{bundle-info.ronn → bundle-info.1.ronn} +0 -0
  148. data/bundler/man/bundle-init.1 +1 -1
  149. data/bundler/man/{bundle-init.ronn → bundle-init.1.ronn} +0 -0
  150. data/bundler/man/bundle-inject.1 +1 -1
  151. data/bundler/man/{bundle-inject.ronn → bundle-inject.1.ronn} +0 -0
  152. data/bundler/man/bundle-install.1 +29 -2
  153. data/bundler/man/{bundle-install.ronn → bundle-install.1.ronn} +24 -2
  154. data/bundler/man/bundle-list.1 +7 -7
  155. data/bundler/man/{bundle-list.ronn → bundle-list.1.ronn} +6 -6
  156. data/bundler/man/bundle-lock.1 +1 -1
  157. data/bundler/man/{bundle-lock.ronn → bundle-lock.1.ronn} +0 -0
  158. data/bundler/man/bundle-open.1 +1 -1
  159. data/bundler/man/{bundle-open.ronn → bundle-open.1.ronn} +0 -0
  160. data/bundler/man/bundle-outdated.1 +1 -1
  161. data/bundler/man/{bundle-outdated.ronn → bundle-outdated.1.ronn} +0 -0
  162. data/bundler/man/bundle-platform.1 +1 -1
  163. data/bundler/man/{bundle-platform.ronn → bundle-platform.1.ronn} +0 -0
  164. data/bundler/man/bundle-pristine.1 +1 -1
  165. data/bundler/man/{bundle-pristine.ronn → bundle-pristine.1.ronn} +0 -0
  166. data/bundler/man/bundle-remove.1 +1 -1
  167. data/bundler/man/{bundle-remove.ronn → bundle-remove.1.ronn} +0 -0
  168. data/bundler/man/bundle-show.1 +1 -1
  169. data/bundler/man/{bundle-show.ronn → bundle-show.1.ronn} +0 -0
  170. data/bundler/man/bundle-update.1 +1 -1
  171. data/bundler/man/{bundle-update.ronn → bundle-update.1.ronn} +0 -0
  172. data/bundler/man/bundle-viz.1 +1 -1
  173. data/bundler/man/{bundle-viz.ronn → bundle-viz.1.ronn} +0 -0
  174. data/bundler/man/bundle.1 +1 -1
  175. data/bundler/man/{bundle.ronn → bundle.1.ronn} +0 -0
  176. data/bundler/man/gemfile.5 +4 -4
  177. data/bundler/man/gemfile.5.ronn +4 -4
  178. data/lib/rubygems.rb +133 -186
  179. data/lib/rubygems/available_set.rb +4 -6
  180. data/lib/rubygems/basic_specification.rb +12 -10
  181. data/lib/rubygems/bundler_version_finder.rb +14 -9
  182. data/lib/rubygems/command.rb +17 -17
  183. data/lib/rubygems/command_manager.rb +4 -5
  184. data/lib/rubygems/commands/build_command.rb +4 -1
  185. data/lib/rubygems/commands/cert_command.rb +1 -9
  186. data/lib/rubygems/commands/check_command.rb +0 -2
  187. data/lib/rubygems/commands/cleanup_command.rb +11 -7
  188. data/lib/rubygems/commands/contents_command.rb +4 -6
  189. data/lib/rubygems/commands/dependency_command.rb +6 -8
  190. data/lib/rubygems/commands/environment_command.rb +1 -3
  191. data/lib/rubygems/commands/fetch_command.rb +2 -4
  192. data/lib/rubygems/commands/generate_index_command.rb +0 -2
  193. data/lib/rubygems/commands/help_command.rb +2 -4
  194. data/lib/rubygems/commands/info_command.rb +8 -5
  195. data/lib/rubygems/commands/install_command.rb +3 -5
  196. data/lib/rubygems/commands/list_command.rb +8 -7
  197. data/lib/rubygems/commands/lock_command.rb +1 -3
  198. data/lib/rubygems/commands/mirror_command.rb +0 -2
  199. data/lib/rubygems/commands/open_command.rb +0 -4
  200. data/lib/rubygems/commands/outdated_command.rb +0 -2
  201. data/lib/rubygems/commands/owner_command.rb +0 -2
  202. data/lib/rubygems/commands/pristine_command.rb +10 -4
  203. data/lib/rubygems/commands/push_command.rb +4 -44
  204. data/lib/rubygems/commands/query_command.rb +6 -353
  205. data/lib/rubygems/commands/rdoc_command.rb +0 -2
  206. data/lib/rubygems/commands/search_command.rb +7 -7
  207. data/lib/rubygems/commands/server_command.rb +0 -2
  208. data/lib/rubygems/commands/setup_command.rb +156 -48
  209. data/lib/rubygems/commands/signin_command.rb +0 -2
  210. data/lib/rubygems/commands/signout_command.rb +0 -2
  211. data/lib/rubygems/commands/sources_command.rb +3 -5
  212. data/lib/rubygems/commands/specification_command.rb +2 -4
  213. data/lib/rubygems/commands/stale_command.rb +1 -3
  214. data/lib/rubygems/commands/uninstall_command.rb +2 -4
  215. data/lib/rubygems/commands/unpack_command.rb +1 -3
  216. data/lib/rubygems/commands/update_command.rb +59 -14
  217. data/lib/rubygems/commands/which_command.rb +0 -2
  218. data/lib/rubygems/commands/yank_command.rb +0 -2
  219. data/lib/rubygems/config_file.rb +11 -4
  220. data/lib/rubygems/core_ext/kernel_require.rb +26 -36
  221. data/lib/rubygems/core_ext/kernel_warn.rb +6 -6
  222. data/lib/rubygems/defaults.rb +99 -5
  223. data/lib/rubygems/dependency.rb +2 -7
  224. data/lib/rubygems/dependency_installer.rb +1 -75
  225. data/lib/rubygems/dependency_list.rb +7 -9
  226. data/lib/rubygems/deprecate.rb +46 -1
  227. data/lib/rubygems/doctor.rb +4 -4
  228. data/lib/rubygems/errors.rb +3 -14
  229. data/lib/rubygems/exceptions.rb +2 -33
  230. data/lib/rubygems/ext.rb +6 -6
  231. data/lib/rubygems/ext/build_error.rb +2 -0
  232. data/lib/rubygems/ext/builder.rb +4 -4
  233. data/lib/rubygems/ext/cmake_builder.rb +1 -3
  234. data/lib/rubygems/ext/configure_builder.rb +0 -2
  235. data/lib/rubygems/ext/ext_conf_builder.rb +6 -9
  236. data/lib/rubygems/ext/rake_builder.rb +0 -2
  237. data/lib/rubygems/gem_runner.rb +3 -10
  238. data/lib/rubygems/gemcutter_utilities.rb +1 -1
  239. data/lib/rubygems/indexer.rb +1 -21
  240. data/lib/rubygems/install_update_options.rb +5 -5
  241. data/lib/rubygems/installer.rb +47 -48
  242. data/lib/rubygems/installer_test_case.rb +18 -5
  243. data/lib/rubygems/installer_uninstaller_utils.rb +24 -0
  244. data/lib/rubygems/local_remote_options.rb +1 -1
  245. data/lib/rubygems/mock_gem_ui.rb +0 -6
  246. data/lib/rubygems/name_tuple.rb +2 -6
  247. data/lib/rubygems/openssl.rb +7 -0
  248. data/lib/rubygems/package.rb +11 -23
  249. data/lib/rubygems/package/digest_io.rb +0 -2
  250. data/lib/rubygems/package/file_source.rb +0 -2
  251. data/lib/rubygems/package/io_source.rb +0 -2
  252. data/lib/rubygems/package/old.rb +1 -3
  253. data/lib/rubygems/package/tar_header.rb +3 -5
  254. data/lib/rubygems/package/tar_reader.rb +0 -3
  255. data/lib/rubygems/package/tar_reader/entry.rb +0 -3
  256. data/lib/rubygems/package/tar_test_case.rb +1 -3
  257. data/lib/rubygems/package/tar_writer.rb +2 -12
  258. data/lib/rubygems/package_task.rb +1 -7
  259. data/lib/rubygems/path_support.rb +1 -3
  260. data/lib/rubygems/platform.rb +3 -5
  261. data/lib/rubygems/psych_tree.rb +0 -2
  262. data/lib/rubygems/query_utils.rb +362 -0
  263. data/lib/rubygems/rdoc.rb +0 -12
  264. data/lib/rubygems/remote_fetcher.rb +9 -25
  265. data/lib/rubygems/request.rb +1 -9
  266. data/lib/rubygems/request/connection_pools.rb +1 -5
  267. data/lib/rubygems/request/http_pool.rb +0 -2
  268. data/lib/rubygems/request/https_pool.rb +0 -2
  269. data/lib/rubygems/request_set.rb +5 -7
  270. data/lib/rubygems/request_set/gem_dependency_api.rb +2 -4
  271. data/lib/rubygems/request_set/lockfile.rb +8 -12
  272. data/lib/rubygems/request_set/lockfile/parser.rb +0 -2
  273. data/lib/rubygems/request_set/lockfile/tokenizer.rb +1 -3
  274. data/lib/rubygems/requirement.rb +20 -21
  275. data/lib/rubygems/resolver.rb +7 -10
  276. data/lib/rubygems/resolver/activation_request.rb +0 -2
  277. data/lib/rubygems/resolver/api_set.rb +4 -6
  278. data/lib/rubygems/resolver/api_specification.rb +16 -7
  279. data/lib/rubygems/resolver/best_set.rb +0 -2
  280. data/lib/rubygems/resolver/composed_set.rb +3 -5
  281. data/lib/rubygems/resolver/conflict.rb +1 -3
  282. data/lib/rubygems/resolver/current_set.rb +0 -2
  283. data/lib/rubygems/resolver/dependency_request.rb +0 -2
  284. data/lib/rubygems/resolver/git_set.rb +0 -2
  285. data/lib/rubygems/resolver/git_specification.rb +0 -2
  286. data/lib/rubygems/resolver/index_set.rb +1 -3
  287. data/lib/rubygems/resolver/index_specification.rb +0 -2
  288. data/lib/rubygems/resolver/installed_specification.rb +0 -2
  289. data/lib/rubygems/resolver/installer_set.rb +3 -5
  290. data/lib/rubygems/resolver/local_specification.rb +0 -2
  291. data/lib/rubygems/resolver/lock_set.rb +1 -3
  292. data/lib/rubygems/resolver/lock_specification.rb +0 -2
  293. data/lib/rubygems/resolver/requirement_list.rb +0 -2
  294. data/lib/rubygems/resolver/set.rb +0 -2
  295. data/lib/rubygems/resolver/source_set.rb +0 -2
  296. data/lib/rubygems/resolver/spec_specification.rb +0 -2
  297. data/lib/rubygems/resolver/specification.rb +0 -2
  298. data/lib/rubygems/resolver/stats.rb +0 -2
  299. data/lib/rubygems/resolver/vendor_set.rb +0 -2
  300. data/lib/rubygems/resolver/vendor_specification.rb +0 -2
  301. data/lib/rubygems/s3_uri_signer.rb +1 -7
  302. data/lib/rubygems/safe_yaml.rb +4 -4
  303. data/lib/rubygems/security.rb +26 -32
  304. data/lib/rubygems/security/policy.rb +3 -7
  305. data/lib/rubygems/security/signer.rb +4 -6
  306. data/lib/rubygems/security/trust_dir.rb +1 -3
  307. data/lib/rubygems/server.rb +9 -11
  308. data/lib/rubygems/source.rb +4 -4
  309. data/lib/rubygems/source/git.rb +7 -8
  310. data/lib/rubygems/source/installed.rb +0 -2
  311. data/lib/rubygems/source/local.rb +2 -4
  312. data/lib/rubygems/source/lock.rb +0 -2
  313. data/lib/rubygems/source/specific_file.rb +0 -2
  314. data/lib/rubygems/source/vendor.rb +0 -2
  315. data/lib/rubygems/source_list.rb +6 -7
  316. data/lib/rubygems/spec_fetcher.rb +18 -17
  317. data/lib/rubygems/specification.rb +107 -120
  318. data/lib/rubygems/specification_policy.rb +88 -30
  319. data/lib/rubygems/stub_specification.rb +0 -4
  320. data/lib/rubygems/syck_hack.rb +0 -2
  321. data/lib/rubygems/test_case.rb +122 -92
  322. data/lib/rubygems/test_utilities.rb +6 -14
  323. data/lib/rubygems/uninstaller.rb +35 -16
  324. data/lib/rubygems/uri_formatter.rb +0 -2
  325. data/lib/rubygems/uri_parser.rb +0 -2
  326. data/lib/rubygems/user_interaction.rb +1 -26
  327. data/lib/rubygems/util.rb +15 -3
  328. data/lib/rubygems/util/licenses.rb +4 -6
  329. data/lib/rubygems/util/list.rb +0 -2
  330. data/lib/rubygems/validator.rb +1 -3
  331. data/lib/rubygems/version.rb +5 -7
  332. data/rubygems-update.gemspec +2 -2
  333. data/setup.rb +2 -7
  334. data/test/rubygems/plugin/load/rubygems_plugin.rb +0 -2
  335. data/test/rubygems/rubygems/commands/crash_command.rb +0 -2
  336. data/test/rubygems/rubygems_plugin.rb +0 -2
  337. data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
  338. data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +12 -0
  339. data/test/rubygems/test_bundled_ca.rb +38 -45
  340. data/test/rubygems/test_config.rb +0 -2
  341. data/test/rubygems/test_deprecate.rb +40 -7
  342. data/test/rubygems/test_gem.rb +150 -103
  343. data/test/rubygems/test_gem_available_set.rb +3 -5
  344. data/test/rubygems/test_gem_bundler_version_finder.rb +19 -3
  345. data/test/rubygems/test_gem_command.rb +24 -7
  346. data/test/rubygems/test_gem_command_manager.rb +36 -5
  347. data/test/rubygems/test_gem_commands_build_command.rb +53 -10
  348. data/test/rubygems/test_gem_commands_cert_command.rb +2 -4
  349. data/test/rubygems/test_gem_commands_check_command.rb +0 -2
  350. data/test/rubygems/test_gem_commands_cleanup_command.rb +13 -4
  351. data/test/rubygems/test_gem_commands_contents_command.rb +48 -17
  352. data/test/rubygems/test_gem_commands_dependency_command.rb +0 -2
  353. data/test/rubygems/test_gem_commands_environment_command.rb +21 -23
  354. data/test/rubygems/test_gem_commands_fetch_command.rb +0 -2
  355. data/test/rubygems/test_gem_commands_generate_index_command.rb +1 -7
  356. data/test/rubygems/test_gem_commands_help_command.rb +0 -2
  357. data/test/rubygems/test_gem_commands_info_command.rb +6 -8
  358. data/test/rubygems/test_gem_commands_install_command.rb +31 -33
  359. data/test/rubygems/test_gem_commands_list_command.rb +0 -2
  360. data/test/rubygems/test_gem_commands_lock_command.rb +0 -2
  361. data/test/rubygems/test_gem_commands_mirror.rb +1 -3
  362. data/test/rubygems/test_gem_commands_open_command.rb +4 -6
  363. data/test/rubygems/test_gem_commands_outdated_command.rb +0 -2
  364. data/test/rubygems/test_gem_commands_owner_command.rb +11 -5
  365. data/test/rubygems/test_gem_commands_pristine_command.rb +41 -10
  366. data/test/rubygems/test_gem_commands_push_command.rb +7 -4
  367. data/test/rubygems/test_gem_commands_query_command.rb +9 -9
  368. data/test/rubygems/test_gem_commands_search_command.rb +0 -2
  369. data/test/rubygems/test_gem_commands_server_command.rb +0 -2
  370. data/test/rubygems/test_gem_commands_setup_command.rb +210 -118
  371. data/test/rubygems/test_gem_commands_signin_command.rb +6 -6
  372. data/test/rubygems/test_gem_commands_signout_command.rb +0 -7
  373. data/test/rubygems/test_gem_commands_sources_command.rb +39 -3
  374. data/test/rubygems/test_gem_commands_specification_command.rb +18 -20
  375. data/test/rubygems/test_gem_commands_stale_command.rb +0 -2
  376. data/test/rubygems/test_gem_commands_uninstall_command.rb +2 -3
  377. data/test/rubygems/test_gem_commands_unpack_command.rb +0 -2
  378. data/test/rubygems/test_gem_commands_update_command.rb +116 -7
  379. data/test/rubygems/test_gem_commands_which_command.rb +3 -5
  380. data/test/rubygems/test_gem_commands_yank_command.rb +14 -8
  381. data/test/rubygems/test_gem_config_file.rb +7 -12
  382. data/test/rubygems/test_gem_dependency.rb +0 -2
  383. data/test/rubygems/test_gem_dependency_installer.rb +54 -191
  384. data/test/rubygems/test_gem_dependency_list.rb +8 -10
  385. data/test/rubygems/test_gem_dependency_resolution_error.rb +1 -3
  386. data/test/rubygems/test_gem_doctor.rb +28 -2
  387. data/test/rubygems/test_gem_ext_builder.rb +16 -33
  388. data/test/rubygems/test_gem_ext_cmake_builder.rb +13 -14
  389. data/test/rubygems/test_gem_ext_configure_builder.rb +1 -11
  390. data/test/rubygems/test_gem_ext_ext_conf_builder.rb +0 -3
  391. data/test/rubygems/test_gem_ext_rake_builder.rb +9 -11
  392. data/test/rubygems/test_gem_gem_runner.rb +43 -1
  393. data/test/rubygems/test_gem_gemcutter_utilities.rb +5 -2
  394. data/test/rubygems/test_gem_impossible_dependencies_error.rb +0 -2
  395. data/test/rubygems/test_gem_indexer.rb +9 -15
  396. data/test/rubygems/test_gem_install_update_options.rb +0 -2
  397. data/test/rubygems/test_gem_installer.rb +192 -71
  398. data/test/rubygems/test_gem_local_remote_options.rb +0 -2
  399. data/test/rubygems/test_gem_name_tuple.rb +0 -2
  400. data/test/rubygems/test_gem_package.rb +33 -31
  401. data/test/rubygems/test_gem_package_old.rb +0 -2
  402. data/test/rubygems/test_gem_package_tar_header.rb +18 -1
  403. data/test/rubygems/test_gem_package_tar_reader.rb +0 -2
  404. data/test/rubygems/test_gem_package_tar_reader_entry.rb +0 -2
  405. data/test/rubygems/test_gem_package_tar_writer.rb +8 -5
  406. data/test/rubygems/test_gem_package_task.rb +46 -13
  407. data/test/rubygems/test_gem_path_support.rb +0 -2
  408. data/test/rubygems/test_gem_platform.rb +0 -2
  409. data/test/rubygems/test_gem_rdoc.rb +0 -2
  410. data/test/rubygems/test_gem_remote_fetcher.rb +156 -195
  411. data/test/rubygems/test_gem_request.rb +11 -15
  412. data/test/rubygems/test_gem_request_connection_pools.rb +0 -4
  413. data/test/rubygems/test_gem_request_set.rb +72 -22
  414. data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -5
  415. data/test/rubygems/test_gem_request_set_lockfile.rb +0 -2
  416. data/test/rubygems/test_gem_request_set_lockfile_parser.rb +9 -11
  417. data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +118 -120
  418. data/test/rubygems/test_gem_requirement.rb +10 -4
  419. data/test/rubygems/test_gem_resolver.rb +6 -8
  420. data/test/rubygems/test_gem_resolver_activation_request.rb +0 -2
  421. data/test/rubygems/test_gem_resolver_api_set.rb +3 -5
  422. data/test/rubygems/test_gem_resolver_api_specification.rb +0 -2
  423. data/test/rubygems/test_gem_resolver_best_set.rb +2 -4
  424. data/test/rubygems/test_gem_resolver_composed_set.rb +0 -2
  425. data/test/rubygems/test_gem_resolver_conflict.rb +0 -2
  426. data/test/rubygems/test_gem_resolver_dependency_request.rb +0 -2
  427. data/test/rubygems/test_gem_resolver_git_set.rb +0 -2
  428. data/test/rubygems/test_gem_resolver_git_specification.rb +0 -2
  429. data/test/rubygems/test_gem_resolver_index_set.rb +2 -4
  430. data/test/rubygems/test_gem_resolver_index_specification.rb +0 -2
  431. data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -2
  432. data/test/rubygems/test_gem_resolver_installer_set.rb +7 -9
  433. data/test/rubygems/test_gem_resolver_local_specification.rb +0 -2
  434. data/test/rubygems/test_gem_resolver_lock_set.rb +3 -5
  435. data/test/rubygems/test_gem_resolver_lock_specification.rb +0 -2
  436. data/test/rubygems/test_gem_resolver_requirement_list.rb +0 -2
  437. data/test/rubygems/test_gem_resolver_specification.rb +0 -4
  438. data/test/rubygems/test_gem_resolver_vendor_set.rb +0 -2
  439. data/test/rubygems/test_gem_resolver_vendor_specification.rb +0 -2
  440. data/test/rubygems/test_gem_security.rb +20 -22
  441. data/test/rubygems/test_gem_security_policy.rb +5 -10
  442. data/test/rubygems/test_gem_security_signer.rb +8 -10
  443. data/test/rubygems/test_gem_security_trust_dir.rb +2 -4
  444. data/test/rubygems/test_gem_server.rb +10 -14
  445. data/test/rubygems/test_gem_silent_ui.rb +0 -2
  446. data/test/rubygems/test_gem_source.rb +12 -16
  447. data/test/rubygems/test_gem_source_fetch_problem.rb +0 -2
  448. data/test/rubygems/test_gem_source_git.rb +12 -13
  449. data/test/rubygems/test_gem_source_installed.rb +7 -9
  450. data/test/rubygems/test_gem_source_list.rb +1 -2
  451. data/test/rubygems/test_gem_source_local.rb +8 -10
  452. data/test/rubygems/test_gem_source_lock.rb +10 -12
  453. data/test/rubygems/test_gem_source_specific_file.rb +7 -9
  454. data/test/rubygems/test_gem_source_vendor.rb +7 -9
  455. data/test/rubygems/test_gem_spec_fetcher.rb +11 -4
  456. data/test/rubygems/test_gem_specification.rb +179 -129
  457. data/test/rubygems/test_gem_stream_ui.rb +3 -3
  458. data/test/rubygems/test_gem_stub_specification.rb +4 -7
  459. data/test/rubygems/test_gem_text.rb +1 -3
  460. data/test/rubygems/test_gem_uninstaller.rb +133 -11
  461. data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +0 -2
  462. data/test/rubygems/test_gem_uri_formatter.rb +0 -2
  463. data/test/rubygems/test_gem_util.rb +7 -7
  464. data/test/rubygems/test_gem_validator.rb +0 -2
  465. data/test/rubygems/test_gem_version.rb +1 -3
  466. data/test/rubygems/test_gem_version_option.rb +0 -2
  467. data/test/rubygems/test_kernel.rb +25 -10
  468. data/test/rubygems/test_project_sanity.rb +7 -2
  469. data/test/rubygems/test_remote_fetch_error.rb +0 -2
  470. data/test/rubygems/test_require.rb +241 -47
  471. metadata +59 -96
  472. data/.bundle/config +0 -2
  473. data/.rubocop.yml +0 -91
  474. data/Gemfile +0 -8
  475. data/Gemfile.lock +0 -43
  476. data/bundler/CODE_OF_CONDUCT.md +0 -136
  477. data/bundler/man/bundle-add.1.txt +0 -58
  478. data/bundler/man/bundle-binstubs.1.txt +0 -48
  479. data/bundler/man/bundle-cache.1.txt +0 -78
  480. data/bundler/man/bundle-check.1.txt +0 -33
  481. data/bundler/man/bundle-clean.1.txt +0 -26
  482. data/bundler/man/bundle-config.1.txt +0 -528
  483. data/bundler/man/bundle-doctor.1.txt +0 -44
  484. data/bundler/man/bundle-exec.1.txt +0 -178
  485. data/bundler/man/bundle-gem.1.txt +0 -91
  486. data/bundler/man/bundle-info.1.txt +0 -21
  487. data/bundler/man/bundle-init.1.txt +0 -34
  488. data/bundler/man/bundle-inject.1.txt +0 -32
  489. data/bundler/man/bundle-install.1.txt +0 -401
  490. data/bundler/man/bundle-list.1.txt +0 -43
  491. data/bundler/man/bundle-lock.1.txt +0 -93
  492. data/bundler/man/bundle-open.1.txt +0 -29
  493. data/bundler/man/bundle-outdated.1.txt +0 -131
  494. data/bundler/man/bundle-platform.1.txt +0 -57
  495. data/bundler/man/bundle-pristine.1.txt +0 -44
  496. data/bundler/man/bundle-remove.1.txt +0 -34
  497. data/bundler/man/bundle-show.1.txt +0 -27
  498. data/bundler/man/bundle-update.1.txt +0 -390
  499. data/bundler/man/bundle-viz.1.txt +0 -39
  500. data/bundler/man/bundle.1.txt +0 -116
  501. data/bundler/man/gemfile.5.txt +0 -649
  502. data/bundler/man/index.txt +0 -25
  503. data/lib/rubygems/source_local.rb +0 -7
  504. data/lib/rubygems/source_specific_file.rb +0 -6
  505. data/lib/ubygems.rb +0 -14
  506. data/tmp/.keep +0 -0
  507. data/util/CL2notes +0 -55
  508. data/util/bisect +0 -10
  509. data/util/ci.sh +0 -62
  510. data/util/cops/deprecations.rb +0 -52
  511. data/util/create_certs.rb +0 -171
  512. data/util/create_certs.sh +0 -27
  513. data/util/create_encrypted_key.rb +0 -16
  514. data/util/generate_spdx_license_list.rb +0 -63
  515. data/util/patch_with_prs.rb +0 -77
  516. data/util/rubocop +0 -8
  517. data/util/update_bundled_ca_certificates.rb +0 -139
  518. data/util/update_changelog.rb +0 -67
@@ -6,7 +6,6 @@ require 'rubygems/request_set/lockfile/tokenizer'
6
6
  require 'rubygems/request_set/lockfile/parser'
7
7
 
8
8
  class TestGemRequestSetLockfileTokenizer < Gem::TestCase
9
-
10
9
  def setup
11
10
  super
12
11
 
@@ -64,86 +63,86 @@ DEPENDENCIES
64
63
  LOCKFILE
65
64
 
66
65
  expected = [
67
- [:section, 'GEM', 0, 0],
68
- [:newline, nil, 3, 0],
69
-
70
- [:entry, 'remote', 2, 1],
71
- [:text, @gem_repo, 10, 1],
72
- [:newline, nil, 34, 1],
73
-
74
- [:entry, 'specs', 2, 2],
75
- [:newline, nil, 8, 2],
76
-
77
- [:text, 'a', 4, 3],
78
- [:l_paren, nil, 6, 3],
79
- [:text, '2', 7, 3],
80
- [:r_paren, nil, 8, 3],
81
- [:newline, nil, 9, 3],
82
-
83
- [:text, 'b', 6, 4],
84
- [:l_paren, nil, 8, 4],
85
- [:requirement, '=', 9, 4],
86
- [:text, '2', 11, 4],
87
- [:r_paren, nil, 12, 4],
88
- [:newline, nil, 13, 4],
89
-
90
- [:text, 'c', 6, 5],
91
- [:l_paren, nil, 8, 5],
92
- [:requirement, '!=', 9, 5],
93
- [:text, '3', 12, 5],
94
- [:r_paren, nil, 13, 5],
95
- [:newline, nil, 14, 5],
96
-
97
- [:text, 'd', 6, 6],
98
- [:l_paren, nil, 8, 6],
99
- [:requirement, '>', 9, 6],
100
- [:text, '4', 11, 6],
101
- [:r_paren, nil, 12, 6],
102
- [:newline, nil, 13, 6],
103
-
104
- [:text, 'e', 6, 7],
105
- [:l_paren, nil, 8, 7],
106
- [:requirement, '<', 9, 7],
107
- [:text, '5', 11, 7],
108
- [:r_paren, nil, 12, 7],
109
- [:newline, nil, 13, 7],
110
-
111
- [:text, 'f', 6, 8],
112
- [:l_paren, nil, 8, 8],
113
- [:requirement, '>=', 9, 8],
114
- [:text, '6', 12, 8],
115
- [:r_paren, nil, 13, 8],
116
- [:newline, nil, 14, 8],
117
-
118
- [:text, 'g', 6, 9],
119
- [:l_paren, nil, 8, 9],
120
- [:requirement, '<=', 9, 9],
121
- [:text, '7', 12, 9],
122
- [:r_paren, nil, 13, 9],
123
- [:newline, nil, 14, 9],
124
-
125
- [:text, 'h', 6, 10],
126
- [:l_paren, nil, 8, 10],
127
- [:requirement, '~>', 9, 10],
66
+ [:section, 'GEM', 0, 0],
67
+ [:newline, nil, 3, 0],
68
+
69
+ [:entry, 'remote', 2, 1],
70
+ [:text, @gem_repo, 10, 1],
71
+ [:newline, nil, 34, 1],
72
+
73
+ [:entry, 'specs', 2, 2],
74
+ [:newline, nil, 8, 2],
75
+
76
+ [:text, 'a', 4, 3],
77
+ [:l_paren, nil, 6, 3],
78
+ [:text, '2', 7, 3],
79
+ [:r_paren, nil, 8, 3],
80
+ [:newline, nil, 9, 3],
81
+
82
+ [:text, 'b', 6, 4],
83
+ [:l_paren, nil, 8, 4],
84
+ [:requirement, '=', 9, 4],
85
+ [:text, '2', 11, 4],
86
+ [:r_paren, nil, 12, 4],
87
+ [:newline, nil, 13, 4],
88
+
89
+ [:text, 'c', 6, 5],
90
+ [:l_paren, nil, 8, 5],
91
+ [:requirement, '!=', 9, 5],
92
+ [:text, '3', 12, 5],
93
+ [:r_paren, nil, 13, 5],
94
+ [:newline, nil, 14, 5],
95
+
96
+ [:text, 'd', 6, 6],
97
+ [:l_paren, nil, 8, 6],
98
+ [:requirement, '>', 9, 6],
99
+ [:text, '4', 11, 6],
100
+ [:r_paren, nil, 12, 6],
101
+ [:newline, nil, 13, 6],
102
+
103
+ [:text, 'e', 6, 7],
104
+ [:l_paren, nil, 8, 7],
105
+ [:requirement, '<', 9, 7],
106
+ [:text, '5', 11, 7],
107
+ [:r_paren, nil, 12, 7],
108
+ [:newline, nil, 13, 7],
109
+
110
+ [:text, 'f', 6, 8],
111
+ [:l_paren, nil, 8, 8],
112
+ [:requirement, '>=', 9, 8],
113
+ [:text, '6', 12, 8],
114
+ [:r_paren, nil, 13, 8],
115
+ [:newline, nil, 14, 8],
116
+
117
+ [:text, 'g', 6, 9],
118
+ [:l_paren, nil, 8, 9],
119
+ [:requirement, '<=', 9, 9],
120
+ [:text, '7', 12, 9],
121
+ [:r_paren, nil, 13, 9],
122
+ [:newline, nil, 14, 9],
123
+
124
+ [:text, 'h', 6, 10],
125
+ [:l_paren, nil, 8, 10],
126
+ [:requirement, '~>', 9, 10],
128
127
  [:text, '8', 12, 10],
129
128
  [:r_paren, nil, 13, 10],
130
129
  [:newline, nil, 14, 10],
131
130
 
132
- [:newline, nil, 0, 11],
131
+ [:newline, nil, 0, 11],
133
132
 
134
- [:section, 'PLATFORMS', 0, 12],
135
- [:newline, nil, 9, 12],
133
+ [:section, 'PLATFORMS', 0, 12],
134
+ [:newline, nil, 9, 12],
136
135
 
137
- [:text, Gem::Platform::RUBY, 2, 13],
138
- [:newline, nil, 6, 13],
136
+ [:text, Gem::Platform::RUBY, 2, 13],
137
+ [:newline, nil, 6, 13],
139
138
 
140
- [:newline, nil, 0, 14],
139
+ [:newline, nil, 0, 14],
141
140
 
142
- [:section, 'DEPENDENCIES', 0, 15],
141
+ [:section, 'DEPENDENCIES', 0, 15],
143
142
  [:newline, nil, 12, 15],
144
143
 
145
- [:text, 'a', 2, 16],
146
- [:newline, nil, 3, 16],
144
+ [:text, 'a', 2, 16],
145
+ [:newline, nil, 3, 16],
147
146
  ]
148
147
 
149
148
  assert_equal expected, tokenize_lockfile
@@ -164,28 +163,28 @@ DEPENDENCIES
164
163
  LOCKFILE
165
164
 
166
165
  expected = [
167
- [:section, 'GEM', 0, 0],
168
- [:newline, nil, 3, 0],
169
- [:entry, 'remote', 2, 1],
166
+ [:section, 'GEM', 0, 0],
167
+ [:newline, nil, 3, 0],
168
+ [:entry, 'remote', 2, 1],
170
169
  [:text, @gem_repo, 10, 1],
171
170
  [:newline, nil, 34, 1],
172
- [:entry, 'specs', 2, 2],
173
- [:newline, nil, 8, 2],
174
- [:text, 'Ab', 4, 3],
175
- [:l_paren, nil, 7, 3],
176
- [:text, '2', 8, 3],
177
- [:r_paren, nil, 9, 3],
171
+ [:entry, 'specs', 2, 2],
172
+ [:newline, nil, 8, 2],
173
+ [:text, 'Ab', 4, 3],
174
+ [:l_paren, nil, 7, 3],
175
+ [:text, '2', 8, 3],
176
+ [:r_paren, nil, 9, 3],
178
177
  [:newline, nil, 10, 3],
179
- [:newline, nil, 0, 4],
180
- [:section, 'PLATFORMS', 0, 5],
181
- [:newline, nil, 9, 5],
182
- [:text, Gem::Platform::RUBY, 2, 6],
183
- [:newline, nil, 6, 6],
184
- [:newline, nil, 0, 7],
185
- [:section, 'DEPENDENCIES', 0, 8],
178
+ [:newline, nil, 0, 4],
179
+ [:section, 'PLATFORMS', 0, 5],
180
+ [:newline, nil, 9, 5],
181
+ [:text, Gem::Platform::RUBY, 2, 6],
182
+ [:newline, nil, 6, 6],
183
+ [:newline, nil, 0, 7],
184
+ [:section, 'DEPENDENCIES', 0, 8],
186
185
  [:newline, nil, 12, 8],
187
- [:text, 'Ab', 2, 9],
188
- [:newline, nil, 4, 9],
186
+ [:text, 'Ab', 2, 9],
187
+ [:newline, nil, 4, 9],
189
188
  ]
190
189
 
191
190
  assert_equal expected, tokenize_lockfile
@@ -236,12 +235,12 @@ DEPENDENCIES
236
235
  LOCKFILE
237
236
 
238
237
  expected = [
239
- [:section, 'DEPENDENCIES', 0, 0],
240
- [:newline, nil, 12, 0],
238
+ [:section, 'DEPENDENCIES', 0, 0],
239
+ [:newline, nil, 12, 0],
241
240
 
242
- [:text, 'a', 2, 1],
243
- [:bang, nil, 3, 1],
244
- [:newline, nil, 4, 1],
241
+ [:text, 'a', 2, 1],
242
+ [:bang, nil, 3, 1],
243
+ [:newline, nil, 4, 1],
245
244
  ]
246
245
 
247
246
  assert_equal expected, tokenize_lockfile
@@ -257,31 +256,31 @@ GEM
257
256
  LOCKFILE
258
257
 
259
258
  expected = [
260
- [:section, 'GEM', 0, 0],
261
- [:newline, nil, 3, 0],
262
-
263
- [:entry, 'remote', 2, 1],
264
- [:text, @gem_repo, 10, 1],
265
- [:newline, nil, 34, 1],
266
-
267
- [:entry, 'specs', 2, 2],
268
- [:newline, nil, 8, 2],
269
-
270
- [:text, 'a', 4, 3],
271
- [:l_paren, nil, 6, 3],
272
- [:text, '2', 7, 3],
273
- [:r_paren, nil, 8, 3],
274
- [:newline, nil, 9, 3],
275
-
276
- [:text, 'b', 6, 4],
277
- [:l_paren, nil, 8, 4],
278
- [:requirement, '~>', 9, 4],
279
- [:text, '3.0', 12, 4],
280
- [:comma, nil, 15, 4],
281
- [:requirement, '>=', 17, 4],
282
- [:text, '3.0.1', 20, 4],
283
- [:r_paren, nil, 25, 4],
284
- [:newline, nil, 26, 4],
259
+ [:section, 'GEM', 0, 0],
260
+ [:newline, nil, 3, 0],
261
+
262
+ [:entry, 'remote', 2, 1],
263
+ [:text, @gem_repo, 10, 1],
264
+ [:newline, nil, 34, 1],
265
+
266
+ [:entry, 'specs', 2, 2],
267
+ [:newline, nil, 8, 2],
268
+
269
+ [:text, 'a', 4, 3],
270
+ [:l_paren, nil, 6, 3],
271
+ [:text, '2', 7, 3],
272
+ [:r_paren, nil, 8, 3],
273
+ [:newline, nil, 9, 3],
274
+
275
+ [:text, 'b', 6, 4],
276
+ [:l_paren, nil, 8, 4],
277
+ [:requirement, '~>', 9, 4],
278
+ [:text, '3.0', 12, 4],
279
+ [:comma, nil, 15, 4],
280
+ [:requirement, '>=', 17, 4],
281
+ [:text, '3.0.1', 20, 4],
282
+ [:r_paren, nil, 25, 4],
283
+ [:newline, nil, 26, 4],
285
284
  ]
286
285
 
287
286
  assert_equal expected, tokenize_lockfile
@@ -304,5 +303,4 @@ GEM
304
303
  def tokenize_lockfile
305
304
  Gem::RequestSet::Lockfile::Tokenizer.from_file(@lock_file).to_a
306
305
  end
307
-
308
306
  end
@@ -3,7 +3,6 @@ require 'rubygems/test_case'
3
3
  require "rubygems/requirement"
4
4
 
5
5
  class TestGemRequirement < Gem::TestCase
6
-
7
6
  def test_concat
8
7
  r = req '>= 1'
9
8
 
@@ -23,6 +22,8 @@ class TestGemRequirement < Gem::TestCase
23
22
  refute_requirement_equal "~> 1.3", "~> 1.3.0"
24
23
  refute_requirement_equal "~> 1.3.0", "~> 1.3"
25
24
 
25
+ assert_requirement_equal ["> 2", "~> 1.3", "~> 1.3.1"], ["~> 1.3.1", "~> 1.3", "> 2"]
26
+
26
27
  assert_requirement_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"]
27
28
  assert_requirement_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"]
28
29
 
@@ -82,6 +83,12 @@ class TestGemRequirement < Gem::TestCase
82
83
  Gem::Requirement.parse(Gem::Version.new('2'))
83
84
  end
84
85
 
86
+ if RUBY_VERSION >= '2.5'
87
+ def test_parse_deduplication
88
+ assert_same '~>', Gem::Requirement.parse('~> 1').first
89
+ end
90
+ end
91
+
85
92
  def test_parse_bad
86
93
  [
87
94
  nil,
@@ -390,8 +397,8 @@ class TestGemRequirement < Gem::TestCase
390
397
  r2 = req('2.0', '1.0')
391
398
  assert_equal r1.hash, r2.hash
392
399
 
393
- r1 = req('1.0', '2.0').tap { |r| r.concat(['3.0']) }
394
- r2 = req('3.0', '1.0').tap { |r| r.concat(['2.0']) }
400
+ r1 = req('1.0', '2.0').tap {|r| r.concat(['3.0']) }
401
+ r2 = req('3.0', '1.0').tap {|r| r.concat(['2.0']) }
395
402
  assert_equal r1.hash, r2.hash
396
403
  end
397
404
 
@@ -421,5 +428,4 @@ class TestGemRequirement < Gem::TestCase
421
428
  refute req(requirement).satisfied_by?(v(version)),
422
429
  "#{requirement} is not satisfied by #{version}"
423
430
  end
424
-
425
431
  end
@@ -2,7 +2,6 @@
2
2
  require 'rubygems/test_case'
3
3
 
4
4
  class TestGemResolver < Gem::TestCase
5
-
6
5
  def setup
7
6
  super
8
7
 
@@ -26,10 +25,10 @@ class TestGemResolver < Gem::TestCase
26
25
  def assert_resolves_to(expected, resolver)
27
26
  actual = resolver.resolve
28
27
 
29
- exp = expected.sort_by { |s| s.full_name }
30
- act = actual.map { |a| a.spec.spec }.sort_by { |s| s.full_name }
28
+ exp = expected.sort_by {|s| s.full_name }
29
+ act = actual.map {|a| a.spec.spec }.sort_by {|s| s.full_name }
31
30
 
32
- msg = "Set of gems was not the same: #{exp.map { |x| x.full_name}.inspect} != #{act.map { |x| x.full_name}.inspect}"
31
+ msg = "Set of gems was not the same: #{exp.map {|x| x.full_name }.inspect} != #{act.map {|x| x.full_name }.inspect}"
33
32
 
34
33
  assert_equal exp, act, msg
35
34
  rescue Gem::DependencyResolutionError => e
@@ -105,7 +104,7 @@ class TestGemResolver < Gem::TestCase
105
104
 
106
105
  res.requests a1, act, reqs
107
106
 
108
- assert_equal ['b (= 2)'], reqs.map { |req| req.to_s }
107
+ assert_equal ['b (= 2)'], reqs.map {|req| req.to_s }
109
108
  end
110
109
 
111
110
  def test_requests_development
@@ -127,7 +126,7 @@ class TestGemResolver < Gem::TestCase
127
126
 
128
127
  res.requests spec, act, reqs
129
128
 
130
- assert_equal ['b (= 2)'], reqs.map { |req| req.to_s }
129
+ assert_equal ['b (= 2)'], reqs.map {|req| req.to_s }
131
130
 
132
131
  assert spec.instance_variable_defined? :@called
133
132
  end
@@ -546,7 +545,7 @@ class TestGemResolver < Gem::TestCase
546
545
 
547
546
  dependency = e.conflict.dependency
548
547
 
549
- assert_includes %w(a b), dependency.name
548
+ assert_includes %w[a b], dependency.name
550
549
  assert_equal req('>= 0'), dependency.requirement
551
550
 
552
551
  activated = e.conflict.activated
@@ -789,5 +788,4 @@ class TestGemResolver < Gem::TestCase
789
788
  assert_match "No match for 'a (= 1)' on this platform. Found: c-p-1",
790
789
  e.message
791
790
  end
792
-
793
791
  end
@@ -2,7 +2,6 @@
2
2
  require 'rubygems/test_case'
3
3
 
4
4
  class TestGemResolverActivationRequest < Gem::TestCase
5
-
6
5
  def setup
7
6
  super
8
7
 
@@ -40,5 +39,4 @@ class TestGemResolverActivationRequest < Gem::TestCase
40
39
 
41
40
  assert @req.installed?
42
41
  end
43
-
44
42
  end
@@ -2,7 +2,6 @@
2
2
  require 'rubygems/test_case'
3
3
 
4
4
  class TestGemResolverAPISet < Gem::TestCase
5
-
6
5
  def setup
7
6
  super
8
7
 
@@ -23,14 +22,14 @@ class TestGemResolverAPISet < Gem::TestCase
23
22
 
24
23
  assert_equal URI('https://rubygemsserver.com/mygems/api/v1/dependencies'), set.dep_uri
25
24
  assert_equal URI('https://rubygemsserver.com/mygems/'), set.uri
26
- assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')), set.source
25
+ assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')), set.source
27
26
  end
28
27
 
29
28
  def test_initialize_uri
30
29
  set = @DR::APISet.new @dep_uri
31
30
 
32
31
  assert_equal URI("#{@gem_repo}api/v1/dependencies"), set.dep_uri
33
- assert_equal URI("#{@gem_repo}"), set.uri
32
+ assert_equal URI("#{@gem_repo}"), set.uri
34
33
  end
35
34
 
36
35
  def test_find_all
@@ -128,7 +127,7 @@ class TestGemResolverAPISet < Gem::TestCase
128
127
 
129
128
  set.prefetch [a_dep, b_dep]
130
129
 
131
- assert_equal %w[a-1], set.find_all(a_dep).map { |s| s.full_name }
130
+ assert_equal %w[a-1], set.find_all(a_dep).map {|s| s.full_name }
132
131
  assert_empty set.find_all(b_dep)
133
132
  end
134
133
 
@@ -204,5 +203,4 @@ class TestGemResolverAPISet < Gem::TestCase
204
203
 
205
204
  assert_empty set.instance_variable_get :@data
206
205
  end
207
-
208
206
  end
@@ -2,7 +2,6 @@
2
2
  require 'rubygems/test_case'
3
3
 
4
4
  class TestGemResolverAPISpecification < Gem::TestCase
5
-
6
5
  def test_initialize
7
6
  set = Gem::Resolver::APISet.new
8
7
  data = {
@@ -164,5 +163,4 @@ class TestGemResolverAPISpecification < Gem::TestCase
164
163
  assert_kind_of Gem::Specification, spec
165
164
  assert_equal 'j-1-java', spec.full_name
166
165
  end
167
-
168
166
  end