rubygems-update 3.1.6 → 3.4.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (784) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5619 -0
  3. data/CODE_OF_CONDUCT.md +55 -19
  4. data/CONTRIBUTING.md +97 -27
  5. data/Manifest.txt +185 -143
  6. data/POLICIES.md +70 -27
  7. data/README.md +29 -14
  8. data/UPGRADING.md +5 -81
  9. data/bin/gem +2 -10
  10. data/bin/update_rubygems +5 -5
  11. data/bundler/CHANGELOG.md +2605 -1431
  12. data/bundler/README.md +9 -14
  13. data/bundler/UPGRADING.md +27 -34
  14. data/bundler/bundler.gemspec +10 -13
  15. data/bundler/exe/bundle +7 -8
  16. data/bundler/exe/bundler +1 -1
  17. data/bundler/lib/bundler/.document +1 -0
  18. data/bundler/lib/bundler/build_metadata.rb +4 -12
  19. data/bundler/lib/bundler/cli/add.rb +2 -2
  20. data/bundler/lib/bundler/cli/binstubs.rb +11 -3
  21. data/bundler/lib/bundler/cli/cache.rb +3 -8
  22. data/bundler/lib/bundler/cli/check.rb +5 -3
  23. data/bundler/lib/bundler/cli/clean.rb +1 -1
  24. data/bundler/lib/bundler/cli/common.rb +32 -3
  25. data/bundler/lib/bundler/cli/config.rb +10 -1
  26. data/bundler/lib/bundler/cli/console.rb +3 -3
  27. data/bundler/lib/bundler/cli/doctor.rb +23 -6
  28. data/bundler/lib/bundler/cli/exec.rb +5 -10
  29. data/bundler/lib/bundler/cli/fund.rb +36 -0
  30. data/bundler/lib/bundler/cli/gem.rb +258 -45
  31. data/bundler/lib/bundler/cli/info.rb +38 -6
  32. data/bundler/lib/bundler/cli/init.rb +7 -3
  33. data/bundler/lib/bundler/cli/inject.rb +1 -1
  34. data/bundler/lib/bundler/cli/install.rb +27 -57
  35. data/bundler/lib/bundler/cli/issue.rb +5 -4
  36. data/bundler/lib/bundler/cli/list.rb +19 -11
  37. data/bundler/lib/bundler/cli/lock.rb +11 -4
  38. data/bundler/lib/bundler/cli/open.rb +7 -6
  39. data/bundler/lib/bundler/cli/outdated.rb +106 -79
  40. data/bundler/lib/bundler/cli/platform.rb +2 -2
  41. data/bundler/lib/bundler/cli/plugin.rb +10 -0
  42. data/bundler/lib/bundler/cli/pristine.rb +5 -0
  43. data/bundler/lib/bundler/cli/remove.rb +1 -2
  44. data/bundler/lib/bundler/cli/show.rb +2 -2
  45. data/bundler/lib/bundler/cli/update.rb +20 -9
  46. data/bundler/lib/bundler/cli/viz.rb +1 -1
  47. data/bundler/lib/bundler/cli.rb +151 -85
  48. data/bundler/lib/bundler/compact_index_client/cache.rb +7 -24
  49. data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
  50. data/bundler/lib/bundler/compact_index_client/updater.rb +56 -51
  51. data/bundler/lib/bundler/compact_index_client.rb +3 -9
  52. data/bundler/lib/bundler/constants.rb +1 -1
  53. data/bundler/lib/bundler/current_ruby.rb +19 -6
  54. data/bundler/lib/bundler/definition.rb +353 -440
  55. data/bundler/lib/bundler/dependency.rb +23 -77
  56. data/bundler/lib/bundler/digest.rb +71 -0
  57. data/bundler/lib/bundler/dsl.rb +77 -85
  58. data/bundler/lib/bundler/endpoint_specification.rb +16 -14
  59. data/bundler/lib/bundler/env.rb +3 -3
  60. data/bundler/lib/bundler/environment_preserver.rb +32 -4
  61. data/bundler/lib/bundler/errors.rb +31 -14
  62. data/bundler/lib/bundler/feature_flag.rb +0 -9
  63. data/bundler/lib/bundler/fetcher/base.rb +7 -9
  64. data/bundler/lib/bundler/fetcher/compact_index.rb +20 -27
  65. data/bundler/lib/bundler/fetcher/dependency.rb +2 -6
  66. data/bundler/lib/bundler/fetcher/downloader.rb +11 -11
  67. data/bundler/lib/bundler/fetcher/index.rb +2 -30
  68. data/bundler/lib/bundler/fetcher.rb +26 -31
  69. data/bundler/lib/bundler/force_platform.rb +18 -0
  70. data/bundler/lib/bundler/friendly_errors.rb +45 -49
  71. data/bundler/lib/bundler/gem_helper.rb +53 -31
  72. data/bundler/lib/bundler/gem_helpers.rb +42 -24
  73. data/bundler/lib/bundler/gem_version_promoter.rb +54 -99
  74. data/bundler/lib/bundler/graph.rb +4 -4
  75. data/bundler/lib/bundler/index.rb +16 -54
  76. data/bundler/lib/bundler/injector.rb +41 -9
  77. data/bundler/lib/bundler/inline.rb +11 -22
  78. data/bundler/lib/bundler/installer/gem_installer.rb +19 -24
  79. data/bundler/lib/bundler/installer/parallel_installer.rb +34 -43
  80. data/bundler/lib/bundler/installer/standalone.rb +62 -11
  81. data/bundler/lib/bundler/installer.rb +43 -87
  82. data/bundler/lib/bundler/lazy_specification.rb +88 -51
  83. data/bundler/lib/bundler/lockfile_generator.rb +4 -4
  84. data/bundler/lib/bundler/lockfile_parser.rb +34 -59
  85. data/bundler/lib/bundler/man/.document +1 -0
  86. data/bundler/{man → lib/bundler/man}/bundle-add.1 +21 -5
  87. data/bundler/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +16 -4
  88. data/bundler/{man → lib/bundler/man}/bundle-binstubs.1 +5 -3
  89. data/bundler/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
  90. data/bundler/{man → lib/bundler/man}/bundle-cache.1 +7 -1
  91. data/bundler/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +7 -0
  92. data/bundler/{man → lib/bundler/man}/bundle-check.1 +1 -1
  93. data/bundler/{man → lib/bundler/man}/bundle-clean.1 +2 -2
  94. data/bundler/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +1 -1
  95. data/bundler/{man → lib/bundler/man}/bundle-config.1 +66 -48
  96. data/bundler/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +75 -66
  97. data/bundler/lib/bundler/man/bundle-console.1 +53 -0
  98. data/bundler/lib/bundler/man/bundle-console.1.ronn +44 -0
  99. data/bundler/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
  100. data/bundler/{man → lib/bundler/man}/bundle-exec.1 +6 -6
  101. data/bundler/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +6 -6
  102. data/bundler/lib/bundler/man/bundle-gem.1 +105 -0
  103. data/bundler/lib/bundler/man/bundle-gem.1.ronn +117 -0
  104. data/bundler/lib/bundler/man/bundle-help.1 +13 -0
  105. data/bundler/lib/bundler/man/bundle-help.1.ronn +12 -0
  106. data/bundler/{man → lib/bundler/man}/bundle-info.1 +1 -1
  107. data/bundler/{man → lib/bundler/man}/bundle-init.1 +5 -1
  108. data/bundler/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +2 -0
  109. data/bundler/{man → lib/bundler/man}/bundle-inject.1 +5 -2
  110. data/bundler/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +3 -1
  111. data/bundler/{man → lib/bundler/man}/bundle-install.1 +35 -33
  112. data/bundler/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +33 -34
  113. data/bundler/{man → lib/bundler/man}/bundle-list.1 +7 -7
  114. data/bundler/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
  115. data/bundler/{man → lib/bundler/man}/bundle-lock.1 +1 -1
  116. data/bundler/{man → lib/bundler/man}/bundle-open.1 +22 -2
  117. data/bundler/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +9 -1
  118. data/bundler/{man → lib/bundler/man}/bundle-outdated.1 +3 -10
  119. data/bundler/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +1 -10
  120. data/bundler/{man → lib/bundler/man}/bundle-platform.1 +16 -6
  121. data/bundler/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +14 -7
  122. data/bundler/lib/bundler/man/bundle-plugin.1 +81 -0
  123. data/bundler/lib/bundler/man/bundle-plugin.1.ronn +59 -0
  124. data/bundler/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
  125. data/bundler/{man → lib/bundler/man}/bundle-remove.1 +1 -1
  126. data/bundler/{man → lib/bundler/man}/bundle-show.1 +1 -1
  127. data/bundler/{man → lib/bundler/man}/bundle-update.1 +5 -5
  128. data/bundler/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +5 -4
  129. data/bundler/lib/bundler/man/bundle-version.1 +35 -0
  130. data/bundler/lib/bundler/man/bundle-version.1.ronn +24 -0
  131. data/bundler/{man → lib/bundler/man}/bundle-viz.1 +4 -1
  132. data/bundler/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +2 -0
  133. data/bundler/{man → lib/bundler/man}/bundle.1 +15 -10
  134. data/bundler/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +12 -7
  135. data/bundler/{man → lib/bundler/man}/gemfile.5 +120 -83
  136. data/bundler/{man → lib/bundler/man}/gemfile.5.ronn +109 -88
  137. data/bundler/{man → lib/bundler/man}/index.txt +4 -0
  138. data/bundler/lib/bundler/match_metadata.rb +13 -0
  139. data/bundler/lib/bundler/match_platform.rb +0 -1
  140. data/bundler/lib/bundler/match_remote_metadata.rb +29 -0
  141. data/bundler/lib/bundler/mirror.rb +7 -9
  142. data/bundler/lib/bundler/plugin/api/source.rb +25 -9
  143. data/bundler/lib/bundler/plugin/dsl.rb +1 -1
  144. data/bundler/lib/bundler/plugin/index.rb +17 -5
  145. data/bundler/lib/bundler/plugin/installer/git.rb +0 -4
  146. data/bundler/lib/bundler/plugin/installer/rubygems.rb +1 -9
  147. data/bundler/lib/bundler/plugin/installer.rb +16 -13
  148. data/bundler/lib/bundler/plugin/source_list.rb +5 -1
  149. data/bundler/lib/bundler/plugin.rb +59 -12
  150. data/bundler/lib/bundler/process_lock.rb +1 -1
  151. data/bundler/lib/bundler/remote_specification.rb +12 -7
  152. data/bundler/lib/bundler/resolver/base.rb +109 -0
  153. data/bundler/lib/bundler/resolver/candidate.rb +94 -0
  154. data/bundler/lib/bundler/resolver/incompatibility.rb +15 -0
  155. data/bundler/lib/bundler/resolver/package.rb +72 -0
  156. data/bundler/lib/bundler/resolver/root.rb +25 -0
  157. data/bundler/lib/bundler/resolver/spec_group.rb +49 -74
  158. data/bundler/lib/bundler/resolver.rb +336 -344
  159. data/bundler/lib/bundler/retry.rb +2 -2
  160. data/bundler/lib/bundler/ruby_dsl.rb +1 -1
  161. data/bundler/lib/bundler/ruby_version.rb +6 -19
  162. data/bundler/lib/bundler/rubygems_ext.rb +231 -32
  163. data/bundler/lib/bundler/rubygems_gem_installer.rb +89 -16
  164. data/bundler/lib/bundler/rubygems_integration.rb +81 -167
  165. data/bundler/lib/bundler/runtime.rb +23 -31
  166. data/bundler/lib/bundler/self_manager.rb +168 -0
  167. data/bundler/lib/bundler/settings.rb +146 -73
  168. data/bundler/lib/bundler/setup.rb +5 -2
  169. data/bundler/lib/bundler/shared_helpers.rb +20 -35
  170. data/bundler/lib/bundler/similarity_detector.rb +1 -1
  171. data/bundler/lib/bundler/source/git/git_proxy.rb +263 -114
  172. data/bundler/lib/bundler/source/git.rb +64 -47
  173. data/bundler/lib/bundler/source/metadata.rb +3 -8
  174. data/bundler/lib/bundler/source/path/installer.rb +11 -32
  175. data/bundler/lib/bundler/source/path.rb +16 -10
  176. data/bundler/lib/bundler/source/rubygems/remote.rb +1 -1
  177. data/bundler/lib/bundler/source/rubygems.rb +167 -200
  178. data/bundler/lib/bundler/source/rubygems_aggregate.rb +68 -0
  179. data/bundler/lib/bundler/source.rb +25 -5
  180. data/bundler/lib/bundler/source_list.rb +112 -64
  181. data/bundler/lib/bundler/source_map.rb +71 -0
  182. data/bundler/lib/bundler/spec_set.rb +74 -61
  183. data/bundler/lib/bundler/stub_specification.rb +30 -10
  184. data/bundler/lib/bundler/templates/Executable +3 -5
  185. data/bundler/lib/bundler/templates/Executable.bundler +11 -16
  186. data/bundler/lib/bundler/templates/Executable.standalone +4 -4
  187. data/bundler/lib/bundler/templates/Gemfile +0 -2
  188. data/bundler/lib/bundler/templates/newgem/CHANGELOG.md.tt +5 -0
  189. data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
  190. data/bundler/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
  191. data/bundler/lib/bundler/templates/newgem/Gemfile.tt +15 -1
  192. data/bundler/lib/bundler/templates/newgem/README.md.tt +13 -16
  193. data/bundler/lib/bundler/templates/newgem/Rakefile.tt +43 -5
  194. data/bundler/lib/bundler/templates/newgem/bin/console.tt +1 -0
  195. data/bundler/lib/bundler/templates/newgem/circleci/config.yml.tt +25 -0
  196. data/bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
  197. data/bundler/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +2 -0
  198. data/bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
  199. data/bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
  200. data/bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt +37 -0
  201. data/bundler/lib/bundler/templates/newgem/gitignore.tt +3 -0
  202. data/bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt +18 -0
  203. data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
  204. data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
  205. data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +34 -18
  206. data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +13 -0
  207. data/bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
  208. data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
  209. data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
  210. data/bundler/lib/bundler/templates/newgem/standard.yml.tt +3 -0
  211. data/bundler/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
  212. data/bundler/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/test_newgem.rb.tt} +3 -1
  213. data/bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
  214. data/bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
  215. data/bundler/lib/bundler/ui/shell.rb +37 -14
  216. data/bundler/lib/bundler/ui/silent.rb +21 -5
  217. data/bundler/lib/bundler/uri_credentials_filter.rb +3 -1
  218. data/bundler/lib/bundler/uri_normalizer.rb +23 -0
  219. data/bundler/lib/bundler/vendor/.document +1 -0
  220. data/bundler/lib/bundler/vendor/connection_pool/LICENSE +20 -0
  221. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +19 -21
  222. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +1 -1
  223. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
  224. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +41 -74
  225. data/bundler/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
  226. data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
  227. data/bundler/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
  228. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +82 -189
  229. data/bundler/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
  230. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
  231. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
  232. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
  233. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
  234. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
  235. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
  236. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
  237. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
  238. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +60 -0
  239. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
  240. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
  241. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
  242. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
  243. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +243 -0
  244. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
  245. data/bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
  246. data/bundler/lib/bundler/vendor/thor/LICENSE.md +20 -0
  247. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
  248. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +9 -7
  249. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -2
  250. data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +7 -3
  251. data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
  252. data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +6 -0
  253. data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +10 -5
  254. data/bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +5 -1
  255. data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +28 -9
  256. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +28 -7
  257. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +5 -1
  258. data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
  259. data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
  260. data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
  261. data/bundler/lib/bundler/vendor/thor/lib/thor.rb +5 -13
  262. data/bundler/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
  263. data/bundler/lib/bundler/vendor/tsort/lib/tsort.rb +452 -0
  264. data/bundler/lib/bundler/vendor/uri/LICENSE.txt +22 -0
  265. data/bundler/lib/bundler/vendor/uri/lib/uri/common.rb +76 -91
  266. data/bundler/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
  267. data/bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
  268. data/bundler/lib/bundler/vendor/uri/lib/uri/generic.rb +32 -13
  269. data/bundler/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
  270. data/bundler/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
  271. data/bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
  272. data/bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
  273. data/bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
  274. data/bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +14 -21
  275. data/bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -17
  276. data/bundler/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
  277. data/bundler/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
  278. data/bundler/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
  279. data/bundler/lib/bundler/vendor/uri/lib/uri.rb +3 -3
  280. data/bundler/lib/bundler/vendored_persistent.rb +1 -40
  281. data/bundler/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
  282. data/bundler/lib/bundler/vendored_tsort.rb +4 -0
  283. data/bundler/lib/bundler/version.rb +5 -1
  284. data/bundler/lib/bundler/worker.rb +25 -12
  285. data/bundler/lib/bundler/yaml_serializer.rb +1 -1
  286. data/bundler/lib/bundler.rb +98 -110
  287. data/hide_lib_for_update/note.txt +0 -4
  288. data/lib/rubygems/available_set.rb +7 -9
  289. data/lib/rubygems/basic_specification.rb +23 -21
  290. data/lib/rubygems/bundler_version_finder.rb +27 -54
  291. data/lib/rubygems/command.rb +63 -52
  292. data/lib/rubygems/command_manager.rb +36 -16
  293. data/lib/rubygems/commands/build_command.rb +50 -27
  294. data/lib/rubygems/commands/cert_command.rb +78 -75
  295. data/lib/rubygems/commands/check_command.rb +20 -22
  296. data/lib/rubygems/commands/cleanup_command.rb +30 -26
  297. data/lib/rubygems/commands/contents_command.rb +16 -18
  298. data/lib/rubygems/commands/dependency_command.rb +39 -51
  299. data/lib/rubygems/commands/environment_command.rb +11 -10
  300. data/lib/rubygems/commands/exec_command.rb +248 -0
  301. data/lib/rubygems/commands/fetch_command.rb +33 -16
  302. data/lib/rubygems/commands/generate_index_command.rb +17 -19
  303. data/lib/rubygems/commands/help_command.rb +9 -9
  304. data/lib/rubygems/commands/info_command.rb +10 -7
  305. data/lib/rubygems/commands/install_command.rb +36 -30
  306. data/lib/rubygems/commands/list_command.rb +9 -8
  307. data/lib/rubygems/commands/lock_command.rb +5 -7
  308. data/lib/rubygems/commands/mirror_command.rb +3 -5
  309. data/lib/rubygems/commands/open_command.rb +10 -14
  310. data/lib/rubygems/commands/outdated_command.rb +5 -7
  311. data/lib/rubygems/commands/owner_command.rb +26 -16
  312. data/lib/rubygems/commands/pristine_command.rb +70 -49
  313. data/lib/rubygems/commands/push_command.rb +22 -59
  314. data/lib/rubygems/commands/query_command.rb +21 -351
  315. data/lib/rubygems/commands/rdoc_command.rb +26 -27
  316. data/lib/rubygems/commands/search_command.rb +8 -8
  317. data/lib/rubygems/commands/server_command.rb +16 -77
  318. data/lib/rubygems/commands/setup_command.rb +255 -229
  319. data/lib/rubygems/commands/signin_command.rb +9 -11
  320. data/lib/rubygems/commands/signout_command.rb +7 -9
  321. data/lib/rubygems/commands/sources_command.rb +27 -25
  322. data/lib/rubygems/commands/specification_command.rb +25 -21
  323. data/lib/rubygems/commands/stale_command.rb +3 -5
  324. data/lib/rubygems/commands/uninstall_command.rb +44 -43
  325. data/lib/rubygems/commands/unpack_command.rb +14 -16
  326. data/lib/rubygems/commands/update_command.rb +126 -74
  327. data/lib/rubygems/commands/which_command.rb +7 -9
  328. data/lib/rubygems/commands/yank_command.rb +16 -19
  329. data/lib/rubygems/compatibility.rb +4 -2
  330. data/lib/rubygems/config_file.rb +75 -26
  331. data/lib/rubygems/core_ext/kernel_gem.rb +1 -6
  332. data/lib/rubygems/core_ext/kernel_require.rb +108 -112
  333. data/lib/rubygems/core_ext/kernel_warn.rb +31 -36
  334. data/lib/rubygems/core_ext/tcpsocket_init.rb +52 -0
  335. data/lib/rubygems/defaults.rb +124 -34
  336. data/lib/rubygems/dependency.rb +24 -22
  337. data/lib/rubygems/dependency_installer.rb +43 -115
  338. data/lib/rubygems/dependency_list.rb +13 -15
  339. data/lib/rubygems/deprecate.rb +102 -8
  340. data/lib/rubygems/doctor.rb +22 -22
  341. data/lib/rubygems/errors.rb +6 -21
  342. data/lib/rubygems/exceptions.rb +34 -37
  343. data/lib/rubygems/ext/build_error.rb +2 -0
  344. data/lib/rubygems/ext/builder.rb +64 -54
  345. data/lib/rubygems/ext/cargo_builder/link_flag_converter.rb +27 -0
  346. data/lib/rubygems/ext/cargo_builder.rb +360 -0
  347. data/lib/rubygems/ext/cmake_builder.rb +6 -9
  348. data/lib/rubygems/ext/configure_builder.rb +5 -8
  349. data/lib/rubygems/ext/ext_conf_builder.rb +43 -66
  350. data/lib/rubygems/ext/rake_builder.rb +7 -10
  351. data/lib/rubygems/ext.rb +7 -6
  352. data/lib/rubygems/gem_runner.rb +15 -26
  353. data/lib/rubygems/gemcutter_utilities.rb +161 -33
  354. data/lib/rubygems/indexer.rb +31 -50
  355. data/lib/rubygems/install_default_message.rb +2 -2
  356. data/lib/rubygems/install_message.rb +2 -2
  357. data/lib/rubygems/install_update_options.rb +73 -64
  358. data/lib/rubygems/installer.rb +199 -156
  359. data/lib/rubygems/installer_uninstaller_utils.rb +29 -0
  360. data/lib/rubygems/local_remote_options.rb +22 -24
  361. data/lib/rubygems/mock_gem_ui.rb +2 -8
  362. data/lib/rubygems/name_tuple.rb +9 -14
  363. data/lib/rubygems/openssl.rb +7 -0
  364. data/lib/rubygems/optparse/.document +1 -0
  365. data/lib/rubygems/optparse/COPYING +56 -0
  366. data/lib/rubygems/optparse/lib/optionparser.rb +2 -0
  367. data/lib/rubygems/optparse/lib/optparse/ac.rb +54 -0
  368. data/lib/rubygems/optparse/lib/optparse/date.rb +18 -0
  369. data/lib/rubygems/optparse/lib/optparse/kwargs.rb +22 -0
  370. data/lib/rubygems/optparse/lib/optparse/shellwords.rb +7 -0
  371. data/lib/rubygems/optparse/lib/optparse/time.rb +11 -0
  372. data/lib/rubygems/optparse/lib/optparse/uri.rb +7 -0
  373. data/lib/rubygems/optparse/lib/optparse/version.rb +71 -0
  374. data/lib/rubygems/optparse/lib/optparse.rb +2308 -0
  375. data/lib/rubygems/optparse.rb +3 -0
  376. data/lib/rubygems/package/digest_io.rb +0 -2
  377. data/lib/rubygems/package/file_source.rb +2 -4
  378. data/lib/rubygems/package/io_source.rb +4 -2
  379. data/lib/rubygems/package/old.rb +9 -11
  380. data/lib/rubygems/package/tar_header.rb +65 -67
  381. data/lib/rubygems/package/tar_reader/entry.rb +89 -11
  382. data/lib/rubygems/package/tar_reader.rb +1 -32
  383. data/lib/rubygems/package/tar_writer.rb +8 -18
  384. data/lib/rubygems/package.rb +109 -120
  385. data/lib/rubygems/package_task.rb +5 -11
  386. data/lib/rubygems/path_support.rb +2 -9
  387. data/lib/rubygems/platform.rb +113 -74
  388. data/lib/rubygems/psych_tree.rb +1 -3
  389. data/lib/rubygems/query_utils.rb +351 -0
  390. data/lib/rubygems/rdoc.rb +2 -14
  391. data/lib/rubygems/remote_fetcher.rb +48 -74
  392. data/lib/rubygems/request/connection_pools.rb +6 -10
  393. data/lib/rubygems/request/http_pool.rb +2 -4
  394. data/lib/rubygems/request/https_pool.rb +0 -2
  395. data/lib/rubygems/request.rb +26 -31
  396. data/lib/rubygems/request_set/gem_dependency_api.rb +127 -130
  397. data/lib/rubygems/request_set/lockfile/parser.rb +26 -28
  398. data/lib/rubygems/request_set/lockfile/tokenizer.rb +5 -7
  399. data/lib/rubygems/request_set/lockfile.rb +17 -21
  400. data/lib/rubygems/request_set.rb +27 -40
  401. data/lib/rubygems/requirement.rb +29 -49
  402. data/lib/rubygems/resolver/activation_request.rb +12 -6
  403. data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
  404. data/lib/rubygems/resolver/api_set.rb +32 -25
  405. data/lib/rubygems/resolver/api_specification.rb +29 -15
  406. data/lib/rubygems/resolver/best_set.rb +7 -9
  407. data/lib/rubygems/resolver/composed_set.rb +3 -5
  408. data/lib/rubygems/resolver/conflict.rb +12 -14
  409. data/lib/rubygems/resolver/current_set.rb +0 -2
  410. data/lib/rubygems/resolver/dependency_request.rb +3 -5
  411. data/lib/rubygems/resolver/git_set.rb +2 -4
  412. data/lib/rubygems/resolver/git_specification.rb +6 -8
  413. data/lib/rubygems/resolver/index_set.rb +4 -6
  414. data/lib/rubygems/resolver/index_specification.rb +38 -7
  415. data/lib/rubygems/resolver/installed_specification.rb +4 -6
  416. data/lib/rubygems/resolver/installer_set.rb +66 -24
  417. data/lib/rubygems/resolver/local_specification.rb +2 -4
  418. data/lib/rubygems/resolver/lock_set.rb +6 -8
  419. data/lib/rubygems/resolver/lock_specification.rb +4 -6
  420. data/lib/rubygems/resolver/molinillo/LICENSE +9 -0
  421. data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
  422. data/lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb +8 -0
  423. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
  424. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +2 -1
  425. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +2 -1
  426. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +2 -1
  427. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +2 -1
  428. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb +7 -6
  429. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb +2 -1
  430. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb +4 -3
  431. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +51 -12
  432. data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +42 -9
  433. data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +82 -8
  434. data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb +2 -1
  435. data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb +13 -1
  436. data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb +3 -1
  437. data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb +510 -165
  438. data/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb +3 -2
  439. data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb +8 -4
  440. data/lib/rubygems/resolver/molinillo/lib/molinillo.rb +6 -5
  441. data/lib/rubygems/resolver/molinillo.rb +1 -1
  442. data/lib/rubygems/resolver/requirement_list.rb +0 -2
  443. data/lib/rubygems/resolver/set.rb +0 -3
  444. data/lib/rubygems/resolver/source_set.rb +0 -2
  445. data/lib/rubygems/resolver/spec_specification.rb +14 -2
  446. data/lib/rubygems/resolver/specification.rb +14 -4
  447. data/lib/rubygems/resolver/stats.rb +1 -3
  448. data/lib/rubygems/resolver/vendor_set.rb +1 -3
  449. data/lib/rubygems/resolver/vendor_specification.rb +3 -5
  450. data/lib/rubygems/resolver.rb +53 -51
  451. data/lib/rubygems/s3_uri_signer.rb +7 -15
  452. data/lib/rubygems/safe_yaml.rb +14 -16
  453. data/lib/rubygems/security/policies.rb +47 -47
  454. data/lib/rubygems/security/policy.rb +25 -29
  455. data/lib/rubygems/security/signer.rb +13 -16
  456. data/lib/rubygems/security/trust_dir.rb +5 -6
  457. data/lib/rubygems/security.rb +90 -69
  458. data/lib/rubygems/security_option.rb +7 -7
  459. data/lib/rubygems/source/git.rb +31 -31
  460. data/lib/rubygems/source/installed.rb +1 -3
  461. data/lib/rubygems/source/local.rb +4 -6
  462. data/lib/rubygems/source/lock.rb +0 -2
  463. data/lib/rubygems/source/specific_file.rb +1 -3
  464. data/lib/rubygems/source/vendor.rb +0 -2
  465. data/lib/rubygems/source.rb +44 -38
  466. data/lib/rubygems/source_list.rb +9 -16
  467. data/lib/rubygems/spec_fetcher.rb +49 -48
  468. data/lib/rubygems/specification.rb +382 -343
  469. data/lib/rubygems/specification_policy.rb +131 -61
  470. data/lib/rubygems/stub_specification.rb +24 -31
  471. data/lib/rubygems/text.rb +22 -21
  472. data/lib/rubygems/tsort/.document +1 -0
  473. data/lib/rubygems/tsort/LICENSE.txt +22 -0
  474. data/lib/rubygems/tsort/lib/tsort.rb +452 -0
  475. data/lib/rubygems/tsort.rb +3 -0
  476. data/lib/rubygems/uninstaller.rb +98 -45
  477. data/lib/rubygems/unknown_command_spell_checker.rb +21 -0
  478. data/lib/rubygems/update_suggestion.rb +69 -0
  479. data/lib/rubygems/uri.rb +126 -0
  480. data/lib/rubygems/uri_formatter.rb +2 -3
  481. data/lib/rubygems/user_interaction.rb +43 -54
  482. data/lib/rubygems/util/licenses.rb +115 -10
  483. data/lib/rubygems/util/list.rb +0 -2
  484. data/lib/rubygems/util.rb +19 -17
  485. data/lib/rubygems/validator.rb +7 -9
  486. data/lib/rubygems/version.rb +31 -22
  487. data/lib/rubygems/version_option.rb +11 -5
  488. data/lib/rubygems.rb +213 -290
  489. data/rubygems-update.gemspec +5 -5
  490. data/setup.rb +11 -22
  491. data/test/rubygems/alternate_cert.pem +14 -14
  492. data/test/rubygems/alternate_cert_32.pem +15 -15
  493. data/test/rubygems/alternate_key.pem +25 -25
  494. data/test/rubygems/bundler_test_gem.rb +419 -0
  495. data/test/rubygems/child_cert.pem +15 -16
  496. data/test/rubygems/child_cert_32.pem +15 -16
  497. data/test/rubygems/child_key.pem +25 -25
  498. data/test/rubygems/data/excon-0.7.7.gemspec.rz +0 -0
  499. data/test/rubygems/data/null-required-ruby-version.gemspec.rz +0 -0
  500. data/test/rubygems/data/null-required-rubygems-version.gemspec.rz +0 -0
  501. data/test/rubygems/data/pry-0.4.7.gemspec.rz +0 -0
  502. data/test/rubygems/encrypted_private_key.pem +26 -26
  503. data/test/rubygems/expired_cert.pem +15 -15
  504. data/test/rubygems/future_cert.pem +15 -15
  505. data/test/rubygems/future_cert_32.pem +15 -15
  506. data/test/rubygems/grandchild_cert.pem +15 -16
  507. data/test/rubygems/grandchild_cert_32.pem +15 -16
  508. data/test/rubygems/grandchild_key.pem +25 -25
  509. data/{lib/rubygems/test_case.rb → test/rubygems/helper.rb} +402 -327
  510. data/{lib → test}/rubygems/installer_test_case.rb +38 -24
  511. data/test/rubygems/invalid_issuer_cert.pem +16 -16
  512. data/test/rubygems/invalid_issuer_cert_32.pem +16 -16
  513. data/test/rubygems/invalid_key.pem +25 -25
  514. data/test/rubygems/invalid_signer_cert.pem +15 -15
  515. data/test/rubygems/invalid_signer_cert_32.pem +15 -15
  516. data/test/rubygems/invalidchild_cert.pem +15 -16
  517. data/test/rubygems/invalidchild_cert_32.pem +15 -16
  518. data/test/rubygems/invalidchild_key.pem +25 -25
  519. data/{lib → test}/rubygems/package/tar_test_case.rb +51 -18
  520. data/test/rubygems/packages/Bluebie-legs-0.6.2.gem +0 -0
  521. data/test/rubygems/packages/ascii_binder-0.1.10.1.gem +0 -0
  522. data/test/rubygems/packages/ill-formatted-platform-1.0.0.10.gem +0 -0
  523. data/test/rubygems/plugin/exception/rubygems_plugin.rb +1 -1
  524. data/test/rubygems/plugin/load/rubygems_plugin.rb +0 -2
  525. data/test/rubygems/plugin/standarderror/rubygems_plugin.rb +1 -1
  526. data/test/rubygems/private_ec_key.pem +9 -0
  527. data/test/rubygems/private_key.pem +25 -25
  528. data/test/rubygems/public_cert.pem +16 -16
  529. data/test/rubygems/public_cert_32.pem +15 -15
  530. data/test/rubygems/public_key.pem +7 -7
  531. data/test/rubygems/rubygems/commands/crash_command.rb +0 -2
  532. data/test/rubygems/rubygems_plugin.rb +2 -4
  533. data/test/rubygems/simple_gem.rb +1 -1
  534. data/test/rubygems/specifications/bar-0.0.2.gemspec +0 -2
  535. data/test/rubygems/specifications/rubyforge-0.0.1.gemspec +4 -6
  536. data/test/rubygems/test_bundled_ca.rb +43 -50
  537. data/test/rubygems/test_config.rb +5 -7
  538. data/test/rubygems/test_deprecate.rb +87 -10
  539. data/test/rubygems/test_exit.rb +17 -0
  540. data/test/rubygems/test_gem.rb +560 -826
  541. data/test/rubygems/test_gem_available_set.rb +24 -26
  542. data/test/rubygems/test_gem_bundler_version_finder.rb +40 -46
  543. data/test/rubygems/test_gem_command.rb +78 -49
  544. data/test/rubygems/test_gem_command_manager.rb +163 -35
  545. data/test/rubygems/test_gem_commands_build_command.rb +285 -57
  546. data/test/rubygems/test_gem_commands_cert_command.rb +180 -125
  547. data/test/rubygems/test_gem_commands_check_command.rb +9 -11
  548. data/test/rubygems/test_gem_commands_cleanup_command.rb +78 -69
  549. data/test/rubygems/test_gem_commands_contents_command.rb +73 -42
  550. data/test/rubygems/test_gem_commands_dependency_command.rb +38 -40
  551. data/test/rubygems/test_gem_commands_environment_command.rb +60 -38
  552. data/test/rubygems/test_gem_commands_exec_command.rb +851 -0
  553. data/test/rubygems/test_gem_commands_fetch_command.rb +163 -32
  554. data/test/rubygems/test_gem_commands_generate_index_command.rb +8 -14
  555. data/test/rubygems/test_gem_commands_help_command.rb +34 -16
  556. data/test/rubygems/test_gem_commands_info_command.rb +33 -9
  557. data/test/rubygems/test_gem_commands_install_command.rb +420 -198
  558. data/test/rubygems/test_gem_commands_list_command.rb +5 -7
  559. data/test/rubygems/test_gem_commands_lock_command.rb +11 -13
  560. data/test/rubygems/test_gem_commands_mirror.rb +3 -5
  561. data/test/rubygems/test_gem_commands_open_command.rb +16 -19
  562. data/test/rubygems/test_gem_commands_outdated_command.rb +23 -7
  563. data/test/rubygems/test_gem_commands_owner_command.rb +181 -46
  564. data/test/rubygems/test_gem_commands_pristine_command.rb +179 -99
  565. data/test/rubygems/test_gem_commands_push_command.rb +156 -67
  566. data/test/rubygems/test_gem_commands_query_command.rb +91 -91
  567. data/test/rubygems/test_gem_commands_search_command.rb +2 -4
  568. data/test/rubygems/test_gem_commands_server_command.rb +6 -50
  569. data/test/rubygems/test_gem_commands_setup_command.rb +285 -183
  570. data/test/rubygems/test_gem_commands_signin_command.rb +187 -28
  571. data/test/rubygems/test_gem_commands_signout_command.rb +3 -10
  572. data/test/rubygems/test_gem_commands_sources_command.rb +139 -32
  573. data/test/rubygems/test_gem_commands_specification_command.rb +81 -55
  574. data/test/rubygems/test_gem_commands_stale_command.rb +4 -6
  575. data/test/rubygems/test_gem_commands_uninstall_command.rb +102 -87
  576. data/test/rubygems/test_gem_commands_unpack_command.rb +32 -34
  577. data/test/rubygems/test_gem_commands_update_command.rb +341 -94
  578. data/test/rubygems/test_gem_commands_which_command.rb +12 -14
  579. data/test/rubygems/test_gem_commands_yank_command.rb +80 -44
  580. data/test/rubygems/test_gem_config_file.rb +114 -97
  581. data/test/rubygems/test_gem_dependency.rb +88 -86
  582. data/test/rubygems/test_gem_dependency_installer.rb +277 -391
  583. data/test/rubygems/test_gem_dependency_list.rb +57 -59
  584. data/test/rubygems/test_gem_dependency_resolution_error.rb +5 -7
  585. data/test/rubygems/test_gem_doctor.rb +73 -47
  586. data/test/rubygems/test_gem_ext_builder.rb +115 -111
  587. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/.gitignore +1 -0
  588. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec +8 -0
  589. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock +233 -0
  590. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml +10 -0
  591. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs +27 -0
  592. data/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb +1 -0
  593. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/.gitignore +1 -0
  594. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.lock +247 -0
  595. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/Cargo.toml +10 -0
  596. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/rust_ruby_example.gemspec +8 -0
  597. data/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example/src/lib.rs +51 -0
  598. data/test/rubygems/test_gem_ext_cargo_builder.rb +166 -0
  599. data/test/rubygems/test_gem_ext_cargo_builder_link_flag_converter.rb +33 -0
  600. data/test/rubygems/test_gem_ext_cargo_builder_unit.rb +60 -0
  601. data/test/rubygems/test_gem_ext_cmake_builder.rb +31 -38
  602. data/test/rubygems/test_gem_ext_configure_builder.rb +23 -39
  603. data/test/rubygems/test_gem_ext_ext_conf_builder.rb +66 -82
  604. data/test/rubygems/test_gem_ext_rake_builder.rb +49 -32
  605. data/test/rubygems/test_gem_gem_runner.rb +57 -9
  606. data/test/rubygems/test_gem_gemcutter_utilities.rb +91 -76
  607. data/test/rubygems/test_gem_impossible_dependencies_error.rb +4 -6
  608. data/test/rubygems/test_gem_indexer.rb +100 -83
  609. data/test/rubygems/test_gem_install_update_options.rb +31 -21
  610. data/test/rubygems/test_gem_installer.rb +857 -484
  611. data/test/rubygems/test_gem_local_remote_options.rb +11 -13
  612. data/test/rubygems/test_gem_name_tuple.rb +4 -6
  613. data/test/rubygems/test_gem_package.rb +330 -305
  614. data/test/rubygems/test_gem_package_old.rb +18 -20
  615. data/test/rubygems/test_gem_package_tar_header.rb +69 -52
  616. data/test/rubygems/test_gem_package_tar_reader.rb +54 -9
  617. data/test/rubygems/test_gem_package_tar_reader_entry.rb +168 -25
  618. data/test/rubygems/test_gem_package_tar_writer.rb +96 -100
  619. data/test/rubygems/test_gem_package_task.rb +58 -25
  620. data/test/rubygems/test_gem_path_support.rb +15 -21
  621. data/test/rubygems/test_gem_platform.rb +388 -201
  622. data/test/rubygems/test_gem_rdoc.rb +19 -21
  623. data/test/rubygems/test_gem_remote_fetcher.rb +377 -338
  624. data/test/rubygems/test_gem_request.rb +114 -86
  625. data/test/rubygems/test_gem_request_connection_pools.rb +30 -34
  626. data/test/rubygems/test_gem_request_set.rb +124 -125
  627. data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +227 -231
  628. data/test/rubygems/test_gem_request_set_lockfile.rb +93 -95
  629. data/test/rubygems/test_gem_request_set_lockfile_parser.rb +69 -71
  630. data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +136 -138
  631. data/test/rubygems/test_gem_requirement.rb +133 -54
  632. data/test/rubygems/test_gem_resolver.rb +182 -117
  633. data/test/rubygems/test_gem_resolver_activation_request.rb +6 -8
  634. data/test/rubygems/test_gem_resolver_api_set.rb +79 -78
  635. data/test/rubygems/test_gem_resolver_api_specification.rb +47 -49
  636. data/test/rubygems/test_gem_resolver_best_set.rb +43 -22
  637. data/test/rubygems/test_gem_resolver_composed_set.rb +1 -3
  638. data/test/rubygems/test_gem_resolver_conflict.rb +12 -14
  639. data/test/rubygems/test_gem_resolver_dependency_request.rb +15 -17
  640. data/test/rubygems/test_gem_resolver_git_set.rb +22 -24
  641. data/test/rubygems/test_gem_resolver_git_specification.rb +22 -23
  642. data/test/rubygems/test_gem_resolver_index_set.rb +14 -16
  643. data/test/rubygems/test_gem_resolver_index_specification.rb +16 -18
  644. data/test/rubygems/test_gem_resolver_installed_specification.rb +5 -7
  645. data/test/rubygems/test_gem_resolver_installer_set.rb +104 -44
  646. data/test/rubygems/test_gem_resolver_local_specification.rb +7 -9
  647. data/test/rubygems/test_gem_resolver_lock_set.rb +15 -17
  648. data/test/rubygems/test_gem_resolver_lock_specification.rb +17 -19
  649. data/test/rubygems/test_gem_resolver_requirement_list.rb +1 -3
  650. data/test/rubygems/test_gem_resolver_specification.rb +8 -12
  651. data/test/rubygems/test_gem_resolver_vendor_set.rb +9 -11
  652. data/test/rubygems/test_gem_resolver_vendor_specification.rb +10 -12
  653. data/test/rubygems/test_gem_security.rb +105 -79
  654. data/test/rubygems/test_gem_security_policy.rb +102 -107
  655. data/test/rubygems/test_gem_security_signer.rb +51 -53
  656. data/test/rubygems/test_gem_security_trust_dir.rb +14 -16
  657. data/test/rubygems/test_gem_silent_ui.rb +46 -42
  658. data/test/rubygems/test_gem_source.rb +53 -52
  659. data/test/rubygems/test_gem_source_fetch_problem.rb +16 -8
  660. data/test/rubygems/test_gem_source_git.rb +78 -72
  661. data/test/rubygems/test_gem_source_installed.rb +16 -18
  662. data/test/rubygems/test_gem_source_list.rb +5 -6
  663. data/test/rubygems/test_gem_source_local.rb +15 -17
  664. data/test/rubygems/test_gem_source_lock.rb +31 -33
  665. data/test/rubygems/test_gem_source_specific_file.rb +18 -20
  666. data/test/rubygems/test_gem_source_subpath_problem.rb +49 -0
  667. data/test/rubygems/test_gem_source_vendor.rb +13 -15
  668. data/test/rubygems/test_gem_spec_fetcher.rb +74 -67
  669. data/test/rubygems/test_gem_specification.rb +967 -1056
  670. data/test/rubygems/test_gem_stream_ui.rb +23 -23
  671. data/test/rubygems/test_gem_stub_specification.rb +39 -57
  672. data/test/rubygems/test_gem_text.rb +8 -4
  673. data/test/rubygems/test_gem_uninstaller.rb +234 -105
  674. data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb +3 -5
  675. data/test/rubygems/test_gem_update_suggestion.rb +208 -0
  676. data/test/rubygems/test_gem_uri.rb +39 -0
  677. data/test/rubygems/test_gem_uri_formatter.rb +14 -16
  678. data/test/rubygems/test_gem_util.rb +37 -35
  679. data/test/rubygems/test_gem_validator.rb +10 -12
  680. data/test/rubygems/test_gem_version.rb +32 -32
  681. data/test/rubygems/test_gem_version_option.rb +16 -18
  682. data/test/rubygems/test_kernel.rb +47 -67
  683. data/test/rubygems/test_project_sanity.rb +8 -3
  684. data/test/rubygems/test_remote_fetch_error.rb +7 -9
  685. data/test/rubygems/test_require.rb +269 -182
  686. data/test/rubygems/test_rubygems.rb +74 -0
  687. data/{lib/rubygems/test_utilities.rb → test/rubygems/utilities.rb} +63 -50
  688. data/test/rubygems/wrong_key_cert.pem +15 -15
  689. data/test/rubygems/wrong_key_cert_32.pem +15 -15
  690. data/test/test_changelog_generator.rb +17 -0
  691. metadata +190 -173
  692. data/.bundle/config +0 -2
  693. data/.rubocop.yml +0 -91
  694. data/Gemfile +0 -8
  695. data/Gemfile.lock +0 -43
  696. data/History.txt +0 -4473
  697. data/Rakefile +0 -428
  698. data/bundler/CODE_OF_CONDUCT.md +0 -136
  699. data/bundler/lib/bundler/dep_proxy.rb +0 -48
  700. data/bundler/lib/bundler/gemdeps.rb +0 -29
  701. data/bundler/lib/bundler/psyched_yaml.rb +0 -37
  702. data/bundler/lib/bundler/templates/gems.rb +0 -8
  703. data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -6
  704. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
  705. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
  706. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
  707. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -81
  708. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
  709. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
  710. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
  711. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
  712. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
  713. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
  714. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
  715. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
  716. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -158
  717. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -223
  718. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
  719. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
  720. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -101
  721. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
  722. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -837
  723. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
  724. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
  725. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -12
  726. data/bundler/lib/bundler/version_ranges.rb +0 -122
  727. data/bundler/man/bundle-add.1.txt +0 -58
  728. data/bundler/man/bundle-binstubs.1.txt +0 -48
  729. data/bundler/man/bundle-cache.1.txt +0 -78
  730. data/bundler/man/bundle-check.1.txt +0 -33
  731. data/bundler/man/bundle-clean.1.txt +0 -26
  732. data/bundler/man/bundle-config.1.txt +0 -528
  733. data/bundler/man/bundle-doctor.1.txt +0 -44
  734. data/bundler/man/bundle-exec.1.txt +0 -178
  735. data/bundler/man/bundle-gem.1 +0 -80
  736. data/bundler/man/bundle-gem.1.txt +0 -91
  737. data/bundler/man/bundle-gem.ronn +0 -78
  738. data/bundler/man/bundle-info.1.txt +0 -21
  739. data/bundler/man/bundle-init.1.txt +0 -34
  740. data/bundler/man/bundle-inject.1.txt +0 -32
  741. data/bundler/man/bundle-install.1.txt +0 -401
  742. data/bundler/man/bundle-list.1.txt +0 -43
  743. data/bundler/man/bundle-lock.1.txt +0 -93
  744. data/bundler/man/bundle-open.1.txt +0 -29
  745. data/bundler/man/bundle-outdated.1.txt +0 -131
  746. data/bundler/man/bundle-platform.1.txt +0 -57
  747. data/bundler/man/bundle-pristine.1.txt +0 -44
  748. data/bundler/man/bundle-remove.1.txt +0 -34
  749. data/bundler/man/bundle-show.1.txt +0 -27
  750. data/bundler/man/bundle-update.1.txt +0 -390
  751. data/bundler/man/bundle-viz.1.txt +0 -39
  752. data/bundler/man/bundle.1.txt +0 -116
  753. data/bundler/man/gemfile.5.txt +0 -649
  754. data/lib/rubygems/psych_additions.rb +0 -10
  755. data/lib/rubygems/server.rb +0 -879
  756. data/lib/rubygems/source_local.rb +0 -7
  757. data/lib/rubygems/source_specific_file.rb +0 -6
  758. data/lib/rubygems/syck_hack.rb +0 -79
  759. data/lib/rubygems/uri_parser.rb +0 -36
  760. data/lib/rubygems/uri_parsing.rb +0 -23
  761. data/lib/ubygems.rb +0 -14
  762. data/test/rubygems/bogussources.rb +0 -9
  763. data/test/rubygems/data/null-type.gemspec.rz +0 -0
  764. data/test/rubygems/test_gem_server.rb +0 -612
  765. data/tmp/.keep +0 -0
  766. data/util/CL2notes +0 -55
  767. data/util/bisect +0 -10
  768. data/util/ci.sh +0 -62
  769. data/util/cops/deprecations.rb +0 -52
  770. data/util/create_certs.rb +0 -171
  771. data/util/create_certs.sh +0 -27
  772. data/util/create_encrypted_key.rb +0 -16
  773. data/util/generate_spdx_license_list.rb +0 -63
  774. data/util/patch_with_prs.rb +0 -77
  775. data/util/rubocop +0 -8
  776. data/util/update_bundled_ca_certificates.rb +0 -137
  777. data/util/update_changelog.rb +0 -64
  778. /data/bundler/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
  779. /data/bundler/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
  780. /data/bundler/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
  781. /data/bundler/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
  782. /data/bundler/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
  783. /data/bundler/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
  784. /data/bundler/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
@@ -1,837 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Bundler::Molinillo
4
- class Resolver
5
- # A specific resolution from a given {Resolver}
6
- class Resolution
7
- # A conflict that the resolution process encountered
8
- # @attr [Object] requirement the requirement that immediately led to the conflict
9
- # @attr [{String,Nil=>[Object]}] requirements the requirements that caused the conflict
10
- # @attr [Object, nil] existing the existing spec that was in conflict with
11
- # the {#possibility}
12
- # @attr [Object] possibility_set the set of specs that was unable to be
13
- # activated due to a conflict.
14
- # @attr [Object] locked_requirement the relevant locking requirement.
15
- # @attr [Array<Array<Object>>] requirement_trees the different requirement
16
- # trees that led to every requirement for the conflicting name.
17
- # @attr [{String=>Object}] activated_by_name the already-activated specs.
18
- # @attr [Object] underlying_error an error that has occurred during resolution, and
19
- # will be raised at the end of it if no resolution is found.
20
- Conflict = Struct.new(
21
- :requirement,
22
- :requirements,
23
- :existing,
24
- :possibility_set,
25
- :locked_requirement,
26
- :requirement_trees,
27
- :activated_by_name,
28
- :underlying_error
29
- )
30
-
31
- class Conflict
32
- # @return [Object] a spec that was unable to be activated due to a conflict
33
- def possibility
34
- possibility_set && possibility_set.latest_version
35
- end
36
- end
37
-
38
- # A collection of possibility states that share the same dependencies
39
- # @attr [Array] dependencies the dependencies for this set of possibilities
40
- # @attr [Array] possibilities the possibilities
41
- PossibilitySet = Struct.new(:dependencies, :possibilities)
42
-
43
- class PossibilitySet
44
- # String representation of the possibility set, for debugging
45
- def to_s
46
- "[#{possibilities.join(', ')}]"
47
- end
48
-
49
- # @return [Object] most up-to-date dependency in the possibility set
50
- def latest_version
51
- possibilities.last
52
- end
53
- end
54
-
55
- # Details of the state to unwind to when a conflict occurs, and the cause of the unwind
56
- # @attr [Integer] state_index the index of the state to unwind to
57
- # @attr [Object] state_requirement the requirement of the state we're unwinding to
58
- # @attr [Array] requirement_tree for the requirement we're relaxing
59
- # @attr [Array] conflicting_requirements the requirements that combined to cause the conflict
60
- # @attr [Array] requirement_trees for the conflict
61
- # @attr [Array] requirements_unwound_to_instead array of unwind requirements that were chosen over this unwind
62
- UnwindDetails = Struct.new(
63
- :state_index,
64
- :state_requirement,
65
- :requirement_tree,
66
- :conflicting_requirements,
67
- :requirement_trees,
68
- :requirements_unwound_to_instead
69
- )
70
-
71
- class UnwindDetails
72
- include Comparable
73
-
74
- # We compare UnwindDetails when choosing which state to unwind to. If
75
- # two options have the same state_index we prefer the one most
76
- # removed from a requirement that caused the conflict. Both options
77
- # would unwind to the same state, but a `grandparent` option will
78
- # filter out fewer of its possibilities after doing so - where a state
79
- # is both a `parent` and a `grandparent` to requirements that have
80
- # caused a conflict this is the correct behaviour.
81
- # @param [UnwindDetail] other UnwindDetail to be compared
82
- # @return [Integer] integer specifying ordering
83
- def <=>(other)
84
- if state_index > other.state_index
85
- 1
86
- elsif state_index == other.state_index
87
- reversed_requirement_tree_index <=> other.reversed_requirement_tree_index
88
- else
89
- -1
90
- end
91
- end
92
-
93
- # @return [Integer] index of state requirement in reversed requirement tree
94
- # (the conflicting requirement itself will be at position 0)
95
- def reversed_requirement_tree_index
96
- @reversed_requirement_tree_index ||=
97
- if state_requirement
98
- requirement_tree.reverse.index(state_requirement)
99
- else
100
- 999_999
101
- end
102
- end
103
-
104
- # @return [Boolean] where the requirement of the state we're unwinding
105
- # to directly caused the conflict. Note: in this case, it is
106
- # impossible for the state we're unwinding to to be a parent of
107
- # any of the other conflicting requirements (or we would have
108
- # circularity)
109
- def unwinding_to_primary_requirement?
110
- requirement_tree.last == state_requirement
111
- end
112
-
113
- # @return [Array] array of sub-dependencies to avoid when choosing a
114
- # new possibility for the state we've unwound to. Only relevant for
115
- # non-primary unwinds
116
- def sub_dependencies_to_avoid
117
- @requirements_to_avoid ||=
118
- requirement_trees.map do |tree|
119
- index = tree.index(state_requirement)
120
- tree[index + 1] if index
121
- end.compact
122
- end
123
-
124
- # @return [Array] array of all the requirements that led to the need for
125
- # this unwind
126
- def all_requirements
127
- @all_requirements ||= requirement_trees.flatten(1)
128
- end
129
- end
130
-
131
- # @return [SpecificationProvider] the provider that knows about
132
- # dependencies, requirements, specifications, versions, etc.
133
- attr_reader :specification_provider
134
-
135
- # @return [UI] the UI that knows how to communicate feedback about the
136
- # resolution process back to the user
137
- attr_reader :resolver_ui
138
-
139
- # @return [DependencyGraph] the base dependency graph to which
140
- # dependencies should be 'locked'
141
- attr_reader :base
142
-
143
- # @return [Array] the dependencies that were explicitly required
144
- attr_reader :original_requested
145
-
146
- # Initializes a new resolution.
147
- # @param [SpecificationProvider] specification_provider
148
- # see {#specification_provider}
149
- # @param [UI] resolver_ui see {#resolver_ui}
150
- # @param [Array] requested see {#original_requested}
151
- # @param [DependencyGraph] base see {#base}
152
- def initialize(specification_provider, resolver_ui, requested, base)
153
- @specification_provider = specification_provider
154
- @resolver_ui = resolver_ui
155
- @original_requested = requested
156
- @base = base
157
- @states = []
158
- @iteration_counter = 0
159
- @parents_of = Hash.new { |h, k| h[k] = [] }
160
- end
161
-
162
- # Resolves the {#original_requested} dependencies into a full dependency
163
- # graph
164
- # @raise [ResolverError] if successful resolution is impossible
165
- # @return [DependencyGraph] the dependency graph of successfully resolved
166
- # dependencies
167
- def resolve
168
- start_resolution
169
-
170
- while state
171
- break if !state.requirement && state.requirements.empty?
172
- indicate_progress
173
- if state.respond_to?(:pop_possibility_state) # DependencyState
174
- debug(depth) { "Creating possibility state for #{requirement} (#{possibilities.count} remaining)" }
175
- state.pop_possibility_state.tap do |s|
176
- if s
177
- states.push(s)
178
- activated.tag(s)
179
- end
180
- end
181
- end
182
- process_topmost_state
183
- end
184
-
185
- resolve_activated_specs
186
- ensure
187
- end_resolution
188
- end
189
-
190
- # @return [Integer] the number of resolver iterations in between calls to
191
- # {#resolver_ui}'s {UI#indicate_progress} method
192
- attr_accessor :iteration_rate
193
- private :iteration_rate
194
-
195
- # @return [Time] the time at which resolution began
196
- attr_accessor :started_at
197
- private :started_at
198
-
199
- # @return [Array<ResolutionState>] the stack of states for the resolution
200
- attr_accessor :states
201
- private :states
202
-
203
- private
204
-
205
- # Sets up the resolution process
206
- # @return [void]
207
- def start_resolution
208
- @started_at = Time.now
209
-
210
- handle_missing_or_push_dependency_state(initial_state)
211
-
212
- debug { "Starting resolution (#{@started_at})\nUser-requested dependencies: #{original_requested}" }
213
- resolver_ui.before_resolution
214
- end
215
-
216
- def resolve_activated_specs
217
- activated.vertices.each do |_, vertex|
218
- next unless vertex.payload
219
-
220
- latest_version = vertex.payload.possibilities.reverse_each.find do |possibility|
221
- vertex.requirements.all? { |req| requirement_satisfied_by?(req, activated, possibility) }
222
- end
223
-
224
- activated.set_payload(vertex.name, latest_version)
225
- end
226
- activated.freeze
227
- end
228
-
229
- # Ends the resolution process
230
- # @return [void]
231
- def end_resolution
232
- resolver_ui.after_resolution
233
- debug do
234
- "Finished resolution (#{@iteration_counter} steps) " \
235
- "(Took #{(ended_at = Time.now) - @started_at} seconds) (#{ended_at})"
236
- end
237
- debug { 'Unactivated: ' + Hash[activated.vertices.reject { |_n, v| v.payload }].keys.join(', ') } if state
238
- debug { 'Activated: ' + Hash[activated.vertices.select { |_n, v| v.payload }].keys.join(', ') } if state
239
- end
240
-
241
- require_relative 'state'
242
- require_relative 'modules/specification_provider'
243
-
244
- require_relative 'delegates/resolution_state'
245
- require_relative 'delegates/specification_provider'
246
-
247
- include Bundler::Molinillo::Delegates::ResolutionState
248
- include Bundler::Molinillo::Delegates::SpecificationProvider
249
-
250
- # Processes the topmost available {RequirementState} on the stack
251
- # @return [void]
252
- def process_topmost_state
253
- if possibility
254
- attempt_to_activate
255
- else
256
- create_conflict
257
- unwind_for_conflict
258
- end
259
- rescue CircularDependencyError => underlying_error
260
- create_conflict(underlying_error)
261
- unwind_for_conflict
262
- end
263
-
264
- # @return [Object] the current possibility that the resolution is trying
265
- # to activate
266
- def possibility
267
- possibilities.last
268
- end
269
-
270
- # @return [RequirementState] the current state the resolution is
271
- # operating upon
272
- def state
273
- states.last
274
- end
275
-
276
- # Creates the initial state for the resolution, based upon the
277
- # {#requested} dependencies
278
- # @return [DependencyState] the initial state for the resolution
279
- def initial_state
280
- graph = DependencyGraph.new.tap do |dg|
281
- original_requested.each do |requested|
282
- vertex = dg.add_vertex(name_for(requested), nil, true)
283
- vertex.explicit_requirements << requested
284
- end
285
- dg.tag(:initial_state)
286
- end
287
-
288
- requirements = sort_dependencies(original_requested, graph, {})
289
- initial_requirement = requirements.shift
290
- DependencyState.new(
291
- initial_requirement && name_for(initial_requirement),
292
- requirements,
293
- graph,
294
- initial_requirement,
295
- possibilities_for_requirement(initial_requirement, graph),
296
- 0,
297
- {},
298
- []
299
- )
300
- end
301
-
302
- # Unwinds the states stack because a conflict has been encountered
303
- # @return [void]
304
- def unwind_for_conflict
305
- details_for_unwind = build_details_for_unwind
306
- unwind_options = unused_unwind_options
307
- debug(depth) { "Unwinding for conflict: #{requirement} to #{details_for_unwind.state_index / 2}" }
308
- conflicts.tap do |c|
309
- sliced_states = states.slice!((details_for_unwind.state_index + 1)..-1)
310
- raise_error_unless_state(c)
311
- activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
312
- state.conflicts = c
313
- state.unused_unwind_options = unwind_options
314
- filter_possibilities_after_unwind(details_for_unwind)
315
- index = states.size - 1
316
- @parents_of.each { |_, a| a.reject! { |i| i >= index } }
317
- state.unused_unwind_options.reject! { |uw| uw.state_index >= index }
318
- end
319
- end
320
-
321
- # Raises a VersionConflict error, or any underlying error, if there is no
322
- # current state
323
- # @return [void]
324
- def raise_error_unless_state(conflicts)
325
- return if state
326
-
327
- error = conflicts.values.map(&:underlying_error).compact.first
328
- raise error || VersionConflict.new(conflicts, specification_provider)
329
- end
330
-
331
- # @return [UnwindDetails] Details of the nearest index to which we could unwind
332
- def build_details_for_unwind
333
- # Get the possible unwinds for the current conflict
334
- current_conflict = conflicts[name]
335
- binding_requirements = binding_requirements_for_conflict(current_conflict)
336
- unwind_details = unwind_options_for_requirements(binding_requirements)
337
-
338
- last_detail_for_current_unwind = unwind_details.sort.last
339
- current_detail = last_detail_for_current_unwind
340
-
341
- # Look for past conflicts that could be unwound to affect the
342
- # requirement tree for the current conflict
343
- relevant_unused_unwinds = unused_unwind_options.select do |alternative|
344
- intersecting_requirements =
345
- last_detail_for_current_unwind.all_requirements &
346
- alternative.requirements_unwound_to_instead
347
- next if intersecting_requirements.empty?
348
- # Find the highest index unwind whilst looping through
349
- current_detail = alternative if alternative > current_detail
350
- alternative
351
- end
352
-
353
- # Add the current unwind options to the `unused_unwind_options` array.
354
- # The "used" option will be filtered out during `unwind_for_conflict`.
355
- state.unused_unwind_options += unwind_details.reject { |detail| detail.state_index == -1 }
356
-
357
- # Update the requirements_unwound_to_instead on any relevant unused unwinds
358
- relevant_unused_unwinds.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
359
- unwind_details.each { |d| d.requirements_unwound_to_instead << current_detail.state_requirement }
360
-
361
- current_detail
362
- end
363
-
364
- # @param [Array<Object>] array of requirements that combine to create a conflict
365
- # @return [Array<UnwindDetails>] array of UnwindDetails that have a chance
366
- # of resolving the passed requirements
367
- def unwind_options_for_requirements(binding_requirements)
368
- unwind_details = []
369
-
370
- trees = []
371
- binding_requirements.reverse_each do |r|
372
- partial_tree = [r]
373
- trees << partial_tree
374
- unwind_details << UnwindDetails.new(-1, nil, partial_tree, binding_requirements, trees, [])
375
-
376
- # If this requirement has alternative possibilities, check if any would
377
- # satisfy the other requirements that created this conflict
378
- requirement_state = find_state_for(r)
379
- if conflict_fixing_possibilities?(requirement_state, binding_requirements)
380
- unwind_details << UnwindDetails.new(
381
- states.index(requirement_state),
382
- r,
383
- partial_tree,
384
- binding_requirements,
385
- trees,
386
- []
387
- )
388
- end
389
-
390
- # Next, look at the parent of this requirement, and check if the requirement
391
- # could have been avoided if an alternative PossibilitySet had been chosen
392
- parent_r = parent_of(r)
393
- next if parent_r.nil?
394
- partial_tree.unshift(parent_r)
395
- requirement_state = find_state_for(parent_r)
396
- if requirement_state.possibilities.any? { |set| !set.dependencies.include?(r) }
397
- unwind_details << UnwindDetails.new(
398
- states.index(requirement_state),
399
- parent_r,
400
- partial_tree,
401
- binding_requirements,
402
- trees,
403
- []
404
- )
405
- end
406
-
407
- # Finally, look at the grandparent and up of this requirement, looking
408
- # for any possibilities that wouldn't create their parent requirement
409
- grandparent_r = parent_of(parent_r)
410
- until grandparent_r.nil?
411
- partial_tree.unshift(grandparent_r)
412
- requirement_state = find_state_for(grandparent_r)
413
- if requirement_state.possibilities.any? { |set| !set.dependencies.include?(parent_r) }
414
- unwind_details << UnwindDetails.new(
415
- states.index(requirement_state),
416
- grandparent_r,
417
- partial_tree,
418
- binding_requirements,
419
- trees,
420
- []
421
- )
422
- end
423
- parent_r = grandparent_r
424
- grandparent_r = parent_of(parent_r)
425
- end
426
- end
427
-
428
- unwind_details
429
- end
430
-
431
- # @param [DependencyState] state
432
- # @param [Array] array of requirements
433
- # @return [Boolean] whether or not the given state has any possibilities
434
- # that could satisfy the given requirements
435
- def conflict_fixing_possibilities?(state, binding_requirements)
436
- return false unless state
437
-
438
- state.possibilities.any? do |possibility_set|
439
- possibility_set.possibilities.any? do |poss|
440
- possibility_satisfies_requirements?(poss, binding_requirements)
441
- end
442
- end
443
- end
444
-
445
- # Filter's a state's possibilities to remove any that would not fix the
446
- # conflict we've just rewound from
447
- # @param [UnwindDetails] details of the conflict just unwound from
448
- # @return [void]
449
- def filter_possibilities_after_unwind(unwind_details)
450
- return unless state && !state.possibilities.empty?
451
-
452
- if unwind_details.unwinding_to_primary_requirement?
453
- filter_possibilities_for_primary_unwind(unwind_details)
454
- else
455
- filter_possibilities_for_parent_unwind(unwind_details)
456
- end
457
- end
458
-
459
- # Filter's a state's possibilities to remove any that would not satisfy
460
- # the requirements in the conflict we've just rewound from
461
- # @param [UnwindDetails] details of the conflict just unwound from
462
- # @return [void]
463
- def filter_possibilities_for_primary_unwind(unwind_details)
464
- unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
465
- unwinds_to_state << unwind_details
466
- unwind_requirement_sets = unwinds_to_state.map(&:conflicting_requirements)
467
-
468
- state.possibilities.reject! do |possibility_set|
469
- possibility_set.possibilities.none? do |poss|
470
- unwind_requirement_sets.any? do |requirements|
471
- possibility_satisfies_requirements?(poss, requirements)
472
- end
473
- end
474
- end
475
- end
476
-
477
- # @param [Object] possibility a single possibility
478
- # @param [Array] requirements an array of requirements
479
- # @return [Boolean] whether the possibility satisfies all of the
480
- # given requirements
481
- def possibility_satisfies_requirements?(possibility, requirements)
482
- name = name_for(possibility)
483
-
484
- activated.tag(:swap)
485
- activated.set_payload(name, possibility) if activated.vertex_named(name)
486
- satisfied = requirements.all? { |r| requirement_satisfied_by?(r, activated, possibility) }
487
- activated.rewind_to(:swap)
488
-
489
- satisfied
490
- end
491
-
492
- # Filter's a state's possibilities to remove any that would (eventually)
493
- # create a requirement in the conflict we've just rewound from
494
- # @param [UnwindDetails] details of the conflict just unwound from
495
- # @return [void]
496
- def filter_possibilities_for_parent_unwind(unwind_details)
497
- unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
498
- unwinds_to_state << unwind_details
499
-
500
- primary_unwinds = unwinds_to_state.select(&:unwinding_to_primary_requirement?).uniq
501
- parent_unwinds = unwinds_to_state.uniq - primary_unwinds
502
-
503
- allowed_possibility_sets = Compatibility.flat_map(primary_unwinds) do |unwind|
504
- states[unwind.state_index].possibilities.select do |possibility_set|
505
- possibility_set.possibilities.any? do |poss|
506
- possibility_satisfies_requirements?(poss, unwind.conflicting_requirements)
507
- end
508
- end
509
- end
510
-
511
- requirements_to_avoid = Compatibility.flat_map(parent_unwinds, &:sub_dependencies_to_avoid)
512
-
513
- state.possibilities.reject! do |possibility_set|
514
- !allowed_possibility_sets.include?(possibility_set) &&
515
- (requirements_to_avoid - possibility_set.dependencies).empty?
516
- end
517
- end
518
-
519
- # @param [Conflict] conflict
520
- # @return [Array] minimal array of requirements that would cause the passed
521
- # conflict to occur.
522
- def binding_requirements_for_conflict(conflict)
523
- return [conflict.requirement] if conflict.possibility.nil?
524
-
525
- possible_binding_requirements = conflict.requirements.values.flatten(1).uniq
526
-
527
- # When there’s a `CircularDependency` error the conflicting requirement
528
- # (the one causing the circular) won’t be `conflict.requirement`
529
- # (which won’t be for the right state, because we won’t have created it,
530
- # because it’s circular).
531
- # We need to make sure we have that requirement in the conflict’s list,
532
- # otherwise we won’t be able to unwind properly, so we just return all
533
- # the requirements for the conflict.
534
- return possible_binding_requirements if conflict.underlying_error
535
-
536
- possibilities = search_for(conflict.requirement)
537
-
538
- # If all the requirements together don't filter out all possibilities,
539
- # then the only two requirements we need to consider are the initial one
540
- # (where the dependency's version was first chosen) and the last
541
- if binding_requirement_in_set?(nil, possible_binding_requirements, possibilities)
542
- return [conflict.requirement, requirement_for_existing_name(name_for(conflict.requirement))].compact
543
- end
544
-
545
- # Loop through the possible binding requirements, removing each one
546
- # that doesn't bind. Use a `reverse_each` as we want the earliest set of
547
- # binding requirements, and don't use `reject!` as we wish to refine the
548
- # array *on each iteration*.
549
- binding_requirements = possible_binding_requirements.dup
550
- possible_binding_requirements.reverse_each do |req|
551
- next if req == conflict.requirement
552
- unless binding_requirement_in_set?(req, binding_requirements, possibilities)
553
- binding_requirements -= [req]
554
- end
555
- end
556
-
557
- binding_requirements
558
- end
559
-
560
- # @param [Object] requirement we wish to check
561
- # @param [Array] array of requirements
562
- # @param [Array] array of possibilities the requirements will be used to filter
563
- # @return [Boolean] whether or not the given requirement is required to filter
564
- # out all elements of the array of possibilities.
565
- def binding_requirement_in_set?(requirement, possible_binding_requirements, possibilities)
566
- possibilities.any? do |poss|
567
- possibility_satisfies_requirements?(poss, possible_binding_requirements - [requirement])
568
- end
569
- end
570
-
571
- # @return [Object] the requirement that led to `requirement` being added
572
- # to the list of requirements.
573
- def parent_of(requirement)
574
- return unless requirement
575
- return unless index = @parents_of[requirement].last
576
- return unless parent_state = @states[index]
577
- parent_state.requirement
578
- end
579
-
580
- # @return [Object] the requirement that led to a version of a possibility
581
- # with the given name being activated.
582
- def requirement_for_existing_name(name)
583
- return nil unless vertex = activated.vertex_named(name)
584
- return nil unless vertex.payload
585
- states.find { |s| s.name == name }.requirement
586
- end
587
-
588
- # @return [ResolutionState] the state whose `requirement` is the given
589
- # `requirement`.
590
- def find_state_for(requirement)
591
- return nil unless requirement
592
- states.find { |i| requirement == i.requirement }
593
- end
594
-
595
- # @return [Conflict] a {Conflict} that reflects the failure to activate
596
- # the {#possibility} in conjunction with the current {#state}
597
- def create_conflict(underlying_error = nil)
598
- vertex = activated.vertex_named(name)
599
- locked_requirement = locked_requirement_named(name)
600
-
601
- requirements = {}
602
- unless vertex.explicit_requirements.empty?
603
- requirements[name_for_explicit_dependency_source] = vertex.explicit_requirements
604
- end
605
- requirements[name_for_locking_dependency_source] = [locked_requirement] if locked_requirement
606
- vertex.incoming_edges.each do |edge|
607
- (requirements[edge.origin.payload.latest_version] ||= []).unshift(edge.requirement)
608
- end
609
-
610
- activated_by_name = {}
611
- activated.each { |v| activated_by_name[v.name] = v.payload.latest_version if v.payload }
612
- conflicts[name] = Conflict.new(
613
- requirement,
614
- requirements,
615
- vertex.payload && vertex.payload.latest_version,
616
- possibility,
617
- locked_requirement,
618
- requirement_trees,
619
- activated_by_name,
620
- underlying_error
621
- )
622
- end
623
-
624
- # @return [Array<Array<Object>>] The different requirement
625
- # trees that led to every requirement for the current spec.
626
- def requirement_trees
627
- vertex = activated.vertex_named(name)
628
- vertex.requirements.map { |r| requirement_tree_for(r) }
629
- end
630
-
631
- # @return [Array<Object>] the list of requirements that led to
632
- # `requirement` being required.
633
- def requirement_tree_for(requirement)
634
- tree = []
635
- while requirement
636
- tree.unshift(requirement)
637
- requirement = parent_of(requirement)
638
- end
639
- tree
640
- end
641
-
642
- # Indicates progress roughly once every second
643
- # @return [void]
644
- def indicate_progress
645
- @iteration_counter += 1
646
- @progress_rate ||= resolver_ui.progress_rate
647
- if iteration_rate.nil?
648
- if Time.now - started_at >= @progress_rate
649
- self.iteration_rate = @iteration_counter
650
- end
651
- end
652
-
653
- if iteration_rate && (@iteration_counter % iteration_rate) == 0
654
- resolver_ui.indicate_progress
655
- end
656
- end
657
-
658
- # Calls the {#resolver_ui}'s {UI#debug} method
659
- # @param [Integer] depth the depth of the {#states} stack
660
- # @param [Proc] block a block that yields a {#to_s}
661
- # @return [void]
662
- def debug(depth = 0, &block)
663
- resolver_ui.debug(depth, &block)
664
- end
665
-
666
- # Attempts to activate the current {#possibility}
667
- # @return [void]
668
- def attempt_to_activate
669
- debug(depth) { 'Attempting to activate ' + possibility.to_s }
670
- existing_vertex = activated.vertex_named(name)
671
- if existing_vertex.payload
672
- debug(depth) { "Found existing spec (#{existing_vertex.payload})" }
673
- attempt_to_filter_existing_spec(existing_vertex)
674
- else
675
- latest = possibility.latest_version
676
- # use reject!(!satisfied) for 1.8.7 compatibility
677
- possibility.possibilities.reject! do |possibility|
678
- !requirement_satisfied_by?(requirement, activated, possibility)
679
- end
680
- if possibility.latest_version.nil?
681
- # ensure there's a possibility for better error messages
682
- possibility.possibilities << latest if latest
683
- create_conflict
684
- unwind_for_conflict
685
- else
686
- activate_new_spec
687
- end
688
- end
689
- end
690
-
691
- # Attempts to update the existing vertex's `PossibilitySet` with a filtered version
692
- # @return [void]
693
- def attempt_to_filter_existing_spec(vertex)
694
- filtered_set = filtered_possibility_set(vertex)
695
- if !filtered_set.possibilities.empty?
696
- activated.set_payload(name, filtered_set)
697
- new_requirements = requirements.dup
698
- push_state_for_requirements(new_requirements, false)
699
- else
700
- create_conflict
701
- debug(depth) { "Unsatisfied by existing spec (#{vertex.payload})" }
702
- unwind_for_conflict
703
- end
704
- end
705
-
706
- # Generates a filtered version of the existing vertex's `PossibilitySet` using the
707
- # current state's `requirement`
708
- # @param [Object] existing vertex
709
- # @return [PossibilitySet] filtered possibility set
710
- def filtered_possibility_set(vertex)
711
- PossibilitySet.new(vertex.payload.dependencies, vertex.payload.possibilities & possibility.possibilities)
712
- end
713
-
714
- # @param [String] requirement_name the spec name to search for
715
- # @return [Object] the locked spec named `requirement_name`, if one
716
- # is found on {#base}
717
- def locked_requirement_named(requirement_name)
718
- vertex = base.vertex_named(requirement_name)
719
- vertex && vertex.payload
720
- end
721
-
722
- # Add the current {#possibility} to the dependency graph of the current
723
- # {#state}
724
- # @return [void]
725
- def activate_new_spec
726
- conflicts.delete(name)
727
- debug(depth) { "Activated #{name} at #{possibility}" }
728
- activated.set_payload(name, possibility)
729
- require_nested_dependencies_for(possibility)
730
- end
731
-
732
- # Requires the dependencies that the recently activated spec has
733
- # @param [Object] activated_possibility the PossibilitySet that has just been
734
- # activated
735
- # @return [void]
736
- def require_nested_dependencies_for(possibility_set)
737
- nested_dependencies = dependencies_for(possibility_set.latest_version)
738
- debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
739
- nested_dependencies.each do |d|
740
- activated.add_child_vertex(name_for(d), nil, [name_for(possibility_set.latest_version)], d)
741
- parent_index = states.size - 1
742
- parents = @parents_of[d]
743
- parents << parent_index if parents.empty?
744
- end
745
-
746
- push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)
747
- end
748
-
749
- # Pushes a new {DependencyState} that encapsulates both existing and new
750
- # requirements
751
- # @param [Array] new_requirements
752
- # @return [void]
753
- def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated)
754
- new_requirements = sort_dependencies(new_requirements.uniq, new_activated, conflicts) if requires_sort
755
- new_requirement = nil
756
- loop do
757
- new_requirement = new_requirements.shift
758
- break if new_requirement.nil? || states.none? { |s| s.requirement == new_requirement }
759
- end
760
- new_name = new_requirement ? name_for(new_requirement) : ''.freeze
761
- possibilities = possibilities_for_requirement(new_requirement)
762
- handle_missing_or_push_dependency_state DependencyState.new(
763
- new_name, new_requirements, new_activated,
764
- new_requirement, possibilities, depth, conflicts.dup, unused_unwind_options.dup
765
- )
766
- end
767
-
768
- # Checks a proposed requirement with any existing locked requirement
769
- # before generating an array of possibilities for it.
770
- # @param [Object] the proposed requirement
771
- # @return [Array] possibilities
772
- def possibilities_for_requirement(requirement, activated = self.activated)
773
- return [] unless requirement
774
- if locked_requirement_named(name_for(requirement))
775
- return locked_requirement_possibility_set(requirement, activated)
776
- end
777
-
778
- group_possibilities(search_for(requirement))
779
- end
780
-
781
- # @param [Object] the proposed requirement
782
- # @return [Array] possibility set containing only the locked requirement, if any
783
- def locked_requirement_possibility_set(requirement, activated = self.activated)
784
- all_possibilities = search_for(requirement)
785
- locked_requirement = locked_requirement_named(name_for(requirement))
786
-
787
- # Longwinded way to build a possibilities array with either the locked
788
- # requirement or nothing in it. Required, since the API for
789
- # locked_requirement isn't guaranteed.
790
- locked_possibilities = all_possibilities.select do |possibility|
791
- requirement_satisfied_by?(locked_requirement, activated, possibility)
792
- end
793
-
794
- group_possibilities(locked_possibilities)
795
- end
796
-
797
- # Build an array of PossibilitySets, with each element representing a group of
798
- # dependency versions that all have the same sub-dependency version constraints
799
- # and are contiguous.
800
- # @param [Array] an array of possibilities
801
- # @return [Array] an array of possibility sets
802
- def group_possibilities(possibilities)
803
- possibility_sets = []
804
- current_possibility_set = nil
805
-
806
- possibilities.reverse_each do |possibility|
807
- dependencies = dependencies_for(possibility)
808
- if current_possibility_set && current_possibility_set.dependencies == dependencies
809
- current_possibility_set.possibilities.unshift(possibility)
810
- else
811
- possibility_sets.unshift(PossibilitySet.new(dependencies, [possibility]))
812
- current_possibility_set = possibility_sets.first
813
- end
814
- end
815
-
816
- possibility_sets
817
- end
818
-
819
- # Pushes a new {DependencyState}.
820
- # If the {#specification_provider} says to
821
- # {SpecificationProvider#allow_missing?} that particular requirement, and
822
- # there are no possibilities for that requirement, then `state` is not
823
- # pushed, and the vertex in {#activated} is removed, and we continue
824
- # resolving the remaining requirements.
825
- # @param [DependencyState] state
826
- # @return [void]
827
- def handle_missing_or_push_dependency_state(state)
828
- if state.requirement && state.possibilities.empty? && allow_missing?(state.requirement)
829
- state.activated.detach_vertex_named(state.name)
830
- push_state_for_requirements(state.requirements.dup, false, state.activated)
831
- else
832
- states.push(state).tap { activated.tag(state) }
833
- end
834
- end
835
- end
836
- end
837
- end