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
@@ -3,7 +3,6 @@ require 'rubygems/test_case'
3
3
  require 'rubygems/commands/which_command'
4
4
 
5
5
  class TestGemCommandsWhichCommand < Gem::TestCase
6
-
7
6
  def setup
8
7
  super
9
8
  Gem::Specification.reset
@@ -33,7 +32,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
33
32
  end
34
33
 
35
34
  assert_equal '', @ui.output
36
- assert_match %r%Can.t find Ruby library file or shared library directory\n%,
35
+ assert_match %r{Can.t find Ruby library file or shared library directory\n},
37
36
  @ui.error
38
37
  end
39
38
 
@@ -51,7 +50,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
51
50
  end
52
51
 
53
52
  assert_equal "#{@foo_bar.full_gem_path}/lib/foo_bar.rb\n", @ui.output
54
- assert_match %r%Can.t find Ruby library file or shared library missinglib\n%,
53
+ assert_match %r{Can.t find Ruby library file or shared library missinglib\n},
55
54
  @ui.error
56
55
  end
57
56
 
@@ -65,7 +64,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
65
64
  end
66
65
 
67
66
  assert_equal '', @ui.output
68
- assert_match %r%Can.t find Ruby library file or shared library missinglib\n%,
67
+ assert_match %r{Can.t find Ruby library file or shared library missinglib\n},
69
68
  @ui.error
70
69
  end
71
70
 
@@ -82,5 +81,4 @@ class TestGemCommandsWhichCommand < Gem::TestCase
82
81
  FileUtils.touch filename
83
82
  end
84
83
  end
85
-
86
84
  end
@@ -3,10 +3,11 @@ require 'rubygems/test_case'
3
3
  require 'rubygems/commands/yank_command'
4
4
 
5
5
  class TestGemCommandsYankCommand < Gem::TestCase
6
-
7
6
  def setup
8
7
  super
9
8
 
9
+ credential_setup
10
+
10
11
  @cmd = Gem::Commands::YankCommand.new
11
12
  @cmd.options[:host] = 'http://example'
12
13
 
@@ -16,6 +17,12 @@ class TestGemCommandsYankCommand < Gem::TestCase
16
17
  Gem.configuration.api_keys[:KEY] = 'other'
17
18
  end
18
19
 
20
+ def teardown
21
+ credential_teardown
22
+
23
+ super
24
+ end
25
+
19
26
  def test_handle_options
20
27
  @cmd.handle_options %w[a --version 1.0 --platform x86-darwin -k KEY --host HOST]
21
28
 
@@ -46,8 +53,8 @@ class TestGemCommandsYankCommand < Gem::TestCase
46
53
  @cmd.execute
47
54
  end
48
55
 
49
- assert_match %r%Yanking gem from http://example%, @ui.output
50
- assert_match %r%Successfully yanked%, @ui.output
56
+ assert_match %r{Yanking gem from http://example}, @ui.output
57
+ assert_match %r{Successfully yanked}, @ui.output
51
58
 
52
59
  platform = Gem.platforms[1]
53
60
  body = @fetcher.last_request.body.split('&').sort
@@ -77,8 +84,8 @@ class TestGemCommandsYankCommand < Gem::TestCase
77
84
 
78
85
  assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @otp_ui.output
79
86
  assert_match 'Code: ', @otp_ui.output
80
- assert_match %r%Yanking gem from http://example%, @otp_ui.output
81
- assert_match %r%Successfully yanked%, @otp_ui.output
87
+ assert_match %r{Yanking gem from http://example}, @otp_ui.output
88
+ assert_match %r{Successfully yanked}, @otp_ui.output
82
89
  assert_equal '111111', @fetcher.last_request['OTP']
83
90
  end
84
91
 
@@ -132,13 +139,12 @@ class TestGemCommandsYankCommand < Gem::TestCase
132
139
  @cmd.execute
133
140
  end
134
141
 
135
- assert_match %r%Yanking gem from https://other.example%, @ui.output
136
- assert_match %r%Successfully yanked%, @ui.output
142
+ assert_match %r{Yanking gem from https://other.example}, @ui.output
143
+ assert_match %r{Successfully yanked}, @ui.output
137
144
 
138
145
  body = @fetcher.last_request.body.split('&').sort
139
146
  assert_equal %w[gem_name=a version=1.0], body
140
147
  assert_equal 'key', @fetcher.last_request['Authorization']
141
148
  assert_equal [yank_uri], @fetcher.paths
142
149
  end
143
-
144
150
  end
@@ -3,18 +3,15 @@ require 'rubygems/test_case'
3
3
  require 'rubygems/config_file'
4
4
 
5
5
  class TestGemConfigFile < Gem::TestCase
6
-
7
6
  def setup
8
7
  super
9
8
 
9
+ credential_setup
10
+
10
11
  @temp_conf = File.join @tempdir, '.gemrc'
11
12
 
12
13
  @cfg_args = %W[--config-file #{@temp_conf}]
13
14
 
14
- @orig_SYSTEM_WIDE_CONFIG_FILE = Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE
15
- Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
16
- Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE,
17
- File.join(@tempdir, 'system-gemrc')
18
15
  Gem::ConfigFile::OPERATING_SYSTEM_DEFAULTS.clear
19
16
  Gem::ConfigFile::PLATFORM_DEFAULTS.clear
20
17
 
@@ -27,12 +24,11 @@ class TestGemConfigFile < Gem::TestCase
27
24
  def teardown
28
25
  Gem::ConfigFile::OPERATING_SYSTEM_DEFAULTS.clear
29
26
  Gem::ConfigFile::PLATFORM_DEFAULTS.clear
30
- Gem::ConfigFile.send :remove_const, :SYSTEM_WIDE_CONFIG_FILE
31
- Gem::ConfigFile.send :const_set, :SYSTEM_WIDE_CONFIG_FILE,
32
- @orig_SYSTEM_WIDE_CONFIG_FILE
33
27
 
34
28
  ENV['GEMRC'] = @env_gemrc
35
29
 
30
+ credential_teardown
31
+
36
32
  super
37
33
  end
38
34
 
@@ -177,7 +173,7 @@ class TestGemConfigFile < Gem::TestCase
177
173
  assert_nil @cfg.instance_variable_get :@api_keys
178
174
 
179
175
  temp_cred = File.join Gem.user_home, '.gem', 'credentials'
180
- FileUtils.mkdir File.dirname(temp_cred)
176
+ FileUtils.mkdir_p File.dirname(temp_cred)
181
177
  File.open temp_cred, 'w', 0600 do |fp|
182
178
  fp.puts ':rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97'
183
179
  end
@@ -303,7 +299,7 @@ if you believe they were disclosed to a third party.
303
299
 
304
300
  def test_load_api_keys
305
301
  temp_cred = File.join Gem.user_home, '.gem', 'credentials'
306
- FileUtils.mkdir File.dirname(temp_cred)
302
+ FileUtils.mkdir_p File.dirname(temp_cred)
307
303
  File.open temp_cred, 'w', 0600 do |fp|
308
304
  fp.puts ":rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97"
309
305
  fp.puts ":other: a5fdbb6ba150cbb83aad2bb2fede64c"
@@ -392,7 +388,7 @@ if you believe they were disclosed to a third party.
392
388
  util_config_file
393
389
 
394
390
  # These should not be written out to the config file.
395
- assert_equal false, @cfg.backtrace, 'backtrace'
391
+ assert_equal false, @cfg.backtrace, 'backtrace'
396
392
  assert_equal Gem::ConfigFile::DEFAULT_BULK_THRESHOLD, @cfg.bulk_threshold,
397
393
  'bulk_threshold'
398
394
  assert_equal true, @cfg.update_sources, 'update_sources'
@@ -495,5 +491,4 @@ if you believe they were disclosed to a third party.
495
491
  util_config_file
496
492
  assert_equal(true, @cfg.disable_default_gem_server)
497
493
  end
498
-
499
494
  end
@@ -3,7 +3,6 @@ require 'rubygems/test_case'
3
3
  require 'rubygems/dependency'
4
4
 
5
5
  class TestGemDependency < Gem::TestCase
6
-
7
6
  def test_initialize
8
7
  d = dep "pkg", "> 1.0"
9
8
 
@@ -391,5 +390,4 @@ class TestGemDependency < Gem::TestCase
391
390
  assert_equal dep("a", " >= 1.a").identity, :abs_latest
392
391
  assert_equal dep("a").identity, :latest
393
392
  end
394
-
395
393
  end
@@ -4,7 +4,6 @@ require 'rubygems/dependency_installer'
4
4
  require 'rubygems/security'
5
5
 
6
6
  class TestGemDependencyInstaller < Gem::TestCase
7
-
8
7
  def setup
9
8
  super
10
9
  common_installer_setup
@@ -48,69 +47,6 @@ class TestGemDependencyInstaller < Gem::TestCase
48
47
  util_reset_gems
49
48
  end
50
49
 
51
- def test_available_set_for_name
52
- util_setup_gems
53
- p1a, = util_gem 'a', '10.a'
54
- util_setup_spec_fetcher p1a, @a1, @a1_pre
55
-
56
- inst = Gem::DependencyInstaller.new
57
-
58
- available = Gem::Deprecate.skip_during do
59
- inst.available_set_for 'a', Gem::Requirement.default
60
- end
61
-
62
- assert_equal %w[a-1], available.set.map { |s| s.spec.full_name }
63
- end
64
-
65
- def test_available_set_for_name_prerelease
66
- util_setup_gems
67
- p1a, = util_gem 'a', '10.a'
68
- util_setup_spec_fetcher p1a, @a1, @a1_pre
69
-
70
- inst = Gem::DependencyInstaller.new :prerelease => true
71
-
72
- available = Gem::Deprecate.skip_during do
73
- inst.available_set_for 'a', Gem::Requirement.default
74
- end
75
-
76
- assert_equal %w[a-10.a],
77
- available.sorted.map { |s| s.spec.full_name }
78
- end
79
-
80
- def test_available_set_for_dep
81
- util_setup_gems
82
- p1a, = util_gem 'a', '10.a'
83
- util_setup_spec_fetcher p1a, @a1, @a1_pre
84
-
85
- inst = Gem::DependencyInstaller.new
86
-
87
- dep = Gem::Dependency.new 'a', Gem::Requirement.default
88
-
89
- available = Gem::Deprecate.skip_during do
90
- inst.available_set_for dep, Gem::Requirement.default
91
- end
92
-
93
- assert_equal %w[a-1], available.set.map { |s| s.spec.full_name }
94
- end
95
-
96
- def test_available_set_for_dep_prerelease
97
- util_setup_gems
98
- p1a, = util_gem 'a', '10.a'
99
- util_setup_spec_fetcher p1a, @a1, @a1_pre
100
-
101
- inst = Gem::DependencyInstaller.new :prerelease => true
102
-
103
- dep = Gem::Dependency.new 'a', Gem::Requirement.default
104
- dep.prerelease = true
105
-
106
- available = Gem::Deprecate.skip_during do
107
- inst.available_set_for dep, Gem::Requirement.default
108
- end
109
-
110
- assert_equal %w[a-10.a],
111
- available.sorted.map { |s| s.spec.full_name }
112
- end
113
-
114
50
  def test_install
115
51
  util_setup_gems
116
52
 
@@ -211,7 +147,7 @@ class TestGemDependencyInstaller < Gem::TestCase
211
147
 
212
148
  FileUtils.mv @a1_gem, @tempdir
213
149
  FileUtils.mv @b1_gem, @tempdir
214
- FileUtils.mv e1_gem, @tempdir
150
+ FileUtils.mv e1_gem, @tempdir
215
151
 
216
152
  inst = nil
217
153
 
@@ -220,7 +156,7 @@ class TestGemDependencyInstaller < Gem::TestCase
220
156
  inst.install 'b'
221
157
  end
222
158
 
223
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name },
159
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
224
160
  'sanity check'
225
161
 
226
162
  Dir.chdir @tempdir do
@@ -228,7 +164,7 @@ class TestGemDependencyInstaller < Gem::TestCase
228
164
  inst.install 'e'
229
165
  end
230
166
 
231
- assert_equal %w[a-1 e-1], inst.installed_gems.map { |s| s.full_name }
167
+ assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name }
232
168
  end
233
169
 
234
170
  def test_install_cache_dir
@@ -245,7 +181,7 @@ class TestGemDependencyInstaller < Gem::TestCase
245
181
  inst.install 'b'
246
182
  end
247
183
 
248
- assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
184
+ assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
249
185
 
250
186
  assert File.exist? File.join(@gemhome, "cache", @a1.file_name)
251
187
  assert File.exist? File.join(@gemhome, "cache", @b1.file_name)
@@ -270,7 +206,7 @@ class TestGemDependencyInstaller < Gem::TestCase
270
206
  inst.install 'a', req("= 2")
271
207
  end
272
208
 
273
- assert_equal %w[a-2], inst.installed_gems.map { |s| s.full_name },
209
+ assert_equal %w[a-2], inst.installed_gems.map {|s| s.full_name },
274
210
  'sanity check'
275
211
 
276
212
  FileUtils.rm File.join(@tempdir, a2.file_name)
@@ -281,7 +217,7 @@ class TestGemDependencyInstaller < Gem::TestCase
281
217
  end
282
218
 
283
219
  assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name)
284
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
220
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
285
221
  end
286
222
 
287
223
  # This asserts that if a gem's dependency is satisfied by an
@@ -302,7 +238,7 @@ class TestGemDependencyInstaller < Gem::TestCase
302
238
  FileUtils.mv @a1_gem, @tempdir
303
239
  FileUtils.mv a2_gem, @tempdir # not in index
304
240
  FileUtils.mv @b1_gem, @tempdir
305
- FileUtils.mv a3_gem, @tempdir
241
+ FileUtils.mv a3_gem, @tempdir
306
242
 
307
243
  Dir.chdir @tempdir do
308
244
  Gem::DependencyInstaller.new.install 'a', req("= 2")
@@ -318,7 +254,7 @@ class TestGemDependencyInstaller < Gem::TestCase
318
254
  end
319
255
 
320
256
  assert_equal %w[a-2 b-1], Gem::Specification.map(&:full_name)
321
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
257
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
322
258
  end
323
259
 
324
260
  def test_install_dependency
@@ -341,7 +277,7 @@ class TestGemDependencyInstaller < Gem::TestCase
341
277
  inst.install 'b'
342
278
  end
343
279
 
344
- assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
280
+ assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
345
281
 
346
282
  assert done_installing_ran, 'post installs hook was not run'
347
283
  end
@@ -363,7 +299,7 @@ class TestGemDependencyInstaller < Gem::TestCase
363
299
  inst.install 'b'
364
300
  end
365
301
 
366
- assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map { |s| s.full_name }
302
+ assert_equal %w[a-1 aa-1 b-1], inst.installed_gems.map {|s| s.full_name }
367
303
  end
368
304
 
369
305
  def test_install_dependency_development_deep
@@ -385,7 +321,7 @@ class TestGemDependencyInstaller < Gem::TestCase
385
321
  inst.install 'd'
386
322
  end
387
323
 
388
- assert_equal %w[a-1 aa-1 b-1 c-1 d-1], inst.installed_gems.map { |s| s.full_name }
324
+ assert_equal %w[a-1 aa-1 b-1 c-1 d-1], inst.installed_gems.map {|s| s.full_name }
389
325
  end
390
326
 
391
327
  def test_install_dependency_development_shallow
@@ -407,7 +343,7 @@ class TestGemDependencyInstaller < Gem::TestCase
407
343
  inst.install 'd'
408
344
  end
409
345
 
410
- assert_equal %w[c-1 d-1], inst.installed_gems.map { |s| s.full_name }
346
+ assert_equal %w[c-1 d-1], inst.installed_gems.map {|s| s.full_name }
411
347
  end
412
348
 
413
349
  def test_install_dependency_existing
@@ -423,7 +359,7 @@ class TestGemDependencyInstaller < Gem::TestCase
423
359
  inst.install 'b'
424
360
  end
425
361
 
426
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
362
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
427
363
  end
428
364
 
429
365
  def test_install_dependency_existing_extension
@@ -440,7 +376,7 @@ class TestGemDependencyInstaller < Gem::TestCase
440
376
  e1 = util_spec 'e', '1', nil, 'extconf.rb' do |s|
441
377
  s.extensions << 'extconf.rb'
442
378
  end
443
- e1_gem = File.join @tempdir, 'gems', "#{e1.full_name}.gem"
379
+ e1_gem = e1.cache_file
444
380
 
445
381
  _, f1_gem = util_gem 'f', '1', 'e' => nil
446
382
 
@@ -460,7 +396,7 @@ class TestGemDependencyInstaller < Gem::TestCase
460
396
  Dir.chdir pwd
461
397
  end
462
398
 
463
- assert_equal %w[f-1], inst.installed_gems.map { |s| s.full_name }
399
+ assert_equal %w[f-1], inst.installed_gems.map {|s| s.full_name }
464
400
 
465
401
  assert_path_exists e1.extension_dir
466
402
  end
@@ -480,7 +416,7 @@ class TestGemDependencyInstaller < Gem::TestCase
480
416
  inst.install 'f'
481
417
  end
482
418
 
483
- assert_equal %w[f-2], inst.installed_gems.map { |s| s.full_name }
419
+ assert_equal %w[f-2], inst.installed_gems.map {|s| s.full_name }
484
420
  end
485
421
 
486
422
  def test_install_local
@@ -494,7 +430,7 @@ class TestGemDependencyInstaller < Gem::TestCase
494
430
  inst.install 'a-1.gem'
495
431
  end
496
432
 
497
- assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
433
+ assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
498
434
  end
499
435
 
500
436
  def test_install_local_prerelease
@@ -508,7 +444,7 @@ class TestGemDependencyInstaller < Gem::TestCase
508
444
  inst.install 'a-1.a.gem'
509
445
  end
510
446
 
511
- assert_equal %w[a-1.a], inst.installed_gems.map { |s| s.full_name }
447
+ assert_equal %w[a-1.a], inst.installed_gems.map {|s| s.full_name }
512
448
  end
513
449
 
514
450
  def test_install_local_dependency
@@ -524,7 +460,7 @@ class TestGemDependencyInstaller < Gem::TestCase
524
460
  inst.install 'b-1.gem'
525
461
  end
526
462
 
527
- assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
463
+ assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
528
464
  end
529
465
 
530
466
  def test_install_local_dependency_installed
@@ -542,7 +478,7 @@ class TestGemDependencyInstaller < Gem::TestCase
542
478
  inst.install 'b-1.gem'
543
479
  end
544
480
 
545
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
481
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
546
482
  end
547
483
 
548
484
  def test_install_local_subdir
@@ -555,7 +491,7 @@ class TestGemDependencyInstaller < Gem::TestCase
555
491
  inst.install 'gems/a-1.gem'
556
492
  end
557
493
 
558
- assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
494
+ assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
559
495
  end
560
496
 
561
497
  def test_install_minimal_deps
@@ -581,7 +517,7 @@ class TestGemDependencyInstaller < Gem::TestCase
581
517
  inst.install 'b', req('= 1')
582
518
  end
583
519
 
584
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name },
520
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name },
585
521
  'sanity check'
586
522
 
587
523
  Dir.chdir @tempdir do
@@ -589,7 +525,7 @@ class TestGemDependencyInstaller < Gem::TestCase
589
525
  inst.install 'e'
590
526
  end
591
527
 
592
- assert_equal %w[a-1 e-1], inst.installed_gems.map { |s| s.full_name }
528
+ assert_equal %w[a-1 e-1], inst.installed_gems.map {|s| s.full_name }
593
529
  end
594
530
 
595
531
  def test_install_no_document
@@ -622,7 +558,7 @@ class TestGemDependencyInstaller < Gem::TestCase
622
558
 
623
559
  env = "/\\S+/env" unless Gem.win_platform?
624
560
 
625
- assert_match %r|\A#!#{env} #{RbConfig::CONFIG['ruby_install_name']}\n|,
561
+ assert_match %r{\A#!#{env} #{RbConfig::CONFIG['ruby_install_name']}\n},
626
562
  File.read(File.join(@gemhome, 'bin', 'a_bin'))
627
563
  end
628
564
 
@@ -639,7 +575,7 @@ class TestGemDependencyInstaller < Gem::TestCase
639
575
  inst.install 'b'
640
576
  end
641
577
 
642
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
578
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
643
579
  end
644
580
 
645
581
  def test_install_build_args
@@ -669,7 +605,7 @@ class TestGemDependencyInstaller < Gem::TestCase
669
605
  inst.install 'b'
670
606
  end
671
607
 
672
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
608
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
673
609
  end
674
610
 
675
611
  def test_install_install_dir
@@ -690,7 +626,7 @@ class TestGemDependencyInstaller < Gem::TestCase
690
626
  inst.install 'b'
691
627
  end
692
628
 
693
- assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
629
+ assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
694
630
 
695
631
  assert File.exist?(File.join(gemhome2, 'specifications', @a1.spec_name))
696
632
  assert File.exist?(File.join(gemhome2, 'cache', @a1.file_name))
@@ -714,7 +650,7 @@ class TestGemDependencyInstaller < Gem::TestCase
714
650
  inst.install 'b'
715
651
  end
716
652
 
717
- assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
653
+ assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
718
654
  a1, b1 = inst.installed_gems
719
655
 
720
656
  assert_equal a1.spec_file, a1.loaded_from
@@ -738,7 +674,7 @@ class TestGemDependencyInstaller < Gem::TestCase
738
674
  inst.install 'b'
739
675
  end
740
676
 
741
- assert_equal %w[a-1 b-1], inst.installed_gems.map { |s| s.full_name }
677
+ assert_equal %w[a-1 b-1], inst.installed_gems.map {|s| s.full_name }
742
678
  end
743
679
 
744
680
  def test_install_domain_local
@@ -757,7 +693,7 @@ class TestGemDependencyInstaller < Gem::TestCase
757
693
  assert_equal expected, e.message
758
694
  end
759
695
 
760
- assert_equal [], inst.installed_gems.map { |s| s.full_name }
696
+ assert_equal [], inst.installed_gems.map {|s| s.full_name }
761
697
  end
762
698
 
763
699
  def test_install_domain_remote
@@ -773,7 +709,7 @@ class TestGemDependencyInstaller < Gem::TestCase
773
709
  inst = Gem::DependencyInstaller.new :domain => :remote
774
710
  inst.install 'a'
775
711
 
776
- assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
712
+ assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
777
713
  end
778
714
 
779
715
  def test_install_dual_repository
@@ -790,7 +726,7 @@ class TestGemDependencyInstaller < Gem::TestCase
790
726
  inst.install 'a'
791
727
  end
792
728
 
793
- assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name },
729
+ assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name },
794
730
  'sanity check'
795
731
 
796
732
  ENV['GEM_HOME'] = @gemhome
@@ -802,7 +738,7 @@ class TestGemDependencyInstaller < Gem::TestCase
802
738
  inst.install 'b'
803
739
  end
804
740
 
805
- assert_equal %w[b-1], inst.installed_gems.map { |s| s.full_name }
741
+ assert_equal %w[b-1], inst.installed_gems.map {|s| s.full_name }
806
742
  end
807
743
 
808
744
  def test_install_reinstall
@@ -837,7 +773,7 @@ class TestGemDependencyInstaller < Gem::TestCase
837
773
  inst.install 'a'
838
774
  end
839
775
 
840
- assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
776
+ assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
841
777
  end
842
778
 
843
779
  def test_install_remote_dep
@@ -857,7 +793,7 @@ class TestGemDependencyInstaller < Gem::TestCase
857
793
  inst.install dep
858
794
  end
859
795
 
860
- assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
796
+ assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
861
797
  end
862
798
 
863
799
  def test_install_remote_platform_newer
@@ -890,7 +826,7 @@ class TestGemDependencyInstaller < Gem::TestCase
890
826
  inst = Gem::DependencyInstaller.new :domain => :remote
891
827
  inst.install 'a'
892
828
 
893
- assert_equal %w[a-1], inst.installed_gems.map { |s| s.full_name }
829
+ assert_equal %w[a-1], inst.installed_gems.map {|s| s.full_name }
894
830
  end
895
831
 
896
832
  def test_install_platform_is_ignored_when_a_file_is_specified
@@ -901,17 +837,19 @@ class TestGemDependencyInstaller < Gem::TestCase
901
837
  inst = Gem::DependencyInstaller.new :domain => :local
902
838
  inst.install a_gem
903
839
 
904
- assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map { |s| s.full_name }
840
+ assert_equal %w[a-1-cpu-other_platform-1], inst.installed_gems.map {|s| s.full_name }
905
841
  end
906
842
 
843
+ require 'rubygems/openssl'
844
+
907
845
  if defined? OpenSSL
908
846
  def test_install_security_policy
909
847
  util_setup_gems
910
848
 
911
- data = File.open(@a1_gem, 'rb') { |f| f.read }
849
+ data = File.open(@a1_gem, 'rb') {|f| f.read }
912
850
  @fetcher.data['http://gems.example.com/gems/a-1.gem'] = data
913
851
 
914
- data = File.open(@b1_gem, 'rb') { |f| f.read }
852
+ data = File.open(@b1_gem, 'rb') {|f| f.read }
915
853
  @fetcher.data['http://gems.example.com/gems/b-1.gem'] = data
916
854
 
917
855
  policy = Gem::Security::HighSecurity
@@ -924,7 +862,7 @@ class TestGemDependencyInstaller < Gem::TestCase
924
862
  assert_equal 'unsigned gems are not allowed by the High Security policy',
925
863
  e.message
926
864
 
927
- assert_equal %w[], inst.installed_gems.map { |s| s.full_name }
865
+ assert_equal %w[], inst.installed_gems.map {|s| s.full_name }
928
866
  end
929
867
  end
930
868
 
@@ -938,7 +876,7 @@ class TestGemDependencyInstaller < Gem::TestCase
938
876
  inst = Gem::DependencyInstaller.new :wrappers => false, :format_executable => false
939
877
  inst.install 'a'
940
878
 
941
- refute_match(%r|This file was generated by RubyGems.|,
879
+ refute_match(%r{This file was generated by RubyGems.},
942
880
  File.read(File.join(@gemhome, 'bin', 'a_bin')))
943
881
  end
944
882
  end
@@ -946,32 +884,32 @@ class TestGemDependencyInstaller < Gem::TestCase
946
884
  def test_install_version
947
885
  util_setup_d
948
886
 
949
- data = File.open(@d2_gem, 'rb') { |f| f.read }
887
+ data = File.open(@d2_gem, 'rb') {|f| f.read }
950
888
  @fetcher.data['http://gems.example.com/gems/d-2.gem'] = data
951
889
 
952
- data = File.open(@d1_gem, 'rb') { |f| f.read }
890
+ data = File.open(@d1_gem, 'rb') {|f| f.read }
953
891
  @fetcher.data['http://gems.example.com/gems/d-1.gem'] = data
954
892
 
955
893
  inst = Gem::DependencyInstaller.new
956
894
 
957
895
  inst.install 'd', '= 1'
958
896
 
959
- assert_equal %w[d-1], inst.installed_gems.map { |s| s.full_name }
897
+ assert_equal %w[d-1], inst.installed_gems.map {|s| s.full_name }
960
898
  end
961
899
 
962
900
  def test_install_version_default
963
901
  util_setup_d
964
902
 
965
- data = File.open(@d2_gem, 'rb') { |f| f.read }
903
+ data = File.open(@d2_gem, 'rb') {|f| f.read }
966
904
  @fetcher.data['http://gems.example.com/gems/d-2.gem'] = data
967
905
 
968
- data = File.open(@d1_gem, 'rb') { |f| f.read }
906
+ data = File.open(@d1_gem, 'rb') {|f| f.read }
969
907
  @fetcher.data['http://gems.example.com/gems/d-1.gem'] = data
970
908
 
971
909
  inst = Gem::DependencyInstaller.new
972
910
  inst.install 'd'
973
911
 
974
- assert_equal %w[d-2], inst.installed_gems.map { |s| s.full_name }
912
+ assert_equal %w[d-2], inst.installed_gems.map {|s| s.full_name }
975
913
  end
976
914
 
977
915
  def test_find_gems_gems_with_sources
@@ -994,80 +932,6 @@ class TestGemDependencyInstaller < Gem::TestCase
994
932
  assert_equal Gem::Source.new(@gem_repo), s.source
995
933
  end
996
934
 
997
- def test_find_spec_by_name_and_version_wildcard
998
- util_gem 'a', 1
999
- FileUtils.mv 'gems/a-1.gem', @tempdir
1000
-
1001
- FileUtils.touch 'rdoc.gem'
1002
-
1003
- inst = Gem::DependencyInstaller.new
1004
-
1005
- available = Gem::Deprecate.skip_during do
1006
- inst.find_spec_by_name_and_version('*.gem')
1007
- end
1008
-
1009
- assert_equal %w[a-1], available.each_spec.map { |spec| spec.full_name }
1010
- end
1011
-
1012
- def test_find_spec_by_name_and_version_wildcard_bad_gem
1013
- FileUtils.touch 'rdoc.gem'
1014
-
1015
- inst = Gem::DependencyInstaller.new
1016
-
1017
- assert_raises Gem::Package::FormatError do
1018
- Gem::Deprecate.skip_during do
1019
- inst.find_spec_by_name_and_version '*.gem'
1020
- end
1021
- end
1022
- end
1023
-
1024
- def test_find_spec_by_name_and_version_bad_gem
1025
- FileUtils.touch 'rdoc.gem'
1026
-
1027
- inst = Gem::DependencyInstaller.new
1028
-
1029
- e = assert_raises Gem::Package::FormatError do
1030
- Gem::Deprecate.skip_during do
1031
- inst.find_spec_by_name_and_version 'rdoc.gem'
1032
- end
1033
- end
1034
-
1035
- full_path = File.join @tempdir, 'rdoc.gem'
1036
- assert_equal "package metadata is missing in #{full_path}", e.message
1037
- end
1038
-
1039
- def test_find_spec_by_name_and_version_directory
1040
- Dir.mkdir 'rdoc'
1041
-
1042
- inst = Gem::DependencyInstaller.new
1043
-
1044
- e = assert_raises Gem::SpecificGemNotFoundException do
1045
- Gem::Deprecate.skip_during do
1046
- inst.find_spec_by_name_and_version 'rdoc'
1047
- end
1048
- end
1049
-
1050
- assert_equal "Could not find a valid gem 'rdoc' (>= 0) " +
1051
- "locally or in a repository",
1052
- e.message
1053
- end
1054
-
1055
- def test_find_spec_by_name_and_version_file
1056
- FileUtils.touch 'rdoc'
1057
-
1058
- inst = Gem::DependencyInstaller.new
1059
-
1060
- e = assert_raises Gem::SpecificGemNotFoundException do
1061
- Gem::Deprecate.skip_during do
1062
- inst.find_spec_by_name_and_version 'rdoc'
1063
- end
1064
- end
1065
-
1066
- assert_equal "Could not find a valid gem 'rdoc' (>= 0) " +
1067
- "locally or in a repository",
1068
- e.message
1069
- end
1070
-
1071
935
  def test_find_gems_with_sources_local
1072
936
  util_setup_gems
1073
937
 
@@ -1109,8 +973,8 @@ class TestGemDependencyInstaller < Gem::TestCase
1109
973
 
1110
974
  releases = set.all_specs
1111
975
 
1112
- assert releases.any? { |s| s.name == 'a' and s.version.to_s == '1' }
1113
- refute releases.any? { |s| s.name == 'a' and s.version.to_s == '1.a' }
976
+ assert releases.any? {|s| s.name == 'a' and s.version.to_s == '1' }
977
+ refute releases.any? {|s| s.name == 'a' and s.version.to_s == '1.a' }
1114
978
 
1115
979
  dependency.prerelease = true
1116
980
 
@@ -1168,7 +1032,7 @@ class TestGemDependencyInstaller < Gem::TestCase
1168
1032
  inst = Gem::DependencyInstaller.new
1169
1033
  request_set = inst.resolve_dependencies 'b', req('>= 0')
1170
1034
 
1171
- requests = request_set.sorted_requests.map { |req| req.full_name }
1035
+ requests = request_set.sorted_requests.map {|req| req.full_name }
1172
1036
 
1173
1037
  assert_equal %w[a-1 b-1], requests
1174
1038
  end
@@ -1182,7 +1046,7 @@ class TestGemDependencyInstaller < Gem::TestCase
1182
1046
  inst = Gem::DependencyInstaller.new :ignore_dependencies => true
1183
1047
  request_set = inst.resolve_dependencies 'b', req('>= 0')
1184
1048
 
1185
- requests = request_set.sorted_requests.map { |req| req.full_name }
1049
+ requests = request_set.sorted_requests.map {|req| req.full_name }
1186
1050
 
1187
1051
  assert request_set.ignore_dependencies
1188
1052
 
@@ -1199,7 +1063,7 @@ class TestGemDependencyInstaller < Gem::TestCase
1199
1063
  inst = Gem::DependencyInstaller.new
1200
1064
  request_set = inst.resolve_dependencies 'a-1.gem', req('>= 0')
1201
1065
 
1202
- requests = request_set.sorted_requests.map { |req| req.full_name }
1066
+ requests = request_set.sorted_requests.map {|req| req.full_name }
1203
1067
 
1204
1068
  assert_equal %w[a-1], requests
1205
1069
  end
@@ -1265,5 +1129,4 @@ class TestGemDependencyInstaller < Gem::TestCase
1265
1129
  @d1, @d2, @x1_m, @x1_o, @w1, @y1,
1266
1130
  @y1_1_p, @z1].compact)
1267
1131
  end
1268
-
1269
1132
  end