rubygems-update 3.3.7 → 3.4.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (600) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1419 -1036
  3. data/CONTRIBUTING.md +30 -7
  4. data/Manifest.txt +63 -31
  5. data/POLICIES.md +53 -18
  6. data/README.md +3 -6
  7. data/bin/gem +2 -5
  8. data/bin/update_rubygems +5 -5
  9. data/bundler/CHANGELOG.md +457 -1
  10. data/bundler/README.md +3 -6
  11. data/bundler/UPGRADING.md +11 -4
  12. data/bundler/bundler.gemspec +8 -10
  13. data/bundler/exe/bundle +2 -5
  14. data/bundler/exe/bundler +1 -1
  15. data/bundler/lib/bundler/build_metadata.rb +3 -3
  16. data/bundler/lib/bundler/cli/add.rb +1 -1
  17. data/bundler/lib/bundler/cli/binstubs.rb +5 -1
  18. data/bundler/lib/bundler/cli/check.rb +1 -1
  19. data/bundler/lib/bundler/cli/common.rb +4 -2
  20. data/bundler/lib/bundler/cli/console.rb +2 -2
  21. data/bundler/lib/bundler/cli/doctor.rb +4 -6
  22. data/bundler/lib/bundler/cli/gem.rb +62 -40
  23. data/bundler/lib/bundler/cli/info.rb +1 -1
  24. data/bundler/lib/bundler/cli/init.rb +6 -2
  25. data/bundler/lib/bundler/cli/install.rb +7 -5
  26. data/bundler/lib/bundler/cli/lock.rb +8 -5
  27. data/bundler/lib/bundler/cli/open.rb +6 -4
  28. data/bundler/lib/bundler/cli/outdated.rb +13 -6
  29. data/bundler/lib/bundler/cli/platform.rb +1 -1
  30. data/bundler/lib/bundler/cli/show.rb +1 -1
  31. data/bundler/lib/bundler/cli/viz.rb +1 -1
  32. data/bundler/lib/bundler/cli.rb +55 -10
  33. data/bundler/lib/bundler/compact_index_client/cache.rb +1 -1
  34. data/bundler/lib/bundler/compact_index_client/updater.rb +53 -39
  35. data/bundler/lib/bundler/constants.rb +1 -1
  36. data/bundler/lib/bundler/current_ruby.rb +18 -6
  37. data/bundler/lib/bundler/definition.rb +206 -129
  38. data/bundler/lib/bundler/dependency.rb +21 -66
  39. data/bundler/lib/bundler/digest.rb +1 -1
  40. data/bundler/lib/bundler/dsl.rb +13 -18
  41. data/bundler/lib/bundler/endpoint_specification.rb +6 -10
  42. data/bundler/lib/bundler/env.rb +1 -1
  43. data/bundler/lib/bundler/environment_preserver.rb +3 -2
  44. data/bundler/lib/bundler/errors.rb +15 -15
  45. data/bundler/lib/bundler/feature_flag.rb +0 -1
  46. data/bundler/lib/bundler/fetcher/base.rb +6 -8
  47. data/bundler/lib/bundler/fetcher/compact_index.rb +9 -11
  48. data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
  49. data/bundler/lib/bundler/fetcher/downloader.rb +2 -5
  50. data/bundler/lib/bundler/fetcher.rb +15 -14
  51. data/bundler/lib/bundler/force_platform.rb +18 -0
  52. data/bundler/lib/bundler/friendly_errors.rb +21 -7
  53. data/bundler/lib/bundler/gem_helpers.rb +9 -2
  54. data/bundler/lib/bundler/gem_version_promoter.rb +53 -98
  55. data/bundler/lib/bundler/graph.rb +3 -3
  56. data/bundler/lib/bundler/index.rb +13 -51
  57. data/bundler/lib/bundler/injector.rb +9 -4
  58. data/bundler/lib/bundler/inline.rb +9 -21
  59. data/bundler/lib/bundler/installer/gem_installer.rb +14 -1
  60. data/bundler/lib/bundler/installer/parallel_installer.rb +3 -33
  61. data/bundler/lib/bundler/installer/standalone.rb +42 -11
  62. data/bundler/lib/bundler/installer.rb +20 -41
  63. data/bundler/lib/bundler/lazy_specification.rb +53 -48
  64. data/bundler/lib/bundler/lockfile_generator.rb +2 -2
  65. data/bundler/lib/bundler/lockfile_parser.rb +18 -14
  66. data/bundler/lib/bundler/man/bundle-add.1 +13 -5
  67. data/bundler/lib/bundler/man/bundle-add.1.ronn +10 -4
  68. data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
  69. data/bundler/lib/bundler/man/bundle-cache.1 +7 -1
  70. data/bundler/lib/bundler/man/bundle-cache.1.ronn +7 -0
  71. data/bundler/lib/bundler/man/bundle-check.1 +1 -1
  72. data/bundler/lib/bundler/man/bundle-clean.1 +2 -2
  73. data/bundler/lib/bundler/man/bundle-clean.1.ronn +1 -1
  74. data/bundler/lib/bundler/man/bundle-config.1 +30 -11
  75. data/bundler/lib/bundler/man/bundle-config.1.ronn +26 -14
  76. data/bundler/lib/bundler/man/bundle-console.1 +53 -0
  77. data/bundler/lib/bundler/man/bundle-console.1.ronn +44 -0
  78. data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
  79. data/bundler/lib/bundler/man/bundle-exec.1 +6 -6
  80. data/bundler/lib/bundler/man/bundle-exec.1.ronn +6 -6
  81. data/bundler/lib/bundler/man/bundle-gem.1 +27 -37
  82. data/bundler/lib/bundler/man/bundle-gem.1.ronn +5 -5
  83. data/bundler/lib/bundler/man/bundle-help.1 +13 -0
  84. data/bundler/lib/bundler/man/bundle-help.1.ronn +12 -0
  85. data/bundler/lib/bundler/man/bundle-info.1 +1 -1
  86. data/bundler/lib/bundler/man/bundle-init.1 +5 -1
  87. data/bundler/lib/bundler/man/bundle-init.1.ronn +2 -0
  88. data/bundler/lib/bundler/man/bundle-inject.1 +5 -2
  89. data/bundler/lib/bundler/man/bundle-inject.1.ronn +3 -1
  90. data/bundler/lib/bundler/man/bundle-install.1 +5 -30
  91. data/bundler/lib/bundler/man/bundle-install.1.ronn +6 -29
  92. data/bundler/lib/bundler/man/bundle-list.1 +1 -1
  93. data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
  94. data/bundler/lib/bundler/man/bundle-open.1 +22 -2
  95. data/bundler/lib/bundler/man/bundle-open.1.ronn +9 -1
  96. data/bundler/lib/bundler/man/bundle-outdated.1 +3 -10
  97. data/bundler/lib/bundler/man/bundle-outdated.1.ronn +1 -10
  98. data/bundler/lib/bundler/man/bundle-platform.1 +16 -6
  99. data/bundler/lib/bundler/man/bundle-platform.1.ronn +14 -7
  100. data/bundler/lib/bundler/man/bundle-plugin.1 +81 -0
  101. data/bundler/lib/bundler/man/bundle-plugin.1.ronn +59 -0
  102. data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
  103. data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
  104. data/bundler/lib/bundler/man/bundle-show.1 +1 -1
  105. data/bundler/lib/bundler/man/bundle-update.1 +1 -1
  106. data/bundler/lib/bundler/man/bundle-version.1 +35 -0
  107. data/bundler/lib/bundler/man/bundle-version.1.ronn +24 -0
  108. data/bundler/lib/bundler/man/bundle-viz.1 +4 -1
  109. data/bundler/lib/bundler/man/bundle-viz.1.ronn +2 -0
  110. data/bundler/lib/bundler/man/bundle.1 +15 -10
  111. data/bundler/lib/bundler/man/bundle.1.ronn +12 -7
  112. data/bundler/lib/bundler/man/gemfile.5 +92 -81
  113. data/bundler/lib/bundler/man/gemfile.5.ronn +98 -85
  114. data/bundler/lib/bundler/man/index.txt +4 -0
  115. data/bundler/lib/bundler/match_metadata.rb +13 -0
  116. data/bundler/lib/bundler/match_platform.rb +0 -1
  117. data/bundler/lib/bundler/match_remote_metadata.rb +29 -0
  118. data/bundler/lib/bundler/mirror.rb +5 -7
  119. data/bundler/lib/bundler/plugin/api/source.rb +3 -9
  120. data/bundler/lib/bundler/plugin/index.rb +4 -4
  121. data/bundler/lib/bundler/plugin/installer/git.rb +0 -4
  122. data/bundler/lib/bundler/plugin/installer/rubygems.rb +0 -8
  123. data/bundler/lib/bundler/plugin.rb +3 -1
  124. data/bundler/lib/bundler/process_lock.rb +1 -1
  125. data/bundler/lib/bundler/remote_specification.rb +8 -9
  126. data/bundler/lib/bundler/resolver/base.rb +77 -0
  127. data/bundler/lib/bundler/resolver/candidate.rb +94 -0
  128. data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
  129. data/bundler/lib/bundler/resolver/package.rb +72 -0
  130. data/bundler/lib/bundler/resolver/root.rb +25 -0
  131. data/bundler/lib/bundler/resolver/spec_group.rb +42 -70
  132. data/bundler/lib/bundler/resolver.rb +328 -299
  133. data/bundler/lib/bundler/ruby_dsl.rb +1 -1
  134. data/bundler/lib/bundler/ruby_version.rb +5 -18
  135. data/bundler/lib/bundler/rubygems_ext.rb +131 -17
  136. data/bundler/lib/bundler/rubygems_gem_installer.rb +32 -20
  137. data/bundler/lib/bundler/rubygems_integration.rb +13 -35
  138. data/bundler/lib/bundler/runtime.rb +1 -6
  139. data/bundler/lib/bundler/settings.rb +2 -8
  140. data/bundler/lib/bundler/setup.rb +4 -1
  141. data/bundler/lib/bundler/shared_helpers.rb +12 -12
  142. data/bundler/lib/bundler/source/git/git_proxy.rb +209 -69
  143. data/bundler/lib/bundler/source/git.rb +22 -25
  144. data/bundler/lib/bundler/source/metadata.rb +2 -3
  145. data/bundler/lib/bundler/source/path/installer.rb +1 -22
  146. data/bundler/lib/bundler/source/path.rb +7 -7
  147. data/bundler/lib/bundler/source/rubygems.rb +75 -117
  148. data/bundler/lib/bundler/source.rb +3 -4
  149. data/bundler/lib/bundler/source_list.rb +12 -2
  150. data/bundler/lib/bundler/source_map.rb +15 -2
  151. data/bundler/lib/bundler/spec_set.rb +58 -34
  152. data/bundler/lib/bundler/stub_specification.rb +5 -3
  153. data/bundler/lib/bundler/templates/Executable +3 -5
  154. data/bundler/lib/bundler/templates/Executable.bundler +6 -11
  155. data/bundler/lib/bundler/templates/Executable.standalone +4 -4
  156. data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
  157. data/bundler/lib/bundler/templates/newgem/Gemfile.tt +3 -0
  158. data/bundler/lib/bundler/templates/newgem/README.md.tt +7 -11
  159. data/bundler/lib/bundler/templates/newgem/Rakefile.tt +2 -1
  160. data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
  161. data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
  162. data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
  163. data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
  164. data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +11 -1
  165. data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
  166. data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
  167. data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +9 -3
  168. data/bundler/lib/bundler/ui/shell.rb +35 -12
  169. data/bundler/lib/bundler/ui/silent.rb +21 -5
  170. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +3 -3
  171. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +0 -1
  172. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +3 -1
  173. data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
  174. data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +1 -1
  175. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +1 -1
  176. data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
  177. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
  178. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
  179. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
  180. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +155 -0
  181. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
  182. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
  183. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
  184. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
  185. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
  186. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
  187. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
  188. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
  189. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
  190. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +243 -0
  191. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
  192. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
  193. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +1 -1
  194. data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +318 -319
  195. data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +64 -16
  196. data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
  197. data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -1
  198. data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +27 -7
  199. data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -2
  200. data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -1
  201. data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +1 -1
  202. data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
  203. data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -2
  204. data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +13 -7
  205. data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +10 -5
  206. data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
  207. data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +1 -2
  208. data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +2 -1
  209. data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -2
  210. data/bundler/lib/bundler/vendored_persistent.rb +1 -33
  211. data/bundler/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb} +1 -1
  212. data/bundler/lib/bundler/version.rb +5 -1
  213. data/bundler/lib/bundler/worker.rb +5 -7
  214. data/bundler/lib/bundler.rb +39 -73
  215. data/lib/rubygems/available_set.rb +3 -3
  216. data/lib/rubygems/basic_specification.rb +4 -4
  217. data/lib/rubygems/bundler_version_finder.rb +1 -1
  218. data/lib/rubygems/command.rb +40 -32
  219. data/lib/rubygems/command_manager.rb +33 -14
  220. data/lib/rubygems/commands/build_command.rb +11 -8
  221. data/lib/rubygems/commands/cert_command.rb +33 -33
  222. data/lib/rubygems/commands/check_command.rb +20 -20
  223. data/lib/rubygems/commands/cleanup_command.rb +17 -17
  224. data/lib/rubygems/commands/contents_command.rb +13 -13
  225. data/lib/rubygems/commands/dependency_command.rb +16 -16
  226. data/lib/rubygems/commands/environment_command.rb +10 -7
  227. data/lib/rubygems/commands/exec_command.rb +248 -0
  228. data/lib/rubygems/commands/fetch_command.rb +9 -9
  229. data/lib/rubygems/commands/generate_index_command.rb +17 -17
  230. data/lib/rubygems/commands/help_command.rb +6 -6
  231. data/lib/rubygems/commands/info_command.rb +3 -3
  232. data/lib/rubygems/commands/install_command.rb +28 -24
  233. data/lib/rubygems/commands/list_command.rb +3 -3
  234. data/lib/rubygems/commands/lock_command.rb +4 -4
  235. data/lib/rubygems/commands/mirror_command.rb +3 -3
  236. data/lib/rubygems/commands/open_command.rb +9 -9
  237. data/lib/rubygems/commands/outdated_command.rb +5 -5
  238. data/lib/rubygems/commands/owner_command.rb +17 -12
  239. data/lib/rubygems/commands/pristine_command.rb +37 -37
  240. data/lib/rubygems/commands/push_command.rb +8 -8
  241. data/lib/rubygems/commands/query_command.rb +8 -8
  242. data/lib/rubygems/commands/rdoc_command.rb +20 -19
  243. data/lib/rubygems/commands/search_command.rb +3 -3
  244. data/lib/rubygems/commands/server_command.rb +3 -3
  245. data/lib/rubygems/commands/setup_command.rb +99 -108
  246. data/lib/rubygems/commands/signin_command.rb +9 -9
  247. data/lib/rubygems/commands/signout_command.rb +7 -7
  248. data/lib/rubygems/commands/sources_command.rb +22 -22
  249. data/lib/rubygems/commands/specification_command.rb +14 -14
  250. data/lib/rubygems/commands/stale_command.rb +2 -2
  251. data/lib/rubygems/commands/uninstall_command.rb +40 -40
  252. data/lib/rubygems/commands/unpack_command.rb +13 -13
  253. data/lib/rubygems/commands/update_command.rb +49 -68
  254. data/lib/rubygems/commands/which_command.rb +7 -7
  255. data/lib/rubygems/commands/yank_command.rb +11 -11
  256. data/lib/rubygems/compatibility.rb +4 -2
  257. data/lib/rubygems/config_file.rb +54 -21
  258. data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
  259. data/lib/rubygems/core_ext/kernel_require.rb +117 -114
  260. data/lib/rubygems/core_ext/kernel_warn.rb +33 -37
  261. data/lib/rubygems/core_ext/tcpsocket_init.rb +1 -1
  262. data/lib/rubygems/defaults.rb +32 -18
  263. data/lib/rubygems/dependency.rb +14 -11
  264. data/lib/rubygems/dependency_installer.rb +37 -37
  265. data/lib/rubygems/dependency_list.rb +6 -6
  266. data/lib/rubygems/deprecate.rb +2 -2
  267. data/lib/rubygems/doctor.rb +18 -18
  268. data/lib/rubygems/errors.rb +3 -3
  269. data/lib/rubygems/exceptions.rb +6 -8
  270. data/lib/rubygems/ext/build_error.rb +1 -1
  271. data/lib/rubygems/ext/builder.rb +27 -18
  272. data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +27 -0
  273. data/lib/rubygems/ext/cargo_builder.rb +360 -0
  274. data/lib/rubygems/ext/cmake_builder.rb +2 -2
  275. data/lib/rubygems/ext/configure_builder.rb +1 -1
  276. data/lib/rubygems/ext/ext_conf_builder.rb +36 -59
  277. data/lib/rubygems/ext/rake_builder.rb +3 -3
  278. data/lib/rubygems/ext.rb +7 -6
  279. data/lib/rubygems/gem_runner.rb +8 -12
  280. data/lib/rubygems/gemcutter_utilities.rb +60 -21
  281. data/lib/rubygems/indexer.rb +30 -28
  282. data/lib/rubygems/install_default_message.rb +2 -2
  283. data/lib/rubygems/install_message.rb +2 -2
  284. data/lib/rubygems/install_update_options.rb +55 -55
  285. data/lib/rubygems/installer.rb +40 -50
  286. data/lib/rubygems/installer_uninstaller_utils.rb +2 -2
  287. data/lib/rubygems/local_remote_options.rb +19 -21
  288. data/lib/rubygems/mock_gem_ui.rb +2 -2
  289. data/lib/rubygems/name_tuple.rb +4 -4
  290. data/lib/rubygems/optparse/lib/optparse/ac.rb +1 -1
  291. data/lib/rubygems/optparse/lib/optparse/date.rb +1 -1
  292. data/lib/rubygems/optparse/lib/optparse/kwargs.rb +1 -1
  293. data/lib/rubygems/optparse/lib/optparse/shellwords.rb +1 -1
  294. data/lib/rubygems/optparse/lib/optparse/time.rb +1 -1
  295. data/lib/rubygems/optparse/lib/optparse/uri.rb +1 -1
  296. data/lib/rubygems/optparse/lib/optparse.rb +95 -17
  297. data/lib/rubygems/optparse.rb +1 -1
  298. data/lib/rubygems/package/file_source.rb +2 -2
  299. data/lib/rubygems/package/old.rb +8 -8
  300. data/lib/rubygems/package/tar_header.rb +61 -61
  301. data/lib/rubygems/package/tar_reader/entry.rb +90 -9
  302. data/lib/rubygems/package/tar_reader.rb +1 -29
  303. data/lib/rubygems/package/tar_writer.rb +7 -7
  304. data/lib/rubygems/package.rb +66 -49
  305. data/lib/rubygems/package_task.rb +4 -4
  306. data/lib/rubygems/platform.rb +80 -51
  307. data/lib/rubygems/psych_tree.rb +1 -1
  308. data/lib/rubygems/query_utils.rb +36 -36
  309. data/lib/rubygems/rdoc.rb +2 -2
  310. data/lib/rubygems/remote_fetcher.rb +22 -22
  311. data/lib/rubygems/request/connection_pools.rb +4 -4
  312. data/lib/rubygems/request/http_pool.rb +1 -1
  313. data/lib/rubygems/request.rb +24 -24
  314. data/lib/rubygems/request_set/gem_dependency_api.rb +122 -123
  315. data/lib/rubygems/request_set/lockfile/parser.rb +26 -26
  316. data/lib/rubygems/request_set/lockfile/tokenizer.rb +4 -4
  317. data/lib/rubygems/request_set/lockfile.rb +5 -5
  318. data/lib/rubygems/request_set.rb +17 -17
  319. data/lib/rubygems/requirement.rb +14 -14
  320. data/lib/rubygems/resolver/activation_request.rb +3 -3
  321. data/lib/rubygems/resolver/api_set.rb +4 -4
  322. data/lib/rubygems/resolver/api_specification.rb +6 -6
  323. data/lib/rubygems/resolver/best_set.rb +5 -5
  324. data/lib/rubygems/resolver/conflict.rb +10 -10
  325. data/lib/rubygems/resolver/dependency_request.rb +2 -2
  326. data/lib/rubygems/resolver/git_set.rb +2 -2
  327. data/lib/rubygems/resolver/git_specification.rb +6 -6
  328. data/lib/rubygems/resolver/index_set.rb +3 -3
  329. data/lib/rubygems/resolver/index_specification.rb +6 -5
  330. data/lib/rubygems/resolver/installed_specification.rb +4 -4
  331. data/lib/rubygems/resolver/installer_set.rb +11 -16
  332. data/lib/rubygems/resolver/local_specification.rb +2 -2
  333. data/lib/rubygems/resolver/lock_set.rb +4 -4
  334. data/lib/rubygems/resolver/lock_specification.rb +4 -4
  335. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +1 -1
  336. data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +32 -26
  337. data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +1 -1
  338. data/lib/rubygems/resolver/molinillo.rb +1 -1
  339. data/lib/rubygems/resolver/specification.rb +1 -1
  340. data/lib/rubygems/resolver/stats.rb +1 -1
  341. data/lib/rubygems/resolver/vendor_set.rb +1 -1
  342. data/lib/rubygems/resolver/vendor_specification.rb +3 -3
  343. data/lib/rubygems/resolver.rb +40 -40
  344. data/lib/rubygems/s3_uri_signer.rb +6 -6
  345. data/lib/rubygems/safe_yaml.rb +2 -2
  346. data/lib/rubygems/security/policies.rb +47 -47
  347. data/lib/rubygems/security/policy.rb +18 -18
  348. data/lib/rubygems/security/signer.rb +5 -5
  349. data/lib/rubygems/security/trust_dir.rb +4 -4
  350. data/lib/rubygems/security.rb +29 -42
  351. data/lib/rubygems/security_option.rb +5 -5
  352. data/lib/rubygems/source/git.rb +25 -24
  353. data/lib/rubygems/source/installed.rb +1 -1
  354. data/lib/rubygems/source/local.rb +2 -2
  355. data/lib/rubygems/source/specific_file.rb +1 -1
  356. data/lib/rubygems/source.rb +18 -25
  357. data/lib/rubygems/source_list.rb +1 -5
  358. data/lib/rubygems/spec_fetcher.rb +11 -11
  359. data/lib/rubygems/specification.rb +175 -118
  360. data/lib/rubygems/specification_policy.rb +35 -16
  361. data/lib/rubygems/stub_specification.rb +8 -8
  362. data/lib/rubygems/text.rb +2 -2
  363. data/lib/rubygems/tsort/lib/tsort.rb +308 -310
  364. data/lib/rubygems/tsort.rb +1 -1
  365. data/lib/rubygems/uninstaller.rb +18 -18
  366. data/lib/rubygems/update_suggestion.rb +69 -0
  367. data/lib/rubygems/uri.rb +45 -30
  368. data/lib/rubygems/uri_formatter.rb +1 -1
  369. data/lib/rubygems/user_interaction.rb +33 -19
  370. data/lib/rubygems/util/licenses.rb +3 -3
  371. data/lib/rubygems/util.rb +12 -16
  372. data/lib/rubygems/validator.rb +6 -6
  373. data/lib/rubygems/version.rb +17 -11
  374. data/lib/rubygems/version_option.rb +3 -3
  375. data/lib/rubygems.rb +96 -77
  376. data/rubygems-update.gemspec +3 -3
  377. data/setup.rb +10 -10
  378. data/test/rubygems/alternate_cert.pem +14 -14
  379. data/test/rubygems/alternate_cert_32.pem +15 -15
  380. data/test/rubygems/alternate_key.pem +25 -25
  381. data/test/rubygems/bundler_test_gem.rb +419 -0
  382. data/test/rubygems/child_cert.pem +15 -16
  383. data/test/rubygems/child_cert_32.pem +15 -16
  384. data/test/rubygems/child_key.pem +25 -25
  385. data/test/rubygems/data/excon-0.7.7.gemspec.rz +0 -0
  386. data/test/rubygems/data/pry-0.4.7.gemspec.rz +0 -0
  387. data/test/rubygems/encrypted_private_key.pem +26 -26
  388. data/test/rubygems/expired_cert.pem +15 -15
  389. data/test/rubygems/future_cert.pem +15 -15
  390. data/test/rubygems/future_cert_32.pem +15 -15
  391. data/test/rubygems/grandchild_cert.pem +15 -16
  392. data/test/rubygems/grandchild_cert_32.pem +15 -16
  393. data/test/rubygems/grandchild_key.pem +25 -25
  394. data/test/rubygems/helper.rb +183 -163
  395. data/test/rubygems/installer_test_case.rb +13 -13
  396. data/test/rubygems/invalid_issuer_cert.pem +16 -16
  397. data/test/rubygems/invalid_issuer_cert_32.pem +16 -16
  398. data/test/rubygems/invalid_key.pem +25 -25
  399. data/test/rubygems/invalid_signer_cert.pem +15 -15
  400. data/test/rubygems/invalid_signer_cert_32.pem +15 -15
  401. data/test/rubygems/invalidchild_cert.pem +15 -16
  402. data/test/rubygems/invalidchild_cert_32.pem +15 -16
  403. data/test/rubygems/invalidchild_key.pem +25 -25
  404. data/test/rubygems/package/tar_test_case.rb +52 -17
  405. data/test/rubygems/packages/Bluebie-legs-0.6.2.gem +0 -0
  406. data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
  407. data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
  408. data/test/rubygems/private_key.pem +25 -25
  409. data/test/rubygems/public_cert.pem +16 -16
  410. data/test/rubygems/public_cert_32.pem +15 -15
  411. data/test/rubygems/public_key.pem +7 -7
  412. data/test/rubygems/rubygems_plugin.rb +2 -2
  413. data/test/rubygems/simple_gem.rb +1 -1
  414. data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -4
  415. data/test/rubygems/test_bundled_ca.rb +11 -11
  416. data/test/rubygems/test_config.rb +3 -3
  417. data/test/rubygems/test_deprecate.rb +3 -3
  418. data/test/rubygems/test_exit.rb +8 -2
  419. data/test/rubygems/test_gem.rb +327 -694
  420. data/test/rubygems/test_gem_available_set.rb +21 -21
  421. data/test/rubygems/test_gem_bundler_version_finder.rb +5 -4
  422. data/test/rubygems/test_gem_command.rb +44 -44
  423. data/test/rubygems/test_gem_command_manager.rb +102 -31
  424. data/test/rubygems/test_gem_commands_build_command.rb +73 -63
  425. data/test/rubygems/test_gem_commands_cert_command.rb +97 -99
  426. data/test/rubygems/test_gem_commands_check_command.rb +4 -4
  427. data/test/rubygems/test_gem_commands_cleanup_command.rb +40 -40
  428. data/test/rubygems/test_gem_commands_contents_command.rb +28 -28
  429. data/test/rubygems/test_gem_commands_dependency_command.rb +36 -36
  430. data/test/rubygems/test_gem_commands_environment_command.rb +38 -14
  431. data/test/rubygems/test_gem_commands_exec_command.rb +851 -0
  432. data/test/rubygems/test_gem_commands_fetch_command.rb +37 -37
  433. data/test/rubygems/test_gem_commands_generate_index_command.rb +7 -7
  434. data/test/rubygems/test_gem_commands_help_command.rb +13 -13
  435. data/test/rubygems/test_gem_commands_info_command.rb +28 -2
  436. data/test/rubygems/test_gem_commands_install_command.rb +153 -134
  437. data/test/rubygems/test_gem_commands_list_command.rb +4 -4
  438. data/test/rubygems/test_gem_commands_lock_command.rb +10 -10
  439. data/test/rubygems/test_gem_commands_mirror.rb +2 -2
  440. data/test/rubygems/test_gem_commands_open_command.rb +4 -4
  441. data/test/rubygems/test_gem_commands_outdated_command.rb +9 -9
  442. data/test/rubygems/test_gem_commands_owner_command.rb +126 -45
  443. data/test/rubygems/test_gem_commands_pristine_command.rb +93 -92
  444. data/test/rubygems/test_gem_commands_push_command.rb +85 -59
  445. data/test/rubygems/test_gem_commands_query_command.rb +73 -73
  446. data/test/rubygems/test_gem_commands_search_command.rb +2 -2
  447. data/test/rubygems/test_gem_commands_server_command.rb +2 -2
  448. data/test/rubygems/test_gem_commands_setup_command.rb +123 -94
  449. data/test/rubygems/test_gem_commands_signin_command.rb +153 -25
  450. data/test/rubygems/test_gem_commands_signout_command.rb +3 -3
  451. data/test/rubygems/test_gem_commands_sources_command.rb +74 -25
  452. data/test/rubygems/test_gem_commands_specification_command.rb +32 -32
  453. data/test/rubygems/test_gem_commands_stale_command.rb +4 -4
  454. data/test/rubygems/test_gem_commands_uninstall_command.rb +75 -75
  455. data/test/rubygems/test_gem_commands_unpack_command.rb +31 -31
  456. data/test/rubygems/test_gem_commands_update_command.rb +145 -93
  457. data/test/rubygems/test_gem_commands_which_command.rb +6 -6
  458. data/test/rubygems/test_gem_commands_yank_command.rb +42 -42
  459. data/test/rubygems/test_gem_config_file.rb +93 -81
  460. data/test/rubygems/test_gem_dependency.rb +75 -73
  461. data/test/rubygems/test_gem_dependency_installer.rb +165 -165
  462. data/test/rubygems/test_gem_dependency_list.rb +47 -47
  463. data/test/rubygems/test_gem_dependency_resolution_error.rb +4 -4
  464. data/test/rubygems/test_gem_doctor.rb +26 -26
  465. data/test/rubygems/test_gem_ext_builder.rb +60 -62
  466. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/.gitignore +1 -0
  467. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +8 -0
  468. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock +233 -0
  469. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml +10 -0
  470. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs +27 -0
  471. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +1 -0
  472. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/.gitignore +1 -0
  473. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +247 -0
  474. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +10 -0
  475. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +8 -0
  476. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +51 -0
  477. data/test/rubygems/test_gem_ext_cargo_builder.rb +166 -0
  478. data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +33 -0
  479. data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +60 -0
  480. data/test/rubygems/test_gem_ext_cmake_builder.rb +17 -15
  481. data/test/rubygems/test_gem_ext_configure_builder.rb +13 -13
  482. data/test/rubygems/test_gem_ext_ext_conf_builder.rb +51 -52
  483. data/test/rubygems/test_gem_ext_rake_builder.rb +15 -15
  484. data/test/rubygems/test_gem_gem_runner.rb +9 -9
  485. data/test/rubygems/test_gem_gemcutter_utilities.rb +71 -65
  486. data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -4
  487. data/test/rubygems/test_gem_indexer.rb +90 -67
  488. data/test/rubygems/test_gem_install_update_options.rb +16 -16
  489. data/test/rubygems/test_gem_installer.rb +371 -304
  490. data/test/rubygems/test_gem_local_remote_options.rb +10 -10
  491. data/test/rubygems/test_gem_name_tuple.rb +4 -4
  492. data/test/rubygems/test_gem_package.rb +244 -234
  493. data/test/rubygems/test_gem_package_old.rb +13 -13
  494. data/test/rubygems/test_gem_package_tar_header.rb +47 -47
  495. data/test/rubygems/test_gem_package_tar_reader.rb +55 -8
  496. data/test/rubygems/test_gem_package_tar_reader_entry.rb +161 -16
  497. data/test/rubygems/test_gem_package_tar_writer.rb +76 -76
  498. data/test/rubygems/test_gem_package_task.rb +18 -18
  499. data/test/rubygems/test_gem_path_support.rb +14 -14
  500. data/test/rubygems/test_gem_platform.rb +335 -214
  501. data/test/rubygems/test_gem_rdoc.rb +14 -14
  502. data/test/rubygems/test_gem_remote_fetcher.rb +157 -157
  503. data/test/rubygems/test_gem_request.rb +55 -55
  504. data/test/rubygems/test_gem_request_connection_pools.rb +29 -29
  505. data/test/rubygems/test_gem_request_set.rb +100 -100
  506. data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +209 -211
  507. data/test/rubygems/test_gem_request_set_lockfile.rb +86 -86
  508. data/test/rubygems/test_gem_request_set_lockfile_parser.rb +58 -58
  509. data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +62 -62
  510. data/test/rubygems/test_gem_requirement.rb +47 -41
  511. data/test/rubygems/test_gem_resolver.rb +166 -99
  512. data/test/rubygems/test_gem_resolver_activation_request.rb +6 -6
  513. data/test/rubygems/test_gem_resolver_api_set.rb +33 -33
  514. data/test/rubygems/test_gem_resolver_api_specification.rb +47 -47
  515. data/test/rubygems/test_gem_resolver_best_set.rb +22 -22
  516. data/test/rubygems/test_gem_resolver_composed_set.rb +1 -1
  517. data/test/rubygems/test_gem_resolver_conflict.rb +12 -12
  518. data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -15
  519. data/test/rubygems/test_gem_resolver_git_set.rb +21 -21
  520. data/test/rubygems/test_gem_resolver_git_specification.rb +21 -21
  521. data/test/rubygems/test_gem_resolver_index_set.rb +12 -12
  522. data/test/rubygems/test_gem_resolver_index_specification.rb +16 -16
  523. data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -5
  524. data/test/rubygems/test_gem_resolver_installer_set.rb +79 -35
  525. data/test/rubygems/test_gem_resolver_local_specification.rb +7 -7
  526. data/test/rubygems/test_gem_resolver_lock_set.rb +12 -12
  527. data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -17
  528. data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -1
  529. data/test/rubygems/test_gem_resolver_specification.rb +8 -8
  530. data/test/rubygems/test_gem_resolver_vendor_set.rb +6 -6
  531. data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -10
  532. data/test/rubygems/test_gem_security.rb +68 -68
  533. data/test/rubygems/test_gem_security_policy.rb +72 -72
  534. data/test/rubygems/test_gem_security_signer.rb +34 -34
  535. data/test/rubygems/test_gem_security_trust_dir.rb +6 -6
  536. data/test/rubygems/test_gem_silent_ui.rb +38 -32
  537. data/test/rubygems/test_gem_source.rb +44 -44
  538. data/test/rubygems/test_gem_source_fetch_problem.rb +9 -9
  539. data/test/rubygems/test_gem_source_git.rb +69 -62
  540. data/test/rubygems/test_gem_source_installed.rb +16 -16
  541. data/test/rubygems/test_gem_source_list.rb +5 -5
  542. data/test/rubygems/test_gem_source_local.rb +14 -14
  543. data/test/rubygems/test_gem_source_lock.rb +31 -31
  544. data/test/rubygems/test_gem_source_specific_file.rb +17 -17
  545. data/test/rubygems/test_gem_source_subpath_problem.rb +7 -7
  546. data/test/rubygems/test_gem_source_vendor.rb +13 -13
  547. data/test/rubygems/test_gem_spec_fetcher.rb +72 -72
  548. data/test/rubygems/test_gem_specification.rb +539 -474
  549. data/test/rubygems/test_gem_stream_ui.rb +19 -19
  550. data/test/rubygems/test_gem_stub_specification.rb +32 -32
  551. data/test/rubygems/test_gem_text.rb +1 -1
  552. data/test/rubygems/test_gem_uninstaller.rb +113 -113
  553. data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -3
  554. data/test/rubygems/test_gem_update_suggestion.rb +208 -0
  555. data/test/rubygems/test_gem_uri.rb +4 -4
  556. data/test/rubygems/test_gem_uri_formatter.rb +14 -14
  557. data/test/rubygems/test_gem_util.rb +23 -23
  558. data/test/rubygems/test_gem_validator.rb +8 -8
  559. data/test/rubygems/test_gem_version.rb +23 -16
  560. data/test/rubygems/test_gem_version_option.rb +15 -15
  561. data/test/rubygems/test_kernel.rb +41 -47
  562. data/test/rubygems/test_project_sanity.rb +1 -1
  563. data/test/rubygems/test_remote_fetch_error.rb +6 -6
  564. data/test/rubygems/test_require.rb +129 -119
  565. data/test/rubygems/test_rubygems.rb +19 -16
  566. data/test/rubygems/utilities.rb +55 -33
  567. data/test/rubygems/wrong_key_cert.pem +15 -15
  568. data/test/rubygems/wrong_key_cert_32.pem +15 -15
  569. data/test/test_changelog_generator.rb +1 -0
  570. metadata +67 -35
  571. data/bundler/lib/bundler/dep_proxy.rb +0 -55
  572. data/bundler/lib/bundler/templates/gems.rb +0 -5
  573. data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
  574. data/bundler/lib/bundler/vendor/molinillo/LICENSE +0 -9
  575. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
  576. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
  577. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
  578. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
  579. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
  580. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
  581. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
  582. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
  583. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
  584. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
  585. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
  586. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
  587. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
  588. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
  589. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
  590. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
  591. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
  592. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
  593. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
  594. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
  595. data/bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
  596. data/bundler/lib/bundler/vendored_molinillo.rb +0 -4
  597. data/bundler/lib/bundler/version_ranges.rb +0 -122
  598. data/lib/rubygems/psych_additions.rb +0 -10
  599. data/test/rubygems/data/null-type.gemspec.rz +0 -0
  600. /data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +0 -0
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'helper'
2
+ require_relative "helper"
3
3
 
4
4
  class TestGemResolverAPISet < Gem::TestCase
5
5
  def setup
@@ -12,17 +12,17 @@ class TestGemResolverAPISet < Gem::TestCase
12
12
  def test_initialize
13
13
  set = @DR::APISet.new
14
14
 
15
- assert_equal URI('https://index.rubygems.org/info/'), set.dep_uri
16
- assert_equal URI('https://index.rubygems.org/'), set.uri
17
- assert_equal Gem::Source.new(URI('https://index.rubygems.org')), set.source
15
+ assert_equal URI("https://index.rubygems.org/info/"), set.dep_uri
16
+ assert_equal URI("https://index.rubygems.org/"), set.uri
17
+ assert_equal Gem::Source.new(URI("https://index.rubygems.org")), set.source
18
18
  end
19
19
 
20
20
  def test_initialize_deeper_uri
21
- set = @DR::APISet.new 'https://rubygemsserver.com/mygems/info'
21
+ set = @DR::APISet.new "https://rubygemsserver.com/mygems/info"
22
22
 
23
- assert_equal URI('https://rubygemsserver.com/mygems/info'), set.dep_uri
24
- assert_equal URI('https://rubygemsserver.com/'), set.uri
25
- assert_equal Gem::Source.new(URI('https://rubygemsserver.com/')), set.source
23
+ assert_equal URI("https://rubygemsserver.com/mygems/info"), set.dep_uri
24
+ assert_equal URI("https://rubygemsserver.com/"), set.uri
25
+ assert_equal Gem::Source.new(URI("https://rubygemsserver.com/")), set.source
26
26
  end
27
27
 
28
28
  def test_initialize_uri
@@ -36,9 +36,9 @@ class TestGemResolverAPISet < Gem::TestCase
36
36
  spec_fetcher
37
37
 
38
38
  data = [
39
- { :name => 'a',
40
- :number => '1',
41
- :platform => 'ruby',
39
+ { :name => "a",
40
+ :number => "1",
41
+ :platform => "ruby",
42
42
  :dependencies => [] },
43
43
  ]
44
44
 
@@ -46,7 +46,7 @@ class TestGemResolverAPISet < Gem::TestCase
46
46
 
47
47
  set = @DR::APISet.new @dep_uri
48
48
 
49
- a_dep = @DR::DependencyRequest.new dep('a'), nil
49
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
50
50
 
51
51
  expected = [
52
52
  @DR::APISpecification.new(set, data.first),
@@ -59,13 +59,13 @@ class TestGemResolverAPISet < Gem::TestCase
59
59
  spec_fetcher
60
60
 
61
61
  data = [
62
- { :name => 'a',
63
- :number => '1',
64
- :platform => 'ruby',
62
+ { :name => "a",
63
+ :number => "1",
64
+ :platform => "ruby",
65
65
  :dependencies => [] },
66
- { :name => 'a',
67
- :number => '2.a',
68
- :platform => 'ruby',
66
+ { :name => "a",
67
+ :number => "2.a",
68
+ :platform => "ruby",
69
69
  :dependencies => [] },
70
70
  ]
71
71
 
@@ -74,7 +74,7 @@ class TestGemResolverAPISet < Gem::TestCase
74
74
  set = @DR::APISet.new @dep_uri
75
75
  set.prerelease = true
76
76
 
77
- a_dep = @DR::DependencyRequest.new dep('a'), nil
77
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
78
78
 
79
79
  expected = [
80
80
  @DR::APISpecification.new(set, data.first),
@@ -88,9 +88,9 @@ class TestGemResolverAPISet < Gem::TestCase
88
88
  spec_fetcher
89
89
 
90
90
  data = [
91
- { :name => 'a',
92
- :number => '1',
93
- :platform => 'ruby',
91
+ { :name => "a",
92
+ :number => "1",
93
+ :platform => "ruby",
94
94
  :dependencies => [] },
95
95
  ]
96
96
 
@@ -98,7 +98,7 @@ class TestGemResolverAPISet < Gem::TestCase
98
98
 
99
99
  set = @DR::APISet.new @dep_uri
100
100
 
101
- a_dep = @DR::DependencyRequest.new dep('a'), nil
101
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
102
102
 
103
103
  set.prefetch [a_dep]
104
104
 
@@ -115,7 +115,7 @@ class TestGemResolverAPISet < Gem::TestCase
115
115
  set = @DR::APISet.new @dep_uri
116
116
  set.remote = false
117
117
 
118
- a_dep = @DR::DependencyRequest.new dep('a'), nil
118
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
119
119
 
120
120
  assert_empty set.find_all(a_dep)
121
121
  end
@@ -127,7 +127,7 @@ class TestGemResolverAPISet < Gem::TestCase
127
127
 
128
128
  set = @DR::APISet.new @dep_uri
129
129
 
130
- a_dep = @DR::DependencyRequest.new dep('a'), nil
130
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
131
131
 
132
132
  assert_empty set.find_all(a_dep)
133
133
 
@@ -144,8 +144,8 @@ class TestGemResolverAPISet < Gem::TestCase
144
144
 
145
145
  set = @DR::APISet.new @dep_uri
146
146
 
147
- a_dep = @DR::DependencyRequest.new dep('a'), nil
148
- b_dep = @DR::DependencyRequest.new dep('b'), nil
147
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
148
+ b_dep = @DR::DependencyRequest.new dep("b"), nil
149
149
 
150
150
  set.prefetch [a_dep, b_dep]
151
151
 
@@ -160,8 +160,8 @@ class TestGemResolverAPISet < Gem::TestCase
160
160
 
161
161
  set = @DR::APISet.new @dep_uri
162
162
 
163
- a_dep = @DR::DependencyRequest.new dep('a'), nil
164
- b_dep = @DR::DependencyRequest.new dep('b'), nil
163
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
164
+ b_dep = @DR::DependencyRequest.new dep("b"), nil
165
165
 
166
166
  set.prefetch [a_dep]
167
167
 
@@ -179,8 +179,8 @@ class TestGemResolverAPISet < Gem::TestCase
179
179
 
180
180
  set = @DR::APISet.new @dep_uri
181
181
 
182
- a_dep = @DR::DependencyRequest.new dep('a'), nil
183
- b_dep = @DR::DependencyRequest.new dep('b'), nil
182
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
183
+ b_dep = @DR::DependencyRequest.new dep("b"), nil
184
184
 
185
185
  set.prefetch [a_dep, b_dep]
186
186
 
@@ -199,8 +199,8 @@ class TestGemResolverAPISet < Gem::TestCase
199
199
  set = @DR::APISet.new @dep_uri
200
200
  set.remote = false
201
201
 
202
- a_dep = @DR::DependencyRequest.new dep('a'), nil
203
- b_dep = @DR::DependencyRequest.new dep('b'), nil
202
+ a_dep = @DR::DependencyRequest.new dep("a"), nil
203
+ b_dep = @DR::DependencyRequest.new dep("b"), nil
204
204
 
205
205
  set.prefetch [a_dep, b_dep]
206
206
 
@@ -1,28 +1,28 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'helper'
2
+ require_relative "helper"
3
3
 
4
4
  class TestGemResolverAPISpecification < Gem::TestCase
5
5
  def test_initialize
6
6
  set = Gem::Resolver::APISet.new
7
7
  data = {
8
- :name => 'rails',
9
- :number => '3.0.3',
8
+ :name => "rails",
9
+ :number => "3.0.3",
10
10
  :platform => Gem::Platform.local.to_s,
11
11
  :dependencies => [
12
- ['bundler', '~> 1.0'],
13
- ['railties', '= 3.0.3'],
12
+ ["bundler", "~> 1.0"],
13
+ ["railties", "= 3.0.3"],
14
14
  ],
15
15
  }
16
16
 
17
17
  spec = Gem::Resolver::APISpecification.new set, data
18
18
 
19
- assert_equal 'rails', spec.name
20
- assert_equal Gem::Version.new('3.0.3'), spec.version
19
+ assert_equal "rails", spec.name
20
+ assert_equal Gem::Version.new("3.0.3"), spec.version
21
21
  assert_equal Gem::Platform.local, spec.platform
22
22
 
23
23
  expected = [
24
- Gem::Dependency.new('bundler', '~> 1.0'),
25
- Gem::Dependency.new('railties', '= 3.0.3'),
24
+ Gem::Dependency.new("bundler", "~> 1.0"),
25
+ Gem::Dependency.new("railties", "= 3.0.3"),
26
26
  ]
27
27
 
28
28
  assert_equal expected, spec.dependencies
@@ -30,26 +30,26 @@ class TestGemResolverAPISpecification < Gem::TestCase
30
30
 
31
31
  def test_fetch_development_dependencies
32
32
  specs = spec_fetcher do |fetcher|
33
- fetcher.spec 'rails', '3.0.3' do |s|
34
- s.add_runtime_dependency 'bundler', '~> 1.0'
35
- s.add_runtime_dependency 'railties', '= 3.0.3'
36
- s.add_development_dependency 'a', '= 1'
33
+ fetcher.spec "rails", "3.0.3" do |s|
34
+ s.add_runtime_dependency "bundler", "~> 1.0"
35
+ s.add_runtime_dependency "railties", "= 3.0.3"
36
+ s.add_development_dependency "a", "= 1"
37
37
  end
38
38
  end
39
39
 
40
- rails = specs['rails-3.0.3']
40
+ rails = specs["rails-3.0.3"]
41
41
 
42
- repo = @gem_repo + 'info'
42
+ repo = @gem_repo + "info"
43
43
 
44
44
  set = Gem::Resolver::APISet.new repo
45
45
 
46
46
  data = {
47
- :name => 'rails',
48
- :number => '3.0.3',
49
- :platform => 'ruby',
47
+ :name => "rails",
48
+ :number => "3.0.3",
49
+ :platform => "ruby",
50
50
  :dependencies => [
51
- ['bundler', '~> 1.0'],
52
- ['railties', '= 3.0.3'],
51
+ ["bundler", "~> 1.0"],
52
+ ["railties", "= 3.0.3"],
53
53
  ],
54
54
  }
55
55
 
@@ -60,9 +60,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
60
60
  spec.fetch_development_dependencies
61
61
 
62
62
  expected = [
63
- Gem::Dependency.new('bundler', '~> 1.0'),
64
- Gem::Dependency.new('railties', '= 3.0.3'),
65
- Gem::Dependency.new('a', '= 1', :development),
63
+ Gem::Dependency.new("bundler", "~> 1.0"),
64
+ Gem::Dependency.new("railties", "= 3.0.3"),
65
+ Gem::Dependency.new("a", "= 1", :development),
66
66
  ]
67
67
 
68
68
  assert_equal expected, spec.dependencies
@@ -71,9 +71,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
71
71
  def test_installable_platform_eh
72
72
  set = Gem::Resolver::APISet.new
73
73
  data = {
74
- :name => 'a',
75
- :number => '1',
76
- :platform => 'ruby',
74
+ :name => "a",
75
+ :number => "1",
76
+ :platform => "ruby",
77
77
  :dependencies => [],
78
78
  }
79
79
 
@@ -82,9 +82,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
82
82
  assert a_spec.installable_platform?
83
83
 
84
84
  data = {
85
- :name => 'b',
86
- :number => '1',
87
- :platform => 'cpu-other_platform-1',
85
+ :name => "b",
86
+ :number => "1",
87
+ :platform => "cpu-other_platform-1",
88
88
  :dependencies => [],
89
89
  }
90
90
 
@@ -93,8 +93,8 @@ class TestGemResolverAPISpecification < Gem::TestCase
93
93
  refute b_spec.installable_platform?
94
94
 
95
95
  data = {
96
- :name => 'c',
97
- :number => '1',
96
+ :name => "c",
97
+ :number => "1",
98
98
  :platform => Gem::Platform.local.to_s,
99
99
  :dependencies => [],
100
100
  }
@@ -107,9 +107,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
107
107
  def test_source
108
108
  set = Gem::Resolver::APISet.new
109
109
  data = {
110
- :name => 'a',
111
- :number => '1',
112
- :platform => 'ruby',
110
+ :name => "a",
111
+ :number => "1",
112
+ :platform => "ruby",
113
113
  :dependencies => [],
114
114
  }
115
115
 
@@ -120,15 +120,15 @@ class TestGemResolverAPISpecification < Gem::TestCase
120
120
 
121
121
  def test_spec
122
122
  spec_fetcher do |fetcher|
123
- fetcher.spec 'a', 1
123
+ fetcher.spec "a", 1
124
124
  end
125
125
 
126
- dep_uri = URI(@gem_repo) + 'info'
126
+ dep_uri = URI(@gem_repo) + "info"
127
127
  set = Gem::Resolver::APISet.new dep_uri
128
128
  data = {
129
- :name => 'a',
130
- :number => '1',
131
- :platform => 'ruby',
129
+ :name => "a",
130
+ :number => "1",
131
+ :platform => "ruby",
132
132
  :dependencies => [],
133
133
  }
134
134
 
@@ -137,22 +137,22 @@ class TestGemResolverAPISpecification < Gem::TestCase
137
137
  spec = api_spec.spec
138
138
 
139
139
  assert_kind_of Gem::Specification, spec
140
- assert_equal 'a-1', spec.full_name
140
+ assert_equal "a-1", spec.full_name
141
141
  end
142
142
 
143
143
  def test_spec_jruby_platform
144
144
  spec_fetcher do |fetcher|
145
- fetcher.gem 'j', 1 do |spec|
146
- spec.platform = 'jruby'
145
+ fetcher.gem "j", 1 do |spec|
146
+ spec.platform = "jruby"
147
147
  end
148
148
  end
149
149
 
150
- dep_uri = URI(@gem_repo) + 'info'
150
+ dep_uri = URI(@gem_repo) + "info"
151
151
  set = Gem::Resolver::APISet.new dep_uri
152
152
  data = {
153
- :name => 'j',
154
- :number => '1',
155
- :platform => 'jruby',
153
+ :name => "j",
154
+ :number => "1",
155
+ :platform => "jruby",
156
156
  :dependencies => [],
157
157
  }
158
158
 
@@ -161,6 +161,6 @@ class TestGemResolverAPISpecification < Gem::TestCase
161
161
  spec = api_spec.spec
162
162
 
163
163
  assert_kind_of Gem::Specification, spec
164
- assert_equal 'j-1-java', spec.full_name
164
+ assert_equal "j-1-java", spec.full_name
165
165
  end
166
166
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'helper'
2
+ require_relative "helper"
3
3
 
4
4
  class TestGemResolverBestSet < Gem::TestCase
5
5
  def setup
@@ -16,14 +16,14 @@ class TestGemResolverBestSet < Gem::TestCase
16
16
 
17
17
  def test_find_all_index
18
18
  spec_fetcher do |fetcher|
19
- fetcher.spec 'a', 1
20
- fetcher.spec 'a', 2
21
- fetcher.spec 'b', 1
19
+ fetcher.spec "a", 1
20
+ fetcher.spec "a", 2
21
+ fetcher.spec "b", 1
22
22
  end
23
23
 
24
24
  set = @DR::BestSet.new
25
25
 
26
- dependency = dep 'a', '~> 1'
26
+ dependency = dep "a", "~> 1"
27
27
 
28
28
  req = @DR::DependencyRequest.new dependency, nil
29
29
 
@@ -34,7 +34,7 @@ class TestGemResolverBestSet < Gem::TestCase
34
34
 
35
35
  def test_find_all_fallback
36
36
  spec_fetcher do |fetcher|
37
- fetcher.spec 'a', 1
37
+ fetcher.spec "a", 1
38
38
  end
39
39
 
40
40
  set = @DR::BestSet.new
@@ -43,7 +43,7 @@ class TestGemResolverBestSet < Gem::TestCase
43
43
 
44
44
  set.sets << Gem::Resolver::APISet.new(api_uri)
45
45
 
46
- dependency = dep 'a', '~> 1'
46
+ dependency = dep "a", "~> 1"
47
47
 
48
48
  req = @DR::DependencyRequest.new dependency, nil
49
49
 
@@ -54,15 +54,15 @@ class TestGemResolverBestSet < Gem::TestCase
54
54
 
55
55
  def test_find_all_local
56
56
  spec_fetcher do |fetcher|
57
- fetcher.spec 'a', 1
58
- fetcher.spec 'a', 2
59
- fetcher.spec 'b', 1
57
+ fetcher.spec "a", 1
58
+ fetcher.spec "a", 2
59
+ fetcher.spec "b", 1
60
60
  end
61
61
 
62
62
  set = @DR::BestSet.new
63
63
  set.remote = false
64
64
 
65
- dependency = dep 'a', '~> 1'
65
+ dependency = dep "a", "~> 1"
66
66
 
67
67
  req = @DR::DependencyRequest.new dependency, nil
68
68
 
@@ -73,7 +73,7 @@ class TestGemResolverBestSet < Gem::TestCase
73
73
 
74
74
  def test_prefetch
75
75
  spec_fetcher do |fetcher|
76
- fetcher.spec 'a', 1
76
+ fetcher.spec "a", 1
77
77
  end
78
78
 
79
79
  set = @DR::BestSet.new
@@ -85,7 +85,7 @@ class TestGemResolverBestSet < Gem::TestCase
85
85
 
86
86
  def test_prefetch_local
87
87
  spec_fetcher do |fetcher|
88
- fetcher.spec 'a', 1
88
+ fetcher.spec "a", 1
89
89
  end
90
90
 
91
91
  set = @DR::BestSet.new
@@ -99,14 +99,14 @@ class TestGemResolverBestSet < Gem::TestCase
99
99
  def test_replace_failed_api_set
100
100
  set = @DR::BestSet.new
101
101
 
102
- api_uri = URI(@gem_repo) + './info/'
102
+ api_uri = URI(@gem_repo) + "./info/"
103
103
  api_set = Gem::Resolver::APISet.new api_uri
104
104
 
105
105
  set.sets << api_set
106
106
 
107
- error_uri = api_uri + 'a'
107
+ error_uri = api_uri + "a"
108
108
 
109
- error = Gem::RemoteFetcher::FetchError.new 'bogus', error_uri
109
+ error = Gem::RemoteFetcher::FetchError.new "bogus", error_uri
110
110
 
111
111
  set.replace_failed_api_set error
112
112
 
@@ -124,7 +124,7 @@ class TestGemResolverBestSet < Gem::TestCase
124
124
 
125
125
  set.sets << index_set
126
126
 
127
- error = Gem::RemoteFetcher::FetchError.new 'bogus', @gem_repo
127
+ error = Gem::RemoteFetcher::FetchError.new "bogus", @gem_repo
128
128
 
129
129
  e = assert_raise Gem::RemoteFetcher::FetchError do
130
130
  set.replace_failed_api_set error
@@ -136,16 +136,16 @@ class TestGemResolverBestSet < Gem::TestCase
136
136
  def test_replace_failed_api_set_uri_with_credentials
137
137
  set = @DR::BestSet.new
138
138
 
139
- api_uri = URI(@gem_repo) + './info/'
140
- api_uri.user = 'user'
141
- api_uri.password = 'pass'
139
+ api_uri = URI(@gem_repo) + "./info/"
140
+ api_uri.user = "user"
141
+ api_uri.password = "pass"
142
142
  api_set = Gem::Resolver::APISet.new api_uri
143
143
 
144
144
  set.sets << api_set
145
145
 
146
- error_uri = api_uri + 'a'
146
+ error_uri = api_uri + "a"
147
147
 
148
- error = Gem::RemoteFetcher::FetchError.new 'bogus', error_uri
148
+ error = Gem::RemoteFetcher::FetchError.new "bogus", error_uri
149
149
 
150
150
  set.replace_failed_api_set error
151
151
 
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'helper'
2
+ require_relative "helper"
3
3
 
4
4
  class TestGemResolverComposedSet < Gem::TestCase
5
5
  def test_errors
@@ -1,16 +1,16 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'helper'
2
+ require_relative "helper"
3
3
 
4
4
  class TestGemResolverConflict < Gem::TestCase
5
5
  def test_explanation
6
6
  root =
7
- dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
7
+ dependency_request dep("net-ssh", ">= 2.0.13"), "rye", "0.9.8"
8
8
  child =
9
- dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
9
+ dependency_request dep("net-ssh", ">= 2.6.5"), "net-ssh", "2.2.2", root
10
10
 
11
- dep = Gem::Resolver::DependencyRequest.new dep('net-ssh', '>= 2.0.13'), nil
11
+ dep = Gem::Resolver::DependencyRequest.new dep("net-ssh", ">= 2.0.13"), nil
12
12
 
13
- spec = util_spec 'net-ssh', '2.2.2'
13
+ spec = util_spec "net-ssh", "2.2.2"
14
14
  active =
15
15
  Gem::Resolver::ActivationRequest.new spec, dep
16
16
 
@@ -37,10 +37,10 @@ class TestGemResolverConflict < Gem::TestCase
37
37
  def test_explanation_user_request
38
38
  @DR = Gem::Resolver
39
39
 
40
- spec = util_spec 'a', 2
40
+ spec = util_spec "a", 2
41
41
 
42
- a1_req = @DR::DependencyRequest.new dep('a', '= 1'), nil
43
- a2_req = @DR::DependencyRequest.new dep('a', '= 2'), nil
42
+ a1_req = @DR::DependencyRequest.new dep("a", "= 1"), nil
43
+ a2_req = @DR::DependencyRequest.new dep("a", "= 2"), nil
44
44
 
45
45
  activated = @DR::ActivationRequest.new spec, a2_req
46
46
 
@@ -63,17 +63,17 @@ class TestGemResolverConflict < Gem::TestCase
63
63
 
64
64
  def test_request_path
65
65
  root =
66
- dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
66
+ dependency_request dep("net-ssh", ">= 2.0.13"), "rye", "0.9.8"
67
67
 
68
68
  child =
69
- dependency_request dep('other', '>= 1.0'), 'net-ssh', '2.2.2', root
69
+ dependency_request dep("other", ">= 1.0"), "net-ssh", "2.2.2", root
70
70
 
71
71
  conflict =
72
72
  Gem::Resolver::Conflict.new nil, nil
73
73
 
74
74
  expected = [
75
- 'net-ssh (>= 2.0.13), 2.2.2 activated',
76
- 'rye (= 0.9.8), 0.9.8 activated',
75
+ "net-ssh (>= 2.0.13), 2.2.2 activated",
76
+ "rye (= 0.9.8), 0.9.8 activated",
77
77
  ]
78
78
 
79
79
  assert_equal expected, conflict.request_path(child.requester)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
- require_relative 'helper'
2
+ require_relative "helper"
3
3
 
4
4
  class TestGemResolverDependencyRequest < Gem::TestCase
5
5
  def setup
@@ -9,13 +9,13 @@ class TestGemResolverDependencyRequest < Gem::TestCase
9
9
  end
10
10
 
11
11
  def test_development_eh
12
- a_dep = dep 'a', '>= 1'
12
+ a_dep = dep "a", ">= 1"
13
13
 
14
14
  a_dep_req = @DR.new a_dep, nil
15
15
 
16
16
  refute a_dep_req.development?
17
17
 
18
- b_dep = dep 'b', '>= 1', :development
18
+ b_dep = dep "b", ">= 1", :development
19
19
 
20
20
  b_dep_req = @DR.new b_dep, nil
21
21
 
@@ -23,8 +23,8 @@ class TestGemResolverDependencyRequest < Gem::TestCase
23
23
  end
24
24
 
25
25
  def test_match_eh
26
- spec = util_spec 'a', 1
27
- dependency = dep 'a', '>= 1'
26
+ spec = util_spec "a", 1
27
+ dependency = dep "a", ">= 1"
28
28
 
29
29
  dr = @DR.new dependency, nil
30
30
 
@@ -32,31 +32,31 @@ class TestGemResolverDependencyRequest < Gem::TestCase
32
32
  end
33
33
 
34
34
  def test_match_eh_prerelease
35
- spec = util_spec 'a', '1.a'
35
+ spec = util_spec "a", "1.a"
36
36
 
37
- a_dep = dep 'a', '>= 1'
37
+ a_dep = dep "a", ">= 1"
38
38
  a_dr = @DR.new a_dep, nil
39
39
 
40
40
  refute a_dr.match? spec
41
41
 
42
- a_pre_dep = dep 'a', '>= 1.a'
42
+ a_pre_dep = dep "a", ">= 1.a"
43
43
  a_pre_dr = @DR.new a_pre_dep, nil
44
44
 
45
45
  assert a_pre_dr.match? spec
46
46
  end
47
47
 
48
48
  def test_match_eh_prerelease_allow_prerelease
49
- spec = util_spec 'a', '2.a'
49
+ spec = util_spec "a", "2.a"
50
50
 
51
- a_dep = dep 'a', '>= 1'
51
+ a_dep = dep "a", ">= 1"
52
52
  a_dr = @DR.new a_dep, nil
53
53
 
54
54
  assert a_dr.match? spec, true
55
55
  end
56
56
 
57
57
  def test_matches_spec_eh
58
- spec = util_spec 'a', 1
59
- dependency = dep 'a', '>= 1'
58
+ spec = util_spec "a", 1
59
+ dependency = dep "a", ">= 1"
60
60
 
61
61
  dr = @DR.new dependency, nil
62
62
 
@@ -64,16 +64,16 @@ class TestGemResolverDependencyRequest < Gem::TestCase
64
64
  end
65
65
 
66
66
  def test_matches_spec_eh_prerelease
67
- spec = util_spec 'a', '1.a'
67
+ spec = util_spec "a", "1.a"
68
68
 
69
- dependency = dep 'a', '>= 0'
69
+ dependency = dep "a", ">= 0"
70
70
  dr = @DR.new dependency, nil
71
71
 
72
72
  assert dr.matches_spec? spec
73
73
  end
74
74
 
75
75
  def test_requirement
76
- dependency = dep 'a', '>= 1'
76
+ dependency = dep "a", ">= 1"
77
77
 
78
78
  dr = @DR.new dependency, nil
79
79