rubygems-update 3.3.16 → 3.3.19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (363) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +57 -0
  3. data/Manifest.txt +1 -0
  4. data/bin/gem +2 -2
  5. data/bin/update_rubygems +4 -4
  6. data/bundler/CHANGELOG.md +71 -0
  7. data/bundler/lib/bundler/build_metadata.rb +2 -2
  8. data/bundler/lib/bundler/cli/cache.rb +1 -1
  9. data/bundler/lib/bundler/cli/common.rb +1 -0
  10. data/bundler/lib/bundler/cli/install.rb +2 -0
  11. data/bundler/lib/bundler/cli.rb +6 -2
  12. data/bundler/lib/bundler/compact_index_client/updater.rb +16 -3
  13. data/bundler/lib/bundler/current_ruby.rb +1 -1
  14. data/bundler/lib/bundler/definition.rb +51 -18
  15. data/bundler/lib/bundler/dependency.rb +3 -2
  16. data/bundler/lib/bundler/dsl.rb +3 -3
  17. data/bundler/lib/bundler/friendly_errors.rb +5 -2
  18. data/bundler/lib/bundler/gem_helpers.rb +2 -0
  19. data/bundler/lib/bundler/incomplete_specification.rb +12 -0
  20. data/bundler/lib/bundler/index.rb +11 -17
  21. data/bundler/lib/bundler/installer/standalone.rb +29 -2
  22. data/bundler/lib/bundler/lazy_specification.rb +17 -8
  23. data/bundler/lib/bundler/lockfile_parser.rb +4 -0
  24. data/bundler/lib/bundler/man/bundle-add.1 +2 -2
  25. data/bundler/lib/bundler/man/bundle-add.1.ronn +1 -1
  26. data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
  27. data/bundler/lib/bundler/man/bundle-cache.1 +1 -1
  28. data/bundler/lib/bundler/man/bundle-check.1 +1 -1
  29. data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
  30. data/bundler/lib/bundler/man/bundle-config.1 +13 -3
  31. data/bundler/lib/bundler/man/bundle-config.1.ronn +9 -2
  32. data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
  33. data/bundler/lib/bundler/man/bundle-exec.1 +2 -2
  34. data/bundler/lib/bundler/man/bundle-exec.1.ronn +1 -1
  35. data/bundler/lib/bundler/man/bundle-gem.1 +1 -1
  36. data/bundler/lib/bundler/man/bundle-info.1 +1 -1
  37. data/bundler/lib/bundler/man/bundle-init.1 +1 -1
  38. data/bundler/lib/bundler/man/bundle-inject.1 +5 -2
  39. data/bundler/lib/bundler/man/bundle-inject.1.ronn +3 -1
  40. data/bundler/lib/bundler/man/bundle-install.1 +1 -1
  41. data/bundler/lib/bundler/man/bundle-list.1 +1 -1
  42. data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
  43. data/bundler/lib/bundler/man/bundle-open.1 +1 -1
  44. data/bundler/lib/bundler/man/bundle-outdated.1 +1 -1
  45. data/bundler/lib/bundler/man/bundle-platform.1 +1 -1
  46. data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
  47. data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
  48. data/bundler/lib/bundler/man/bundle-show.1 +1 -1
  49. data/bundler/lib/bundler/man/bundle-update.1 +1 -1
  50. data/bundler/lib/bundler/man/bundle-viz.1 +4 -1
  51. data/bundler/lib/bundler/man/bundle-viz.1.ronn +2 -0
  52. data/bundler/lib/bundler/man/bundle.1 +3 -3
  53. data/bundler/lib/bundler/man/bundle.1.ronn +2 -2
  54. data/bundler/lib/bundler/man/gemfile.5 +77 -47
  55. data/bundler/lib/bundler/man/gemfile.5.ronn +75 -54
  56. data/bundler/lib/bundler/match_platform.rb +0 -1
  57. data/bundler/lib/bundler/remote_specification.rb +5 -4
  58. data/bundler/lib/bundler/resolver/spec_group.rb +5 -4
  59. data/bundler/lib/bundler/resolver.rb +11 -9
  60. data/bundler/lib/bundler/rubygems_ext.rb +6 -5
  61. data/bundler/lib/bundler/rubygems_gem_installer.rb +19 -12
  62. data/bundler/lib/bundler/runtime.rb +0 -1
  63. data/bundler/lib/bundler/settings.rb +1 -0
  64. data/bundler/lib/bundler/source/rubygems.rb +14 -6
  65. data/bundler/lib/bundler/spec_set.rb +31 -20
  66. data/bundler/lib/bundler/version.rb +1 -1
  67. data/bundler/lib/bundler.rb +1 -0
  68. data/lib/rubygems/basic_specification.rb +2 -2
  69. data/lib/rubygems/command.rb +19 -19
  70. data/lib/rubygems/command_manager.rb +9 -9
  71. data/lib/rubygems/commands/build_command.rb +8 -8
  72. data/lib/rubygems/commands/cert_command.rb +32 -32
  73. data/lib/rubygems/commands/check_command.rb +20 -20
  74. data/lib/rubygems/commands/cleanup_command.rb +16 -16
  75. data/lib/rubygems/commands/contents_command.rb +12 -12
  76. data/lib/rubygems/commands/dependency_command.rb +12 -12
  77. data/lib/rubygems/commands/environment_command.rb +10 -7
  78. data/lib/rubygems/commands/fetch_command.rb +6 -6
  79. data/lib/rubygems/commands/generate_index_command.rb +15 -15
  80. data/lib/rubygems/commands/help_command.rb +3 -3
  81. data/lib/rubygems/commands/info_command.rb +3 -3
  82. data/lib/rubygems/commands/install_command.rb +13 -13
  83. data/lib/rubygems/commands/list_command.rb +3 -3
  84. data/lib/rubygems/commands/lock_command.rb +4 -4
  85. data/lib/rubygems/commands/mirror_command.rb +3 -3
  86. data/lib/rubygems/commands/open_command.rb +9 -9
  87. data/lib/rubygems/commands/outdated_command.rb +5 -5
  88. data/lib/rubygems/commands/owner_command.rb +11 -11
  89. data/lib/rubygems/commands/pristine_command.rb +31 -31
  90. data/lib/rubygems/commands/push_command.rb +8 -8
  91. data/lib/rubygems/commands/query_command.rb +8 -8
  92. data/lib/rubygems/commands/rdoc_command.rb +17 -17
  93. data/lib/rubygems/commands/search_command.rb +3 -3
  94. data/lib/rubygems/commands/server_command.rb +3 -3
  95. data/lib/rubygems/commands/setup_command.rb +94 -103
  96. data/lib/rubygems/commands/signin_command.rb +9 -9
  97. data/lib/rubygems/commands/signout_command.rb +7 -7
  98. data/lib/rubygems/commands/sources_command.rb +19 -19
  99. data/lib/rubygems/commands/specification_command.rb +11 -11
  100. data/lib/rubygems/commands/stale_command.rb +2 -2
  101. data/lib/rubygems/commands/uninstall_command.rb +36 -36
  102. data/lib/rubygems/commands/unpack_command.rb +12 -12
  103. data/lib/rubygems/commands/update_command.rb +40 -52
  104. data/lib/rubygems/commands/which_command.rb +6 -6
  105. data/lib/rubygems/commands/yank_command.rb +11 -11
  106. data/lib/rubygems/config_file.rb +14 -14
  107. data/lib/rubygems/core_ext/kernel_gem.rb +1 -1
  108. data/lib/rubygems/core_ext/kernel_require.rb +1 -1
  109. data/lib/rubygems/core_ext/kernel_warn.rb +1 -1
  110. data/lib/rubygems/core_ext/tcpsocket_init.rb +1 -1
  111. data/lib/rubygems/defaults.rb +15 -15
  112. data/lib/rubygems/dependency.rb +4 -4
  113. data/lib/rubygems/dependency_installer.rb +8 -8
  114. data/lib/rubygems/dependency_list.rb +2 -2
  115. data/lib/rubygems/doctor.rb +16 -16
  116. data/lib/rubygems/errors.rb +2 -2
  117. data/lib/rubygems/exceptions.rb +4 -4
  118. data/lib/rubygems/ext/build_error.rb +1 -1
  119. data/lib/rubygems/ext/builder.rb +23 -16
  120. data/lib/rubygems/ext/cargo_builder.rb +18 -25
  121. data/lib/rubygems/ext/cmake_builder.rb +2 -2
  122. data/lib/rubygems/ext/configure_builder.rb +1 -1
  123. data/lib/rubygems/ext/ext_conf_builder.rb +34 -59
  124. data/lib/rubygems/ext/rake_builder.rb +3 -3
  125. data/lib/rubygems/ext.rb +7 -7
  126. data/lib/rubygems/gem_runner.rb +8 -12
  127. data/lib/rubygems/gemcutter_utilities.rb +30 -27
  128. data/lib/rubygems/indexer.rb +26 -24
  129. data/lib/rubygems/install_default_message.rb +2 -2
  130. data/lib/rubygems/install_message.rb +2 -2
  131. data/lib/rubygems/install_update_options.rb +55 -55
  132. data/lib/rubygems/installer.rb +28 -28
  133. data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
  134. data/lib/rubygems/local_remote_options.rb +18 -20
  135. data/lib/rubygems/mock_gem_ui.rb +2 -2
  136. data/lib/rubygems/name_tuple.rb +1 -1
  137. data/lib/rubygems/optparse.rb +1 -1
  138. data/lib/rubygems/package/file_source.rb +2 -2
  139. data/lib/rubygems/package/old.rb +8 -8
  140. data/lib/rubygems/package/tar_header.rb +33 -33
  141. data/lib/rubygems/package/tar_reader/entry.rb +2 -2
  142. data/lib/rubygems/package/tar_reader.rb +1 -1
  143. data/lib/rubygems/package/tar_writer.rb +6 -6
  144. data/lib/rubygems/package.rb +35 -35
  145. data/lib/rubygems/package_task.rb +4 -4
  146. data/lib/rubygems/platform.rb +44 -40
  147. data/lib/rubygems/psych_tree.rb +1 -1
  148. data/lib/rubygems/query_utils.rb +27 -27
  149. data/lib/rubygems/rdoc.rb +2 -2
  150. data/lib/rubygems/remote_fetcher.rb +19 -19
  151. data/lib/rubygems/request/connection_pools.rb +2 -2
  152. data/lib/rubygems/request.rb +21 -21
  153. data/lib/rubygems/request_set/gem_dependency_api.rb +15 -15
  154. data/lib/rubygems/request_set/lockfile/parser.rb +14 -14
  155. data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -2
  156. data/lib/rubygems/request_set/lockfile.rb +5 -5
  157. data/lib/rubygems/request_set.rb +14 -14
  158. data/lib/rubygems/requirement.rb +5 -5
  159. data/lib/rubygems/resolver/activation_request.rb +3 -3
  160. data/lib/rubygems/resolver/api_set.rb +4 -4
  161. data/lib/rubygems/resolver/api_specification.rb +2 -2
  162. data/lib/rubygems/resolver/best_set.rb +2 -2
  163. data/lib/rubygems/resolver/conflict.rb +7 -7
  164. data/lib/rubygems/resolver/dependency_request.rb +2 -2
  165. data/lib/rubygems/resolver/git_set.rb +2 -2
  166. data/lib/rubygems/resolver/git_specification.rb +3 -3
  167. data/lib/rubygems/resolver/index_set.rb +3 -3
  168. data/lib/rubygems/resolver/index_specification.rb +3 -3
  169. data/lib/rubygems/resolver/installed_specification.rb +2 -2
  170. data/lib/rubygems/resolver/installer_set.rb +4 -4
  171. data/lib/rubygems/resolver/local_specification.rb +2 -2
  172. data/lib/rubygems/resolver/lock_set.rb +3 -3
  173. data/lib/rubygems/resolver/lock_specification.rb +3 -3
  174. data/lib/rubygems/resolver/molinillo.rb +1 -1
  175. data/lib/rubygems/resolver/specification.rb +1 -1
  176. data/lib/rubygems/resolver/vendor_set.rb +1 -1
  177. data/lib/rubygems/resolver.rb +35 -35
  178. data/lib/rubygems/s3_uri_signer.rb +6 -6
  179. data/lib/rubygems/safe_yaml.rb +2 -2
  180. data/lib/rubygems/security/policies.rb +11 -11
  181. data/lib/rubygems/security/policy.rb +12 -12
  182. data/lib/rubygems/security/signer.rb +4 -4
  183. data/lib/rubygems/security/trust_dir.rb +3 -3
  184. data/lib/rubygems/security.rb +27 -27
  185. data/lib/rubygems/security_option.rb +5 -5
  186. data/lib/rubygems/source/git.rb +17 -17
  187. data/lib/rubygems/source/installed.rb +1 -1
  188. data/lib/rubygems/source/local.rb +2 -2
  189. data/lib/rubygems/source/specific_file.rb +1 -1
  190. data/lib/rubygems/source.rb +15 -15
  191. data/lib/rubygems/spec_fetcher.rb +8 -8
  192. data/lib/rubygems/specification.rb +61 -38
  193. data/lib/rubygems/specification_policy.rb +13 -13
  194. data/lib/rubygems/stub_specification.rb +5 -5
  195. data/lib/rubygems/tsort.rb +1 -1
  196. data/lib/rubygems/uninstaller.rb +14 -14
  197. data/lib/rubygems/uri.rb +4 -4
  198. data/lib/rubygems/uri_formatter.rb +1 -1
  199. data/lib/rubygems/user_interaction.rb +31 -17
  200. data/lib/rubygems/util/licenses.rb +3 -3
  201. data/lib/rubygems/util.rb +10 -10
  202. data/lib/rubygems/validator.rb +5 -5
  203. data/lib/rubygems/version.rb +3 -5
  204. data/lib/rubygems/version_option.rb +3 -3
  205. data/lib/rubygems.rb +61 -59
  206. data/rubygems-update.gemspec +2 -2
  207. data/setup.rb +9 -9
  208. data/test/rubygems/helper.rb +133 -127
  209. data/test/rubygems/installer_test_case.rb +13 -13
  210. data/test/rubygems/package/tar_test_case.rb +2 -2
  211. data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
  212. data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
  213. data/test/rubygems/rubygems_plugin.rb +2 -2
  214. data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -4
  215. data/test/rubygems/test_bundled_ca.rb +10 -10
  216. data/test/rubygems/test_config.rb +3 -3
  217. data/test/rubygems/test_deprecate.rb +3 -3
  218. data/test/rubygems/test_exit.rb +2 -2
  219. data/test/rubygems/test_gem.rb +342 -342
  220. data/test/rubygems/test_gem_available_set.rb +21 -21
  221. data/test/rubygems/test_gem_bundler_version_finder.rb +1 -1
  222. data/test/rubygems/test_gem_command.rb +44 -44
  223. data/test/rubygems/test_gem_command_manager.rb +29 -29
  224. data/test/rubygems/test_gem_commands_build_command.rb +63 -63
  225. data/test/rubygems/test_gem_commands_cert_command.rb +97 -99
  226. data/test/rubygems/test_gem_commands_check_command.rb +4 -4
  227. data/test/rubygems/test_gem_commands_cleanup_command.rb +40 -40
  228. data/test/rubygems/test_gem_commands_contents_command.rb +27 -27
  229. data/test/rubygems/test_gem_commands_dependency_command.rb +36 -36
  230. data/test/rubygems/test_gem_commands_environment_command.rb +38 -14
  231. data/test/rubygems/test_gem_commands_fetch_command.rb +37 -37
  232. data/test/rubygems/test_gem_commands_generate_index_command.rb +7 -7
  233. data/test/rubygems/test_gem_commands_help_command.rb +13 -13
  234. data/test/rubygems/test_gem_commands_info_command.rb +2 -2
  235. data/test/rubygems/test_gem_commands_install_command.rb +131 -131
  236. data/test/rubygems/test_gem_commands_list_command.rb +4 -4
  237. data/test/rubygems/test_gem_commands_lock_command.rb +10 -10
  238. data/test/rubygems/test_gem_commands_mirror.rb +2 -2
  239. data/test/rubygems/test_gem_commands_open_command.rb +4 -4
  240. data/test/rubygems/test_gem_commands_outdated_command.rb +9 -9
  241. data/test/rubygems/test_gem_commands_owner_command.rb +41 -41
  242. data/test/rubygems/test_gem_commands_pristine_command.rb +93 -92
  243. data/test/rubygems/test_gem_commands_push_command.rb +54 -54
  244. data/test/rubygems/test_gem_commands_query_command.rb +73 -73
  245. data/test/rubygems/test_gem_commands_search_command.rb +2 -2
  246. data/test/rubygems/test_gem_commands_server_command.rb +2 -2
  247. data/test/rubygems/test_gem_commands_setup_command.rb +119 -85
  248. data/test/rubygems/test_gem_commands_signin_command.rb +45 -31
  249. data/test/rubygems/test_gem_commands_signout_command.rb +3 -3
  250. data/test/rubygems/test_gem_commands_sources_command.rb +28 -29
  251. data/test/rubygems/test_gem_commands_specification_command.rb +32 -32
  252. data/test/rubygems/test_gem_commands_stale_command.rb +4 -4
  253. data/test/rubygems/test_gem_commands_uninstall_command.rb +75 -75
  254. data/test/rubygems/test_gem_commands_unpack_command.rb +31 -31
  255. data/test/rubygems/test_gem_commands_update_command.rb +109 -88
  256. data/test/rubygems/test_gem_commands_which_command.rb +6 -6
  257. data/test/rubygems/test_gem_commands_yank_command.rb +40 -40
  258. data/test/rubygems/test_gem_config_file.rb +77 -77
  259. data/test/rubygems/test_gem_dependency.rb +73 -73
  260. data/test/rubygems/test_gem_dependency_installer.rb +165 -165
  261. data/test/rubygems/test_gem_dependency_list.rb +47 -47
  262. data/test/rubygems/test_gem_dependency_resolution_error.rb +4 -4
  263. data/test/rubygems/test_gem_doctor.rb +26 -26
  264. data/test/rubygems/test_gem_ext_builder.rb +59 -59
  265. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock +22 -165
  266. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml +2 -1
  267. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb +10 -10
  268. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +1 -1
  269. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/src/lib.rs +0 -3
  270. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +22 -165
  271. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +2 -1
  272. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb +8 -8
  273. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +0 -3
  274. data/test/rubygems/test_gem_ext_cargo_builder.rb +26 -26
  275. data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +3 -3
  276. data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +23 -23
  277. data/test/rubygems/test_gem_ext_cmake_builder.rb +15 -15
  278. data/test/rubygems/test_gem_ext_configure_builder.rb +13 -13
  279. data/test/rubygems/test_gem_ext_ext_conf_builder.rb +51 -52
  280. data/test/rubygems/test_gem_ext_rake_builder.rb +15 -15
  281. data/test/rubygems/test_gem_gem_runner.rb +7 -7
  282. data/test/rubygems/test_gem_gemcutter_utilities.rb +66 -66
  283. data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -4
  284. data/test/rubygems/test_gem_indexer.rb +52 -48
  285. data/test/rubygems/test_gem_install_update_options.rb +16 -16
  286. data/test/rubygems/test_gem_installer.rb +297 -297
  287. data/test/rubygems/test_gem_local_remote_options.rb +10 -10
  288. data/test/rubygems/test_gem_name_tuple.rb +4 -4
  289. data/test/rubygems/test_gem_package.rb +207 -209
  290. data/test/rubygems/test_gem_package_old.rb +13 -13
  291. data/test/rubygems/test_gem_package_tar_header.rb +42 -42
  292. data/test/rubygems/test_gem_package_tar_reader.rb +7 -7
  293. data/test/rubygems/test_gem_package_tar_reader_entry.rb +10 -10
  294. data/test/rubygems/test_gem_package_tar_writer.rb +76 -76
  295. data/test/rubygems/test_gem_package_task.rb +18 -18
  296. data/test/rubygems/test_gem_path_support.rb +14 -14
  297. data/test/rubygems/test_gem_platform.rb +230 -214
  298. data/test/rubygems/test_gem_rdoc.rb +14 -14
  299. data/test/rubygems/test_gem_remote_fetcher.rb +149 -149
  300. data/test/rubygems/test_gem_request.rb +55 -55
  301. data/test/rubygems/test_gem_request_connection_pools.rb +29 -29
  302. data/test/rubygems/test_gem_request_set.rb +99 -99
  303. data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +204 -206
  304. data/test/rubygems/test_gem_request_set_lockfile.rb +86 -86
  305. data/test/rubygems/test_gem_request_set_lockfile_parser.rb +56 -56
  306. data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +62 -62
  307. data/test/rubygems/test_gem_requirement.rb +38 -38
  308. data/test/rubygems/test_gem_resolver.rb +98 -98
  309. data/test/rubygems/test_gem_resolver_activation_request.rb +6 -6
  310. data/test/rubygems/test_gem_resolver_api_set.rb +33 -33
  311. data/test/rubygems/test_gem_resolver_api_specification.rb +47 -47
  312. data/test/rubygems/test_gem_resolver_best_set.rb +22 -22
  313. data/test/rubygems/test_gem_resolver_composed_set.rb +1 -1
  314. data/test/rubygems/test_gem_resolver_conflict.rb +12 -12
  315. data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -15
  316. data/test/rubygems/test_gem_resolver_git_set.rb +21 -21
  317. data/test/rubygems/test_gem_resolver_git_specification.rb +21 -21
  318. data/test/rubygems/test_gem_resolver_index_set.rb +12 -12
  319. data/test/rubygems/test_gem_resolver_index_specification.rb +15 -15
  320. data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -5
  321. data/test/rubygems/test_gem_resolver_installer_set.rb +34 -34
  322. data/test/rubygems/test_gem_resolver_local_specification.rb +7 -7
  323. data/test/rubygems/test_gem_resolver_lock_set.rb +12 -12
  324. data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -17
  325. data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -1
  326. data/test/rubygems/test_gem_resolver_specification.rb +8 -8
  327. data/test/rubygems/test_gem_resolver_vendor_set.rb +6 -6
  328. data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -10
  329. data/test/rubygems/test_gem_security.rb +67 -67
  330. data/test/rubygems/test_gem_security_policy.rb +62 -62
  331. data/test/rubygems/test_gem_security_signer.rb +28 -28
  332. data/test/rubygems/test_gem_security_trust_dir.rb +4 -4
  333. data/test/rubygems/test_gem_silent_ui.rb +38 -32
  334. data/test/rubygems/test_gem_source.rb +44 -44
  335. data/test/rubygems/test_gem_source_fetch_problem.rb +9 -9
  336. data/test/rubygems/test_gem_source_git.rb +59 -59
  337. data/test/rubygems/test_gem_source_installed.rb +16 -16
  338. data/test/rubygems/test_gem_source_list.rb +5 -5
  339. data/test/rubygems/test_gem_source_local.rb +14 -14
  340. data/test/rubygems/test_gem_source_lock.rb +31 -31
  341. data/test/rubygems/test_gem_source_specific_file.rb +17 -17
  342. data/test/rubygems/test_gem_source_subpath_problem.rb +7 -7
  343. data/test/rubygems/test_gem_source_vendor.rb +13 -13
  344. data/test/rubygems/test_gem_spec_fetcher.rb +72 -72
  345. data/test/rubygems/test_gem_specification.rb +436 -435
  346. data/test/rubygems/test_gem_stream_ui.rb +19 -19
  347. data/test/rubygems/test_gem_stub_specification.rb +32 -32
  348. data/test/rubygems/test_gem_text.rb +1 -1
  349. data/test/rubygems/test_gem_uninstaller.rb +112 -112
  350. data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -3
  351. data/test/rubygems/test_gem_uri.rb +4 -4
  352. data/test/rubygems/test_gem_uri_formatter.rb +14 -14
  353. data/test/rubygems/test_gem_util.rb +23 -23
  354. data/test/rubygems/test_gem_validator.rb +8 -8
  355. data/test/rubygems/test_gem_version.rb +13 -13
  356. data/test/rubygems/test_gem_version_option.rb +15 -15
  357. data/test/rubygems/test_kernel.rb +31 -31
  358. data/test/rubygems/test_project_sanity.rb +1 -1
  359. data/test/rubygems/test_remote_fetch_error.rb +6 -6
  360. data/test/rubygems/test_require.rb +42 -42
  361. data/test/rubygems/test_rubygems.rb +17 -14
  362. data/test/rubygems/utilities.rb +17 -17
  363. metadata +4 -3
data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock CHANGED
@@ -11,47 +11,23 @@ dependencies = [
11
11
  "memchr",
12
12
  ]
13
13
 
14
- [[package]]
15
- name = "ansi_term"
16
- version = "0.12.1"
17
- source = "registry+https://github.com/rust-lang/crates.io-index"
18
- checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
19
- dependencies = [
20
- "winapi",
21
- ]
22
-
23
- [[package]]
24
- name = "atty"
25
- version = "0.2.14"
26
- source = "registry+https://github.com/rust-lang/crates.io-index"
27
- checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
28
- dependencies = [
29
- "hermit-abi",
30
- "libc",
31
- "winapi",
32
- ]
33
-
34
14
  [[package]]
35
15
  name = "bindgen"
36
- version = "0.59.2"
16
+ version = "0.60.1"
37
17
  source = "registry+https://github.com/rust-lang/crates.io-index"
38
- checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
18
+ checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
39
19
  dependencies = [
40
20
  "bitflags",
41
21
  "cexpr",
42
22
  "clang-sys",
43
- "clap",
44
- "env_logger",
45
23
  "lazy_static",
46
24
  "lazycell",
47
- "log",
48
25
  "peeking_take_while",
49
26
  "proc-macro2",
50
27
  "quote",
51
28
  "regex",
52
29
  "rustc-hash",
53
30
  "shlex",
54
- "which",
55
31
  ]
56
32
 
57
33
  [[package]]
@@ -60,12 +36,6 @@ version = "1.3.2"
60
36
  source = "registry+https://github.com/rust-lang/crates.io-index"
61
37
  checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
62
38
 
63
- [[package]]
64
- name = "cc"
65
- version = "1.0.73"
66
- source = "registry+https://github.com/rust-lang/crates.io-index"
67
- checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
68
-
69
39
  [[package]]
70
40
  name = "cexpr"
71
41
  version = "0.6.0"
@@ -92,21 +62,6 @@ dependencies = [
92
62
  "libloading",
93
63
  ]
94
64
 
95
- [[package]]
96
- name = "clap"
97
- version = "2.34.0"
98
- source = "registry+https://github.com/rust-lang/crates.io-index"
99
- checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
100
- dependencies = [
101
- "ansi_term",
102
- "atty",
103
- "bitflags",
104
- "strsim",
105
- "textwrap",
106
- "unicode-width",
107
- "vec_map",
108
- ]
109
-
110
65
  [[package]]
111
66
  name = "custom-name-ext"
112
67
  version = "0.1.0"
@@ -114,46 +69,12 @@ dependencies = [
114
69
  "rb-sys",
115
70
  ]
116
71
 
117
- [[package]]
118
- name = "either"
119
- version = "1.6.1"
120
- source = "registry+https://github.com/rust-lang/crates.io-index"
121
- checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
122
-
123
- [[package]]
124
- name = "env_logger"
125
- version = "0.9.0"
126
- source = "registry+https://github.com/rust-lang/crates.io-index"
127
- checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
128
- dependencies = [
129
- "atty",
130
- "humantime",
131
- "log",
132
- "regex",
133
- "termcolor",
134
- ]
135
-
136
72
  [[package]]
137
73
  name = "glob"
138
74
  version = "0.3.0"
139
75
  source = "registry+https://github.com/rust-lang/crates.io-index"
140
76
  checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
141
77
 
142
- [[package]]
143
- name = "hermit-abi"
144
- version = "0.1.19"
145
- source = "registry+https://github.com/rust-lang/crates.io-index"
146
- checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
147
- dependencies = [
148
- "libc",
149
- ]
150
-
151
- [[package]]
152
- name = "humantime"
153
- version = "2.1.0"
154
- source = "registry+https://github.com/rust-lang/crates.io-index"
155
- checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
156
-
157
78
  [[package]]
158
79
  name = "lazy_static"
159
80
  version = "1.4.0"
@@ -184,22 +105,13 @@ dependencies = [
184
105
 
185
106
  [[package]]
186
107
  name = "linkify"
187
- version = "0.8.1"
108
+ version = "0.9.0"
188
109
  source = "registry+https://github.com/rust-lang/crates.io-index"
189
- checksum = "28d9967eb7d0bc31c39c6f52e8fce42991c0cd1f7a2078326f0b7a399a584c8d"
110
+ checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5"
190
111
  dependencies = [
191
112
  "memchr",
192
113
  ]
193
114
 
194
- [[package]]
195
- name = "log"
196
- version = "0.4.17"
197
- source = "registry+https://github.com/rust-lang/crates.io-index"
198
- checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
199
- dependencies = [
200
- "cfg-if",
201
- ]
202
-
203
115
  [[package]]
204
116
  name = "memchr"
205
117
  version = "2.5.0"
@@ -228,41 +140,42 @@ version = "0.1.2"
228
140
  source = "registry+https://github.com/rust-lang/crates.io-index"
229
141
  checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
230
142
 
231
- [[package]]
232
- name = "pkg-config"
233
- version = "0.3.25"
234
- source = "registry+https://github.com/rust-lang/crates.io-index"
235
- checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
236
-
237
143
  [[package]]
238
144
  name = "proc-macro2"
239
- version = "1.0.39"
145
+ version = "1.0.40"
240
146
  source = "registry+https://github.com/rust-lang/crates.io-index"
241
- checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
147
+ checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
242
148
  dependencies = [
243
149
  "unicode-ident",
244
150
  ]
245
151
 
246
152
  [[package]]
247
153
  name = "quote"
248
- version = "1.0.18"
154
+ version = "1.0.20"
249
155
  source = "registry+https://github.com/rust-lang/crates.io-index"
250
- checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
156
+ checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
251
157
  dependencies = [
252
158
  "proc-macro2",
253
159
  ]
254
160
 
255
161
  [[package]]
256
162
  name = "rb-sys"
257
- version = "0.9.4"
163
+ version = "0.9.26"
258
164
  source = "registry+https://github.com/rust-lang/crates.io-index"
259
- checksum = "f5465c5bd695ef70959b91b4ca9cfd515e9af012f6d9f0ae46f09fa4bcc3b722"
165
+ checksum = "723f7560e878bec9d1d49538a17fb6a4e3a04688c1dc6f14eef17918634a54e4"
260
166
  dependencies = [
261
167
  "bindgen",
262
- "cc",
263
- "lazy_static",
264
168
  "linkify",
265
- "pkg-config",
169
+ "rb-sys-build",
170
+ ]
171
+
172
+ [[package]]
173
+ name = "rb-sys-build"
174
+ version = "0.9.26"
175
+ source = "registry+https://github.com/rust-lang/crates.io-index"
176
+ checksum = "2ccd93f0d9767385cd7a23076c47e3dca4c86144e510ea4c61d04dbce0cbac7e"
177
+ dependencies = [
178
+ "regex",
266
179
  "shell-words",
267
180
  ]
268
181
 
@@ -301,58 +214,11 @@ version = "1.1.0"
301
214
  source = "registry+https://github.com/rust-lang/crates.io-index"
302
215
  checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
303
216
 
304
- [[package]]
305
- name = "strsim"
306
- version = "0.8.0"
307
- source = "registry+https://github.com/rust-lang/crates.io-index"
308
- checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
309
-
310
- [[package]]
311
- name = "termcolor"
312
- version = "1.1.3"
313
- source = "registry+https://github.com/rust-lang/crates.io-index"
314
- checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
315
- dependencies = [
316
- "winapi-util",
317
- ]
318
-
319
- [[package]]
320
- name = "textwrap"
321
- version = "0.11.0"
322
- source = "registry+https://github.com/rust-lang/crates.io-index"
323
- checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
324
- dependencies = [
325
- "unicode-width",
326
- ]
327
-
328
217
  [[package]]
329
218
  name = "unicode-ident"
330
- version = "1.0.0"
331
- source = "registry+https://github.com/rust-lang/crates.io-index"
332
- checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
333
-
334
- [[package]]
335
- name = "unicode-width"
336
- version = "0.1.9"
337
- source = "registry+https://github.com/rust-lang/crates.io-index"
338
- checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
339
-
340
- [[package]]
341
- name = "vec_map"
342
- version = "0.8.2"
343
- source = "registry+https://github.com/rust-lang/crates.io-index"
344
- checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
345
-
346
- [[package]]
347
- name = "which"
348
- version = "4.2.5"
219
+ version = "1.0.1"
349
220
  source = "registry+https://github.com/rust-lang/crates.io-index"
350
- checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
351
- dependencies = [
352
- "either",
353
- "lazy_static",
354
- "libc",
355
- ]
221
+ checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
356
222
 
357
223
  [[package]]
358
224
  name = "winapi"
@@ -370,15 +236,6 @@ version = "0.4.0"
370
236
  source = "registry+https://github.com/rust-lang/crates.io-index"
371
237
  checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
372
238
 
373
- [[package]]
374
- name = "winapi-util"
375
- version = "0.1.5"
376
- source = "registry+https://github.com/rust-lang/crates.io-index"
377
- checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
378
- dependencies = [
379
- "winapi",
380
- ]
381
-
382
239
  [[package]]
383
240
  name = "winapi-x86_64-pc-windows-gnu"
384
241
  version = "0.4.0"
data/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml CHANGED
@@ -1,9 +1,10 @@
1
1
  [package]
2
2
  name = "custom-name-ext"
3
3
  version = "0.1.0"
4
+ edition = "2021"
4
5
 
5
6
  [lib]
6
7
  crate-type = ["cdylib"]
7
8
 
8
9
  [dependencies]
9
- rb-sys = "0.9.4"
10
+ rb-sys = { version = "0.9.26", features = ["gem"] }
data/test/rubygems/test_gem_ext_cargo_builder/custom_name/build.rb CHANGED
@@ -1,21 +1,21 @@
1
- if ENV['RUBYOPT'] or defined? Gem
2
- ENV.delete 'RUBYOPT'
1
+ if ENV["RUBYOPT"] or defined? Gem
2
+ ENV.delete "RUBYOPT"
3
3
 
4
- require 'rbconfig'
5
- cmd = [RbConfig.ruby, '--disable-gems', 'build.rb', *ARGV]
4
+ require "rbconfig"
5
+ cmd = [RbConfig.ruby, "--disable-gems", "build.rb", *ARGV]
6
6
 
7
7
  exec(*cmd)
8
8
  end
9
9
 
10
- require 'tmpdir'
10
+ require "tmpdir"
11
11
 
12
- lp = File.expand_path('../../../../lib', __dir__)
13
- gem = ["ruby", "-I#{lp}", File.expand_path('../../../../bin/gem', __dir__)]
14
- gemspec = File.expand_path('custom_name.gemspec', __dir__)
12
+ lp = File.expand_path("../../../../lib", __dir__)
13
+ gem = ["ruby", "-I#{lp}", File.expand_path("../../../../bin/gem", __dir__)]
14
+ gemspec = File.expand_path("custom_name.gemspec", __dir__)
15
15
 
16
16
  Dir.mktmpdir("custom_name") do |dir|
17
17
  built_gem = File.expand_path(File.join(dir, "custom_name.gem"))
18
- system *gem, "build", gemspec, "--output", built_gem
19
- system *gem, "install", "--verbose", "--local", built_gem, *ARGV
18
+ system(*gem, "build", gemspec, "--output", built_gem)
19
+ system(*gem, "install", "--verbose", "--local", built_gem, *ARGV)
20
20
  system %q(ruby -rcustom_name -e "puts 'Result: ' + CustomName.say_hello")
21
21
  end
data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec CHANGED
@@ -6,5 +6,5 @@ Gem::Specification.new do |s|
6
6
  s.authors = ["Ian Ker-Seymer"]
7
7
  s.files = ["Cargo.toml", "Cargo.lock", "src/lib.rs"]
8
8
 
9
- s.metadata['cargo_crate_name'] = 'custom-name-ext'
9
+ s.metadata["cargo_crate_name"] = "custom-name-ext"
10
10
  end
data/test/rubygems/test_gem_ext_cargo_builder/custom_name/src/lib.rs CHANGED
@@ -1,11 +1,8 @@
1
- #[macro_use]
2
1
  extern crate rb_sys;
3
2
 
4
3
  use rb_sys::{rb_define_module, rb_define_module_function, rb_utf8_str_new, VALUE};
5
4
  use std::ffi::CString;
6
5
 
7
- ruby_extension!();
8
-
9
6
  #[no_mangle]
10
7
  unsafe extern "C" fn say_hello(_klass: VALUE) -> VALUE {
11
8
  let cstr = CString::new("Hello world!").unwrap();
data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock CHANGED
@@ -11,47 +11,23 @@ dependencies = [
11
11
  "memchr",
12
12
  ]
13
13
 
14
- [[package]]
15
- name = "ansi_term"
16
- version = "0.12.1"
17
- source = "registry+https://github.com/rust-lang/crates.io-index"
18
- checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
19
- dependencies = [
20
- "winapi",
21
- ]
22
-
23
- [[package]]
24
- name = "atty"
25
- version = "0.2.14"
26
- source = "registry+https://github.com/rust-lang/crates.io-index"
27
- checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
28
- dependencies = [
29
- "hermit-abi",
30
- "libc",
31
- "winapi",
32
- ]
33
-
34
14
  [[package]]
35
15
  name = "bindgen"
36
- version = "0.59.2"
16
+ version = "0.60.1"
37
17
  source = "registry+https://github.com/rust-lang/crates.io-index"
38
- checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
18
+ checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
39
19
  dependencies = [
40
20
  "bitflags",
41
21
  "cexpr",
42
22
  "clang-sys",
43
- "clap",
44
- "env_logger",
45
23
  "lazy_static",
46
24
  "lazycell",
47
- "log",
48
25
  "peeking_take_while",
49
26
  "proc-macro2",
50
27
  "quote",
51
28
  "regex",
52
29
  "rustc-hash",
53
30
  "shlex",
54
- "which",
55
31
  ]
56
32
 
57
33
  [[package]]
@@ -60,12 +36,6 @@ version = "1.3.2"
60
36
  source = "registry+https://github.com/rust-lang/crates.io-index"
61
37
  checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
62
38
 
63
- [[package]]
64
- name = "cc"
65
- version = "1.0.73"
66
- source = "registry+https://github.com/rust-lang/crates.io-index"
67
- checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
68
-
69
39
  [[package]]
70
40
  name = "cexpr"
71
41
  version = "0.6.0"
@@ -92,61 +62,12 @@ dependencies = [
92
62
  "libloading",
93
63
  ]
94
64
 
95
- [[package]]
96
- name = "clap"
97
- version = "2.34.0"
98
- source = "registry+https://github.com/rust-lang/crates.io-index"
99
- checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
100
- dependencies = [
101
- "ansi_term",
102
- "atty",
103
- "bitflags",
104
- "strsim",
105
- "textwrap",
106
- "unicode-width",
107
- "vec_map",
108
- ]
109
-
110
- [[package]]
111
- name = "either"
112
- version = "1.6.1"
113
- source = "registry+https://github.com/rust-lang/crates.io-index"
114
- checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
115
-
116
- [[package]]
117
- name = "env_logger"
118
- version = "0.9.0"
119
- source = "registry+https://github.com/rust-lang/crates.io-index"
120
- checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
121
- dependencies = [
122
- "atty",
123
- "humantime",
124
- "log",
125
- "regex",
126
- "termcolor",
127
- ]
128
-
129
65
  [[package]]
130
66
  name = "glob"
131
67
  version = "0.3.0"
132
68
  source = "registry+https://github.com/rust-lang/crates.io-index"
133
69
  checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
134
70
 
135
- [[package]]
136
- name = "hermit-abi"
137
- version = "0.1.19"
138
- source = "registry+https://github.com/rust-lang/crates.io-index"
139
- checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
140
- dependencies = [
141
- "libc",
142
- ]
143
-
144
- [[package]]
145
- name = "humantime"
146
- version = "2.1.0"
147
- source = "registry+https://github.com/rust-lang/crates.io-index"
148
- checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
149
-
150
71
  [[package]]
151
72
  name = "lazy_static"
152
73
  version = "1.4.0"
@@ -177,22 +98,13 @@ dependencies = [
177
98
 
178
99
  [[package]]
179
100
  name = "linkify"
180
- version = "0.8.1"
101
+ version = "0.9.0"
181
102
  source = "registry+https://github.com/rust-lang/crates.io-index"
182
- checksum = "28d9967eb7d0bc31c39c6f52e8fce42991c0cd1f7a2078326f0b7a399a584c8d"
103
+ checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5"
183
104
  dependencies = [
184
105
  "memchr",
185
106
  ]
186
107
 
187
- [[package]]
188
- name = "log"
189
- version = "0.4.17"
190
- source = "registry+https://github.com/rust-lang/crates.io-index"
191
- checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
192
- dependencies = [
193
- "cfg-if",
194
- ]
195
-
196
108
  [[package]]
197
109
  name = "memchr"
198
110
  version = "2.5.0"
@@ -221,41 +133,42 @@ version = "0.1.2"
221
133
  source = "registry+https://github.com/rust-lang/crates.io-index"
222
134
  checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
223
135
 
224
- [[package]]
225
- name = "pkg-config"
226
- version = "0.3.25"
227
- source = "registry+https://github.com/rust-lang/crates.io-index"
228
- checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
229
-
230
136
  [[package]]
231
137
  name = "proc-macro2"
232
- version = "1.0.39"
138
+ version = "1.0.40"
233
139
  source = "registry+https://github.com/rust-lang/crates.io-index"
234
- checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
140
+ checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
235
141
  dependencies = [
236
142
  "unicode-ident",
237
143
  ]
238
144
 
239
145
  [[package]]
240
146
  name = "quote"
241
- version = "1.0.18"
147
+ version = "1.0.20"
242
148
  source = "registry+https://github.com/rust-lang/crates.io-index"
243
- checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
149
+ checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
244
150
  dependencies = [
245
151
  "proc-macro2",
246
152
  ]
247
153
 
248
154
  [[package]]
249
155
  name = "rb-sys"
250
- version = "0.9.4"
156
+ version = "0.9.26"
251
157
  source = "registry+https://github.com/rust-lang/crates.io-index"
252
- checksum = "f5465c5bd695ef70959b91b4ca9cfd515e9af012f6d9f0ae46f09fa4bcc3b722"
158
+ checksum = "723f7560e878bec9d1d49538a17fb6a4e3a04688c1dc6f14eef17918634a54e4"
253
159
  dependencies = [
254
160
  "bindgen",
255
- "cc",
256
- "lazy_static",
257
161
  "linkify",
258
- "pkg-config",
162
+ "rb-sys-build",
163
+ ]
164
+
165
+ [[package]]
166
+ name = "rb-sys-build"
167
+ version = "0.9.26"
168
+ source = "registry+https://github.com/rust-lang/crates.io-index"
169
+ checksum = "2ccd93f0d9767385cd7a23076c47e3dca4c86144e510ea4c61d04dbce0cbac7e"
170
+ dependencies = [
171
+ "regex",
259
172
  "shell-words",
260
173
  ]
261
174
 
@@ -301,58 +214,11 @@ version = "1.1.0"
301
214
  source = "registry+https://github.com/rust-lang/crates.io-index"
302
215
  checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
303
216
 
304
- [[package]]
305
- name = "strsim"
306
- version = "0.8.0"
307
- source = "registry+https://github.com/rust-lang/crates.io-index"
308
- checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
309
-
310
- [[package]]
311
- name = "termcolor"
312
- version = "1.1.3"
313
- source = "registry+https://github.com/rust-lang/crates.io-index"
314
- checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
315
- dependencies = [
316
- "winapi-util",
317
- ]
318
-
319
- [[package]]
320
- name = "textwrap"
321
- version = "0.11.0"
322
- source = "registry+https://github.com/rust-lang/crates.io-index"
323
- checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
324
- dependencies = [
325
- "unicode-width",
326
- ]
327
-
328
217
  [[package]]
329
218
  name = "unicode-ident"
330
- version = "1.0.0"
331
- source = "registry+https://github.com/rust-lang/crates.io-index"
332
- checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
333
-
334
- [[package]]
335
- name = "unicode-width"
336
- version = "0.1.9"
337
- source = "registry+https://github.com/rust-lang/crates.io-index"
338
- checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
339
-
340
- [[package]]
341
- name = "vec_map"
342
- version = "0.8.2"
343
- source = "registry+https://github.com/rust-lang/crates.io-index"
344
- checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
345
-
346
- [[package]]
347
- name = "which"
348
- version = "4.2.5"
219
+ version = "1.0.1"
349
220
  source = "registry+https://github.com/rust-lang/crates.io-index"
350
- checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
351
- dependencies = [
352
- "either",
353
- "lazy_static",
354
- "libc",
355
- ]
221
+ checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
356
222
 
357
223
  [[package]]
358
224
  name = "winapi"
@@ -370,15 +236,6 @@ version = "0.4.0"
370
236
  source = "registry+https://github.com/rust-lang/crates.io-index"
371
237
  checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
372
238
 
373
- [[package]]
374
- name = "winapi-util"
375
- version = "0.1.5"
376
- source = "registry+https://github.com/rust-lang/crates.io-index"
377
- checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
378
- dependencies = [
379
- "winapi",
380
- ]
381
-
382
239
  [[package]]
383
240
  name = "winapi-x86_64-pc-windows-gnu"
384
241
  version = "0.4.0"
data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml CHANGED
@@ -1,9 +1,10 @@
1
1
  [package]
2
2
  name = "rust_ruby_example"
3
3
  version = "0.1.0"
4
+ edition = "2021"
4
5
 
5
6
  [lib]
6
7
  crate-type = ["cdylib"]
7
8
 
8
9
  [dependencies]
9
- rb-sys = "0.9.4"
10
+ rb-sys = { version = "0.9.26", features = ["gem"] }
data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/build.rb CHANGED
@@ -1,17 +1,17 @@
1
- if ENV['RUBYOPT'] or defined? Gem
2
- ENV.delete 'RUBYOPT'
1
+ if ENV["RUBYOPT"] or defined? Gem
2
+ ENV.delete "RUBYOPT"
3
3
 
4
- require 'rbconfig'
5
- cmd = [RbConfig.ruby, '--disable-gems', 'build.rb', *ARGV]
4
+ require "rbconfig"
5
+ cmd = [RbConfig.ruby, "--disable-gems", "build.rb", *ARGV]
6
6
 
7
7
  exec(*cmd)
8
8
  end
9
9
 
10
- require 'tmpdir'
10
+ require "tmpdir"
11
11
 
12
- lp = File.expand_path('../../../../lib', __dir__)
13
- gem = ["ruby", "-I#{lp}", File.expand_path('../../../../bin/gem', __dir__)]
14
- gemspec = File.expand_path('rust_ruby_example.gemspec', __dir__)
12
+ lp = File.expand_path("../../../../lib", __dir__)
13
+ gem = ["ruby", "-I#{lp}", File.expand_path("../../../../bin/gem", __dir__)]
14
+ gemspec = File.expand_path("rust_ruby_example.gemspec", __dir__)
15
15
 
16
16
  Dir.mktmpdir("rust_ruby_example") do |dir|
17
17
  built_gem = File.expand_path(File.join(dir, "rust_ruby_example.gem"))
data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs CHANGED
@@ -1,4 +1,3 @@
1
- #[macro_use]
2
1
  extern crate rb_sys;
3
2
 
4
3
  use rb_sys::{
@@ -7,8 +6,6 @@ use rb_sys::{
7
6
  use std::ffi::{CStr, CString};
8
7
  use std::os::raw::{c_char, c_long};
9
8
 
10
- ruby_extension!();
11
-
12
9
  #[inline]
13
10
  unsafe fn cstr_to_string(str: *const c_char) -> String {
14
11
  CStr::from_ptr(str).to_string_lossy().into_owned()