bundler 2.2.29 → 2.5.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (330) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1129 -4
  3. data/README.md +4 -8
  4. data/bundler.gemspec +11 -11
  5. data/exe/bundle +5 -26
  6. data/exe/bundler +1 -1
  7. data/lib/bundler/.document +1 -0
  8. data/lib/bundler/build_metadata.rb +4 -4
  9. data/lib/bundler/capistrano.rb +1 -1
  10. data/lib/bundler/checksum.rb +254 -0
  11. data/lib/bundler/ci_detector.rb +75 -0
  12. data/lib/bundler/cli/add.rb +4 -4
  13. data/lib/bundler/cli/binstubs.rb +10 -6
  14. data/lib/bundler/cli/cache.rb +1 -1
  15. data/lib/bundler/cli/check.rb +3 -3
  16. data/lib/bundler/cli/common.rb +13 -3
  17. data/lib/bundler/cli/config.rb +18 -8
  18. data/lib/bundler/cli/console.rb +5 -4
  19. data/lib/bundler/cli/doctor.rb +12 -5
  20. data/lib/bundler/cli/exec.rb +1 -1
  21. data/lib/bundler/cli/fund.rb +1 -1
  22. data/lib/bundler/cli/gem.rb +141 -48
  23. data/lib/bundler/cli/info.rb +27 -17
  24. data/lib/bundler/cli/init.rb +6 -2
  25. data/lib/bundler/cli/install.rb +22 -39
  26. data/lib/bundler/cli/issue.rb +5 -4
  27. data/lib/bundler/cli/lock.rb +36 -29
  28. data/lib/bundler/cli/open.rb +9 -9
  29. data/lib/bundler/cli/outdated.rb +19 -12
  30. data/lib/bundler/cli/platform.rb +8 -6
  31. data/lib/bundler/cli/plugin.rb +9 -15
  32. data/lib/bundler/cli/pristine.rb +38 -30
  33. data/lib/bundler/cli/show.rb +3 -3
  34. data/lib/bundler/cli/update.rb +12 -7
  35. data/lib/bundler/cli/viz.rb +1 -1
  36. data/lib/bundler/cli.rb +266 -285
  37. data/lib/bundler/compact_index_client/cache.rb +53 -67
  38. data/lib/bundler/compact_index_client/cache_file.rb +153 -0
  39. data/lib/bundler/compact_index_client/gem_parser.rb +7 -3
  40. data/lib/bundler/compact_index_client/parser.rb +84 -0
  41. data/lib/bundler/compact_index_client/updater.rb +83 -76
  42. data/lib/bundler/compact_index_client.rb +59 -87
  43. data/lib/bundler/constants.rb +9 -2
  44. data/lib/bundler/current_ruby.rb +12 -16
  45. data/lib/bundler/definition.rb +509 -319
  46. data/lib/bundler/dependency.rb +33 -71
  47. data/lib/bundler/digest.rb +71 -0
  48. data/lib/bundler/dsl.rb +88 -69
  49. data/lib/bundler/endpoint_specification.rb +32 -15
  50. data/lib/bundler/env.rb +5 -7
  51. data/lib/bundler/environment_preserver.rb +8 -22
  52. data/lib/bundler/errors.rb +101 -13
  53. data/lib/bundler/feature_flag.rb +0 -2
  54. data/lib/bundler/fetcher/base.rb +11 -11
  55. data/lib/bundler/fetcher/compact_index.rb +32 -52
  56. data/lib/bundler/fetcher/dependency.rb +3 -7
  57. data/lib/bundler/fetcher/downloader.rb +17 -16
  58. data/lib/bundler/fetcher/gem_remote_fetcher.rb +16 -0
  59. data/lib/bundler/fetcher/index.rb +2 -29
  60. data/lib/bundler/fetcher.rb +87 -79
  61. data/lib/bundler/force_platform.rb +18 -0
  62. data/lib/bundler/friendly_errors.rb +29 -40
  63. data/lib/bundler/gem_helper.rb +11 -23
  64. data/lib/bundler/gem_helpers.rb +30 -6
  65. data/lib/bundler/gem_version_promoter.rb +68 -109
  66. data/lib/bundler/graph.rb +9 -9
  67. data/lib/bundler/index.rb +71 -79
  68. data/lib/bundler/injector.rb +23 -11
  69. data/lib/bundler/inline.rb +11 -23
  70. data/lib/bundler/installer/gem_installer.rb +18 -11
  71. data/lib/bundler/installer/parallel_installer.rb +17 -65
  72. data/lib/bundler/installer/standalone.rb +56 -15
  73. data/lib/bundler/installer.rb +35 -61
  74. data/lib/bundler/lazy_specification.rb +92 -61
  75. data/lib/bundler/lockfile_generator.rb +12 -3
  76. data/lib/bundler/lockfile_parser.rb +137 -70
  77. data/lib/bundler/man/bundle-add.1 +19 -26
  78. data/lib/bundler/man/bundle-add.1.ronn +16 -4
  79. data/lib/bundler/man/bundle-binstubs.1 +4 -16
  80. data/lib/bundler/man/bundle-cache.1 +9 -24
  81. data/lib/bundler/man/bundle-cache.1.ronn +9 -2
  82. data/lib/bundler/man/bundle-check.1 +5 -12
  83. data/lib/bundler/man/bundle-check.1.ronn +3 -0
  84. data/lib/bundler/man/bundle-clean.1 +4 -11
  85. data/lib/bundler/man/bundle-clean.1.ronn +1 -1
  86. data/lib/bundler/man/bundle-config.1 +47 -224
  87. data/lib/bundler/man/bundle-config.1.ronn +40 -28
  88. data/lib/bundler/man/bundle-console.1 +35 -0
  89. data/lib/bundler/man/bundle-console.1.ronn +44 -0
  90. data/lib/bundler/man/bundle-doctor.1 +4 -18
  91. data/lib/bundler/man/bundle-exec.1 +16 -77
  92. data/lib/bundler/man/bundle-exec.1.ronn +8 -9
  93. data/lib/bundler/man/bundle-gem.1 +45 -72
  94. data/lib/bundler/man/bundle-gem.1.ronn +32 -5
  95. data/lib/bundler/man/bundle-help.1 +9 -0
  96. data/lib/bundler/man/bundle-help.1.ronn +12 -0
  97. data/lib/bundler/man/bundle-info.1 +5 -11
  98. data/lib/bundler/man/bundle-info.1.ronn +3 -3
  99. data/lib/bundler/man/bundle-init.1 +6 -11
  100. data/lib/bundler/man/bundle-init.1.ronn +2 -0
  101. data/lib/bundler/man/bundle-inject.1 +8 -18
  102. data/lib/bundler/man/bundle-inject.1.ronn +3 -1
  103. data/lib/bundler/man/bundle-install.1 +32 -155
  104. data/lib/bundler/man/bundle-install.1.ronn +11 -33
  105. data/lib/bundler/man/bundle-list.1 +4 -19
  106. data/lib/bundler/man/bundle-lock.1 +5 -29
  107. data/lib/bundler/man/bundle-open.1 +18 -18
  108. data/lib/bundler/man/bundle-open.1.ronn +9 -1
  109. data/lib/bundler/man/bundle-outdated.1 +17 -72
  110. data/lib/bundler/man/bundle-outdated.1.ronn +13 -18
  111. data/lib/bundler/man/bundle-platform.1 +16 -28
  112. data/lib/bundler/man/bundle-platform.1.ronn +14 -7
  113. data/lib/bundler/man/bundle-plugin.1 +58 -0
  114. data/lib/bundler/man/bundle-plugin.1.ronn +63 -0
  115. data/lib/bundler/man/bundle-pristine.1 +5 -16
  116. data/lib/bundler/man/bundle-remove.1 +4 -14
  117. data/lib/bundler/man/bundle-show.1 +3 -10
  118. data/lib/bundler/man/bundle-update.1 +19 -138
  119. data/lib/bundler/man/bundle-update.1.ronn +2 -1
  120. data/lib/bundler/man/bundle-version.1 +22 -0
  121. data/lib/bundler/man/bundle-version.1.ronn +24 -0
  122. data/lib/bundler/man/bundle-viz.1 +6 -15
  123. data/lib/bundler/man/bundle-viz.1.ronn +2 -0
  124. data/lib/bundler/man/bundle.1 +17 -51
  125. data/lib/bundler/man/bundle.1.ronn +12 -7
  126. data/lib/bundler/man/gemfile.5 +130 -346
  127. data/lib/bundler/man/gemfile.5.ronn +121 -86
  128. data/lib/bundler/man/index.txt +4 -0
  129. data/lib/bundler/match_metadata.rb +17 -0
  130. data/lib/bundler/match_platform.rb +1 -2
  131. data/lib/bundler/match_remote_metadata.rb +29 -0
  132. data/lib/bundler/mirror.rb +8 -10
  133. data/lib/bundler/plugin/api/source.rb +9 -13
  134. data/lib/bundler/plugin/index.rb +13 -5
  135. data/lib/bundler/plugin/installer/git.rb +0 -4
  136. data/lib/bundler/plugin/installer/path.rb +18 -0
  137. data/lib/bundler/plugin/installer/rubygems.rb +0 -8
  138. data/lib/bundler/plugin/installer.rb +42 -19
  139. data/lib/bundler/plugin/source_list.rb +4 -4
  140. data/lib/bundler/plugin.rb +16 -7
  141. data/lib/bundler/process_lock.rb +1 -1
  142. data/lib/bundler/remote_specification.rb +11 -5
  143. data/lib/bundler/resolver/base.rb +111 -0
  144. data/lib/bundler/resolver/candidate.rb +82 -0
  145. data/lib/bundler/resolver/incompatibility.rb +15 -0
  146. data/lib/bundler/resolver/package.rb +81 -0
  147. data/lib/bundler/resolver/root.rb +25 -0
  148. data/lib/bundler/resolver/spec_group.rb +53 -66
  149. data/lib/bundler/resolver.rb +419 -307
  150. data/lib/bundler/retry.rb +1 -1
  151. data/lib/bundler/ruby_dsl.rb +42 -7
  152. data/lib/bundler/ruby_version.rb +16 -22
  153. data/lib/bundler/rubygems_ext.rb +250 -64
  154. data/lib/bundler/rubygems_gem_installer.rb +90 -64
  155. data/lib/bundler/rubygems_integration.rb +81 -190
  156. data/lib/bundler/runtime.rb +8 -13
  157. data/lib/bundler/safe_marshal.rb +31 -0
  158. data/lib/bundler/self_manager.rb +206 -0
  159. data/lib/bundler/settings.rb +139 -57
  160. data/lib/bundler/setup.rb +13 -1
  161. data/lib/bundler/shared_helpers.rb +67 -36
  162. data/lib/bundler/source/git/git_proxy.rb +285 -82
  163. data/lib/bundler/source/git.rb +81 -41
  164. data/lib/bundler/source/metadata.rb +17 -16
  165. data/lib/bundler/source/path/installer.rb +1 -22
  166. data/lib/bundler/source/path.rb +13 -25
  167. data/lib/bundler/source/rubygems/remote.rb +1 -1
  168. data/lib/bundler/source/rubygems.rb +164 -234
  169. data/lib/bundler/source/rubygems_aggregate.rb +1 -1
  170. data/lib/bundler/source.rb +7 -6
  171. data/lib/bundler/source_list.rb +40 -32
  172. data/lib/bundler/source_map.rb +15 -2
  173. data/lib/bundler/spec_set.rb +156 -46
  174. data/lib/bundler/stub_specification.rb +18 -5
  175. data/lib/bundler/templates/Executable +3 -5
  176. data/lib/bundler/templates/Executable.bundler +7 -12
  177. data/lib/bundler/templates/Executable.standalone +4 -4
  178. data/lib/bundler/templates/Gemfile +0 -2
  179. data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +77 -29
  180. data/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
  181. data/lib/bundler/templates/newgem/Gemfile.tt +8 -2
  182. data/lib/bundler/templates/newgem/README.md.tt +7 -11
  183. data/lib/bundler/templates/newgem/Rakefile.tt +28 -4
  184. data/lib/bundler/templates/newgem/bin/console.tt +0 -4
  185. data/lib/bundler/templates/newgem/circleci/config.yml.tt +12 -0
  186. data/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
  187. data/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt +10 -0
  188. data/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
  189. data/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +1 -1
  190. data/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
  191. data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +13 -3
  192. data/lib/bundler/templates/newgem/gitignore.tt +3 -0
  193. data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +13 -4
  194. data/lib/bundler/templates/newgem/newgem.gemspec.tt +25 -17
  195. data/lib/bundler/templates/newgem/rubocop.yml.tt +0 -5
  196. data/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
  197. data/lib/bundler/templates/newgem/standard.yml.tt +3 -0
  198. data/lib/bundler/templates/newgem/test/minitest/{newgem_test.rb.tt → test_newgem.rb.tt} +1 -1
  199. data/lib/bundler/ui/rg_proxy.rb +1 -1
  200. data/lib/bundler/ui/shell.rb +38 -15
  201. data/lib/bundler/ui/silent.rb +21 -5
  202. data/lib/bundler/uri_credentials_filter.rb +2 -2
  203. data/lib/bundler/uri_normalizer.rb +23 -0
  204. data/lib/bundler/vendor/.document +1 -0
  205. data/lib/bundler/vendor/connection_pool/.document +1 -0
  206. data/lib/bundler/vendor/connection_pool/LICENSE +20 -0
  207. data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +19 -21
  208. data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +1 -1
  209. data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
  210. data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +92 -78
  211. data/lib/bundler/vendor/fileutils/.document +1 -0
  212. data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
  213. data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1340 -410
  214. data/lib/bundler/vendor/net-http-persistent/.document +1 -0
  215. data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
  216. data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +4 -3
  217. data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +23 -11
  218. data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +1 -1
  219. data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +57 -57
  220. data/lib/bundler/vendor/pub_grub/.document +1 -0
  221. data/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
  222. data/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
  223. data/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
  224. data/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
  225. data/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +150 -0
  226. data/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
  227. data/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
  228. data/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
  229. data/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
  230. data/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +61 -0
  231. data/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
  232. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
  233. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +129 -0
  234. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +411 -0
  235. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +248 -0
  236. data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
  237. data/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
  238. data/lib/bundler/vendor/thor/.document +1 -0
  239. data/lib/bundler/vendor/thor/LICENSE.md +20 -0
  240. data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +3 -2
  241. data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
  242. data/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +1 -1
  243. data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +12 -14
  244. data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +16 -6
  245. data/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -17
  246. data/lib/bundler/vendor/thor/lib/thor/base.rb +140 -14
  247. data/lib/bundler/vendor/thor/lib/thor/command.rb +13 -4
  248. data/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +10 -0
  249. data/lib/bundler/vendor/thor/lib/thor/error.rb +16 -20
  250. data/lib/bundler/vendor/thor/lib/thor/group.rb +1 -1
  251. data/lib/bundler/vendor/thor/lib/thor/invocation.rb +1 -1
  252. data/lib/bundler/vendor/thor/lib/thor/nested_context.rb +2 -2
  253. data/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +20 -1
  254. data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +33 -17
  255. data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +27 -8
  256. data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +63 -7
  257. data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +2 -2
  258. data/lib/bundler/vendor/thor/lib/thor/runner.rb +40 -30
  259. data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +48 -154
  260. data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -46
  261. data/lib/bundler/vendor/thor/lib/thor/shell/column_printer.rb +29 -0
  262. data/lib/bundler/vendor/thor/lib/thor/shell/html.rb +0 -45
  263. data/lib/bundler/vendor/thor/lib/thor/shell/table_printer.rb +134 -0
  264. data/lib/bundler/vendor/thor/lib/thor/shell/terminal.rb +42 -0
  265. data/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb +38 -0
  266. data/lib/bundler/vendor/thor/lib/thor/shell.rb +2 -2
  267. data/lib/bundler/vendor/thor/lib/thor/util.rb +9 -8
  268. data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
  269. data/lib/bundler/vendor/thor/lib/thor.rb +155 -8
  270. data/lib/bundler/vendor/tsort/.document +1 -0
  271. data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
  272. data/lib/bundler/vendor/tsort/lib/tsort.rb +455 -0
  273. data/lib/bundler/vendor/uri/.document +1 -0
  274. data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
  275. data/lib/bundler/vendor/uri/lib/uri/common.rb +316 -207
  276. data/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
  277. data/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
  278. data/lib/bundler/vendor/uri/lib/uri/generic.rb +33 -13
  279. data/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
  280. data/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
  281. data/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
  282. data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
  283. data/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
  284. data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +16 -23
  285. data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +105 -47
  286. data/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
  287. data/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
  288. data/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
  289. data/lib/bundler/vendor/uri/lib/uri.rb +3 -3
  290. data/lib/bundler/vendored_net_http.rb +23 -0
  291. data/lib/bundler/vendored_persistent.rb +0 -36
  292. data/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
  293. data/lib/bundler/vendored_timeout.rb +12 -0
  294. data/lib/bundler/{vendored_tmpdir.rb → vendored_tsort.rb} +1 -1
  295. data/lib/bundler/vendored_uri.rb +18 -1
  296. data/lib/bundler/version.rb +5 -1
  297. data/lib/bundler/vlad.rb +1 -1
  298. data/lib/bundler/worker.rb +7 -9
  299. data/lib/bundler/yaml_serializer.rb +21 -12
  300. data/lib/bundler.rb +114 -121
  301. metadata +87 -41
  302. data/lib/bundler/dep_proxy.rb +0 -55
  303. data/lib/bundler/gemdeps.rb +0 -29
  304. data/lib/bundler/psyched_yaml.rb +0 -22
  305. data/lib/bundler/templates/gems.rb +0 -8
  306. data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +0 -5
  307. data/lib/bundler/templates/newgem/travis.yml.tt +0 -6
  308. data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
  309. data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
  310. data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -88
  311. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
  312. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
  313. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
  314. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
  315. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
  316. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
  317. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
  318. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
  319. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -164
  320. data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -255
  321. data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
  322. data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
  323. data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -112
  324. data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
  325. data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -839
  326. data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
  327. data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
  328. data/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -11
  329. data/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +0 -154
  330. data/lib/bundler/version_ranges.rb +0 -122
data/lib/bundler/cli.rb CHANGED
@@ -5,11 +5,13 @@ require_relative "vendored_thor"
5
5
  module Bundler
6
6
  class CLI < Thor
7
7
  require_relative "cli/common"
8
+ require_relative "cli/install"
8
9
 
9
10
  package_name "Bundler"
10
11
 
11
12
  AUTO_INSTALL_CMDS = %w[show binstubs outdated exec open console licenses clean].freeze
12
13
  PARSEABLE_COMMANDS = %w[check config help exec platform show version].freeze
14
+ EXTENSIONS = ["c", "rust"].freeze
13
15
 
14
16
  COMMAND_ALIASES = {
15
17
  "check" => "c",
@@ -22,6 +24,8 @@ module Bundler
22
24
  }.freeze
23
25
 
24
26
  def self.start(*)
27
+ check_deprecated_ext_option(ARGV) if ARGV.include?("--ext")
28
+
25
29
  super
26
30
  ensure
27
31
  Bundler::SharedHelpers.print_major_deprecations!
@@ -61,10 +65,12 @@ module Bundler
61
65
  Bundler.reset_settings_and_root!
62
66
  end
63
67
 
68
+ Bundler.auto_switch
69
+
64
70
  Bundler.settings.set_command_option_if_given :retry, options[:retry]
65
71
 
66
72
  current_cmd = args.last[:current_command].name
67
- auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
73
+ Bundler.auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
68
74
  rescue UnknownArgumentError => e
69
75
  raise InvalidOption, e.message
70
76
  ensure
@@ -75,10 +81,10 @@ module Bundler
75
81
  unprinted_warnings.each {|w| Bundler.ui.warn(w) }
76
82
  end
77
83
 
78
- check_unknown_options!(:except => [:config, :exec])
84
+ check_unknown_options!(except: [:config, :exec])
79
85
  stop_on_unknown_option! :exec
80
86
 
81
- desc "cli_help", "Prints a summary of bundler commands", :hide => true
87
+ desc "cli_help", "Prints a summary of bundler commands", hide: true
82
88
  def cli_help
83
89
  version
84
90
  Bundler.ui.info "\n"
@@ -94,21 +100,23 @@ module Bundler
94
100
  shell.say "Bundler commands:\n\n"
95
101
 
96
102
  shell.say " Primary commands:\n"
97
- shell.print_table(primary_commands, :indent => 4, :truncate => true)
103
+ shell.print_table(primary_commands, indent: 4, truncate: true)
98
104
  shell.say
99
105
  shell.say " Utilities:\n"
100
- shell.print_table(utilities, :indent => 4, :truncate => true)
106
+ shell.print_table(utilities, indent: 4, truncate: true)
101
107
  shell.say
102
108
  self.class.send(:class_options_help, shell)
103
109
  end
104
110
  default_task(Bundler.feature_flag.default_cli_command)
105
111
 
106
- class_option "no-color", :type => :boolean, :desc => "Disable colorization in output"
107
- class_option "retry", :type => :numeric, :aliases => "-r", :banner => "NUM",
108
- :desc => "Specify the number of times you wish to attempt network commands"
109
- class_option "verbose", :type => :boolean, :desc => "Enable verbose output mode", :aliases => "-V"
112
+ class_option "no-color", type: :boolean, desc: "Disable colorization in output"
113
+ class_option "retry", type: :numeric, aliases: "-r", banner: "NUM",
114
+ desc: "Specify the number of times you wish to attempt network commands"
115
+ class_option "verbose", type: :boolean, desc: "Enable verbose output mode", aliases: "-V"
110
116
 
111
117
  def help(cli = nil)
118
+ cli = self.class.all_aliases[cli] if self.class.all_aliases[cli]
119
+
112
120
  case cli
113
121
  when "gemfile" then command = "gemfile"
114
122
  when nil then command = "bundle"
@@ -122,8 +130,8 @@ module Bundler
122
130
 
123
131
  if man_pages.include?(command)
124
132
  man_page = man_pages[command]
125
- if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+}
126
- Kernel.exec "man #{man_page}"
133
+ if Bundler.which("man") && !man_path.match?(%r{^file:/.+!/META-INF/jruby.home/.+})
134
+ Kernel.exec("man", man_page)
127
135
  else
128
136
  puts File.read("#{man_path}/#{File.basename(man_page)}.ronn")
129
137
  end
@@ -150,7 +158,8 @@ module Bundler
150
158
  Gemfile to a gem with a gemspec, the --gemspec option will automatically add each
151
159
  dependency listed in the gemspec file to the newly created Gemfile.
152
160
  D
153
- method_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
161
+ method_option "gemspec", type: :string, banner: "Use the specified .gemspec to create the Gemfile"
162
+ method_option "gemfile", type: :string, banner: "Use the specified name for the gemfile instead of 'Gemfile'"
154
163
  def init
155
164
  require_relative "cli/init"
156
165
  Init.new(options.dup).run
@@ -162,12 +171,9 @@ module Bundler
162
171
  all gems are found, Bundler prints a success message and exits with a status of 0.
163
172
  If not, the first missing gem is listed and Bundler exits status 1.
164
173
  D
165
- method_option "dry-run", :type => :boolean, :default => false, :banner =>
166
- "Lock the Gemfile"
167
- method_option "gemfile", :type => :string, :banner =>
168
- "Use the specified gemfile instead of Gemfile"
169
- method_option "path", :type => :string, :banner =>
170
- "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
174
+ method_option "dry-run", type: :boolean, default: false, banner: "Lock the Gemfile"
175
+ method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
176
+ method_option "path", type: :string, banner: "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
171
177
  def check
172
178
  remembered_flag_deprecation("path")
173
179
 
@@ -181,10 +187,14 @@ module Bundler
181
187
  long_desc <<-D
182
188
  Removes the given gems from the Gemfile while ensuring that the resulting Gemfile is still valid. If the gem is not found, Bundler prints a error message and if gem could not be removed due to any reason Bundler will display a warning.
183
189
  D
184
- method_option "install", :type => :boolean, :banner =>
185
- "Runs 'bundle install' after removing the gems from the Gemfile"
190
+ method_option "install", type: :boolean, banner: "Runs 'bundle install' after removing the gems from the Gemfile"
186
191
  def remove(*gems)
187
- SharedHelpers.major_deprecation(2, "The `--install` flag has been deprecated. `bundle install` is triggered by default.") if ARGV.include?("--install")
192
+ if ARGV.include?("--install")
193
+ message = "The `--install` flag has been deprecated. `bundle install` is triggered by default."
194
+ removed_message = "The `--install` flag has been removed. `bundle install` is triggered by default."
195
+ SharedHelpers.major_deprecation(2, message, removed_message: removed_message)
196
+ end
197
+
188
198
  require_relative "cli/remove"
189
199
  Remove.new(gems, options).run
190
200
  end
@@ -200,56 +210,40 @@ module Bundler
200
210
 
201
211
  If the bundle has already been installed, bundler will tell you so and then exit.
202
212
  D
203
- method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
204
- "Generate bin stubs for bundled gems to ./bin"
205
- method_option "clean", :type => :boolean, :banner =>
206
- "Run bundle clean automatically after install"
207
- method_option "deployment", :type => :boolean, :banner =>
208
- "Install using defaults tuned for deployment environments"
209
- method_option "frozen", :type => :boolean, :banner =>
210
- "Do not allow the Gemfile.lock to be updated after this install"
211
- method_option "full-index", :type => :boolean, :banner =>
212
- "Fall back to using the single-file index of all gems"
213
- method_option "gemfile", :type => :string, :banner =>
214
- "Use the specified gemfile instead of Gemfile"
215
- method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
216
- "Specify the number of jobs to run in parallel"
217
- method_option "local", :type => :boolean, :banner =>
218
- "Do not attempt to fetch gems remotely and use the gem cache instead"
219
- method_option "no-cache", :type => :boolean, :banner =>
220
- "Don't update the existing gem cache."
221
- method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
222
- "Force downloading every gem."
223
- method_option "no-prune", :type => :boolean, :banner =>
224
- "Don't remove stale gems from the cache."
225
- method_option "path", :type => :string, :banner =>
226
- "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
227
- method_option "quiet", :type => :boolean, :banner =>
228
- "Only output warnings and errors."
229
- method_option "shebang", :type => :string, :banner =>
230
- "Specify a different shebang executable name than the default (usually 'ruby')"
231
- method_option "standalone", :type => :array, :lazy_default => [], :banner =>
232
- "Make a bundle that can work without the Bundler runtime"
233
- method_option "system", :type => :boolean, :banner =>
234
- "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
235
- method_option "trust-policy", :alias => "P", :type => :string, :banner =>
236
- "Gem trust policy (like gem install -P). Must be one of " +
237
- Bundler.rubygems.security_policy_keys.join("|")
238
- method_option "without", :type => :array, :banner =>
239
- "Exclude gems that are part of the specified named group."
240
- method_option "with", :type => :array, :banner =>
241
- "Include gems that are part of the specified named group."
213
+ method_option "binstubs", type: :string, lazy_default: "bin", banner: "Generate bin stubs for bundled gems to ./bin"
214
+ method_option "clean", type: :boolean, banner: "Run bundle clean automatically after install"
215
+ method_option "deployment", type: :boolean, banner: "Install using defaults tuned for deployment environments"
216
+ method_option "frozen", type: :boolean, banner: "Do not allow the Gemfile.lock to be updated after this install"
217
+ method_option "full-index", type: :boolean, banner: "Fall back to using the single-file index of all gems"
218
+ method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
219
+ method_option "jobs", aliases: "-j", type: :numeric, banner: "Specify the number of jobs to run in parallel"
220
+ method_option "local", type: :boolean, banner: "Do not attempt to fetch gems remotely and use the gem cache instead"
221
+ method_option "prefer-local", type: :boolean, banner: "Only attempt to fetch gems remotely if not present locally, even if newer versions are available remotely"
222
+ method_option "no-cache", type: :boolean, banner: "Don't update the existing gem cache."
223
+ method_option "redownload", type: :boolean, aliases: "--force", banner: "Force downloading every gem."
224
+ method_option "no-prune", type: :boolean, banner: "Don't remove stale gems from the cache."
225
+ method_option "path", type: :string, banner: "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
226
+ method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
227
+ method_option "shebang", type: :string, banner: "Specify a different shebang executable name than the default (usually 'ruby')"
228
+ method_option "standalone", type: :array, lazy_default: [], banner: "Make a bundle that can work without the Bundler runtime"
229
+ method_option "system", type: :boolean, banner: "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
230
+ method_option "trust-policy", alias: "P", type: :string, banner: "Gem trust policy (like gem install -P). Must be one of " +
231
+ Bundler.rubygems.security_policy_keys.join("|")
232
+ method_option "without", type: :array, banner: "Exclude gems that are part of the specified named group."
233
+ method_option "with", type: :array, banner: "Include gems that are part of the specified named group."
242
234
  def install
243
235
  SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
244
236
 
245
- %w[clean deployment frozen no-prune path shebang system without with].each do |option|
237
+ %w[clean deployment frozen no-prune path shebang without with].each do |option|
246
238
  remembered_flag_deprecation(option)
247
239
  end
248
240
 
241
+ print_remembered_flag_deprecation("--system", "path.system", "true") if ARGV.include?("--system")
242
+
249
243
  remembered_negative_flag_deprecation("no-deployment")
250
244
 
251
245
  require_relative "cli/install"
252
- Bundler.settings.temporary(:no_install => false) do
246
+ Bundler.settings.temporary(no_install: false) do
253
247
  Install.new(options.dup).run
254
248
  end
255
249
  end
@@ -262,42 +256,27 @@ module Bundler
262
256
  update when you have changed the Gemfile, or if you want to get the newest
263
257
  possible versions of the gems in the bundle.
264
258
  D
265
- method_option "full-index", :type => :boolean, :banner =>
266
- "Fall back to using the single-file index of all gems"
267
- method_option "gemfile", :type => :string, :banner =>
268
- "Use the specified gemfile instead of Gemfile"
269
- method_option "group", :aliases => "-g", :type => :array, :banner =>
270
- "Update a specific group"
271
- method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
272
- "Specify the number of jobs to run in parallel"
273
- method_option "local", :type => :boolean, :banner =>
274
- "Do not attempt to fetch gems remotely and use the gem cache instead"
275
- method_option "quiet", :type => :boolean, :banner =>
276
- "Only output warnings and errors."
277
- method_option "source", :type => :array, :banner =>
278
- "Update a specific source (and all gems associated with it)"
279
- method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
280
- "Force downloading every gem."
281
- method_option "ruby", :type => :boolean, :banner =>
282
- "Update ruby specified in Gemfile.lock"
283
- method_option "bundler", :type => :string, :lazy_default => "> 0.a", :banner =>
284
- "Update the locked version of bundler"
285
- method_option "patch", :type => :boolean, :banner =>
286
- "Prefer updating only to next patch version"
287
- method_option "minor", :type => :boolean, :banner =>
288
- "Prefer updating only to next minor version"
289
- method_option "major", :type => :boolean, :banner =>
290
- "Prefer updating to next major version (default)"
291
- method_option "strict", :type => :boolean, :banner =>
292
- "Do not allow any gem to be updated past latest --patch | --minor | --major"
293
- method_option "conservative", :type => :boolean, :banner =>
294
- "Use bundle install conservative update behavior and do not allow shared dependencies to be updated."
295
- method_option "all", :type => :boolean, :banner =>
296
- "Update everything."
259
+ method_option "full-index", type: :boolean, banner: "Fall back to using the single-file index of all gems"
260
+ method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
261
+ method_option "group", aliases: "-g", type: :array, banner: "Update a specific group"
262
+ method_option "jobs", aliases: "-j", type: :numeric, banner: "Specify the number of jobs to run in parallel"
263
+ method_option "local", type: :boolean, banner: "Do not attempt to fetch gems remotely and use the gem cache instead"
264
+ method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
265
+ method_option "source", type: :array, banner: "Update a specific source (and all gems associated with it)"
266
+ method_option "redownload", type: :boolean, aliases: "--force", banner: "Force downloading every gem."
267
+ method_option "ruby", type: :boolean, banner: "Update ruby specified in Gemfile.lock"
268
+ method_option "bundler", type: :string, lazy_default: "> 0.a", banner: "Update the locked version of bundler"
269
+ method_option "patch", type: :boolean, banner: "Prefer updating only to next patch version"
270
+ method_option "minor", type: :boolean, banner: "Prefer updating only to next minor version"
271
+ method_option "major", type: :boolean, banner: "Prefer updating to next major version (default)"
272
+ method_option "pre", type: :boolean, banner: "Always choose the highest allowed version when updating gems, regardless of prerelease status"
273
+ method_option "strict", type: :boolean, banner: "Do not allow any gem to be updated past latest --patch | --minor | --major"
274
+ method_option "conservative", type: :boolean, banner: "Use bundle install conservative update behavior and do not allow shared dependencies to be updated."
275
+ method_option "all", type: :boolean, banner: "Update everything."
297
276
  def update(*gems)
298
277
  SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
299
278
  require_relative "cli/update"
300
- Bundler.settings.temporary(:no_install => false) do
279
+ Bundler.settings.temporary(no_install: false) do
301
280
  Update.new(options, gems).run
302
281
  end
303
282
  end
@@ -307,21 +286,25 @@ module Bundler
307
286
  Show lists the names and versions of all gems that are required by your Gemfile.
308
287
  Calling show with [GEM] will list the exact location of that gem on your machine.
309
288
  D
310
- method_option "paths", :type => :boolean,
311
- :banner => "List the paths of all gems that are required by your Gemfile."
312
- method_option "outdated", :type => :boolean,
313
- :banner => "Show verbose output including whether gems are outdated."
289
+ method_option "paths", type: :boolean,
290
+ banner: "List the paths of all gems that are required by your Gemfile."
291
+ method_option "outdated", type: :boolean,
292
+ banner: "Show verbose output including whether gems are outdated."
314
293
  def show(gem_name = nil)
315
- SharedHelpers.major_deprecation(2, "the `--outdated` flag to `bundle show` was undocumented and will be removed without replacement") if ARGV.include?("--outdated")
294
+ if ARGV.include?("--outdated")
295
+ message = "the `--outdated` flag to `bundle show` was undocumented and will be removed without replacement"
296
+ removed_message = "the `--outdated` flag to `bundle show` was undocumented and has been removed without replacement"
297
+ SharedHelpers.major_deprecation(2, message, removed_message: removed_message)
298
+ end
316
299
  require_relative "cli/show"
317
300
  Show.new(options, gem_name).run
318
301
  end
319
302
 
320
303
  desc "list", "List all gems in the bundle"
321
- method_option "name-only", :type => :boolean, :banner => "print only the gem names"
322
- method_option "only-group", :type => :array, :default => [], :banner => "print gems from a given set of groups"
323
- method_option "without-group", :type => :array, :default => [], :banner => "print all gems except from a given set of groups"
324
- method_option "paths", :type => :boolean, :banner => "print the path to each gem in the bundle"
304
+ method_option "name-only", type: :boolean, banner: "print only the gem names"
305
+ method_option "only-group", type: :array, default: [], banner: "print gems from a given set of groups"
306
+ method_option "without-group", type: :array, default: [], banner: "print all gems except from a given set of groups"
307
+ method_option "paths", type: :boolean, banner: "print the path to each gem in the bundle"
325
308
  def list
326
309
  require_relative "cli/list"
327
310
  List.new(options).run
@@ -330,7 +313,8 @@ module Bundler
330
313
  map aliases_for("list")
331
314
 
332
315
  desc "info GEM [OPTIONS]", "Show information for the given gem"
333
- method_option "path", :type => :boolean, :banner => "Print full path to gem"
316
+ method_option "path", type: :boolean, banner: "Print full path to gem"
317
+ method_option "version", type: :boolean, banner: "Print gem version"
334
318
  def info(gem_name)
335
319
  require_relative "cli/info"
336
320
  Info.new(options, gem_name).run
@@ -342,18 +326,12 @@ module Bundler
342
326
  or the --binstubs directory if one has been set. Calling binstubs with [GEM [GEM]]
343
327
  will create binstubs for all given gems.
344
328
  D
345
- method_option "force", :type => :boolean, :default => false, :banner =>
346
- "Overwrite existing binstubs if they exist"
347
- method_option "path", :type => :string, :lazy_default => "bin", :banner =>
348
- "Binstub destination directory (default bin)"
349
- method_option "shebang", :type => :string, :banner =>
350
- "Specify a different shebang executable name than the default (usually 'ruby')"
351
- method_option "standalone", :type => :boolean, :banner =>
352
- "Make binstubs that can work without the Bundler runtime"
353
- method_option "all", :type => :boolean, :banner =>
354
- "Install binstubs for all gems"
355
- method_option "all-platforms", :type => :boolean, :default => false, :banner =>
356
- "Install binstubs for all platforms"
329
+ method_option "force", type: :boolean, default: false, banner: "Overwrite existing binstubs if they exist"
330
+ method_option "path", type: :string, lazy_default: "bin", banner: "Binstub destination directory (default bin)"
331
+ method_option "shebang", type: :string, banner: "Specify a different shebang executable name than the default (usually 'ruby')"
332
+ method_option "standalone", type: :boolean, banner: "Make binstubs that can work without the Bundler runtime"
333
+ method_option "all", type: :boolean, banner: "Install binstubs for all gems"
334
+ method_option "all-platforms", type: :boolean, default: false, banner: "Install binstubs for all platforms"
357
335
  def binstubs(*gems)
358
336
  require_relative "cli/binstubs"
359
337
  Binstubs.new(options, gems).run
@@ -363,15 +341,19 @@ module Bundler
363
341
  long_desc <<-D
364
342
  Adds the specified gem to Gemfile (if valid) and run 'bundle install' in one step.
365
343
  D
366
- method_option "version", :aliases => "-v", :type => :string
367
- method_option "group", :aliases => "-g", :type => :string
368
- method_option "source", :aliases => "-s", :type => :string
369
- method_option "git", :type => :string
370
- method_option "branch", :type => :string
371
- method_option "skip-install", :type => :boolean, :banner =>
372
- "Adds gem to the Gemfile but does not install it"
373
- method_option "optimistic", :type => :boolean, :banner => "Adds optimistic declaration of version to gem"
374
- method_option "strict", :type => :boolean, :banner => "Adds strict declaration of version to gem"
344
+ method_option "version", aliases: "-v", type: :string
345
+ method_option "group", aliases: "-g", type: :string
346
+ method_option "source", aliases: "-s", type: :string
347
+ method_option "require", aliases: "-r", type: :string, banner: "Adds require path to gem. Provide false, or a path as a string."
348
+ method_option "path", type: :string
349
+ method_option "git", type: :string
350
+ method_option "github", type: :string
351
+ method_option "branch", type: :string
352
+ method_option "ref", type: :string
353
+ method_option "glob", type: :string, banner: "The location of a dependency's .gemspec, expanded within Ruby (single quotes recommended)"
354
+ method_option "skip-install", type: :boolean, banner: "Adds gem to the Gemfile but does not install it"
355
+ method_option "optimistic", type: :boolean, banner: "Adds optimistic declaration of version to gem"
356
+ method_option "strict", type: :boolean, banner: "Adds strict declaration of version to gem"
375
357
  def add(*gems)
376
358
  require_relative "cli/add"
377
359
  Add.new(options.dup, gems).run
@@ -385,57 +367,47 @@ module Bundler
385
367
  are up to date, Bundler will exit with a status of 0. Otherwise, it will exit 1.
386
368
 
387
369
  For more information on patch level options (--major, --minor, --patch,
388
- --update-strict) see documentation on the same options on the update command.
370
+ --strict) see documentation on the same options on the update command.
389
371
  D
390
- method_option "group", :type => :string, :banner => "List gems from a specific group"
391
- method_option "groups", :type => :boolean, :banner => "List gems organized by groups"
392
- method_option "local", :type => :boolean, :banner =>
393
- "Do not attempt to fetch gems remotely and use the gem cache instead"
394
- method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
395
- method_option "source", :type => :array, :banner => "Check against a specific source"
396
- strict_is_update = Bundler.feature_flag.forget_cli_options?
397
- method_option "filter-strict", :type => :boolean, :aliases => strict_is_update ? [] : %w[--strict], :banner =>
398
- "Only list newer versions allowed by your Gemfile requirements"
399
- method_option "update-strict", :type => :boolean, :aliases => strict_is_update ? %w[--strict] : [], :banner =>
400
- "Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major"
401
- method_option "minor", :type => :boolean, :banner => "Prefer updating only to next minor version"
402
- method_option "major", :type => :boolean, :banner => "Prefer updating to next major version (default)"
403
- method_option "patch", :type => :boolean, :banner => "Prefer updating only to next patch version"
404
- method_option "filter-major", :type => :boolean, :banner => "Only list major newer versions"
405
- method_option "filter-minor", :type => :boolean, :banner => "Only list minor newer versions"
406
- method_option "filter-patch", :type => :boolean, :banner => "Only list patch newer versions"
407
- method_option "parseable", :aliases => "--porcelain", :type => :boolean, :banner =>
408
- "Use minimal formatting for more parseable output"
409
- method_option "only-explicit", :type => :boolean, :banner =>
410
- "Only list gems specified in your Gemfile, not their dependencies"
372
+ method_option "group", type: :string, banner: "List gems from a specific group"
373
+ method_option "groups", type: :boolean, banner: "List gems organized by groups"
374
+ method_option "local", type: :boolean, banner: "Do not attempt to fetch gems remotely and use the gem cache instead"
375
+ method_option "pre", type: :boolean, banner: "Check for newer pre-release gems"
376
+ method_option "source", type: :array, banner: "Check against a specific source"
377
+ method_option "filter-strict", type: :boolean, aliases: "--strict", banner: "Only list newer versions allowed by your Gemfile requirements"
378
+ method_option "update-strict", type: :boolean, banner: "Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major"
379
+ method_option "minor", type: :boolean, banner: "Prefer updating only to next minor version"
380
+ method_option "major", type: :boolean, banner: "Prefer updating to next major version (default)"
381
+ method_option "patch", type: :boolean, banner: "Prefer updating only to next patch version"
382
+ method_option "filter-major", type: :boolean, banner: "Only list major newer versions"
383
+ method_option "filter-minor", type: :boolean, banner: "Only list minor newer versions"
384
+ method_option "filter-patch", type: :boolean, banner: "Only list patch newer versions"
385
+ method_option "parseable", aliases: "--porcelain", type: :boolean, banner: "Use minimal formatting for more parseable output"
386
+ method_option "only-explicit", type: :boolean, banner: "Only list gems specified in your Gemfile, not their dependencies"
411
387
  def outdated(*gems)
412
388
  require_relative "cli/outdated"
413
389
  Outdated.new(options, gems).run
414
390
  end
415
391
 
416
392
  desc "fund [OPTIONS]", "Lists information about gems seeking funding assistance"
417
- method_option "group", :aliases => "-g", :type => :array, :banner =>
418
- "Fetch funding information for a specific group"
393
+ method_option "group", aliases: "-g", type: :array, banner: "Fetch funding information for a specific group"
419
394
  def fund
420
395
  require_relative "cli/fund"
421
396
  Fund.new(options).run
422
397
  end
423
398
 
424
399
  desc "cache [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
425
- method_option "all", :type => :boolean,
426
- :default => Bundler.feature_flag.cache_all?,
427
- :banner => "Include all sources (including path and git)."
428
- method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not only the current one"
429
- method_option "cache-path", :type => :string, :banner =>
430
- "Specify a different cache path than the default (vendor/cache)."
431
- method_option "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile"
432
- method_option "no-install", :type => :boolean, :banner => "Don't install the gems, only update the cache."
433
- method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
434
- method_option "path", :type => :string, :banner =>
435
- "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
436
- method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
437
- method_option "frozen", :type => :boolean, :banner =>
438
- "Do not allow the Gemfile.lock to be updated after this bundle cache operation's install"
400
+ method_option "all", type: :boolean,
401
+ default: Bundler.feature_flag.cache_all?,
402
+ banner: "Include all sources (including path and git)."
403
+ method_option "all-platforms", type: :boolean, banner: "Include gems for all platforms present in the lockfile, not only the current one"
404
+ method_option "cache-path", type: :string, banner: "Specify a different cache path than the default (vendor/cache)."
405
+ method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
406
+ method_option "no-install", type: :boolean, banner: "Don't install the gems, only update the cache."
407
+ method_option "no-prune", type: :boolean, banner: "Don't remove stale gems from the cache."
408
+ method_option "path", type: :string, banner: "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
409
+ method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
410
+ method_option "frozen", type: :boolean, banner: "Do not allow the Gemfile.lock to be updated after this bundle cache operation's install"
439
411
  long_desc <<-D
440
412
  The cache command will copy the .gem files for every gem in the bundle into the
441
413
  directory ./vendor/cache. If you then check that directory into your source
@@ -443,17 +415,20 @@ module Bundler
443
415
  bundle without having to download any additional gems.
444
416
  D
445
417
  def cache
446
- SharedHelpers.major_deprecation 2,
447
- "The `--all` flag is deprecated because it relies on being " \
448
- "remembered across bundler invocations, which bundler will no longer " \
449
- "do in future versions. Instead please use `bundle config set cache_all true`, " \
450
- "and stop using this flag" if ARGV.include?("--all")
451
-
452
- SharedHelpers.major_deprecation 2,
453
- "The `--path` flag is deprecated because its semantics are unclear. " \
454
- "Use `bundle config cache_path` to configure the path of your cache of gems, " \
455
- "and `bundle config path` to configure the path where your gems are installed, " \
456
- "and stop using this flag" if ARGV.include?("--path")
418
+ print_remembered_flag_deprecation("--all", "cache_all", "true") if ARGV.include?("--all")
419
+
420
+ if ARGV.include?("--path")
421
+ message =
422
+ "The `--path` flag is deprecated because its semantics are unclear. " \
423
+ "Use `bundle config cache_path` to configure the path of your cache of gems, " \
424
+ "and `bundle config path` to configure the path where your gems are installed, " \
425
+ "and stop using this flag"
426
+ removed_message =
427
+ "The `--path` flag has been removed because its semantics were unclear. " \
428
+ "Use `bundle config cache_path` to configure the path of your cache of gems, " \
429
+ "and `bundle config path` to configure the path where your gems are installed."
430
+ SharedHelpers.major_deprecation 2, message, removed_message: removed_message
431
+ end
457
432
 
458
433
  require_relative "cli/cache"
459
434
  Cache.new(options).run
@@ -462,8 +437,8 @@ module Bundler
462
437
  map aliases_for("cache")
463
438
 
464
439
  desc "exec [OPTIONS]", "Run the command in context of the bundle"
465
- method_option :keep_file_descriptors, :type => :boolean, :default => true
466
- method_option :gemfile, :type => :string, :required => false
440
+ method_option :keep_file_descriptors, type: :boolean, default: true
441
+ method_option :gemfile, type: :string, required: false
467
442
  long_desc <<-D
468
443
  Exec runs a command, providing it access to the gems in the bundle. While using
469
444
  bundle exec you can require and call the bundled gems as if they were installed
@@ -471,7 +446,9 @@ module Bundler
471
446
  D
472
447
  def exec(*args)
473
448
  if ARGV.include?("--no-keep-file-descriptors")
474
- SharedHelpers.major_deprecation(2, "The `--no-keep-file-descriptors` has been deprecated. `bundle exec` no longer mess with your file descriptors. Close them in the exec'd script if you need to")
449
+ message = "The `--no-keep-file-descriptors` has been deprecated. `bundle exec` no longer mess with your file descriptors. Close them in the exec'd script if you need to"
450
+ removed_message = "The `--no-keep-file-descriptors` has been removed. `bundle exec` no longer mess with your file descriptors. Close them in the exec'd script if you need to"
451
+ SharedHelpers.major_deprecation(2, message, removed_message: removed_message)
475
452
  end
476
453
 
477
454
  require_relative "cli/exec"
@@ -496,6 +473,7 @@ module Bundler
496
473
  subcommand "config", Config
497
474
 
498
475
  desc "open GEM", "Opens the source directory of the given bundled gem"
476
+ method_option "path", type: :string, lazy_default: "", banner: "Open relative path of the gem source."
499
477
  def open(name)
500
478
  require_relative "cli/open"
501
479
  Open.new(options, name).run
@@ -509,7 +487,7 @@ module Bundler
509
487
  end
510
488
  end
511
489
 
512
- desc "version", "Prints the bundler's version information"
490
+ desc "version", "Prints Bundler version information"
513
491
  def version
514
492
  cli_help = current_command.name == "cli_help"
515
493
  if cli_help || ARGV.include?("version")
@@ -540,19 +518,19 @@ module Bundler
540
518
  end
541
519
 
542
520
  unless Bundler.feature_flag.bundler_3_mode?
543
- desc "viz [OPTIONS]", "Generates a visual dependency graph", :hide => true
521
+ desc "viz [OPTIONS]", "Generates a visual dependency graph", hide: true
544
522
  long_desc <<-D
545
523
  Viz generates a PNG file of the current Gemfile as a dependency graph.
546
524
  Viz requires the ruby-graphviz gem (and its dependencies).
547
525
  The associated gems must also be installed via 'bundle install'.
548
526
  D
549
- method_option :file, :type => :string, :default => "gem_graph", :aliases => "-f", :desc => "The name to use for the generated file. see format option"
550
- method_option :format, :type => :string, :default => "png", :aliases => "-F", :desc => "This is output format option. Supported format is png, jpg, svg, dot ..."
551
- method_option :requirements, :type => :boolean, :default => false, :aliases => "-R", :desc => "Set to show the version of each required dependency."
552
- method_option :version, :type => :boolean, :default => false, :aliases => "-v", :desc => "Set to show each gem version."
553
- method_option :without, :type => :array, :default => [], :aliases => "-W", :banner => "GROUP[ GROUP...]", :desc => "Exclude gems that are part of the specified named group."
527
+ method_option :file, type: :string, default: "gem_graph", aliases: "-f", desc: "The name to use for the generated file. see format option"
528
+ method_option :format, type: :string, default: "png", aliases: "-F", desc: "This is output format option. Supported format is png, jpg, svg, dot ..."
529
+ method_option :requirements, type: :boolean, default: false, aliases: "-R", desc: "Set to show the version of each required dependency."
530
+ method_option :version, type: :boolean, default: false, aliases: "-v", desc: "Set to show each gem version."
531
+ method_option :without, type: :array, default: [], aliases: "-W", banner: "GROUP[ GROUP...]", desc: "Exclude gems that are part of the specified named group."
554
532
  def viz
555
- SharedHelpers.major_deprecation 2, "The `viz` command has been moved to the `bundle-viz` gem, see https://github.com/bundler/bundler-viz"
533
+ SharedHelpers.major_deprecation 2, "The `viz` command has been renamed to `graph` and moved to a plugin. See https://github.com/rubygems/bundler-graph"
556
534
  require_relative "cli/viz"
557
535
  Viz.new(options.dup).run
558
536
  end
@@ -561,21 +539,26 @@ module Bundler
561
539
  old_gem = instance_method(:gem)
562
540
 
563
541
  desc "gem NAME [OPTIONS]", "Creates a skeleton for creating a rubygem"
564
- method_option :exe, :type => :boolean, :default => false, :aliases => ["--bin", "-b"], :desc => "Generate a binary executable for your library."
565
- method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config set --global gem.coc true`."
566
- method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
567
- :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? },
568
- :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
569
- method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code"
570
- method_option :git, :type => :boolean, :default => true, :desc => "Initialize a git repo inside your library."
571
- method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config set --global gem.mit true`."
572
- method_option :rubocop, :type => :boolean, :desc => "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set --global gem.rubocop true`."
573
- method_option :changelog, :type => :boolean, :desc => "Generate changelog file. Set a default with `bundle config set --global gem.changelog true`."
574
- method_option :test, :type => :string, :lazy_default => Bundler.settings["gem.test"] || "", :aliases => "-t", :banner => "Use the specified test framework for your library",
575
- :desc => "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set --global gem.test (rspec|minitest|test-unit)`."
576
- method_option :ci, :type => :string, :lazy_default => Bundler.settings["gem.ci"] || "",
577
- :desc => "Generate CI configuration, either GitHub Actions, Travis CI, GitLab CI or CircleCI. Set a default with `bundle config set --global gem.ci (github|travis|gitlab|circle)`"
578
- method_option :github_username, :type => :string, :default => Bundler.settings["gem.github_username"], :banner => "Set your username on GitHub", :desc => "Fill in GitHub username on README so that you don't have to do it manually. Set a default with `bundle config set --global gem.github_username <your_username>`."
542
+ method_option :exe, type: :boolean, default: false, aliases: ["--bin", "-b"], desc: "Generate a binary executable for your library."
543
+ method_option :coc, type: :boolean, desc: "Generate a code of conduct file. Set a default with `bundle config set --global gem.coc true`."
544
+ method_option :edit, type: :string, aliases: "-e", required: false, banner: "EDITOR",
545
+ lazy_default: [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? },
546
+ desc: "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
547
+ method_option :ext, type: :string, desc: "Generate the boilerplate for C extension code.", enum: EXTENSIONS
548
+ method_option :git, type: :boolean, default: true, desc: "Initialize a git repo inside your library."
549
+ method_option :mit, type: :boolean, desc: "Generate an MIT license file. Set a default with `bundle config set --global gem.mit true`."
550
+ method_option :rubocop, type: :boolean, desc: "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set --global gem.rubocop true`."
551
+ method_option :changelog, type: :boolean, desc: "Generate changelog file. Set a default with `bundle config set --global gem.changelog true`."
552
+ method_option :test, type: :string, lazy_default: Bundler.settings["gem.test"] || "", aliases: "-t", banner: "Use the specified test framework for your library",
553
+ enum: %w[rspec minitest test-unit],
554
+ desc: "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set --global gem.test (rspec|minitest|test-unit)`."
555
+ method_option :ci, type: :string, lazy_default: Bundler.settings["gem.ci"] || "",
556
+ enum: %w[github gitlab circle],
557
+ desc: "Generate CI configuration, either GitHub Actions, GitLab CI or CircleCI. Set a default with `bundle config set --global gem.ci (github|gitlab|circle)`"
558
+ method_option :linter, type: :string, lazy_default: Bundler.settings["gem.linter"] || "",
559
+ enum: %w[rubocop standard],
560
+ desc: "Add a linter and code formatter, either RuboCop or Standard. Set a default with `bundle config set --global gem.linter (rubocop|standard)`"
561
+ method_option :github_username, type: :string, default: Bundler.settings["gem.github_username"], banner: "Set your username on GitHub", desc: "Fill in GitHub username on README so that you don't have to do it manually. Set a default with `bundle config set --global gem.github_username <your_username>`."
579
562
 
580
563
  def gem(name)
581
564
  end
@@ -603,32 +586,27 @@ module Bundler
603
586
  private :gem
604
587
 
605
588
  def self.source_root
606
- File.expand_path(File.join(File.dirname(__FILE__), "templates"))
589
+ File.expand_path("templates", __dir__)
607
590
  end
608
591
 
609
- desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory", :hide => true
610
- method_option "dry-run", :type => :boolean, :default => false, :banner =>
611
- "Only print out changes, do not clean gems"
612
- method_option "force", :type => :boolean, :default => false, :banner =>
613
- "Forces clean even if --path is not set"
592
+ desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory", hide: true
593
+ method_option "dry-run", type: :boolean, default: false, banner: "Only print out changes, do not clean gems"
594
+ method_option "force", type: :boolean, default: false, banner: "Forces cleaning up unused gems even if Bundler is configured to use globally installed gems. As a consequence, removes all system gems except for the ones in the current application."
614
595
  def clean
615
596
  require_relative "cli/clean"
616
597
  Clean.new(options.dup).run
617
598
  end
618
599
 
619
600
  desc "platform [OPTIONS]", "Displays platform compatibility information"
620
- method_option "ruby", :type => :boolean, :default => false, :banner =>
621
- "only display ruby related platform information"
601
+ method_option "ruby", type: :boolean, default: false, banner: "only display ruby related platform information"
622
602
  def platform
623
603
  require_relative "cli/platform"
624
604
  Platform.new(options).run
625
605
  end
626
606
 
627
- desc "inject GEM VERSION", "Add the named gem, with version requirements, to the resolved Gemfile", :hide => true
628
- method_option "source", :type => :string, :banner =>
629
- "Install gem from the given source"
630
- method_option "group", :type => :string, :banner =>
631
- "Install gem into a bundler group"
607
+ desc "inject GEM VERSION", "Add the named gem, with version requirements, to the resolved Gemfile", hide: true
608
+ method_option "source", type: :string, banner: "Install gem from the given source"
609
+ method_option "group", type: :string, banner: "Install gem into a bundler group"
632
610
  def inject(name, version)
633
611
  SharedHelpers.major_deprecation 2, "The `inject` command has been replaced by the `add` command"
634
612
  require_relative "cli/inject"
@@ -636,32 +614,21 @@ module Bundler
636
614
  end
637
615
 
638
616
  desc "lock", "Creates a lockfile without installing"
639
- method_option "update", :type => :array, :lazy_default => true, :banner =>
640
- "ignore the existing lockfile, update all gems by default, or update list of given gems"
641
- method_option "local", :type => :boolean, :default => false, :banner =>
642
- "do not attempt to fetch remote gemspecs and use the local gem cache only"
643
- method_option "print", :type => :boolean, :default => false, :banner =>
644
- "print the lockfile to STDOUT instead of writing to the file system"
645
- method_option "gemfile", :type => :string, :banner =>
646
- "Use the specified gemfile instead of Gemfile"
647
- method_option "lockfile", :type => :string, :default => nil, :banner =>
648
- "the path the lockfile should be written to"
649
- method_option "full-index", :type => :boolean, :default => false, :banner =>
650
- "Fall back to using the single-file index of all gems"
651
- method_option "add-platform", :type => :array, :default => [], :banner =>
652
- "Add a new platform to the lockfile"
653
- method_option "remove-platform", :type => :array, :default => [], :banner =>
654
- "Remove a platform from the lockfile"
655
- method_option "patch", :type => :boolean, :banner =>
656
- "If updating, prefer updating only to next patch version"
657
- method_option "minor", :type => :boolean, :banner =>
658
- "If updating, prefer updating only to next minor version"
659
- method_option "major", :type => :boolean, :banner =>
660
- "If updating, prefer updating to next major version (default)"
661
- method_option "strict", :type => :boolean, :banner =>
662
- "If updating, do not allow any gem to be updated past latest --patch | --minor | --major"
663
- method_option "conservative", :type => :boolean, :banner =>
664
- "If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated"
617
+ method_option "update", type: :array, lazy_default: true, banner: "ignore the existing lockfile, update all gems by default, or update list of given gems"
618
+ method_option "local", type: :boolean, default: false, banner: "do not attempt to fetch remote gemspecs and use the local gem cache only"
619
+ method_option "print", type: :boolean, default: false, banner: "print the lockfile to STDOUT instead of writing to the file system"
620
+ method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
621
+ method_option "lockfile", type: :string, default: nil, banner: "the path the lockfile should be written to"
622
+ method_option "full-index", type: :boolean, default: false, banner: "Fall back to using the single-file index of all gems"
623
+ method_option "add-platform", type: :array, default: [], banner: "Add a new platform to the lockfile"
624
+ method_option "remove-platform", type: :array, default: [], banner: "Remove a platform from the lockfile"
625
+ method_option "patch", type: :boolean, banner: "If updating, prefer updating only to next patch version"
626
+ method_option "minor", type: :boolean, banner: "If updating, prefer updating only to next minor version"
627
+ method_option "major", type: :boolean, banner: "If updating, prefer updating to next major version (default)"
628
+ method_option "pre", type: :boolean, banner: "If updating, always choose the highest allowed version, regardless of prerelease status"
629
+ method_option "strict", type: :boolean, banner: "If updating, do not allow any gem to be updated past latest --patch | --minor | --major"
630
+ method_option "conservative", type: :boolean, banner: "If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated"
631
+ method_option "bundler", type: :string, lazy_default: "> 0.a", banner: "Update the locked version of bundler"
665
632
  def lock
666
633
  require_relative "cli/lock"
667
634
  Lock.new(options).run
@@ -678,10 +645,8 @@ module Bundler
678
645
  missing dependencies are detected, Bundler prints them and exits status 1.
679
646
  Otherwise, Bundler prints a success message and exits with a status of 0.
680
647
  D
681
- method_option "gemfile", :type => :string, :banner =>
682
- "Use the specified gemfile instead of Gemfile"
683
- method_option "quiet", :type => :boolean, :banner =>
684
- "Only output warnings and errors."
648
+ method_option "gemfile", type: :string, banner: "Use the specified gemfile instead of Gemfile"
649
+ method_option "quiet", type: :boolean, banner: "Only output warnings and errors."
685
650
  def doctor
686
651
  require_relative "cli/doctor"
687
652
  Doctor.new(options).run
@@ -701,7 +666,9 @@ module Bundler
701
666
  D
702
667
  def pristine(*gems)
703
668
  require_relative "cli/pristine"
704
- Pristine.new(gems).run
669
+ Bundler.settings.temporary(no_install: false) do
670
+ Pristine.new(gems).run
671
+ end
705
672
  end
706
673
 
707
674
  if Bundler.feature_flag.plugins?
@@ -722,7 +689,6 @@ module Bundler
722
689
  exec_used = args.index {|a| exec_commands.include? a }
723
690
 
724
691
  command = args.find {|a| bundler_commands.include? a }
725
- command = all_aliases[command] if all_aliases[command]
726
692
 
727
693
  if exec_used && help_used
728
694
  if exec_used + help_used == 1
@@ -739,28 +705,42 @@ module Bundler
739
705
  end
740
706
  end
741
707
 
742
- private
743
-
744
- # Automatically invoke `bundle install` and resume if
745
- # Bundler.settings[:auto_install] exists. This is set through config cmd
746
- # `bundle config set --global auto_install 1`.
747
- #
748
- # Note that this method `nil`s out the global Definition object, so it
749
- # should be called first, before you instantiate anything like an
750
- # `Installer` that'll keep a reference to the old one instead.
751
- def auto_install
752
- return unless Bundler.settings[:auto_install]
753
-
754
- begin
755
- Bundler.definition.specs
756
- rescue GemNotFound
757
- Bundler.ui.info "Automatically installing missing gems."
758
- Bundler.reset!
759
- invoke :install, []
760
- Bundler.reset!
708
+ def self.check_deprecated_ext_option(arguments)
709
+ # when deprecated version of `--ext` is called
710
+ # print out deprecation warning and pretend `--ext=c` was provided
711
+ if deprecated_ext_value?(arguments)
712
+ message = "Extensions can now be generated using C or Rust, so `--ext` with no arguments has been deprecated. Please select a language, e.g. `--ext=rust` to generate a Rust extension. This gem will now be generated as if `--ext=c` was used."
713
+ removed_message = "Extensions can now be generated using C or Rust, so `--ext` with no arguments has been removed. Please select a language, e.g. `--ext=rust` to generate a Rust extension."
714
+ SharedHelpers.major_deprecation 2, message, removed_message: removed_message
715
+ arguments[arguments.index("--ext")] = "--ext=c"
761
716
  end
762
717
  end
763
718
 
719
+ def self.deprecated_ext_value?(arguments)
720
+ index = arguments.index("--ext")
721
+ next_argument = arguments[index + 1]
722
+
723
+ # it is ok when --ext is followed with valid extension value
724
+ # for example `bundle gem hello --ext c`
725
+ return false if EXTENSIONS.include?(next_argument)
726
+
727
+ # deprecated call when --ext is called with no value in last position
728
+ # for example `bundle gem hello_gem --ext`
729
+ return true if next_argument.nil?
730
+
731
+ # deprecated call when --ext is followed by other parameter
732
+ # for example `bundle gem --ext --no-ci hello_gem`
733
+ return true if next_argument.start_with?("-")
734
+
735
+ # deprecated call when --ext is followed by gem name
736
+ # for example `bundle gem --ext hello_gem`
737
+ return true if next_argument
738
+
739
+ false
740
+ end
741
+
742
+ private
743
+
764
744
  def current_command
765
745
  _, _, config = @_initializer
766
746
  config[:current_command]
@@ -790,28 +770,18 @@ module Bundler
790
770
 
791
771
  return unless SharedHelpers.md5_available?
792
772
 
793
- latest = Fetcher::CompactIndex.
794
- new(nil, Source::Rubygems::Remote.new(Bundler::URI("https://rubygems.org")), nil).
795
- send(:compact_index_client).
796
- instance_variable_get(:@cache).
797
- dependencies("bundler").
798
- map {|d| Gem::Version.new(d.first) }.
799
- max
773
+ require_relative "vendored_uri"
774
+ remote = Source::Rubygems::Remote.new(Gem::URI("https://rubygems.org"))
775
+ cache_path = Bundler.user_cache.join("compact_index", remote.cache_slug)
776
+ latest = Bundler::CompactIndexClient.new(cache_path).latest_version("bundler")
800
777
  return unless latest
801
778
 
802
779
  current = Gem::Version.new(VERSION)
803
780
  return if current >= latest
804
- latest_installed = Bundler.rubygems.find_name("bundler").map(&:version).max
805
-
806
- installation = "To install the latest version, run `gem install bundler#{" --pre" if latest.prerelease?}`"
807
- if latest_installed && latest_installed > current
808
- suggestion = "To update to the most recent installed version (#{latest_installed}), run `bundle update --bundler`"
809
- suggestion = "#{installation}\n#{suggestion}" if latest_installed < latest
810
- else
811
- suggestion = installation
812
- end
813
781
 
814
- Bundler.ui.warn "The latest bundler is #{latest}, but you are currently running #{current}.\n#{suggestion}"
782
+ Bundler.ui.warn \
783
+ "The latest bundler is #{latest}, but you are currently running #{current}.\n" \
784
+ "To update to the most recent version, run `bundle update --bundler`"
815
785
  rescue RuntimeError
816
786
  nil
817
787
  end
@@ -837,12 +807,23 @@ module Bundler
837
807
 
838
808
  value = options[name]
839
809
  value = value.join(" ").to_s if option.type == :array
810
+ value = "'#{value}'" unless option.type == :boolean
840
811
 
841
- Bundler::SharedHelpers.major_deprecation 2,
812
+ print_remembered_flag_deprecation(flag_name, name.tr("-", "_"), value)
813
+ end
814
+
815
+ def print_remembered_flag_deprecation(flag_name, option_name, option_value)
816
+ message =
842
817
  "The `#{flag_name}` flag is deprecated because it relies on being " \
843
818
  "remembered across bundler invocations, which bundler will no longer " \
844
- "do in future versions. Instead please use `bundle config set --local #{name.tr("-", "_")} " \
845
- "'#{value}'`, and stop using this flag"
819
+ "do in future versions. Instead please use `bundle config set #{option_name} " \
820
+ "#{option_value}`, and stop using this flag"
821
+ removed_message =
822
+ "The `#{flag_name}` flag has been removed because it relied on being " \
823
+ "remembered across bundler invocations, which bundler will no longer " \
824
+ "do. Instead please use `bundle config set #{option_name} " \
825
+ "#{option_value}`, and stop using this flag"
826
+ Bundler::SharedHelpers.major_deprecation 2, message, removed_message: removed_message
846
827
  end
847
828
  end
848
829
  end