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
@@ -0,0 +1,419 @@
1
+ require_relative "helper"
2
+
3
+ class TestBundlerGem < Gem::TestCase
4
+ PROJECT_DIR = File.expand_path("../..", __dir__).tap(&Gem::UNTAINT)
5
+
6
+ def test_self_use_gemdeps
7
+ with_local_bundler_at(Gem.dir) do
8
+ with_rubygems_gemdeps("-") do
9
+ FileUtils.mkdir_p "detect/a/b"
10
+ FileUtils.mkdir_p "detect/a/Isolate"
11
+
12
+ FileUtils.touch "detect/Isolate"
13
+
14
+ begin
15
+ Dir.chdir "detect/a/b"
16
+
17
+ Gem.use_gemdeps
18
+
19
+ assert_equal add_bundler_full_name([]), loaded_spec_names
20
+ ensure
21
+ Dir.chdir @tempdir
22
+ end
23
+ end
24
+ end
25
+ end
26
+
27
+ def test_self_find_files_with_gemfile
28
+ with_local_bundler_at(Gem.dir) do
29
+ cwd = File.expand_path("test/rubygems", PROJECT_DIR)
30
+ actual_load_path = $LOAD_PATH.unshift(cwd).dup
31
+
32
+ discover_path = File.join "lib", "sff", "discover.rb"
33
+
34
+ foo1, _ = %w[1 2].map do |version|
35
+ spec = quick_gem "sff", version do |s|
36
+ s.files << discover_path
37
+ end
38
+
39
+ write_file(File.join "gems", spec.full_name, discover_path) do |fp|
40
+ fp.puts "# #{spec.full_name}"
41
+ end
42
+
43
+ spec
44
+ end
45
+ Gem.refresh
46
+
47
+ write_file(File.join Dir.pwd, "Gemfile") do |fp|
48
+ fp.puts "source 'https://rubygems.org'"
49
+ fp.puts "gem '#{foo1.name}', '#{foo1.version}'"
50
+ end
51
+ Gem.use_gemdeps(File.join Dir.pwd, "Gemfile")
52
+
53
+ expected = [
54
+ File.expand_path("test/rubygems/sff/discover.rb", PROJECT_DIR),
55
+ File.join(foo1.full_gem_path, discover_path),
56
+ ].sort
57
+
58
+ assert_equal expected, Gem.find_files("sff/discover").sort
59
+ assert_equal expected, Gem.find_files("sff/**.rb").sort, "[ruby-core:31730]"
60
+ assert_equal cwd, actual_load_path.shift
61
+ end
62
+ end
63
+
64
+ def test_auto_activation_of_specific_gemdeps_file
65
+ with_local_bundler_at(Gem.dir) do
66
+ a = util_spec "a", "1", nil, "lib/a.rb"
67
+ b = util_spec "b", "1", nil, "lib/b.rb"
68
+ c = util_spec "c", "1", nil, "lib/c.rb"
69
+
70
+ install_specs a, b, c
71
+
72
+ path = File.join @tempdir, "gem.deps.rb"
73
+
74
+ File.open path, "w" do |f|
75
+ f.puts "gem 'a'"
76
+ f.puts "gem 'b'"
77
+ f.puts "gem 'c'"
78
+ end
79
+
80
+ with_rubygems_gemdeps(path) do
81
+ Gem.use_gemdeps
82
+
83
+ assert_equal add_bundler_full_name(%W[a-1 b-1 c-1]), loaded_spec_names
84
+ end
85
+ end
86
+ end
87
+
88
+ def test_auto_activation_of_used_gemdeps_file
89
+ with_local_bundler_at(Gem.dir) do
90
+ a = util_spec "a", "1", nil, "lib/a.rb"
91
+ b = util_spec "b", "1", nil, "lib/b.rb"
92
+ c = util_spec "c", "1", nil, "lib/c.rb"
93
+
94
+ install_specs a, b, c
95
+
96
+ path = File.join @tempdir, "gem.deps.rb"
97
+
98
+ File.open path, "w" do |f|
99
+ f.puts "gem 'a'"
100
+ f.puts "gem 'b'"
101
+ f.puts "gem 'c'"
102
+ end
103
+
104
+ with_rubygems_gemdeps("-") do
105
+ expected_specs = [a, b, util_spec("bundler", Bundler::VERSION), c].compact.map(&:full_name)
106
+
107
+ Gem.use_gemdeps
108
+
109
+ assert_equal expected_specs, loaded_spec_names
110
+ end
111
+ end
112
+ end
113
+
114
+ def test_looks_for_gemdeps_files_automatically_from_binstubs
115
+ path = File.join(@tempdir, "gd-tmp")
116
+
117
+ with_local_bundler_at(path) do
118
+ a = util_spec "a", "1" do |s|
119
+ s.executables = %w[foo]
120
+ s.bindir = "exe"
121
+ end
122
+
123
+ write_file File.join(@tempdir, "exe", "foo") do |fp|
124
+ fp.puts "puts Gem.loaded_specs.values.map(&:full_name).sort"
125
+ end
126
+
127
+ b = util_spec "b", "1", nil, "lib/b.rb"
128
+ c = util_spec "c", "1", nil, "lib/c.rb"
129
+
130
+ install_specs a, b, c
131
+
132
+ install_gem a, :install_dir => path
133
+ install_gem b, :install_dir => path
134
+ install_gem c, :install_dir => path
135
+
136
+ ENV["GEM_PATH"] = path
137
+
138
+ with_rubygems_gemdeps("-") do
139
+ new_PATH = [File.join(path, "bin"), ENV["PATH"]].join(File::PATH_SEPARATOR)
140
+ new_RUBYOPT = "-I#{rubygems_path} -I#{bundler_path}"
141
+
142
+ path = File.join @tempdir, "gem.deps.rb"
143
+
144
+ File.open path, "w" do |f|
145
+ f.puts "gem 'a'"
146
+ end
147
+ out0 = with_path_and_rubyopt(new_PATH, new_RUBYOPT) do
148
+ IO.popen("foo", &:read).split(/\n/)
149
+ end
150
+
151
+ File.open path, "a" do |f|
152
+ f.puts "gem 'b'"
153
+ f.puts "gem 'c'"
154
+ end
155
+ out = with_path_and_rubyopt(new_PATH, new_RUBYOPT) do
156
+ IO.popen("foo", &:read).split(/\n/)
157
+ end
158
+
159
+ assert_equal ["b-1", "c-1"], out - out0
160
+ end
161
+ end
162
+ end
163
+
164
+ def test_looks_for_gemdeps_files_automatically_from_binstubs_in_parent_dir
165
+ path = File.join(@tempdir, "gd-tmp")
166
+
167
+ with_local_bundler_at(path) do
168
+ pend "IO.popen has issues on JRuby when passed :chdir" if Gem.java_platform?
169
+
170
+ a = util_spec "a", "1" do |s|
171
+ s.executables = %w[foo]
172
+ s.bindir = "exe"
173
+ end
174
+
175
+ write_file File.join(@tempdir, "exe", "foo") do |fp|
176
+ fp.puts "puts Gem.loaded_specs.values.map(&:full_name).sort"
177
+ end
178
+
179
+ b = util_spec "b", "1", nil, "lib/b.rb"
180
+ c = util_spec "c", "1", nil, "lib/c.rb"
181
+
182
+ install_specs a, b, c
183
+
184
+ install_gem a, :install_dir => path
185
+ install_gem b, :install_dir => path
186
+ install_gem c, :install_dir => path
187
+
188
+ ENV["GEM_PATH"] = path
189
+
190
+ with_rubygems_gemdeps("-") do
191
+ Dir.mkdir "sub1"
192
+
193
+ new_PATH = [File.join(path, "bin"), ENV["PATH"]].join(File::PATH_SEPARATOR)
194
+ new_RUBYOPT = "-I#{rubygems_path} -I#{bundler_path}"
195
+
196
+ path = File.join @tempdir, "gem.deps.rb"
197
+
198
+ File.open path, "w" do |f|
199
+ f.puts "gem 'a'"
200
+ end
201
+ out0 = with_path_and_rubyopt(new_PATH, new_RUBYOPT) do
202
+ IO.popen("foo", :chdir => "sub1", &:read).split(/\n/)
203
+ end
204
+
205
+ File.open path, "a" do |f|
206
+ f.puts "gem 'b'"
207
+ f.puts "gem 'c'"
208
+ end
209
+ out = with_path_and_rubyopt(new_PATH, new_RUBYOPT) do
210
+ IO.popen("foo", :chdir => "sub1", &:read).split(/\n/)
211
+ end
212
+
213
+ Dir.rmdir "sub1"
214
+
215
+ assert_equal ["b-1", "c-1"], out - out0
216
+ end
217
+ end
218
+ end
219
+
220
+ def test_use_gemdeps
221
+ with_local_bundler_at(Gem.dir) do
222
+ gem_deps_file = "gem.deps.rb".tap(&Gem::UNTAINT)
223
+ spec = util_spec "a", 1
224
+ install_specs spec
225
+
226
+ spec = Gem::Specification.find {|s| s == spec }
227
+ refute spec.activated?
228
+
229
+ File.open gem_deps_file, "w" do |io|
230
+ io.write 'gem "a"'
231
+ end
232
+
233
+ assert_nil Gem.gemdeps
234
+
235
+ Gem.use_gemdeps gem_deps_file
236
+
237
+ assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
238
+ refute_nil Gem.gemdeps
239
+ end
240
+ end
241
+
242
+ def test_use_gemdeps_ENV
243
+ with_local_bundler_at(Gem.dir) do
244
+ with_rubygems_gemdeps(nil) do
245
+ spec = util_spec "a", 1
246
+
247
+ refute spec.activated?
248
+
249
+ File.open "gem.deps.rb", "w" do |io|
250
+ io.write 'gem "a"'
251
+ end
252
+
253
+ Gem.use_gemdeps
254
+
255
+ refute spec.activated?
256
+ end
257
+ end
258
+ end
259
+
260
+ def test_use_gemdeps_argument_missing
261
+ with_local_bundler_at(Gem.dir) do
262
+ e = assert_raise ArgumentError do
263
+ Gem.use_gemdeps "gem.deps.rb"
264
+ end
265
+
266
+ assert_equal "Unable to find gem dependencies file at gem.deps.rb",
267
+ e.message
268
+ end
269
+ end
270
+
271
+ def test_use_gemdeps_argument_missing_match_ENV
272
+ with_local_bundler_at(Gem.dir) do
273
+ with_rubygems_gemdeps("gem.deps.rb") do
274
+ e = assert_raise ArgumentError do
275
+ Gem.use_gemdeps "gem.deps.rb"
276
+ end
277
+
278
+ assert_equal "Unable to find gem dependencies file at gem.deps.rb",
279
+ e.message
280
+ end
281
+ end
282
+ end
283
+
284
+ def test_use_gemdeps_automatic
285
+ with_local_bundler_at(Gem.dir) do
286
+ with_rubygems_gemdeps("-") do
287
+ spec = util_spec "a", 1
288
+ install_specs spec
289
+ spec = Gem::Specification.find {|s| s == spec }
290
+
291
+ refute spec.activated?
292
+
293
+ File.open "Gemfile", "w" do |io|
294
+ io.write 'gem "a"'
295
+ end
296
+
297
+ Gem.use_gemdeps
298
+
299
+ assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
300
+ end
301
+ end
302
+ end
303
+
304
+ def test_use_gemdeps_automatic_missing
305
+ with_local_bundler_at(Gem.dir) do
306
+ with_rubygems_gemdeps("-") do
307
+ Gem.use_gemdeps
308
+
309
+ assert true # count
310
+ end
311
+ end
312
+ end
313
+
314
+ def test_use_gemdeps_disabled
315
+ with_local_bundler_at(Gem.dir) do
316
+ with_rubygems_gemdeps("") do
317
+ spec = util_spec "a", 1
318
+
319
+ refute spec.activated?
320
+
321
+ File.open "gem.deps.rb", "w" do |io|
322
+ io.write 'gem "a"'
323
+ end
324
+
325
+ Gem.use_gemdeps
326
+
327
+ refute spec.activated?
328
+ end
329
+ end
330
+ end
331
+
332
+ def test_use_gemdeps_missing_gem
333
+ with_local_bundler_at(Gem.dir) do
334
+ with_rubygems_gemdeps("x") do
335
+ File.open "x", "w" do |io|
336
+ io.write 'gem "a"'
337
+ end
338
+
339
+ expected = <<-EXPECTED
340
+ Could not find gem 'a' in locally installed gems.
341
+ You may need to `bundle install` to install missing gems
342
+
343
+ EXPECTED
344
+
345
+ Gem::Deprecate.skip_during do
346
+ actual_stdout, actual_stderr = capture_output do
347
+ Gem.use_gemdeps
348
+ end
349
+ assert_empty actual_stdout
350
+ assert_equal(expected, actual_stderr)
351
+ end
352
+ end
353
+ end
354
+ end
355
+
356
+ def test_use_gemdeps_specific
357
+ with_local_bundler_at(Gem.dir) do
358
+ with_rubygems_gemdeps("x") do
359
+ spec = util_spec "a", 1
360
+ install_specs spec
361
+
362
+ spec = Gem::Specification.find {|s| s == spec }
363
+ refute spec.activated?
364
+
365
+ File.open "x", "w" do |io|
366
+ io.write 'gem "a"'
367
+ end
368
+
369
+ Gem.use_gemdeps
370
+
371
+ assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
372
+ end
373
+ end
374
+ end
375
+
376
+ private
377
+
378
+ def add_bundler_full_name(names)
379
+ names << "bundler-#{Bundler::VERSION}".freeze
380
+ names.sort!
381
+ names
382
+ end
383
+
384
+ def with_path_and_rubyopt(path_value, rubyopt_value)
385
+ path, ENV["PATH"] = ENV["PATH"], path_value
386
+ rubyopt, ENV["RUBYOPT"] = ENV["RUBYOPT"], rubyopt_value
387
+
388
+ yield
389
+ ensure
390
+ ENV["PATH"] = path
391
+ ENV["RUBYOPT"] = rubyopt
392
+ end
393
+
394
+ def with_rubygems_gemdeps(value)
395
+ rubygems_gemdeps, ENV["RUBYGEMS_GEMDEPS"] = ENV["RUBYGEMS_GEMDEPS"], value
396
+
397
+ yield
398
+ ensure
399
+ ENV["RUBYGEMS_GEMDEPS"] = rubygems_gemdeps
400
+ end
401
+
402
+ def with_local_bundler_at(path)
403
+ require "bundler"
404
+
405
+ # If bundler gemspec exists, pretend it's installed
406
+ bundler_gemspec = File.expand_path("../../bundler/bundler.gemspec", __dir__)
407
+ if File.exist?(bundler_gemspec)
408
+ target_gemspec_location = "#{path}/specifications/bundler-#{Bundler::VERSION}.gemspec"
409
+
410
+ FileUtils.mkdir_p File.dirname(target_gemspec_location)
411
+
412
+ File.write target_gemspec_location, Gem::Specification.load(bundler_gemspec).to_ruby_for_cache
413
+ end
414
+
415
+ yield
416
+ ensure
417
+ Bundler.reset!
418
+ end
419
+ end
@@ -1,20 +1,19 @@
1
1
  -----BEGIN CERTIFICATE-----
2
- MIIDTTCCAjWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAqMQ8wDQYDVQQDDAZub2Jv
2
+ MIIDLDCCAhSgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAqMQ8wDQYDVQQDDAZub2Jv
3
3
  ZHkxFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMCAXDTEyMDEwMTAwMDAwMFoYDzk5
4
4
  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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
20
19
  -----END CERTIFICATE-----
@@ -1,20 +1,19 @@
1
1
  -----BEGIN CERTIFICATE-----
2
- MIIDSzCCAjOgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAqMQ8wDQYDVQQDDAZub2Jv
2
+ MIIDKjCCAhKgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAqMQ8wDQYDVQQDDAZub2Jv
3
3
  ZHkxFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMB4XDTEyMDEwMTAwMDAwMFoXDTM4
4
4
  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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- RFvI9JzRY5TmY3nXdP3JNi4rNGZULEl+Hdm79LS6yrXthZQ4dqeMqJqXLggdVPf5
18
- 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
- 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
20
19
  -----END CERTIFICATE-----
@@ -1,27 +1,27 @@
1
1
  -----BEGIN RSA PRIVATE KEY-----
2
- MIIEogIBAAKCAQEAyn+/tatHETIQv0TOloaaJ/+SMbkr3twgscXTdC3Em1IrBTJX
3
- 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
- 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
- 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
- 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
- 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
- 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
- igsbmlO6+EAxJjWSy9998SUFKq+4LfiJduelqLw4nG2VM8Fmn9kRMY0CIm/IvjBM
10
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 9MkSUHNGwZ7ESAgoZWc1D5xxp3sT2+vV192TS+QBe3TT5AXhAGH9uL+qz7Gz4ihH
18
- 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
- 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
- 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
- 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
- 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
- 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
- auhZAoGAThhKJW0Rf+LX1zlVaq+GXrj2rkYVSBwChMHbmmp49q6crldfLi15KbI/
25
- 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
- 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
27
27
  -----END RSA PRIVATE KEY-----
@@ -1,30 +1,30 @@
1
1
  -----BEGIN RSA PRIVATE KEY-----
2
2
  Proc-Type: 4,ENCRYPTED
3
- DEK-Info: AES-256-CBC,CB6FD0B173EF450C6EE21A01DD785C1D
3
+ DEK-Info: AES-256-CBC,4851D8D265711252BA5EAD983C957412
4
4
 
5
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- PTyO/6a+FbXZ1zhVJxu/0bmBERZ14WVmWq56oxQav8knpxYeYPgpEmIZnrHnJ1Ko
25
- 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
- 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
- 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
- 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
- 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
30
30
  -----END RSA PRIVATE KEY-----
@@ -1,19 +1,19 @@
1
1
  -----BEGIN CERTIFICATE-----
2
- MIIDCzCCAfOgAwIBAgIBBjANBgkqhkiG9w0BAQUFADAqMQ8wDQYDVQQDDAZub2Jv
2
+ MIIDCzCCAfOgAwIBAgIBBjANBgkqhkiG9w0BAQsFADAqMQ8wDQYDVQQDDAZub2Jv
3
3
  ZHkxFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMB4XDTcwMDEwMTAwMDAwMFoXDTcw
4
4
  MDEwMTAwMDAwMFowKjEPMA0GA1UEAwwGbm9ib2R5MRcwFQYKCZImiZPyLGQBGRYH
5
- ZXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdlNYcvFB6x
6
- gpT8QcnMybVelGLUKyQL/hQPTK9J5FyqB8hEDLt2ruMwKsHU6fu/mgG+sLvHF1nq
7
- WhZADhn6rwCfNP03025vktOZ6iJfU60vytY/f3gkiGNkP21l0hz0+Ms15f+52gk+
8
- sFXqwGBbDteI0x57UsHi+KAN67QuPDnthYDtwhXIA5pcdx2wH+NW8F82HEZvm1hc
9
- pA75BDVk4vPxnpDfvPOKSYn9dWghmUtaPmqyVvs8XkDxHDfY54/D3ziPehP+zQzE
10
- g8C07Sq/z6vLSOQ3uaYn0nBDuNE6XP3ijJ4Zvs2eJEdOMyS1H3CsnkWiePCrLtKd
11
- w8d/F+D5bocCAwEAAaM8MDowGQYDVR0RBBIwEIEObm9ib2R5QGV4YW1wbGUwHQYD
12
- VR0OBBYEFF9DbvaajkUl6SLjfTdepNU2AoUbMA0GCSqGSIb3DQEBBQUAA4IBAQAP
13
- Z8vKQ1OjQCHx8MJ0gy6WN2CIjh0Uqf3fSfza3nd+K8jlJPkF7znEBZ345iCSmNwn
14
- EPrz/OrqiId2OHW2OCJv3c9NEb7hgaTswGfdq9LmqMRVeQy57FWh2lRdjVZbquWy
15
- IvM72hjVLqnMVisWbDxf32YghnmT37SzZKsHSXU0xUx7rVSIShnoMjLWQtIQDoqI
16
- 3isMAeKals2NNJOy0TGKJ9SspIDl/IYm9sEO1HKiuxubrdN9q+wEQdizt59sXkol
17
- 4AYga+5TN+KtsSRclAGjfKYfuRrQ85IbVsRhQIYX1ZOJtMseEhBRnIeySKV4xWsi
18
- kXAaxX5wIyoM+S1vaKcu
5
+ ZXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFC3H6Q26GO
6
+ bllXTiJBeALUbouzzxaGinwZeYYhhXKWEcfA0D8k+22w/JyndeEYc29JxwjFNwxM
7
+ /DyyQplptzbM1Q5BCcLNQaQhmpOryosjWuYWW1JUDGTG3nEg0qRCrtjwVoAU++Ko
8
+ NkQboM0wFQJxkBns0J1sr+O5Ml73YzKKtdVWWvg89osxyb4wRxkEoa9a/b9/aiK7
9
+ WoeQhF00cRKoa/eoIN8usTjzKsYudHUtEQWibD7IxWdY3nMntGf1jyLYi40lVUbL
10
+ FFytWtlZGMVKpMVIOMMCQ+ex+ExGQaJrQF5QEqPq1L/BvXgTZkv5P6CS3YjBdVC2
11
+ /ntfos3gMhsCAwEAAaM8MDowGQYDVR0RBBIwEIEObm9ib2R5QGV4YW1wbGUwHQYD
12
+ VR0OBBYEFLEaVAlnRWACAtfO9B1gSonf51jZMA0GCSqGSIb3DQEBCwUAA4IBAQDI
13
+ x70p19RI73Y9AEfBd0Wmk7KsZQyP55kjTAdaM37crhmClkUQRrk/Y2a0pXOhsrNI
14
+ 0YO7t44fJKwMu++1dxh/bllKbuOkca6ApxTb2IfhOejx3IXXWzp+C1F9pmG9q5QW
15
+ 0FDt//0SFZJIqDq9N+zFiA2z0MM1L7X/r29uUgAqkU7rsytKavHXru9EGQrrkxwh
16
+ 5dM5VI+pnJgk9HYpBDPwiFVd0yFelebqdlv/nnW11tVBMTkMloVYyhei5yZbWKFk
17
+ f0Aj5g94+S107oRMyzq5e6lxQcJBhmKfOXqGaz2wue3/IHnwio9dMArayug9GLEr
18
+ ycy6PubJImhM/dboDIdO
19
19
  -----END CERTIFICATE-----