rubygems-update 3.2.30 → 3.4.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (641) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1666 -994
  3. data/CONTRIBUTING.md +71 -15
  4. data/Manifest.txt +93 -37
  5. data/POLICIES.md +65 -16
  6. data/README.md +28 -13
  7. data/UPGRADING.md +5 -81
  8. data/bin/gem +2 -10
  9. data/bin/update_rubygems +5 -5
  10. data/bundler/CHANGELOG.md +647 -1
  11. data/bundler/README.md +3 -6
  12. data/bundler/UPGRADING.md +11 -4
  13. data/bundler/bundler.gemspec +8 -10
  14. data/bundler/exe/bundle +7 -11
  15. data/bundler/exe/bundler +1 -1
  16. data/bundler/lib/bundler/.document +1 -0
  17. data/bundler/lib/bundler/build_metadata.rb +3 -3
  18. data/bundler/lib/bundler/cli/add.rb +1 -1
  19. data/bundler/lib/bundler/cli/binstubs.rb +5 -1
  20. data/bundler/lib/bundler/cli/check.rb +1 -1
  21. data/bundler/lib/bundler/cli/common.rb +4 -2
  22. data/bundler/lib/bundler/cli/config.rb +10 -1
  23. data/bundler/lib/bundler/cli/console.rb +2 -2
  24. data/bundler/lib/bundler/cli/doctor.rb +10 -3
  25. data/bundler/lib/bundler/cli/gem.rb +136 -42
  26. data/bundler/lib/bundler/cli/info.rb +17 -3
  27. data/bundler/lib/bundler/cli/init.rb +6 -2
  28. data/bundler/lib/bundler/cli/install.rb +15 -33
  29. data/bundler/lib/bundler/cli/lock.rb +8 -5
  30. data/bundler/lib/bundler/cli/open.rb +6 -4
  31. data/bundler/lib/bundler/cli/outdated.rb +13 -6
  32. data/bundler/lib/bundler/cli/platform.rb +2 -2
  33. data/bundler/lib/bundler/cli/show.rb +1 -1
  34. data/bundler/lib/bundler/cli/update.rb +8 -4
  35. data/bundler/lib/bundler/cli/viz.rb +1 -1
  36. data/bundler/lib/bundler/cli.rb +67 -21
  37. data/bundler/lib/bundler/compact_index_client/cache.rb +1 -10
  38. data/bundler/lib/bundler/compact_index_client/updater.rb +53 -44
  39. data/bundler/lib/bundler/compact_index_client.rb +0 -6
  40. data/bundler/lib/bundler/constants.rb +1 -1
  41. data/bundler/lib/bundler/current_ruby.rb +18 -6
  42. data/bundler/lib/bundler/definition.rb +259 -242
  43. data/bundler/lib/bundler/dependency.rb +24 -71
  44. data/bundler/lib/bundler/digest.rb +1 -1
  45. data/bundler/lib/bundler/dsl.rb +29 -46
  46. data/bundler/lib/bundler/endpoint_specification.rb +15 -13
  47. data/bundler/lib/bundler/env.rb +2 -2
  48. data/bundler/lib/bundler/environment_preserver.rb +7 -3
  49. data/bundler/lib/bundler/errors.rb +15 -15
  50. data/bundler/lib/bundler/feature_flag.rb +0 -1
  51. data/bundler/lib/bundler/fetcher/base.rb +6 -8
  52. data/bundler/lib/bundler/fetcher/compact_index.rb +18 -25
  53. data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
  54. data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
  55. data/bundler/lib/bundler/fetcher/index.rb +0 -26
  56. data/bundler/lib/bundler/fetcher.rb +22 -29
  57. data/bundler/lib/bundler/force_platform.rb +18 -0
  58. data/bundler/lib/bundler/friendly_errors.rb +21 -7
  59. data/bundler/lib/bundler/gem_helper.rb +4 -4
  60. data/bundler/lib/bundler/gem_helpers.rb +9 -2
  61. data/bundler/lib/bundler/gem_version_promoter.rb +53 -98
  62. data/bundler/lib/bundler/graph.rb +3 -3
  63. data/bundler/lib/bundler/index.rb +13 -51
  64. data/bundler/lib/bundler/injector.rb +18 -4
  65. data/bundler/lib/bundler/inline.rb +9 -21
  66. data/bundler/lib/bundler/installer/gem_installer.rb +13 -5
  67. data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
  68. data/bundler/lib/bundler/installer/standalone.rb +42 -11
  69. data/bundler/lib/bundler/installer.rb +20 -44
  70. data/bundler/lib/bundler/lazy_specification.rb +72 -55
  71. data/bundler/lib/bundler/lockfile_generator.rb +3 -3
  72. data/bundler/lib/bundler/lockfile_parser.rb +28 -26
  73. data/bundler/lib/bundler/man/bundle-add.1 +21 -5
  74. data/bundler/lib/bundler/man/bundle-add.1.ronn +16 -4
  75. data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
  76. data/bundler/lib/bundler/man/bundle-cache.1 +7 -1
  77. data/bundler/lib/bundler/man/bundle-cache.1.ronn +7 -0
  78. data/bundler/lib/bundler/man/bundle-check.1 +1 -1
  79. data/bundler/lib/bundler/man/bundle-clean.1 +2 -2
  80. data/bundler/lib/bundler/man/bundle-clean.1.ronn +1 -1
  81. data/bundler/lib/bundler/man/bundle-config.1 +34 -15
  82. data/bundler/lib/bundler/man/bundle-config.1.ronn +31 -19
  83. data/bundler/lib/bundler/man/bundle-console.1 +53 -0
  84. data/bundler/lib/bundler/man/bundle-console.1.ronn +44 -0
  85. data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
  86. data/bundler/lib/bundler/man/bundle-exec.1 +6 -6
  87. data/bundler/lib/bundler/man/bundle-exec.1.ronn +6 -6
  88. data/bundler/lib/bundler/man/bundle-gem.1 +37 -34
  89. data/bundler/lib/bundler/man/bundle-gem.1.ronn +21 -5
  90. data/bundler/lib/bundler/man/bundle-help.1 +13 -0
  91. data/bundler/lib/bundler/man/bundle-help.1.ronn +12 -0
  92. data/bundler/lib/bundler/man/bundle-info.1 +1 -1
  93. data/bundler/lib/bundler/man/bundle-init.1 +5 -1
  94. data/bundler/lib/bundler/man/bundle-init.1.ronn +2 -0
  95. data/bundler/lib/bundler/man/bundle-inject.1 +5 -2
  96. data/bundler/lib/bundler/man/bundle-inject.1.ronn +3 -1
  97. data/bundler/lib/bundler/man/bundle-install.1 +6 -31
  98. data/bundler/lib/bundler/man/bundle-install.1.ronn +8 -31
  99. data/bundler/lib/bundler/man/bundle-list.1 +1 -1
  100. data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
  101. data/bundler/lib/bundler/man/bundle-open.1 +22 -2
  102. data/bundler/lib/bundler/man/bundle-open.1.ronn +9 -1
  103. data/bundler/lib/bundler/man/bundle-outdated.1 +3 -10
  104. data/bundler/lib/bundler/man/bundle-outdated.1.ronn +1 -10
  105. data/bundler/lib/bundler/man/bundle-platform.1 +16 -6
  106. data/bundler/lib/bundler/man/bundle-platform.1.ronn +14 -7
  107. data/bundler/lib/bundler/man/bundle-plugin.1 +81 -0
  108. data/bundler/lib/bundler/man/bundle-plugin.1.ronn +59 -0
  109. data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
  110. data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
  111. data/bundler/lib/bundler/man/bundle-show.1 +1 -1
  112. data/bundler/lib/bundler/man/bundle-update.1 +2 -2
  113. data/bundler/lib/bundler/man/bundle-update.1.ronn +2 -1
  114. data/bundler/lib/bundler/man/bundle-version.1 +35 -0
  115. data/bundler/lib/bundler/man/bundle-version.1.ronn +24 -0
  116. data/bundler/lib/bundler/man/bundle-viz.1 +4 -1
  117. data/bundler/lib/bundler/man/bundle-viz.1.ronn +2 -0
  118. data/bundler/lib/bundler/man/bundle.1 +15 -10
  119. data/bundler/lib/bundler/man/bundle.1.ronn +12 -7
  120. data/bundler/lib/bundler/man/gemfile.5 +117 -80
  121. data/bundler/lib/bundler/man/gemfile.5.ronn +105 -84
  122. data/bundler/lib/bundler/man/index.txt +4 -0
  123. data/bundler/lib/bundler/match_metadata.rb +13 -0
  124. data/bundler/lib/bundler/match_platform.rb +0 -1
  125. data/bundler/lib/bundler/match_remote_metadata.rb +29 -0
  126. data/bundler/lib/bundler/mirror.rb +5 -7
  127. data/bundler/lib/bundler/plugin/api/source.rb +4 -9
  128. data/bundler/lib/bundler/plugin/index.rb +4 -4
  129. data/bundler/lib/bundler/plugin/installer/git.rb +0 -4
  130. data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -8
  131. data/bundler/lib/bundler/plugin/installer.rb +6 -3
  132. data/bundler/lib/bundler/plugin.rb +3 -1
  133. data/bundler/lib/bundler/process_lock.rb +1 -1
  134. data/bundler/lib/bundler/remote_specification.rb +7 -5
  135. data/bundler/lib/bundler/resolver/base.rb +109 -0
  136. data/bundler/lib/bundler/resolver/candidate.rb +94 -0
  137. data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
  138. data/bundler/lib/bundler/resolver/package.rb +72 -0
  139. data/bundler/lib/bundler/resolver/root.rb +25 -0
  140. data/bundler/lib/bundler/resolver/spec_group.rb +43 -71
  141. data/bundler/lib/bundler/resolver.rb +332 -308
  142. data/bundler/lib/bundler/ruby_dsl.rb +1 -1
  143. data/bundler/lib/bundler/ruby_version.rb +5 -18
  144. data/bundler/lib/bundler/rubygems_ext.rb +144 -25
  145. data/bundler/lib/bundler/rubygems_gem_installer.rb +32 -20
  146. data/bundler/lib/bundler/rubygems_integration.rb +24 -95
  147. data/bundler/lib/bundler/runtime.rb +2 -7
  148. data/bundler/lib/bundler/self_manager.rb +168 -0
  149. data/bundler/lib/bundler/settings.rb +5 -10
  150. data/bundler/lib/bundler/setup.rb +4 -1
  151. data/bundler/lib/bundler/shared_helpers.rb +17 -25
  152. data/bundler/lib/bundler/source/git/git_proxy.rb +219 -71
  153. data/bundler/lib/bundler/source/git.rb +23 -26
  154. data/bundler/lib/bundler/source/metadata.rb +3 -4
  155. data/bundler/lib/bundler/source/path/installer.rb +1 -22
  156. data/bundler/lib/bundler/source/path.rb +7 -7
  157. data/bundler/lib/bundler/source/rubygems.rb +91 -130
  158. data/bundler/lib/bundler/source/rubygems_aggregate.rb +1 -1
  159. data/bundler/lib/bundler/source.rb +4 -5
  160. data/bundler/lib/bundler/source_list.rb +19 -31
  161. data/bundler/lib/bundler/source_map.rb +15 -2
  162. data/bundler/lib/bundler/spec_set.rb +63 -35
  163. data/bundler/lib/bundler/stub_specification.rb +5 -3
  164. data/bundler/lib/bundler/templates/Executable +3 -5
  165. data/bundler/lib/bundler/templates/Executable.bundler +6 -11
  166. data/bundler/lib/bundler/templates/Executable.standalone +4 -4
  167. data/bundler/lib/bundler/templates/Gemfile +0 -2
  168. data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
  169. data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
  170. data/bundler/lib/bundler/templates/newgem/README.md.tt +7 -11
  171. data/bundler/lib/bundler/templates/newgem/Rakefile.tt +27 -3
  172. data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
  173. data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
  174. data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
  175. data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
  176. data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +13 -3
  177. data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
  178. data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
  179. data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +22 -16
  180. data/bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
  181. data/bundler/lib/bundler/templates/newgem/standard.yml.tt +3 -0
  182. data/bundler/lib/bundler/templates/newgem/test/minitest/{newgem_test.rb.tt → test_newgem.rb.tt} +1 -1
  183. data/bundler/lib/bundler/ui/shell.rb +36 -13
  184. data/bundler/lib/bundler/ui/silent.rb +21 -5
  185. data/bundler/lib/bundler/uri_normalizer.rb +23 -0
  186. data/bundler/lib/bundler/vendor/.document +1 -0
  187. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
  188. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
  189. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
  190. data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
  191. data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
  192. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
  193. data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
  194. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
  195. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
  196. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
  197. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
  198. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
  199. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
  200. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
  201. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
  202. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
  203. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
  204. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
  205. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
  206. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
  207. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +243 -0
  208. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
  209. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
  210. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +6 -6
  211. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -2
  212. data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +6 -2
  213. data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +6 -0
  214. data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +9 -4
  215. data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +19 -1
  216. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +23 -5
  217. data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
  218. data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
  219. data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
  220. data/bundler/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
  221. data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +452 -0
  222. data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +76 -91
  223. data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
  224. data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
  225. data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +32 -13
  226. data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
  227. data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
  228. data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
  229. data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
  230. data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
  231. data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +14 -21
  232. data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -17
  233. data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
  234. data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
  235. data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
  236. data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -3
  237. data/bundler/lib/bundler/vendored_persistent.rb +1 -33
  238. data/bundler/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
  239. data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_tsort.rb} +1 -1
  240. data/bundler/lib/bundler/version.rb +5 -1
  241. data/bundler/lib/bundler/worker.rb +5 -7
  242. data/bundler/lib/bundler.rb +50 -77
  243. data/hide_lib_for_update/note.txt +0 -4
  244. data/lib/rubygems/available_set.rb +3 -3
  245. data/lib/rubygems/basic_specification.rb +12 -12
  246. data/lib/rubygems/bundler_version_finder.rb +14 -46
  247. data/lib/rubygems/command.rb +47 -39
  248. data/lib/rubygems/command_manager.rb +34 -13
  249. data/lib/rubygems/commands/build_command.rb +11 -8
  250. data/lib/rubygems/commands/cert_command.rb +39 -39
  251. data/lib/rubygems/commands/check_command.rb +20 -20
  252. data/lib/rubygems/commands/cleanup_command.rb +23 -23
  253. data/lib/rubygems/commands/contents_command.rb +13 -13
  254. data/lib/rubygems/commands/dependency_command.rb +35 -45
  255. data/lib/rubygems/commands/environment_command.rb +10 -7
  256. data/lib/rubygems/commands/exec_command.rb +248 -0
  257. data/lib/rubygems/commands/fetch_command.rb +32 -13
  258. data/lib/rubygems/commands/generate_index_command.rb +17 -17
  259. data/lib/rubygems/commands/help_command.rb +6 -6
  260. data/lib/rubygems/commands/info_command.rb +3 -3
  261. data/lib/rubygems/commands/install_command.rb +31 -24
  262. data/lib/rubygems/commands/list_command.rb +4 -4
  263. data/lib/rubygems/commands/lock_command.rb +4 -4
  264. data/lib/rubygems/commands/mirror_command.rb +3 -3
  265. data/lib/rubygems/commands/open_command.rb +9 -9
  266. data/lib/rubygems/commands/outdated_command.rb +5 -5
  267. data/lib/rubygems/commands/owner_command.rb +17 -12
  268. data/lib/rubygems/commands/pristine_command.rb +64 -49
  269. data/lib/rubygems/commands/push_command.rb +16 -16
  270. data/lib/rubygems/commands/query_command.rb +9 -9
  271. data/lib/rubygems/commands/rdoc_command.rb +26 -25
  272. data/lib/rubygems/commands/search_command.rb +4 -4
  273. data/lib/rubygems/commands/server_command.rb +16 -79
  274. data/lib/rubygems/commands/setup_command.rb +172 -173
  275. data/lib/rubygems/commands/signin_command.rb +9 -9
  276. data/lib/rubygems/commands/signout_command.rb +7 -7
  277. data/lib/rubygems/commands/sources_command.rb +22 -22
  278. data/lib/rubygems/commands/specification_command.rb +18 -18
  279. data/lib/rubygems/commands/stale_command.rb +2 -2
  280. data/lib/rubygems/commands/uninstall_command.rb +43 -40
  281. data/lib/rubygems/commands/unpack_command.rb +13 -13
  282. data/lib/rubygems/commands/update_command.rb +61 -72
  283. data/lib/rubygems/commands/which_command.rb +7 -7
  284. data/lib/rubygems/commands/yank_command.rb +11 -11
  285. data/lib/rubygems/compatibility.rb +4 -2
  286. data/lib/rubygems/config_file.rb +58 -25
  287. data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
  288. data/lib/rubygems/core_ext/kernel_require.rb +108 -115
  289. data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
  290. data/lib/rubygems/core_ext/tcpsocket_init.rb +1 -1
  291. data/lib/rubygems/defaults.rb +32 -36
  292. data/lib/rubygems/dependency.rb +20 -17
  293. data/lib/rubygems/dependency_installer.rb +37 -37
  294. data/lib/rubygems/dependency_list.rb +7 -7
  295. data/lib/rubygems/deprecate.rb +55 -8
  296. data/lib/rubygems/doctor.rb +21 -21
  297. data/lib/rubygems/errors.rb +3 -6
  298. data/lib/rubygems/exceptions.rb +35 -7
  299. data/lib/rubygems/ext/build_error.rb +1 -1
  300. data/lib/rubygems/ext/builder.rb +51 -22
  301. data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +27 -0
  302. data/lib/rubygems/ext/cargo_builder.rb +360 -0
  303. data/lib/rubygems/ext/cmake_builder.rb +2 -2
  304. data/lib/rubygems/ext/configure_builder.rb +1 -1
  305. data/lib/rubygems/ext/ext_conf_builder.rb +35 -59
  306. data/lib/rubygems/ext/rake_builder.rb +3 -3
  307. data/lib/rubygems/ext.rb +7 -6
  308. data/lib/rubygems/gem_runner.rb +12 -16
  309. data/lib/rubygems/gemcutter_utilities.rb +60 -21
  310. data/lib/rubygems/indexer.rb +30 -28
  311. data/lib/rubygems/install_default_message.rb +2 -2
  312. data/lib/rubygems/install_message.rb +2 -2
  313. data/lib/rubygems/install_update_options.rb +70 -61
  314. data/lib/rubygems/installer.rb +135 -87
  315. data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
  316. data/lib/rubygems/local_remote_options.rb +22 -24
  317. data/lib/rubygems/mock_gem_ui.rb +2 -2
  318. data/lib/rubygems/name_tuple.rb +6 -7
  319. data/lib/rubygems/optparse/.document +1 -0
  320. data/lib/rubygems/optparse/COPYING +56 -0
  321. data/lib/rubygems/optparse/lib/optionparser.rb +2 -0
  322. data/lib/rubygems/optparse/lib/optparse/ac.rb +54 -0
  323. data/lib/rubygems/optparse/lib/optparse/date.rb +18 -0
  324. data/lib/rubygems/optparse/lib/optparse/kwargs.rb +22 -0
  325. data/lib/rubygems/optparse/lib/optparse/shellwords.rb +7 -0
  326. data/lib/rubygems/optparse/lib/optparse/time.rb +11 -0
  327. data/lib/rubygems/optparse/lib/optparse/uri.rb +7 -0
  328. data/lib/rubygems/optparse/lib/optparse/version.rb +71 -0
  329. data/lib/rubygems/optparse/lib/optparse.rb +2308 -0
  330. data/lib/rubygems/optparse.rb +3 -0
  331. data/lib/rubygems/package/file_source.rb +2 -2
  332. data/lib/rubygems/package/old.rb +9 -9
  333. data/lib/rubygems/package/tar_header.rb +62 -62
  334. data/lib/rubygems/package/tar_reader/entry.rb +90 -9
  335. data/lib/rubygems/package/tar_reader.rb +1 -29
  336. data/lib/rubygems/package/tar_writer.rb +7 -7
  337. data/lib/rubygems/package.rb +77 -60
  338. data/lib/rubygems/package_task.rb +4 -4
  339. data/lib/rubygems/path_support.rb +1 -6
  340. data/lib/rubygems/platform.rb +94 -61
  341. data/lib/rubygems/psych_tree.rb +1 -1
  342. data/lib/rubygems/query_utils.rb +49 -51
  343. data/lib/rubygems/rdoc.rb +2 -2
  344. data/lib/rubygems/remote_fetcher.rb +27 -27
  345. data/lib/rubygems/request/connection_pools.rb +4 -4
  346. data/lib/rubygems/request/http_pool.rb +1 -1
  347. data/lib/rubygems/request.rb +24 -24
  348. data/lib/rubygems/request_set/gem_dependency_api.rb +122 -123
  349. data/lib/rubygems/request_set/lockfile/parser.rb +26 -26
  350. data/lib/rubygems/request_set/lockfile/tokenizer.rb +4 -4
  351. data/lib/rubygems/request_set/lockfile.rb +9 -9
  352. data/lib/rubygems/request_set.rb +18 -18
  353. data/lib/rubygems/requirement.rb +15 -15
  354. data/lib/rubygems/resolver/activation_request.rb +3 -3
  355. data/lib/rubygems/resolver/api_set.rb +4 -4
  356. data/lib/rubygems/resolver/api_specification.rb +6 -6
  357. data/lib/rubygems/resolver/best_set.rb +5 -5
  358. data/lib/rubygems/resolver/conflict.rb +10 -10
  359. data/lib/rubygems/resolver/dependency_request.rb +2 -2
  360. data/lib/rubygems/resolver/git_set.rb +2 -2
  361. data/lib/rubygems/resolver/git_specification.rb +6 -6
  362. data/lib/rubygems/resolver/index_set.rb +3 -3
  363. data/lib/rubygems/resolver/index_specification.rb +6 -5
  364. data/lib/rubygems/resolver/installed_specification.rb +4 -4
  365. data/lib/rubygems/resolver/installer_set.rb +21 -26
  366. data/lib/rubygems/resolver/local_specification.rb +2 -2
  367. data/lib/rubygems/resolver/lock_set.rb +4 -4
  368. data/lib/rubygems/resolver/lock_specification.rb +4 -4
  369. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +3 -3
  370. data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
  371. data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
  372. data/lib/rubygems/resolver/molinillo.rb +1 -1
  373. data/lib/rubygems/resolver/specification.rb +1 -1
  374. data/lib/rubygems/resolver/stats.rb +1 -1
  375. data/lib/rubygems/resolver/vendor_set.rb +1 -1
  376. data/lib/rubygems/resolver/vendor_specification.rb +3 -3
  377. data/lib/rubygems/resolver.rb +40 -40
  378. data/lib/rubygems/s3_uri_signer.rb +6 -6
  379. data/lib/rubygems/safe_yaml.rb +10 -10
  380. data/lib/rubygems/security/policies.rb +47 -47
  381. data/lib/rubygems/security/policy.rb +19 -21
  382. data/lib/rubygems/security/signer.rb +5 -5
  383. data/lib/rubygems/security/trust_dir.rb +4 -4
  384. data/lib/rubygems/security.rb +37 -43
  385. data/lib/rubygems/security_option.rb +7 -7
  386. data/lib/rubygems/source/git.rb +25 -24
  387. data/lib/rubygems/source/installed.rb +1 -1
  388. data/lib/rubygems/source/local.rb +2 -2
  389. data/lib/rubygems/source/specific_file.rb +1 -1
  390. data/lib/rubygems/source.rb +27 -32
  391. data/lib/rubygems/source_list.rb +5 -9
  392. data/lib/rubygems/spec_fetcher.rb +37 -37
  393. data/lib/rubygems/specification.rb +265 -211
  394. data/lib/rubygems/specification_policy.rb +49 -30
  395. data/lib/rubygems/stub_specification.rb +24 -27
  396. data/lib/rubygems/text.rb +22 -21
  397. data/lib/rubygems/tsort/.document +1 -0
  398. data/lib/rubygems/tsort/LICENSE.txt +22 -0
  399. data/lib/rubygems/tsort/lib/tsort.rb +452 -0
  400. data/lib/rubygems/tsort.rb +3 -0
  401. data/lib/rubygems/uninstaller.rb +29 -26
  402. data/lib/rubygems/unknown_command_spell_checker.rb +21 -0
  403. data/lib/rubygems/update_suggestion.rb +69 -0
  404. data/lib/rubygems/uri.rb +45 -30
  405. data/lib/rubygems/uri_formatter.rb +1 -1
  406. data/lib/rubygems/user_interaction.rb +42 -28
  407. data/lib/rubygems/util/licenses.rb +4 -2
  408. data/lib/rubygems/util.rb +12 -16
  409. data/lib/rubygems/validator.rb +6 -6
  410. data/lib/rubygems/version.rb +28 -17
  411. data/lib/rubygems/version_option.rb +5 -5
  412. data/lib/rubygems.rb +129 -117
  413. data/rubygems-update.gemspec +3 -3
  414. data/setup.rb +11 -16
  415. data/test/rubygems/alternate_cert.pem +14 -14
  416. data/test/rubygems/alternate_cert_32.pem +15 -15
  417. data/test/rubygems/alternate_key.pem +25 -25
  418. data/test/rubygems/bundler_test_gem.rb +419 -0
  419. data/test/rubygems/child_cert.pem +15 -16
  420. data/test/rubygems/child_cert_32.pem +15 -16
  421. data/test/rubygems/child_key.pem +25 -25
  422. data/test/rubygems/data/excon-0.7.7.gemspec.rz +0 -0
  423. data/test/rubygems/data/pry-0.4.7.gemspec.rz +0 -0
  424. data/test/rubygems/encrypted_private_key.pem +26 -26
  425. data/test/rubygems/expired_cert.pem +15 -15
  426. data/test/rubygems/future_cert.pem +15 -15
  427. data/test/rubygems/future_cert_32.pem +15 -15
  428. data/test/rubygems/grandchild_cert.pem +15 -16
  429. data/test/rubygems/grandchild_cert_32.pem +15 -16
  430. data/test/rubygems/grandchild_key.pem +25 -25
  431. data/test/rubygems/helper.rb +237 -207
  432. data/test/rubygems/installer_test_case.rb +13 -13
  433. data/test/rubygems/invalid_issuer_cert.pem +16 -16
  434. data/test/rubygems/invalid_issuer_cert_32.pem +16 -16
  435. data/test/rubygems/invalid_key.pem +25 -25
  436. data/test/rubygems/invalid_signer_cert.pem +15 -15
  437. data/test/rubygems/invalid_signer_cert_32.pem +15 -15
  438. data/test/rubygems/invalidchild_cert.pem +15 -16
  439. data/test/rubygems/invalidchild_cert_32.pem +15 -16
  440. data/test/rubygems/invalidchild_key.pem +25 -25
  441. data/test/rubygems/package/tar_test_case.rb +52 -17
  442. data/test/rubygems/packages/Bluebie-legs-0.6.2.gem +0 -0
  443. data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
  444. data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
  445. data/test/rubygems/private_key.pem +25 -25
  446. data/test/rubygems/public_cert.pem +16 -16
  447. data/test/rubygems/public_cert_32.pem +15 -15
  448. data/test/rubygems/public_key.pem +7 -7
  449. data/test/rubygems/rubygems_plugin.rb +2 -2
  450. data/test/rubygems/simple_gem.rb +1 -1
  451. data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -4
  452. data/test/rubygems/test_bundled_ca.rb +11 -11
  453. data/test/rubygems/test_config.rb +5 -5
  454. data/test/rubygems/test_deprecate.rb +3 -3
  455. data/test/rubygems/test_exit.rb +17 -0
  456. data/test/rubygems/test_gem.rb +367 -757
  457. data/test/rubygems/test_gem_available_set.rb +21 -21
  458. data/test/rubygems/test_gem_bundler_version_finder.rb +27 -47
  459. data/test/rubygems/test_gem_command.rb +45 -45
  460. data/test/rubygems/test_gem_command_manager.rb +124 -27
  461. data/test/rubygems/test_gem_commands_build_command.rb +73 -63
  462. data/test/rubygems/test_gem_commands_cert_command.rb +105 -107
  463. data/test/rubygems/test_gem_commands_check_command.rb +4 -4
  464. data/test/rubygems/test_gem_commands_cleanup_command.rb +40 -40
  465. data/test/rubygems/test_gem_commands_contents_command.rb +28 -28
  466. data/test/rubygems/test_gem_commands_dependency_command.rb +36 -36
  467. data/test/rubygems/test_gem_commands_environment_command.rb +38 -14
  468. data/test/rubygems/test_gem_commands_exec_command.rb +851 -0
  469. data/test/rubygems/test_gem_commands_fetch_command.rb +159 -26
  470. data/test/rubygems/test_gem_commands_generate_index_command.rb +7 -7
  471. data/test/rubygems/test_gem_commands_help_command.rb +13 -13
  472. data/test/rubygems/test_gem_commands_info_command.rb +28 -2
  473. data/test/rubygems/test_gem_commands_install_command.rb +200 -132
  474. data/test/rubygems/test_gem_commands_list_command.rb +4 -4
  475. data/test/rubygems/test_gem_commands_lock_command.rb +10 -10
  476. data/test/rubygems/test_gem_commands_mirror.rb +2 -2
  477. data/test/rubygems/test_gem_commands_open_command.rb +5 -5
  478. data/test/rubygems/test_gem_commands_outdated_command.rb +9 -9
  479. data/test/rubygems/test_gem_commands_owner_command.rb +126 -45
  480. data/test/rubygems/test_gem_commands_pristine_command.rb +141 -92
  481. data/test/rubygems/test_gem_commands_push_command.rb +85 -59
  482. data/test/rubygems/test_gem_commands_query_command.rb +73 -73
  483. data/test/rubygems/test_gem_commands_search_command.rb +2 -2
  484. data/test/rubygems/test_gem_commands_server_command.rb +6 -48
  485. data/test/rubygems/test_gem_commands_setup_command.rb +169 -92
  486. data/test/rubygems/test_gem_commands_signin_command.rb +154 -26
  487. data/test/rubygems/test_gem_commands_signout_command.rb +3 -3
  488. data/test/rubygems/test_gem_commands_sources_command.rb +74 -25
  489. data/test/rubygems/test_gem_commands_specification_command.rb +32 -32
  490. data/test/rubygems/test_gem_commands_stale_command.rb +4 -4
  491. data/test/rubygems/test_gem_commands_uninstall_command.rb +99 -82
  492. data/test/rubygems/test_gem_commands_unpack_command.rb +31 -31
  493. data/test/rubygems/test_gem_commands_update_command.rb +202 -91
  494. data/test/rubygems/test_gem_commands_which_command.rb +6 -6
  495. data/test/rubygems/test_gem_commands_yank_command.rb +43 -43
  496. data/test/rubygems/test_gem_config_file.rb +93 -81
  497. data/test/rubygems/test_gem_dependency.rb +78 -80
  498. data/test/rubygems/test_gem_dependency_installer.rb +165 -165
  499. data/test/rubygems/test_gem_dependency_list.rb +47 -47
  500. data/test/rubygems/test_gem_dependency_resolution_error.rb +4 -4
  501. data/test/rubygems/test_gem_doctor.rb +26 -26
  502. data/test/rubygems/test_gem_ext_builder.rb +60 -62
  503. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/.gitignore +1 -0
  504. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +8 -0
  505. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock +233 -0
  506. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml +10 -0
  507. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs +27 -0
  508. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +1 -0
  509. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/.gitignore +1 -0
  510. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +247 -0
  511. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +10 -0
  512. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +8 -0
  513. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +51 -0
  514. data/test/rubygems/test_gem_ext_cargo_builder.rb +166 -0
  515. data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +33 -0
  516. data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +60 -0
  517. data/test/rubygems/test_gem_ext_cmake_builder.rb +17 -15
  518. data/test/rubygems/test_gem_ext_configure_builder.rb +13 -13
  519. data/test/rubygems/test_gem_ext_ext_conf_builder.rb +53 -50
  520. data/test/rubygems/test_gem_ext_rake_builder.rb +15 -15
  521. data/test/rubygems/test_gem_gem_runner.rb +13 -8
  522. data/test/rubygems/test_gem_gemcutter_utilities.rb +71 -65
  523. data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -4
  524. data/test/rubygems/test_gem_indexer.rb +90 -67
  525. data/test/rubygems/test_gem_install_update_options.rb +18 -18
  526. data/test/rubygems/test_gem_installer.rb +511 -327
  527. data/test/rubygems/test_gem_local_remote_options.rb +10 -10
  528. data/test/rubygems/test_gem_name_tuple.rb +4 -4
  529. data/test/rubygems/test_gem_package.rb +246 -236
  530. data/test/rubygems/test_gem_package_old.rb +13 -13
  531. data/test/rubygems/test_gem_package_tar_header.rb +47 -47
  532. data/test/rubygems/test_gem_package_tar_reader.rb +55 -8
  533. data/test/rubygems/test_gem_package_tar_reader_entry.rb +161 -16
  534. data/test/rubygems/test_gem_package_tar_writer.rb +76 -76
  535. data/test/rubygems/test_gem_package_task.rb +18 -18
  536. data/test/rubygems/test_gem_path_support.rb +15 -19
  537. data/test/rubygems/test_gem_platform.rb +335 -214
  538. data/test/rubygems/test_gem_rdoc.rb +14 -14
  539. data/test/rubygems/test_gem_remote_fetcher.rb +169 -154
  540. data/test/rubygems/test_gem_request.rb +65 -59
  541. data/test/rubygems/test_gem_request_connection_pools.rb +29 -29
  542. data/test/rubygems/test_gem_request_set.rb +100 -100
  543. data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +209 -211
  544. data/test/rubygems/test_gem_request_set_lockfile.rb +86 -86
  545. data/test/rubygems/test_gem_request_set_lockfile_parser.rb +58 -58
  546. data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +62 -62
  547. data/test/rubygems/test_gem_requirement.rb +47 -42
  548. data/test/rubygems/test_gem_resolver.rb +173 -106
  549. data/test/rubygems/test_gem_resolver_activation_request.rb +6 -6
  550. data/test/rubygems/test_gem_resolver_api_set.rb +33 -33
  551. data/test/rubygems/test_gem_resolver_api_specification.rb +47 -47
  552. data/test/rubygems/test_gem_resolver_best_set.rb +22 -22
  553. data/test/rubygems/test_gem_resolver_composed_set.rb +1 -1
  554. data/test/rubygems/test_gem_resolver_conflict.rb +12 -12
  555. data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -15
  556. data/test/rubygems/test_gem_resolver_git_set.rb +21 -21
  557. data/test/rubygems/test_gem_resolver_git_specification.rb +21 -21
  558. data/test/rubygems/test_gem_resolver_index_set.rb +12 -12
  559. data/test/rubygems/test_gem_resolver_index_specification.rb +16 -16
  560. data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -5
  561. data/test/rubygems/test_gem_resolver_installer_set.rb +79 -35
  562. data/test/rubygems/test_gem_resolver_local_specification.rb +7 -7
  563. data/test/rubygems/test_gem_resolver_lock_set.rb +12 -12
  564. data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -17
  565. data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -1
  566. data/test/rubygems/test_gem_resolver_specification.rb +8 -8
  567. data/test/rubygems/test_gem_resolver_vendor_set.rb +6 -6
  568. data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -10
  569. data/test/rubygems/test_gem_security.rb +69 -69
  570. data/test/rubygems/test_gem_security_policy.rb +72 -72
  571. data/test/rubygems/test_gem_security_signer.rb +34 -34
  572. data/test/rubygems/test_gem_security_trust_dir.rb +6 -6
  573. data/test/rubygems/test_gem_silent_ui.rb +38 -32
  574. data/test/rubygems/test_gem_source.rb +44 -44
  575. data/test/rubygems/test_gem_source_fetch_problem.rb +9 -9
  576. data/test/rubygems/test_gem_source_git.rb +69 -62
  577. data/test/rubygems/test_gem_source_installed.rb +16 -16
  578. data/test/rubygems/test_gem_source_list.rb +5 -5
  579. data/test/rubygems/test_gem_source_local.rb +14 -14
  580. data/test/rubygems/test_gem_source_lock.rb +31 -31
  581. data/test/rubygems/test_gem_source_specific_file.rb +17 -17
  582. data/test/rubygems/test_gem_source_subpath_problem.rb +7 -7
  583. data/test/rubygems/test_gem_source_vendor.rb +13 -13
  584. data/test/rubygems/test_gem_spec_fetcher.rb +72 -72
  585. data/test/rubygems/test_gem_specification.rb +560 -493
  586. data/test/rubygems/test_gem_stream_ui.rb +20 -20
  587. data/test/rubygems/test_gem_stub_specification.rb +32 -48
  588. data/test/rubygems/test_gem_text.rb +7 -1
  589. data/test/rubygems/test_gem_uninstaller.rb +113 -113
  590. data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -3
  591. data/test/rubygems/test_gem_update_suggestion.rb +208 -0
  592. data/test/rubygems/test_gem_uri.rb +4 -4
  593. data/test/rubygems/test_gem_uri_formatter.rb +14 -14
  594. data/test/rubygems/test_gem_util.rb +23 -23
  595. data/test/rubygems/test_gem_validator.rb +8 -8
  596. data/test/rubygems/test_gem_version.rb +27 -16
  597. data/test/rubygems/test_gem_version_option.rb +15 -15
  598. data/test/rubygems/test_kernel.rb +42 -60
  599. data/test/rubygems/test_project_sanity.rb +2 -2
  600. data/test/rubygems/test_remote_fetch_error.rb +6 -6
  601. data/test/rubygems/test_require.rb +132 -174
  602. data/test/rubygems/test_rubygems.rb +42 -12
  603. data/test/rubygems/utilities.rb +59 -37
  604. data/test/rubygems/wrong_key_cert.pem +15 -15
  605. data/test/rubygems/wrong_key_cert_32.pem +15 -15
  606. data/test/test_changelog_generator.rb +1 -0
  607. metadata +97 -41
  608. data/bundler/lib/bundler/dep_proxy.rb +0 -55
  609. data/bundler/lib/bundler/gemdeps.rb +0 -29
  610. data/bundler/lib/bundler/psyched_yaml.rb +0 -22
  611. data/bundler/lib/bundler/templates/gems.rb +0 -8
  612. data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
  613. data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
  614. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
  615. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
  616. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
  617. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
  618. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
  619. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
  620. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
  621. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
  622. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
  623. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
  624. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
  625. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
  626. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
  627. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
  628. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
  629. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
  630. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
  631. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
  632. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
  633. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
  634. data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
  635. data/bundler/lib/bundler/version_ranges.rb +0 -122
  636. data/lib/rubygems/psych_additions.rb +0 -10
  637. data/lib/rubygems/server.rb +0 -882
  638. data/test/rubygems/bogussources.rb +0 -9
  639. data/test/rubygems/data/null-type.gemspec.rz +0 -0
  640. data/test/rubygems/test_gem_server.rb +0 -608
  641. /data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
@@ -0,0 +1,166 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative "helper"
4
+ require "rubygems/ext"
5
+ require "open3"
6
+
7
+ class TestGemExtCargoBuilder < Gem::TestCase
8
+ def setup
9
+ super
10
+
11
+ @rust_envs = {
12
+ "CARGO_HOME" => ENV.fetch("CARGO_HOME", File.join(@orig_env["HOME"], ".cargo")),
13
+ "RUSTUP_HOME" => ENV.fetch("RUSTUP_HOME", File.join(@orig_env["HOME"], ".rustup")),
14
+ }
15
+ end
16
+
17
+ def setup_rust_gem(name)
18
+ @ext = File.join(@tempdir, "ext")
19
+ @dest_path = File.join(@tempdir, "prefix")
20
+ @fixture_dir = Pathname.new(File.expand_path("test_gem_ext_cargo_builder/#{name}/", __dir__))
21
+
22
+ FileUtils.mkdir_p @dest_path
23
+ FileUtils.cp_r(@fixture_dir.to_s, @ext)
24
+ end
25
+
26
+ def test_build_cdylib
27
+ skip_unsupported_platforms!
28
+ setup_rust_gem "rust_ruby_example"
29
+
30
+ output = []
31
+
32
+ Dir.chdir @ext do
33
+ ENV.update(@rust_envs)
34
+ builder = Gem::Ext::CargoBuilder.new
35
+ builder.build "Cargo.toml", @dest_path, output
36
+ end
37
+
38
+ output = output.join "\n"
39
+ bundle = File.join(@dest_path, "rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
40
+
41
+ assert_match(/Finished/, output)
42
+ assert_match(/release/, output)
43
+ assert_ffi_handle bundle, "Init_rust_ruby_example"
44
+ rescue Exception => e
45
+ pp output if output
46
+
47
+ raise(e)
48
+ end
49
+
50
+ def test_rubygems_cfg_passed_to_rustc
51
+ skip_unsupported_platforms!
52
+ setup_rust_gem "rust_ruby_example"
53
+ version_slug = Gem::VERSION.tr(".", "_")
54
+ output = []
55
+
56
+ replace_in_rust_file("src/lib.rs", "rubygems_x_x_x", "rubygems_#{version_slug}")
57
+
58
+ Dir.chdir @ext do
59
+ ENV.update(@rust_envs)
60
+ builder = Gem::Ext::CargoBuilder.new
61
+ builder.build "Cargo.toml", @dest_path, output
62
+ end
63
+
64
+ output = output.join "\n"
65
+ bundle = File.join(@dest_path, "rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
66
+
67
+ assert_ffi_handle bundle, "hello_from_rubygems"
68
+ assert_ffi_handle bundle, "hello_from_rubygems_version"
69
+ refute_ffi_handle bundle, "should_never_exist"
70
+ rescue Exception => e
71
+ pp output if output
72
+
73
+ raise(e)
74
+ end
75
+
76
+ def test_build_fail
77
+ skip_unsupported_platforms!
78
+ setup_rust_gem "rust_ruby_example"
79
+
80
+ FileUtils.rm(File.join(@ext, "src/lib.rs"))
81
+
82
+ error = assert_raise(Gem::InstallError) do
83
+ Dir.chdir @ext do
84
+ ENV.update(@rust_envs)
85
+ builder = Gem::Ext::CargoBuilder.new
86
+ builder.build "Cargo.toml", @dest_path, []
87
+ end
88
+ end
89
+
90
+ assert_match(/cargo\s.*\sfailed/, error.message)
91
+ end
92
+
93
+ def test_full_integration
94
+ skip_unsupported_platforms!
95
+ setup_rust_gem "rust_ruby_example"
96
+
97
+ require "open3"
98
+
99
+ Dir.chdir @ext do
100
+ require "tmpdir"
101
+
102
+ env_for_subprocess = @rust_envs.merge("GEM_HOME" => Gem.paths.home)
103
+ gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path("../../bin/gem", __dir__)]
104
+
105
+ Dir.mktmpdir("rust_ruby_example") do |dir|
106
+ built_gem = File.expand_path(File.join(dir, "rust_ruby_example.gem"))
107
+ Open3.capture2e(*gem, "build", "rust_ruby_example.gemspec", "--output", built_gem)
108
+ Open3.capture2e(*gem, "install", "--verbose", "--local", built_gem, *ARGV)
109
+
110
+ stdout_and_stderr_str, status = Open3.capture2e(env_for_subprocess, *ruby_with_rubygems_in_load_path, "-rrust_ruby_example", "-e", "puts 'Result: ' + RustRubyExample.reverse('hello world')")
111
+ assert status.success?, stdout_and_stderr_str
112
+ assert_match "Result: #{"hello world".reverse}", stdout_and_stderr_str
113
+ end
114
+ end
115
+ end
116
+
117
+ def test_custom_name
118
+ skip_unsupported_platforms!
119
+ setup_rust_gem "custom_name"
120
+
121
+ Dir.chdir @ext do
122
+ require "tmpdir"
123
+
124
+ env_for_subprocess = @rust_envs.merge("GEM_HOME" => Gem.paths.home)
125
+ gem = [env_for_subprocess, *ruby_with_rubygems_in_load_path, File.expand_path("../../bin/gem", __dir__)]
126
+
127
+ Dir.mktmpdir("custom_name") do |dir|
128
+ built_gem = File.expand_path(File.join(dir, "custom_name.gem"))
129
+ Open3.capture2e(*gem, "build", "custom_name.gemspec", "--output", built_gem)
130
+ Open3.capture2e(*gem, "install", "--verbose", "--local", built_gem, *ARGV)
131
+ end
132
+
133
+ stdout_and_stderr_str, status = Open3.capture2e(env_for_subprocess, *ruby_with_rubygems_in_load_path, "-rcustom_name", "-e", "puts 'Result: ' + CustomName.say_hello")
134
+
135
+ assert status.success?, stdout_and_stderr_str
136
+ assert_match "Result: Hello world!", stdout_and_stderr_str
137
+ end
138
+ end
139
+
140
+ private
141
+
142
+ def skip_unsupported_platforms!
143
+ pend "jruby not supported" if java_platform?
144
+ pend "truffleruby not supported (yet)" if RUBY_ENGINE == "truffleruby"
145
+ system(@rust_envs, "cargo", "-V", out: IO::NULL, err: [:child, :out])
146
+ pend "cargo not present" unless $?.success?
147
+ pend "ruby.h is not provided by ruby repo" if ruby_repo?
148
+ end
149
+
150
+ def assert_ffi_handle(bundle, name)
151
+ require "fiddle"
152
+ dylib_handle = Fiddle.dlopen bundle
153
+ assert_nothing_raised { dylib_handle[name] }
154
+ end
155
+
156
+ def refute_ffi_handle(bundle, name)
157
+ require "fiddle"
158
+ dylib_handle = Fiddle.dlopen bundle
159
+ assert_raise { dylib_handle[name] }
160
+ end
161
+
162
+ def replace_in_rust_file(name, from, to)
163
+ content = @fixture_dir.join(name).read.gsub(from, to)
164
+ File.write(File.join(@ext, name), content)
165
+ end
166
+ end
@@ -0,0 +1,33 @@
1
+ # frozen_string_literal: true
2
+ require_relative "helper"
3
+ require "rubygems/ext"
4
+ require "rubygems/ext/cargo_builder/link_flag_converter"
5
+
6
+ class TestGemExtCargoBuilderLinkFlagConverter < Gem::TestCase
7
+ CASES = {
8
+ test_search_path_basic: ["-L/usr/local/lib", ["-L", "native=/usr/local/lib"]],
9
+ test_search_path_space: ["-L /usr/local/lib", ["-L", "native=/usr/local/lib"]],
10
+ test_search_path_space_in_path: ["-L/usr/local/my\ lib", ["-L", "native=/usr/local/my\ lib"]],
11
+ test_simple_lib: ["-lfoo", ["-l", "foo"]],
12
+ test_lib_with_nonascii: ["-lws2_32", ["-l", "ws2_32"]],
13
+ test_simple_lib_space: ["-l foo", ["-l", "foo"]],
14
+ test_verbose_lib_space: ["--library=foo", ["-l", "foo"]],
15
+ test_libstatic_with_colon: ["-l:libssp.a", ["-C", "link-args=-l:libssp.a"]],
16
+ test_libstatic_with_colon_space: ["-l :libssp.a", ["-C", "link-args=-l :libssp.a"]],
17
+ test_unconventional_lib_with_colon: ["-l:ssp.a", ["-C", "link-args=-l:ssp.a"]],
18
+ test_dylib_with_colon_space: ["-l :libssp.dylib", ["-C", "link-args=-l :libssp.dylib"]],
19
+ test_so_with_colon_space: ["-l :libssp.so", ["-C", "link-args=-l :libssp.so"]],
20
+ test_dll_with_colon_space: ["-l :libssp.dll", ["-C", "link-args=-l :libssp.dll"]],
21
+ test_framework: ["-F/some/path", ["-l", "framework=/some/path"]],
22
+ test_framework_space: ["-F /some/path", ["-l", "framework=/some/path"]],
23
+ test_non_lib_dash_l: ["test_rubygems_20220413-976-lemgf9/prefix", ["-C", "link-args=test_rubygems_20220413-976-lemgf9/prefix"]],
24
+ }.freeze
25
+
26
+ CASES.each do |test_name, (arg, expected)|
27
+ raise "duplicate test name" if instance_methods.include?(test_name)
28
+
29
+ define_method(test_name) do
30
+ assert_equal(expected, Gem::Ext::CargoBuilder::LinkFlagConverter.convert(arg))
31
+ end
32
+ end
33
+ end
@@ -0,0 +1,60 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative "helper"
4
+ require "rubygems/ext"
5
+
6
+ class TestGemExtCargoBuilderUnit < Gem::TestCase
7
+ def test_cargo_command_passes_args
8
+ skip_unsupported_platforms!
9
+ builder = Gem::Ext::CargoBuilder.new
10
+ command = builder.cargo_command(Dir.pwd, @tempdir, ["--all-features"])
11
+
12
+ assert_includes command, "--all-features"
13
+ end
14
+
15
+ def test_cargo_command_locks_in_release_profile
16
+ skip_unsupported_platforms!
17
+ builder = Gem::Ext::CargoBuilder.new
18
+ builder.profile = :release
19
+ command = builder.cargo_command(Dir.pwd, @tempdir)
20
+
21
+ assert_includes command, "--locked"
22
+ end
23
+
24
+ def test_cargo_command_passes_respects_cargo_env_var
25
+ skip_unsupported_platforms!
26
+ old_cargo = ENV["CARGO"]
27
+ ENV["CARGO"] = "mycargo"
28
+ builder = Gem::Ext::CargoBuilder.new
29
+ command = builder.cargo_command(Dir.pwd, @tempdir)
30
+
31
+ assert_includes command, "mycargo"
32
+ ensure
33
+ ENV["CARGO"] = old_cargo
34
+ end
35
+
36
+ def test_build_env_includes_rbconfig
37
+ skip_unsupported_platforms!
38
+ builder = Gem::Ext::CargoBuilder.new
39
+ env = builder.build_env
40
+
41
+ assert_equal env.fetch("RBCONFIG_RUBY_SO_NAME"), RbConfig::CONFIG["RUBY_SO_NAME"]
42
+ end
43
+
44
+ def test_cargo_command_passes_respects_cargo_build_target
45
+ skip_unsupported_platforms!
46
+ old_cargo = ENV["CARGO_BUILD_TARGET"]
47
+ ENV["CARGO_BUILD_TARGET"] = "x86_64-unknown-linux-gnu"
48
+ builder = Gem::Ext::CargoBuilder.new
49
+ command = builder.cargo_command(Dir.pwd, @tempdir, ["--locked"])
50
+
51
+ assert_includes command, "--target"
52
+ assert_includes command, "x86_64-unknown-linux-gnu"
53
+ ensure
54
+ ENV["CARGO_BUILD_TARGET"] = old_cargo
55
+ end
56
+
57
+ def skip_unsupported_platforms!
58
+ pend "jruby not supported" if java_platform?
59
+ end
60
+ end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'helper'
3
- require 'rubygems/ext'
2
+ require_relative "helper"
3
+ require "rubygems/ext"
4
4
 
5
5
  class TestGemExtCmakeBuilder < Gem::TestCase
6
6
  def setup
@@ -9,22 +9,24 @@ class TestGemExtCmakeBuilder < Gem::TestCase
9
9
  # Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340
10
10
  pend "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
11
11
 
12
+ require "open3"
13
+
12
14
  begin
13
- _, status = Open3.capture2e('cmake')
14
- pend 'cmake not present' unless status.success?
15
+ _, status = Open3.capture2e("cmake")
16
+ pend "cmake not present" unless status.success?
15
17
  rescue Errno::ENOENT
16
- pend 'cmake not present'
18
+ pend "cmake not present"
17
19
  end
18
20
 
19
- @ext = File.join @tempdir, 'ext'
20
- @dest_path = File.join @tempdir, 'prefix'
21
+ @ext = File.join @tempdir, "ext"
22
+ @dest_path = File.join @tempdir, "prefix"
21
23
 
22
24
  FileUtils.mkdir_p @ext
23
25
  FileUtils.mkdir_p @dest_path
24
26
  end
25
27
 
26
28
  def test_self_build
27
- File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
29
+ File.open File.join(@ext, "CMakeLists.txt"), "w" do |cmakelists|
28
30
  cmakelists.write <<-EO_CMAKE
29
31
  cmake_minimum_required(VERSION 2.6)
30
32
  project(self_build NONE)
@@ -32,7 +34,7 @@ install (FILES test.txt DESTINATION bin)
32
34
  EO_CMAKE
33
35
  end
34
36
 
35
- FileUtils.touch File.join(@ext, 'test.txt')
37
+ FileUtils.touch File.join(@ext, "test.txt")
36
38
 
37
39
  output = []
38
40
 
@@ -42,8 +44,8 @@ install (FILES test.txt DESTINATION bin)
42
44
 
43
45
  assert_match %r{^cmake \. -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}}, output
44
46
  assert_match %r{#{Regexp.escape @ext}}, output
45
- assert_contains_make_command '', output
46
- assert_contains_make_command 'install', output
47
+ assert_contains_make_command "", output
48
+ assert_contains_make_command "install", output
47
49
  assert_match %r{test\.txt}, output
48
50
  end
49
51
 
@@ -58,14 +60,14 @@ install (FILES test.txt DESTINATION bin)
58
60
 
59
61
  shell_error_msg = %r{(CMake Error: .*)}
60
62
 
61
- assert_match 'cmake failed', error.message
63
+ assert_match "cmake failed", error.message
62
64
 
63
65
  assert_match %r{^cmake . -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}}, output
64
66
  assert_match %r{#{shell_error_msg}}, output
65
67
  end
66
68
 
67
69
  def test_self_build_has_makefile
68
- File.open File.join(@ext, 'Makefile'), 'w' do |makefile|
70
+ File.open File.join(@ext, "Makefile"), "w" do |makefile|
69
71
  makefile.puts "all:\n\t@echo ok\ninstall:\n\t@echo ok"
70
72
  end
71
73
 
@@ -75,7 +77,7 @@ install (FILES test.txt DESTINATION bin)
75
77
 
76
78
  output = output.join "\n"
77
79
 
78
- assert_contains_make_command '', output
79
- assert_contains_make_command 'install', output
80
+ assert_contains_make_command "", output
81
+ assert_contains_make_command "install", output
80
82
  end
81
83
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'helper'
3
- require 'rubygems/ext'
2
+ require_relative "helper"
3
+ require "rubygems/ext"
4
4
 
5
5
  class TestGemExtConfigureBuilder < Gem::TestCase
6
6
  def setup
@@ -9,8 +9,8 @@ class TestGemExtConfigureBuilder < Gem::TestCase
9
9
  @makefile_body =
10
10
  "clean:\n\t@echo ok\nall:\n\t@echo ok\ninstall:\n\t@echo ok"
11
11
 
12
- @ext = File.join @tempdir, 'ext'
13
- @dest_path = File.join @tempdir, 'prefix'
12
+ @ext = File.join @tempdir, "ext"
13
+ @dest_path = File.join @tempdir, "prefix"
14
14
 
15
15
  FileUtils.mkdir_p @ext
16
16
  FileUtils.mkdir_p @dest_path
@@ -19,7 +19,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
19
19
  def test_self_build
20
20
  pend("test_self_build skipped on MS Windows (VC++)") if vc_windows?
21
21
 
22
- File.open File.join(@ext, './configure'), 'w' do |configure|
22
+ File.open File.join(@ext, "./configure"), "w" do |configure|
23
23
  configure.puts "#!/bin/sh\necho \"#{@makefile_body}\" > Makefile"
24
24
  end
25
25
 
@@ -31,13 +31,13 @@ class TestGemExtConfigureBuilder < Gem::TestCase
31
31
  assert_equal "sh ./configure --prefix\\=#{@dest_path}", output.shift
32
32
  assert_equal "", output.shift
33
33
  assert_match(/^current directory:/, output.shift)
34
- assert_contains_make_command 'clean', output.shift
34
+ assert_contains_make_command "clean", output.shift
35
35
  assert_match(/^ok$/m, output.shift)
36
36
  assert_match(/^current directory:/, output.shift)
37
- assert_contains_make_command '', output.shift
37
+ assert_contains_make_command "", output.shift
38
38
  assert_match(/^ok$/m, output.shift)
39
39
  assert_match(/^current directory:/, output.shift)
40
- assert_contains_make_command 'install', output.shift
40
+ assert_contains_make_command "install", output.shift
41
41
  assert_match(/^ok$/m, output.shift)
42
42
  end
43
43
 
@@ -52,7 +52,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
52
52
  shell_error_msg = %r{(\./configure: .*)|((?:[Cc]an't|cannot) open '?\./configure'?(?:: No such file or directory)?)}
53
53
  sh_prefix_configure = "sh ./configure --prefix\\="
54
54
 
55
- assert_match 'configure failed', error.message
55
+ assert_match "configure failed", error.message
56
56
 
57
57
  assert_match(/^current directory:/, output.shift)
58
58
  assert_equal "#{sh_prefix_configure}#{@dest_path}", output.shift
@@ -65,15 +65,15 @@ class TestGemExtConfigureBuilder < Gem::TestCase
65
65
  pend("test_self_build_has_makefile skipped - nmake not found")
66
66
  end
67
67
 
68
- File.open File.join(@ext, 'Makefile'), 'w' do |makefile|
68
+ File.open File.join(@ext, "Makefile"), "w" do |makefile|
69
69
  makefile.puts @makefile_body
70
70
  end
71
71
 
72
72
  output = []
73
73
  Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
74
74
 
75
- assert_contains_make_command 'clean', output[1]
76
- assert_contains_make_command '', output[4]
77
- assert_contains_make_command 'install', output[7]
75
+ assert_contains_make_command "clean", output[1]
76
+ assert_contains_make_command "", output[4]
77
+ assert_contains_make_command "install", output[7]
78
78
  end
79
79
  end
@@ -1,14 +1,14 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative 'helper'
4
- require 'rubygems/ext'
3
+ require_relative "helper"
4
+ require "rubygems/ext"
5
5
 
6
6
  class TestGemExtExtConfBuilder < Gem::TestCase
7
7
  def setup
8
8
  super
9
9
 
10
- @ext = File.join @tempdir, 'ext'
11
- @dest_path = File.join @tempdir, 'prefix'
10
+ @ext = File.join @tempdir, "ext"
11
+ @dest_path = File.join @tempdir, "prefix"
12
12
 
13
13
  FileUtils.mkdir_p @ext
14
14
  FileUtils.mkdir_p @dest_path
@@ -23,13 +23,13 @@ class TestGemExtExtConfBuilder < Gem::TestCase
23
23
  pend("test_class_build skipped - nmake not found")
24
24
  end
25
25
 
26
- File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
26
+ File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
27
27
  extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
28
28
  end
29
29
 
30
30
  output = []
31
31
 
32
- result = Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
32
+ result = Gem::Ext::ExtConfBuilder.build "extconf.rb", @dest_path, output, [], nil, @ext
33
33
 
34
34
  assert_same result, output
35
35
 
@@ -37,11 +37,11 @@ class TestGemExtExtConfBuilder < Gem::TestCase
37
37
  assert_match(/^#{Gem.ruby}.* extconf.rb/, output[1])
38
38
  assert_equal "creating Makefile\n", output[2]
39
39
  assert_match(/^current directory:/, output[3])
40
- assert_contains_make_command 'clean', output[4]
41
- assert_contains_make_command '', output[7]
42
- assert_contains_make_command 'install', output[10]
43
- assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
44
- assert_empty Dir.glob(File.join(@ext, '.gem.*'))
40
+ assert_contains_make_command "clean", output[4]
41
+ assert_contains_make_command "", output[7]
42
+ assert_contains_make_command "install", output[10]
43
+ assert_empty Dir.glob(File.join(@ext, "siteconf*.rb"))
44
+ assert_empty Dir.glob(File.join(@ext, ".gem.*"))
45
45
  end
46
46
 
47
47
  def test_class_build_rbconfig_make_prog
@@ -50,46 +50,49 @@ class TestGemExtExtConfBuilder < Gem::TestCase
50
50
  end
51
51
 
52
52
  configure_args do
53
-
54
- File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
53
+ File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
55
54
  extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
56
55
  end
57
56
 
58
57
  output = []
59
58
 
60
- Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
59
+ Gem::Ext::ExtConfBuilder.build "extconf.rb", @dest_path, output, [], nil, @ext
61
60
 
62
61
  assert_equal "creating Makefile\n", output[2]
63
- assert_contains_make_command 'clean', output[4]
64
- assert_contains_make_command '', output[7]
65
- assert_contains_make_command 'install', output[10]
62
+ assert_contains_make_command "clean", output[4]
63
+ assert_contains_make_command "", output[7]
64
+ assert_contains_make_command "install", output[10]
66
65
  end
67
66
  end
68
67
 
69
- def test_class_build_env_make
70
- env_make = ENV.delete 'MAKE'
71
- ENV['MAKE'] = 'anothermake'
68
+ def test_class_build_env_MAKE
69
+ env_make = ENV.delete "make"
70
+ ENV["make"] = nil
71
+
72
+ env_MAKE = ENV.delete "MAKE"
73
+ ENV["MAKE"] = "anothermake"
72
74
 
73
75
  if java_platform?
74
76
  pend("failing on jruby")
75
77
  end
76
78
 
77
- configure_args '' do
78
- File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
79
+ configure_args "" do
80
+ File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
79
81
  extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
80
82
  end
81
83
 
82
84
  output = []
83
85
 
84
86
  assert_raise Gem::InstallError do
85
- Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
87
+ Gem::Ext::ExtConfBuilder.build "extconf.rb", @dest_path, output, [], nil, @ext
86
88
  end
87
89
 
88
90
  assert_equal "creating Makefile\n", output[2]
89
- assert_contains_make_command 'clean', output[4]
91
+ assert_contains_make_command "clean", output[4]
90
92
  end
91
93
  ensure
92
- ENV['MAKE'] = env_make
94
+ ENV["MAKE"] = env_MAKE
95
+ ENV["make"] = env_make
93
96
  end
94
97
 
95
98
  def test_class_build_extconf_fail
@@ -97,7 +100,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
97
100
  pend("test_class_build_extconf_fail skipped - nmake not found")
98
101
  end
99
102
 
100
- File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
103
+ File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
101
104
  extconf.puts "require 'mkmf'"
102
105
  extconf.puts "have_library 'nonexistent' or abort 'need libnonexistent'"
103
106
  extconf.puts "create_makefile 'foo'"
@@ -106,16 +109,16 @@ class TestGemExtExtConfBuilder < Gem::TestCase
106
109
  output = []
107
110
 
108
111
  error = assert_raise Gem::InstallError do
109
- Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
112
+ Gem::Ext::ExtConfBuilder.build "extconf.rb", @dest_path, output, [], nil, @ext
110
113
  end
111
114
 
112
- assert_equal 'extconf failed, exit code 1', error.message
115
+ assert_equal "extconf failed, exit code 1", error.message
113
116
 
114
117
  assert_match(/^#{Gem.ruby}.* extconf.rb/, output[1])
115
- assert_match(File.join(@dest_path, 'mkmf.log'), output[4])
118
+ assert_match(File.join(@dest_path, "mkmf.log"), output[4])
116
119
  assert_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
117
120
 
118
- assert_path_exist File.join @dest_path, 'mkmf.log'
121
+ assert_path_exist File.join @dest_path, "mkmf.log"
119
122
  end
120
123
 
121
124
  def test_class_build_extconf_success_without_warning
@@ -123,7 +126,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
123
126
  pend("test_class_build_extconf_fail skipped - nmake not found")
124
127
  end
125
128
 
126
- File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
129
+ File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
127
130
  extconf.puts "require 'mkmf'"
128
131
  extconf.puts "File.open('mkmf.log', 'w'){|f| f.write('a')}"
129
132
  extconf.puts "create_makefile 'foo'"
@@ -131,11 +134,11 @@ class TestGemExtExtConfBuilder < Gem::TestCase
131
134
 
132
135
  output = []
133
136
 
134
- Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
137
+ Gem::Ext::ExtConfBuilder.build "extconf.rb", @dest_path, output, [], nil, @ext
135
138
 
136
139
  refute_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
137
140
 
138
- assert_path_exist File.join @dest_path, 'mkmf.log'
141
+ assert_path_exist File.join @dest_path, "mkmf.log"
139
142
  end
140
143
 
141
144
  def test_class_build_unconventional
@@ -143,7 +146,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
143
146
  pend("test_class_build skipped - nmake not found")
144
147
  end
145
148
 
146
- File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
149
+ File.open File.join(@ext, "extconf.rb"), "w" do |extconf|
147
150
  extconf.puts <<-'EXTCONF'
148
151
  include RbConfig
149
152
 
@@ -171,12 +174,12 @@ end
171
174
 
172
175
  output = []
173
176
 
174
- Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
177
+ Gem::Ext::ExtConfBuilder.build "extconf.rb", @dest_path, output, [], nil, @ext
175
178
 
176
- assert_contains_make_command 'clean', output[4]
177
- assert_contains_make_command '', output[7]
178
- assert_contains_make_command 'install', output[10]
179
- assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
179
+ assert_contains_make_command "clean", output[4]
180
+ assert_contains_make_command "", output[7]
181
+ assert_contains_make_command "install", output[10]
182
+ assert_empty Dir.glob(File.join(@ext, "siteconf*.rb"))
180
183
  end
181
184
 
182
185
  def test_class_make
@@ -185,8 +188,8 @@ end
185
188
  end
186
189
 
187
190
  output = []
188
- makefile_path = File.join(@ext, 'Makefile')
189
- File.open makefile_path, 'w' do |makefile|
191
+ makefile_path = File.join(@ext, "Makefile")
192
+ File.open makefile_path, "w" do |makefile|
190
193
  makefile.puts "# π"
191
194
  makefile.puts "RUBYARCHDIR = $(foo)$(target_prefix)"
192
195
  makefile.puts "RUBYLIBDIR = $(bar)$(target_prefix)"
@@ -197,30 +200,30 @@ end
197
200
 
198
201
  Gem::Ext::ExtConfBuilder.make @ext, output, @ext
199
202
 
200
- assert_contains_make_command 'clean', output[1]
201
- assert_contains_make_command '', output[4]
202
- assert_contains_make_command 'install', output[7]
203
+ assert_contains_make_command "clean", output[1]
204
+ assert_contains_make_command "", output[4]
205
+ assert_contains_make_command "install", output[7]
203
206
  end
204
207
 
205
208
  def test_class_make_no_Makefile
206
209
  error = assert_raise Gem::InstallError do
207
- Gem::Ext::ExtConfBuilder.make @ext, ['output'], @ext
210
+ Gem::Ext::ExtConfBuilder.make @ext, ["output"], @ext
208
211
  end
209
212
 
210
- assert_equal 'Makefile not found', error.message
213
+ assert_equal "Makefile not found", error.message
211
214
  end
212
215
 
213
216
  def configure_args(args = nil)
214
- configure_args = RbConfig::CONFIG['configure_args']
215
- RbConfig::CONFIG['configure_args'] = args if args
217
+ configure_args = RbConfig::CONFIG["configure_args"]
218
+ RbConfig::CONFIG["configure_args"] = args if args
216
219
 
217
220
  yield
218
221
 
219
222
  ensure
220
223
  if configure_args
221
- RbConfig::CONFIG['configure_args'] = configure_args
224
+ RbConfig::CONFIG["configure_args"] = configure_args
222
225
  else
223
- RbConfig::CONFIG.delete 'configure_args'
226
+ RbConfig::CONFIG.delete "configure_args"
224
227
  end
225
228
  end
226
229
  end