rubygems-update 3.0.9 → 3.1.0.pre1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (428) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +31 -8
  3. data/.travis.yml +9 -27
  4. data/CONTRIBUTING.md +13 -0
  5. data/History.txt +24 -28
  6. data/MAINTAINERS.txt +1 -6
  7. data/Manifest.txt +65 -15
  8. data/Rakefile +39 -23
  9. data/bin/gem +0 -6
  10. data/bundler/CHANGELOG.md +746 -570
  11. data/bundler/CODE_OF_CONDUCT.md +117 -23
  12. data/bundler/LICENSE.md +18 -19
  13. data/bundler/README.md +9 -8
  14. data/bundler/bundler.gemspec +8 -25
  15. data/bundler/exe/bundle +19 -3
  16. data/bundler/lib/bundler.rb +120 -67
  17. data/bundler/lib/bundler/build_metadata.rb +1 -3
  18. data/bundler/lib/bundler/capistrano.rb +4 -4
  19. data/bundler/lib/bundler/cli.rb +129 -121
  20. data/bundler/lib/bundler/cli/add.rb +27 -16
  21. data/bundler/lib/bundler/cli/common.rb +11 -12
  22. data/bundler/lib/bundler/cli/config.rb +161 -86
  23. data/bundler/lib/bundler/cli/console.rb +1 -1
  24. data/bundler/lib/bundler/cli/doctor.rb +4 -4
  25. data/bundler/lib/bundler/cli/exec.rb +4 -9
  26. data/bundler/lib/bundler/cli/gem.rb +5 -5
  27. data/bundler/lib/bundler/cli/info.rb +17 -5
  28. data/bundler/lib/bundler/cli/init.rb +1 -1
  29. data/bundler/lib/bundler/cli/install.rb +11 -10
  30. data/bundler/lib/bundler/cli/issue.rb +3 -3
  31. data/bundler/lib/bundler/cli/open.rb +10 -6
  32. data/bundler/lib/bundler/cli/outdated.rb +85 -81
  33. data/bundler/lib/bundler/cli/package.rb +8 -9
  34. data/bundler/lib/bundler/cli/plugin.rb +9 -2
  35. data/bundler/lib/bundler/cli/pristine.rb +1 -1
  36. data/bundler/lib/bundler/cli/show.rb +1 -1
  37. data/bundler/lib/bundler/cli/update.rb +31 -11
  38. data/bundler/lib/bundler/compact_index_client.rb +25 -9
  39. data/bundler/lib/bundler/compact_index_client/updater.rb +2 -6
  40. data/bundler/lib/bundler/current_ruby.rb +9 -7
  41. data/bundler/lib/bundler/definition.rb +35 -26
  42. data/bundler/lib/bundler/dependency.rb +16 -4
  43. data/bundler/lib/bundler/deployment.rb +1 -1
  44. data/bundler/lib/bundler/dsl.rb +15 -39
  45. data/bundler/lib/bundler/env.rb +8 -13
  46. data/bundler/lib/bundler/environment_preserver.rb +0 -1
  47. data/bundler/lib/bundler/feature_flag.rb +23 -34
  48. data/bundler/lib/bundler/fetcher.rb +14 -11
  49. data/bundler/lib/bundler/fetcher/compact_index.rb +26 -12
  50. data/bundler/lib/bundler/fetcher/dependency.rb +1 -1
  51. data/bundler/lib/bundler/fetcher/downloader.rb +4 -1
  52. data/bundler/lib/bundler/fetcher/index.rb +4 -2
  53. data/bundler/lib/bundler/friendly_errors.rb +4 -5
  54. data/bundler/lib/bundler/gem_helper.rb +39 -24
  55. data/bundler/lib/bundler/gem_helpers.rb +2 -4
  56. data/bundler/lib/bundler/gem_tasks.rb +1 -1
  57. data/bundler/lib/bundler/gem_version_promoter.rb +3 -3
  58. data/bundler/lib/bundler/graph.rb +2 -2
  59. data/bundler/lib/bundler/injector.rb +10 -8
  60. data/bundler/lib/bundler/inline.rb +19 -18
  61. data/bundler/lib/bundler/installer.rb +7 -14
  62. data/bundler/lib/bundler/installer/gem_installer.rb +5 -1
  63. data/bundler/lib/bundler/installer/parallel_installer.rb +4 -8
  64. data/bundler/lib/bundler/installer/standalone.rb +1 -2
  65. data/bundler/lib/bundler/lazy_specification.rb +2 -2
  66. data/bundler/lib/bundler/lockfile_parser.rb +13 -21
  67. data/bundler/lib/bundler/match_platform.rb +1 -1
  68. data/bundler/lib/bundler/plugin.rb +42 -29
  69. data/bundler/lib/bundler/plugin/api.rb +1 -1
  70. data/bundler/lib/bundler/plugin/api/source.rb +2 -2
  71. data/bundler/lib/bundler/plugin/index.rb +14 -3
  72. data/bundler/lib/bundler/plugin/installer.rb +28 -15
  73. data/bundler/lib/bundler/psyched_yaml.rb +1 -1
  74. data/bundler/lib/bundler/resolver.rb +72 -24
  75. data/bundler/lib/bundler/resolver/spec_group.rb +3 -2
  76. data/bundler/lib/bundler/retry.rb +2 -2
  77. data/bundler/lib/bundler/ruby_version.rb +4 -19
  78. data/bundler/lib/bundler/rubygems_ext.rb +10 -66
  79. data/bundler/lib/bundler/rubygems_gem_installer.rb +1 -8
  80. data/bundler/lib/bundler/rubygems_integration.rb +144 -395
  81. data/bundler/lib/bundler/runtime.rb +2 -9
  82. data/bundler/lib/bundler/settings.rb +15 -47
  83. data/bundler/lib/bundler/setup.rb +6 -5
  84. data/bundler/lib/bundler/shared_helpers.rb +58 -71
  85. data/bundler/lib/bundler/similarity_detector.rb +2 -2
  86. data/bundler/lib/bundler/source.rb +5 -5
  87. data/bundler/lib/bundler/source/git.rb +19 -12
  88. data/bundler/lib/bundler/source/git/git_proxy.rb +35 -39
  89. data/bundler/lib/bundler/source/metadata.rb +7 -2
  90. data/bundler/lib/bundler/source/path.rb +13 -8
  91. data/bundler/lib/bundler/source/rubygems.rb +11 -5
  92. data/bundler/lib/bundler/source/rubygems/remote.rb +1 -2
  93. data/bundler/lib/bundler/source_list.rb +9 -12
  94. data/bundler/lib/bundler/spec_set.rb +23 -12
  95. data/bundler/lib/bundler/stub_specification.rb +18 -30
  96. data/bundler/lib/bundler/templates/Executable.bundler +23 -14
  97. data/bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +3 -3
  98. data/bundler/lib/bundler/templates/newgem/Gemfile.tt +8 -2
  99. data/bundler/lib/bundler/templates/newgem/README.md.tt +4 -3
  100. data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +6 -27
  101. data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +1 -1
  102. data/bundler/lib/bundler/templates/newgem/travis.yml.tt +0 -1
  103. data/bundler/lib/bundler/ui.rb +3 -3
  104. data/bundler/lib/bundler/ui/rg_proxy.rb +1 -1
  105. data/bundler/lib/bundler/ui/shell.rb +4 -8
  106. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +161 -0
  107. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +66 -0
  108. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +176 -0
  109. data/bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
  110. data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +151 -48
  111. data/bundler/lib/bundler/vendor/fileutils/lib/fileutils/version.rb +5 -0
  112. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +6 -6
  113. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +2 -2
  114. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
  115. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
  116. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
  117. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
  118. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
  119. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
  120. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -1
  121. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +30 -8
  122. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
  123. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +4 -4
  124. data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
  125. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +248 -279
  126. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
  127. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
  128. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
  129. data/bundler/lib/bundler/vendor/thor/lib/thor.rb +7 -2
  130. data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +21 -11
  131. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
  132. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +1 -1
  133. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +1 -1
  134. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +11 -2
  135. data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -1
  136. data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +16 -17
  137. data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +82 -0
  138. data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
  139. data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
  140. data/bundler/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
  141. data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +7 -2
  142. data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +6 -6
  143. data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
  144. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +52 -7
  145. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
  146. data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +1 -1
  147. data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
  148. data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
  149. data/bundler/lib/bundler/vendored_fileutils.rb +1 -6
  150. data/bundler/lib/bundler/vendored_molinillo.rb +1 -1
  151. data/bundler/lib/bundler/vendored_persistent.rb +7 -5
  152. data/bundler/lib/bundler/vendored_thor.rb +2 -2
  153. data/bundler/lib/bundler/version.rb +1 -20
  154. data/bundler/lib/bundler/version_ranges.rb +51 -5
  155. data/bundler/lib/bundler/vlad.rb +2 -2
  156. data/bundler/lib/bundler/worker.rb +1 -3
  157. data/bundler/lib/bundler/yaml_serializer.rb +2 -3
  158. data/bundler/man/bundle-add.1 +66 -0
  159. data/bundler/man/bundle-add.1.txt +58 -0
  160. data/bundler/man/bundle-add.ronn +7 -1
  161. data/bundler/man/bundle-binstubs.1 +40 -0
  162. data/bundler/man/bundle-binstubs.1.txt +48 -0
  163. data/bundler/man/bundle-binstubs.ronn +1 -1
  164. data/bundler/man/bundle-check.1 +31 -0
  165. data/bundler/man/bundle-check.1.txt +33 -0
  166. data/bundler/man/bundle-clean.1 +24 -0
  167. data/bundler/man/bundle-clean.1.txt +26 -0
  168. data/bundler/man/bundle-config.1 +497 -0
  169. data/bundler/man/bundle-config.1.txt +528 -0
  170. data/bundler/man/bundle-config.ronn +42 -40
  171. data/bundler/man/bundle-doctor.1 +44 -0
  172. data/bundler/man/bundle-doctor.1.txt +44 -0
  173. data/bundler/man/bundle-exec.1 +165 -0
  174. data/bundler/man/bundle-exec.1.txt +178 -0
  175. data/bundler/man/bundle-exec.ronn +1 -1
  176. data/bundler/man/bundle-gem.1 +80 -0
  177. data/bundler/man/bundle-gem.1.txt +91 -0
  178. data/bundler/man/bundle-info.1 +20 -0
  179. data/bundler/man/bundle-info.1.txt +21 -0
  180. data/bundler/man/bundle-init.1 +25 -0
  181. data/bundler/man/bundle-init.1.txt +34 -0
  182. data/bundler/man/bundle-init.ronn +1 -1
  183. data/bundler/man/bundle-inject.1 +33 -0
  184. data/bundler/man/bundle-inject.1.txt +32 -0
  185. data/bundler/man/bundle-install.1 +311 -0
  186. data/bundler/man/bundle-install.1.txt +401 -0
  187. data/bundler/man/bundle-install.ronn +9 -4
  188. data/bundler/man/bundle-list.1 +50 -0
  189. data/bundler/man/bundle-list.1.txt +43 -0
  190. data/bundler/man/bundle-lock.1 +84 -0
  191. data/bundler/man/bundle-lock.1.txt +93 -0
  192. data/bundler/man/bundle-open.1 +32 -0
  193. data/bundler/man/bundle-open.1.txt +29 -0
  194. data/bundler/man/bundle-outdated.1 +155 -0
  195. data/bundler/man/bundle-outdated.1.txt +131 -0
  196. data/bundler/man/bundle-package.1 +55 -0
  197. data/bundler/man/bundle-package.1.txt +79 -0
  198. data/bundler/man/bundle-platform.1 +61 -0
  199. data/bundler/man/bundle-platform.1.txt +57 -0
  200. data/bundler/man/bundle-pristine.1 +34 -0
  201. data/bundler/man/bundle-pristine.1.txt +44 -0
  202. data/bundler/man/bundle-remove.1 +31 -0
  203. data/bundler/man/bundle-remove.1.txt +34 -0
  204. data/bundler/man/bundle-show.1 +23 -0
  205. data/bundler/man/bundle-show.1.txt +27 -0
  206. data/bundler/man/bundle-update.1 +394 -0
  207. data/bundler/man/bundle-update.1.txt +390 -0
  208. data/bundler/man/bundle-update.ronn +3 -3
  209. data/bundler/man/bundle-viz.1 +39 -0
  210. data/bundler/man/bundle-viz.1.txt +39 -0
  211. data/bundler/man/bundle.1 +136 -0
  212. data/bundler/man/bundle.1.txt +116 -0
  213. data/bundler/man/bundle.ronn +2 -2
  214. data/bundler/man/gemfile.5 +686 -0
  215. data/bundler/man/gemfile.5.ronn +14 -18
  216. data/bundler/man/gemfile.5.txt +649 -0
  217. data/bundler/man/index.txt +25 -0
  218. data/lib/rubygems.rb +80 -48
  219. data/lib/rubygems/available_set.rb +1 -0
  220. data/lib/rubygems/basic_specification.rb +17 -6
  221. data/lib/rubygems/bundler_version_finder.rb +5 -0
  222. data/lib/rubygems/command.rb +34 -5
  223. data/lib/rubygems/command_manager.rb +0 -6
  224. data/lib/rubygems/commands/build_command.rb +21 -8
  225. data/lib/rubygems/commands/cert_command.rb +0 -1
  226. data/lib/rubygems/commands/cleanup_command.rb +7 -7
  227. data/lib/rubygems/commands/contents_command.rb +3 -3
  228. data/lib/rubygems/commands/dependency_command.rb +4 -3
  229. data/lib/rubygems/commands/environment_command.rb +0 -3
  230. data/lib/rubygems/commands/info_command.rb +2 -0
  231. data/lib/rubygems/commands/install_command.rb +12 -52
  232. data/lib/rubygems/commands/lock_command.rb +2 -2
  233. data/lib/rubygems/commands/mirror_command.rb +1 -0
  234. data/lib/rubygems/commands/open_command.rb +2 -1
  235. data/lib/rubygems/commands/outdated_command.rb +1 -0
  236. data/lib/rubygems/commands/owner_command.rb +2 -7
  237. data/lib/rubygems/commands/pristine_command.rb +3 -0
  238. data/lib/rubygems/commands/push_command.rb +4 -6
  239. data/lib/rubygems/commands/query_command.rb +94 -80
  240. data/lib/rubygems/commands/rdoc_command.rb +1 -0
  241. data/lib/rubygems/commands/setup_command.rb +10 -8
  242. data/lib/rubygems/commands/signin_command.rb +1 -0
  243. data/lib/rubygems/commands/specification_command.rb +1 -0
  244. data/lib/rubygems/commands/stale_command.rb +2 -0
  245. data/lib/rubygems/commands/uninstall_command.rb +1 -0
  246. data/lib/rubygems/commands/unpack_command.rb +2 -29
  247. data/lib/rubygems/commands/update_command.rb +14 -14
  248. data/lib/rubygems/commands/which_command.rb +1 -0
  249. data/lib/rubygems/commands/yank_command.rb +8 -2
  250. data/lib/rubygems/compatibility.rb +4 -4
  251. data/lib/rubygems/config_file.rb +28 -23
  252. data/lib/rubygems/core_ext/kernel_gem.rb +2 -5
  253. data/lib/rubygems/core_ext/kernel_require.rb +29 -2
  254. data/lib/rubygems/core_ext/kernel_warn.rb +10 -4
  255. data/lib/rubygems/defaults.rb +10 -17
  256. data/lib/rubygems/dependency.rb +21 -6
  257. data/lib/rubygems/dependency_installer.rb +19 -102
  258. data/lib/rubygems/dependency_list.rb +11 -10
  259. data/lib/rubygems/deprecate.rb +5 -5
  260. data/lib/rubygems/errors.rb +11 -2
  261. data/lib/rubygems/exceptions.rb +9 -0
  262. data/lib/rubygems/ext/builder.rb +24 -43
  263. data/lib/rubygems/ext/cmake_builder.rb +2 -0
  264. data/lib/rubygems/ext/ext_conf_builder.rb +11 -9
  265. data/lib/rubygems/ext/rake_builder.rb +1 -1
  266. data/lib/rubygems/gemcutter_utilities.rb +19 -26
  267. data/lib/rubygems/indexer.rb +9 -5
  268. data/lib/rubygems/installer.rb +26 -13
  269. data/lib/rubygems/installer_test_case.rb +86 -38
  270. data/lib/rubygems/local_remote_options.rb +1 -1
  271. data/lib/rubygems/mock_gem_ui.rb +4 -1
  272. data/lib/rubygems/name_tuple.rb +1 -0
  273. data/lib/rubygems/package.rb +37 -9
  274. data/lib/rubygems/package/tar_writer.rb +4 -4
  275. data/lib/rubygems/path_support.rb +2 -0
  276. data/lib/rubygems/platform.rb +2 -1
  277. data/lib/rubygems/psych_tree.rb +2 -0
  278. data/lib/rubygems/remote_fetcher.rb +5 -1
  279. data/lib/rubygems/request.rb +5 -3
  280. data/lib/rubygems/request/connection_pools.rb +4 -4
  281. data/lib/rubygems/request/http_pool.rb +1 -0
  282. data/lib/rubygems/request/https_pool.rb +2 -0
  283. data/lib/rubygems/request_set.rb +2 -2
  284. data/lib/rubygems/request_set/gem_dependency_api.rb +2 -2
  285. data/lib/rubygems/request_set/lockfile.rb +5 -2
  286. data/lib/rubygems/request_set/lockfile/parser.rb +4 -2
  287. data/lib/rubygems/request_set/lockfile/tokenizer.rb +2 -0
  288. data/lib/rubygems/requirement.rb +20 -18
  289. data/lib/rubygems/resolver.rb +4 -5
  290. data/lib/rubygems/resolver/activation_request.rb +19 -49
  291. data/lib/rubygems/resolver/best_set.rb +2 -2
  292. data/lib/rubygems/resolver/conflict.rb +0 -5
  293. data/lib/rubygems/resolver/installer_set.rb +3 -3
  294. data/lib/rubygems/resolver/lock_set.rb +1 -1
  295. data/lib/rubygems/resolver/lock_specification.rb +2 -2
  296. data/lib/rubygems/resolver/requirement_list.rb +1 -0
  297. data/lib/rubygems/resolver/specification.rb +1 -0
  298. data/lib/rubygems/resolver/stats.rb +2 -0
  299. data/lib/rubygems/security/signer.rb +3 -2
  300. data/lib/rubygems/server.rb +5 -4
  301. data/lib/rubygems/source_list.rb +1 -0
  302. data/lib/rubygems/spec_fetcher.rb +3 -16
  303. data/lib/rubygems/specification.rb +69 -133
  304. data/lib/rubygems/specification_policy.rb +7 -2
  305. data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -0
  306. data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -0
  307. data/{bundler/lib/bundler → lib/rubygems}/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -0
  308. data/lib/rubygems/stub_specification.rb +5 -2
  309. data/lib/rubygems/syck_hack.rb +2 -0
  310. data/lib/rubygems/test_case.rb +78 -227
  311. data/lib/rubygems/test_utilities.rb +17 -6
  312. data/lib/rubygems/text.rb +2 -3
  313. data/lib/rubygems/uninstaller.rb +15 -15
  314. data/lib/rubygems/user_interaction.rb +9 -1
  315. data/lib/rubygems/util.rb +5 -41
  316. data/lib/rubygems/util/licenses.rb +398 -396
  317. data/lib/rubygems/util/list.rb +2 -0
  318. data/lib/rubygems/validator.rb +9 -29
  319. data/lib/rubygems/version.rb +5 -3
  320. data/rubygems-update.gemspec +3 -3
  321. data/test/rubygems/plugin/load/rubygems_plugin.rb +2 -0
  322. data/test/rubygems/test_bundled_ca.rb +4 -7
  323. data/test/rubygems/test_deprecate.rb +3 -0
  324. data/test/rubygems/test_gem.rb +183 -176
  325. data/test/rubygems/test_gem_available_set.rb +3 -2
  326. data/test/rubygems/test_gem_bundler_version_finder.rb +3 -1
  327. data/test/rubygems/test_gem_command.rb +94 -5
  328. data/test/rubygems/test_gem_command_manager.rb +5 -13
  329. data/test/rubygems/test_gem_commands_build_command.rb +142 -4
  330. data/test/rubygems/test_gem_commands_cert_command.rb +15 -1
  331. data/test/rubygems/test_gem_commands_cleanup_command.rb +22 -6
  332. data/test/rubygems/test_gem_commands_dependency_command.rb +1 -1
  333. data/test/rubygems/test_gem_commands_environment_command.rb +1 -11
  334. data/test/rubygems/test_gem_commands_help_command.rb +2 -0
  335. data/test/rubygems/test_gem_commands_info_command.rb +1 -0
  336. data/test/rubygems/test_gem_commands_install_command.rb +207 -2
  337. data/test/rubygems/test_gem_commands_mirror.rb +1 -0
  338. data/test/rubygems/test_gem_commands_outdated_command.rb +1 -0
  339. data/test/rubygems/test_gem_commands_owner_command.rb +4 -5
  340. data/test/rubygems/test_gem_commands_pristine_command.rb +56 -4
  341. data/test/rubygems/test_gem_commands_push_command.rb +19 -14
  342. data/test/rubygems/test_gem_commands_query_command.rb +27 -2
  343. data/test/rubygems/test_gem_commands_setup_command.rb +62 -37
  344. data/test/rubygems/test_gem_commands_signin_command.rb +5 -4
  345. data/test/rubygems/test_gem_commands_sources_command.rb +20 -6
  346. data/test/rubygems/test_gem_commands_uninstall_command.rb +107 -50
  347. data/test/rubygems/test_gem_commands_update_command.rb +86 -23
  348. data/test/rubygems/test_gem_commands_yank_command.rb +46 -1
  349. data/test/rubygems/test_gem_config_file.rb +9 -2
  350. data/test/rubygems/test_gem_dependency.rb +6 -0
  351. data/test/rubygems/test_gem_dependency_installer.rb +67 -36
  352. data/test/rubygems/test_gem_dependency_list.rb +21 -14
  353. data/test/rubygems/test_gem_ext_builder.rb +5 -1
  354. data/test/rubygems/test_gem_ext_cmake_builder.rb +2 -0
  355. data/test/rubygems/test_gem_ext_configure_builder.rb +8 -0
  356. data/test/rubygems/test_gem_ext_ext_conf_builder.rb +12 -0
  357. data/test/rubygems/test_gem_ext_rake_builder.rb +2 -0
  358. data/test/rubygems/test_gem_gemcutter_utilities.rb +8 -8
  359. data/test/rubygems/test_gem_indexer.rb +31 -40
  360. data/test/rubygems/test_gem_install_update_options.rb +31 -17
  361. data/test/rubygems/test_gem_installer.rb +383 -223
  362. data/test/rubygems/test_gem_package.rb +99 -14
  363. data/test/rubygems/test_gem_package_old.rb +57 -54
  364. data/test/rubygems/test_gem_package_tar_reader_entry.rb +6 -5
  365. data/test/rubygems/test_gem_package_tar_writer.rb +11 -6
  366. data/test/rubygems/test_gem_path_support.rb +19 -13
  367. data/test/rubygems/test_gem_platform.rb +4 -2
  368. data/test/rubygems/test_gem_rdoc.rb +1 -0
  369. data/test/rubygems/test_gem_remote_fetcher.rb +29 -16
  370. data/test/rubygems/test_gem_request.rb +19 -4
  371. data/test/rubygems/test_gem_request_connection_pools.rb +6 -2
  372. data/test/rubygems/test_gem_request_set.rb +33 -8
  373. data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +1 -1
  374. data/test/rubygems/test_gem_request_set_lockfile.rb +1 -0
  375. data/test/rubygems/test_gem_request_set_lockfile_parser.rb +2 -1
  376. data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb +2 -0
  377. data/test/rubygems/test_gem_requirement.rb +7 -1
  378. data/test/rubygems/test_gem_resolver.rb +67 -23
  379. data/test/rubygems/test_gem_resolver_activation_request.rb +3 -32
  380. data/test/rubygems/test_gem_resolver_conflict.rb +0 -4
  381. data/test/rubygems/test_gem_resolver_git_specification.rb +1 -0
  382. data/test/rubygems/test_gem_resolver_index_specification.rb +7 -2
  383. data/test/rubygems/test_gem_resolver_installed_specification.rb +0 -1
  384. data/test/rubygems/test_gem_resolver_installer_set.rb +3 -1
  385. data/test/rubygems/test_gem_resolver_specification.rb +2 -0
  386. data/test/rubygems/test_gem_security.rb +6 -2
  387. data/test/rubygems/test_gem_security_signer.rb +1 -0
  388. data/test/rubygems/test_gem_server.rb +7 -2
  389. data/test/rubygems/test_gem_silent_ui.rb +1 -0
  390. data/test/rubygems/test_gem_source.rb +7 -7
  391. data/test/rubygems/test_gem_source_fetch_problem.rb +1 -0
  392. data/test/rubygems/test_gem_source_git.rb +4 -9
  393. data/test/rubygems/test_gem_source_installed.rb +6 -6
  394. data/test/rubygems/test_gem_source_list.rb +1 -0
  395. data/test/rubygems/test_gem_source_local.rb +5 -4
  396. data/test/rubygems/test_gem_source_lock.rb +12 -12
  397. data/test/rubygems/test_gem_source_specific_file.rb +7 -6
  398. data/test/rubygems/test_gem_source_vendor.rb +4 -4
  399. data/test/rubygems/test_gem_specification.rb +75 -43
  400. data/test/rubygems/test_gem_stream_ui.rb +2 -0
  401. data/test/rubygems/test_gem_stub_specification.rb +3 -1
  402. data/test/rubygems/test_gem_text.rb +1 -0
  403. data/test/rubygems/test_gem_uninstaller.rb +31 -10
  404. data/test/rubygems/test_gem_util.rb +6 -4
  405. data/test/rubygems/test_gem_validator.rb +3 -4
  406. data/test/rubygems/test_gem_version.rb +16 -8
  407. data/test/rubygems/test_kernel.rb +1 -0
  408. data/test/rubygems/test_rake_package.rb +26 -0
  409. data/test/rubygems/test_remote_fetch_error.rb +1 -0
  410. data/test/rubygems/test_require.rb +107 -3
  411. data/util/bisect +31 -0
  412. data/util/ci.sh +50 -0
  413. data/util/generate_spdx_license_list.rb +4 -2
  414. data/util/rubocop +2 -2
  415. data/util/update_bundled_ca_certificates.rb +3 -1
  416. metadata +97 -25
  417. data/appveyor.yml +0 -43
  418. data/bundler/CONTRIBUTING.md +0 -17
  419. data/bundler/exe/bundle_ruby +0 -60
  420. data/bundler/lib/bundler/cli/cache.rb +0 -36
  421. data/bundler/lib/bundler/compatibility_guard.rb +0 -14
  422. data/bundler/lib/bundler/ssl_certs/.document +0 -1
  423. data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
  424. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
  425. data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
  426. data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem +0 -21
  427. data/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem +0 -21
  428. data/util/ci +0 -82
@@ -4,8 +4,6 @@ module Bundler
4
4
  # Represents metadata from when the Bundler gem was built.
5
5
  module BuildMetadata
6
6
  # begin ivars
7
- @built_at = "2020-12-09".freeze
8
- @git_commit_sha = "d7089abb6a".freeze
9
7
  @release = false
10
8
  # end ivars
11
9
 
@@ -25,7 +23,7 @@ module Bundler
25
23
 
26
24
  # The SHA for the git commit the bundler gem was built from.
27
25
  def self.git_commit_sha
28
- return @git_commit_sha if @git_commit_sha
26
+ return @git_commit_sha if instance_variable_defined? :@git_commit_sha
29
27
 
30
28
  # If Bundler has been installed without its .git directory and without a
31
29
  # commit instance variable then we can't determine its commits SHA.
@@ -1,18 +1,18 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "bundler/shared_helpers"
3
+ require_relative "shared_helpers"
4
4
  Bundler::SharedHelpers.major_deprecation 2,
5
- "The Bundler task for Capistrano. Please use http://github.com/capistrano/bundler"
5
+ "The Bundler task for Capistrano. Please use https://github.com/capistrano/bundler"
6
6
 
7
7
  # Capistrano task for Bundler.
8
8
  #
9
9
  # Add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and
10
10
  # Bundler will be activated after each new deployment.
11
- require "bundler/deployment"
11
+ require_relative "deployment"
12
12
  require "capistrano/version"
13
13
 
14
14
  if defined?(Capistrano::Version) && Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
15
- raise "For Capistrano 3.x integration, please use http://github.com/capistrano/bundler"
15
+ raise "For Capistrano 3.x integration, please use https://github.com/capistrano/bundler"
16
16
  end
17
17
 
18
18
  Capistrano::Configuration.instance(:must_exist).load do
@@ -1,11 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "bundler"
4
- require "bundler/vendored_thor"
3
+ require_relative "vendored_thor"
5
4
 
6
5
  module Bundler
7
6
  class CLI < Thor
8
- require "bundler/cli/common"
7
+ require_relative "cli/common"
9
8
 
10
9
  package_name "Bundler"
11
10
 
@@ -16,7 +15,7 @@ module Bundler
16
15
 
17
16
  def self.start(*)
18
17
  super
19
- rescue Exception => e
18
+ rescue Exception => e # rubocop:disable Lint/RescueException
20
19
  Bundler.ui = UI::Shell.new
21
20
  raise e
22
21
  ensure
@@ -61,11 +60,6 @@ module Bundler
61
60
  end
62
61
  end
63
62
 
64
- def self.deprecated_option(*args, &blk)
65
- return if Bundler.feature_flag.forget_cli_options?
66
- method_option(*args, &blk)
67
- end
68
-
69
63
  check_unknown_options!(:except => [:config, :exec])
70
64
  stop_on_unknown_option! :exec
71
65
 
@@ -75,7 +69,7 @@ module Bundler
75
69
  Bundler.ui.info "\n"
76
70
 
77
71
  primary_commands = ["install", "update",
78
- Bundler.feature_flag.cache_command_is_package? ? "cache" : "package",
72
+ Bundler.feature_flag.bundler_3_mode? ? "cache" : "package",
79
73
  "exec", "config", "help"]
80
74
 
81
75
  list = self.class.printable_commands(true)
@@ -142,9 +136,9 @@ module Bundler
142
136
  Gemfile to a gem with a gemspec, the --gemspec option will automatically add each
143
137
  dependency listed in the gemspec file to the newly created Gemfile.
144
138
  D
145
- deprecated_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
139
+ method_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
146
140
  def init
147
- require "bundler/cli/init"
141
+ require_relative "cli/init"
148
142
  Init.new(options.dup).run
149
143
  end
150
144
 
@@ -162,7 +156,9 @@ module Bundler
162
156
  "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?}"
163
157
  map "c" => "check"
164
158
  def check
165
- require "bundler/cli/check"
159
+ remembered_flag_deprecation("path")
160
+
161
+ require_relative "cli/check"
166
162
  Check.new(options).run
167
163
  end
168
164
 
@@ -173,7 +169,7 @@ module Bundler
173
169
  method_option "install", :type => :boolean, :banner =>
174
170
  "Runs 'bundle install' after removing the gems from the Gemfile"
175
171
  def remove(*gems)
176
- require "bundler/cli/remove"
172
+ require_relative "cli/remove"
177
173
  Remove.new(gems, options).run
178
174
  end
179
175
 
@@ -188,13 +184,13 @@ module Bundler
188
184
 
189
185
  If the bundle has already been installed, bundler will tell you so and then exit.
190
186
  D
191
- deprecated_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
187
+ method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
192
188
  "Generate bin stubs for bundled gems to ./bin"
193
- deprecated_option "clean", :type => :boolean, :banner =>
189
+ method_option "clean", :type => :boolean, :banner =>
194
190
  "Run bundle clean automatically after install"
195
- deprecated_option "deployment", :type => :boolean, :banner =>
191
+ method_option "deployment", :type => :boolean, :banner =>
196
192
  "Install using defaults tuned for deployment environments"
197
- deprecated_option "frozen", :type => :boolean, :banner =>
193
+ method_option "frozen", :type => :boolean, :banner =>
198
194
  "Do not allow the Gemfile.lock to be updated after this install"
199
195
  method_option "full-index", :type => :boolean, :banner =>
200
196
  "Fall back to using the single-file index of all gems"
@@ -204,33 +200,38 @@ module Bundler
204
200
  "Specify the number of jobs to run in parallel"
205
201
  method_option "local", :type => :boolean, :banner =>
206
202
  "Do not attempt to fetch gems remotely and use the gem cache instead"
207
- deprecated_option "no-cache", :type => :boolean, :banner =>
203
+ method_option "no-cache", :type => :boolean, :banner =>
208
204
  "Don't update the existing gem cache."
209
205
  method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
210
206
  "Force downloading every gem."
211
- deprecated_option "no-prune", :type => :boolean, :banner =>
207
+ method_option "no-prune", :type => :boolean, :banner =>
212
208
  "Don't remove stale gems from the cache."
213
- deprecated_option "path", :type => :string, :banner =>
214
- "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
209
+ method_option "path", :type => :string, :banner =>
210
+ "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?}"
215
211
  method_option "quiet", :type => :boolean, :banner =>
216
212
  "Only output warnings and errors."
217
- deprecated_option "shebang", :type => :string, :banner =>
213
+ method_option "shebang", :type => :string, :banner =>
218
214
  "Specify a different shebang executable name than the default (usually 'ruby')"
219
215
  method_option "standalone", :type => :array, :lazy_default => [], :banner =>
220
216
  "Make a bundle that can work without the Bundler runtime"
221
- deprecated_option "system", :type => :boolean, :banner =>
217
+ method_option "system", :type => :boolean, :banner =>
222
218
  "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
223
219
  method_option "trust-policy", :alias => "P", :type => :string, :banner =>
224
220
  "Gem trust policy (like gem install -P). Must be one of " +
225
221
  Bundler.rubygems.security_policy_keys.join("|")
226
- deprecated_option "without", :type => :array, :banner =>
222
+ method_option "without", :type => :array, :banner =>
227
223
  "Exclude gems that are part of the specified named group."
228
- deprecated_option "with", :type => :array, :banner =>
224
+ method_option "with", :type => :array, :banner =>
229
225
  "Include gems that are part of the specified named group."
230
226
  map "i" => "install"
231
227
  def install
232
228
  SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
233
- require "bundler/cli/install"
229
+
230
+ %w[clean deployment frozen no-cache no-prune path shebang system without with].each do |option|
231
+ remembered_flag_deprecation(option)
232
+ end
233
+
234
+ require_relative "cli/install"
234
235
  Bundler.settings.temporary(:no_install => false) do
235
236
  Install.new(options.dup).run
236
237
  end
@@ -276,60 +277,63 @@ module Bundler
276
277
  "Update everything."
277
278
  def update(*gems)
278
279
  SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
279
- require "bundler/cli/update"
280
- Update.new(options, gems).run
280
+ require_relative "cli/update"
281
+ Bundler.settings.temporary(:no_install => false) do
282
+ Update.new(options, gems).run
283
+ end
281
284
  end
282
285
 
283
- desc "show GEM [OPTIONS]", "Shows all gems that are part of the bundle, or the path to a given gem"
284
- long_desc <<-D
285
- Show lists the names and versions of all gems that are required by your Gemfile.
286
- Calling show with [GEM] will list the exact location of that gem on your machine.
287
- D
288
- method_option "paths", :type => :boolean,
289
- :banner => "List the paths of all gems that are required by your Gemfile."
290
- method_option "outdated", :type => :boolean,
291
- :banner => "Show verbose output including whether gems are outdated."
292
- def show(gem_name = nil)
293
- if ARGV[0] == "show"
294
- rest = ARGV[1..-1]
295
-
296
- new_command = rest.find {|arg| !arg.start_with?("--") } ? "info" : "list"
297
-
298
- new_arguments = rest.map do |arg|
299
- next arg if arg != "--paths"
300
- next "--path" if new_command == "info"
286
+ unless Bundler.feature_flag.bundler_3_mode?
287
+ desc "show GEM [OPTIONS]", "Shows all gems that are part of the bundle, or the path to a given gem"
288
+ long_desc <<-D
289
+ Show lists the names and versions of all gems that are required by your Gemfile.
290
+ Calling show with [GEM] will list the exact location of that gem on your machine.
291
+ D
292
+ method_option "paths", :type => :boolean,
293
+ :banner => "List the paths of all gems that are required by your Gemfile."
294
+ method_option "outdated", :type => :boolean,
295
+ :banner => "Show verbose output including whether gems are outdated."
296
+ def show(gem_name = nil)
297
+ if ARGV[0] == "show"
298
+ rest = ARGV[1..-1]
299
+
300
+ if flag = rest.find{|arg| ["--verbose", "--outdated"].include?(arg) }
301
+ Bundler::SharedHelpers.major_deprecation(2, "the `#{flag}` flag to `bundle show` was undocumented and will be removed without replacement")
302
+ else
303
+ new_command = rest.find {|arg| !arg.start_with?("--") } ? "info" : "list"
304
+
305
+ new_arguments = rest.map do |arg|
306
+ next arg if arg != "--paths"
307
+ next "--path" if new_command == "info"
308
+ end
309
+
310
+ old_argv = ARGV.join(" ")
311
+ new_argv = [new_command, *new_arguments.compact].join(" ")
312
+
313
+ Bundler::SharedHelpers.major_deprecation(2, "use `bundle #{new_argv}` instead of `bundle #{old_argv}`")
314
+ end
301
315
  end
302
-
303
- old_argv = ARGV.join(" ")
304
- new_argv = [new_command, *new_arguments.compact].join(" ")
305
-
306
- Bundler::SharedHelpers.major_deprecation(2, "use `bundle #{new_argv}` instead of `bundle #{old_argv}`")
307
- end
308
- require "bundler/cli/show"
309
- Show.new(options, gem_name).run
310
- end
311
- # TODO: 2.0 remove `bundle show`
312
-
313
- if Bundler.feature_flag.list_command?
314
- desc "list", "List all gems in the bundle"
315
- method_option "name-only", :type => :boolean, :banner => "print only the gem names"
316
- method_option "only-group", :type => :string, :banner => "print gems from a particular group"
317
- method_option "without-group", :type => :string, :banner => "print all gems expect from a group"
318
- method_option "paths", :type => :boolean, :banner => "print the path to each gem in the bundle"
319
- def list
320
- require "bundler/cli/list"
321
- List.new(options).run
316
+ require_relative "cli/show"
317
+ Show.new(options, gem_name).run
322
318
  end
319
+ end
323
320
 
324
- map %w[ls] => "list"
325
- else
326
- map %w[list] => "show"
321
+ desc "list", "List all gems in the bundle"
322
+ method_option "name-only", :type => :boolean, :banner => "print only the gem names"
323
+ method_option "only-group", :type => :string, :banner => "print gems from a particular group"
324
+ method_option "without-group", :type => :string, :banner => "print all gems except from a group"
325
+ method_option "paths", :type => :boolean, :banner => "print the path to each gem in the bundle"
326
+ def list
327
+ require_relative "cli/list"
328
+ List.new(options).run
327
329
  end
328
330
 
331
+ map %w[ls] => "list"
332
+
329
333
  desc "info GEM [OPTIONS]", "Show information for the given gem"
330
334
  method_option "path", :type => :boolean, :banner => "Print full path to gem"
331
335
  def info(gem_name)
332
- require "bundler/cli/info"
336
+ require_relative "cli/info"
333
337
  Info.new(options, gem_name).run
334
338
  end
335
339
 
@@ -350,7 +354,7 @@ module Bundler
350
354
  method_option "all", :type => :boolean, :banner =>
351
355
  "Install binstubs for all gems"
352
356
  def binstubs(*gems)
353
- require "bundler/cli/binstubs"
357
+ require_relative "cli/binstubs"
354
358
  Binstubs.new(options, gems).run
355
359
  end
356
360
 
@@ -361,12 +365,14 @@ module Bundler
361
365
  method_option "version", :aliases => "-v", :type => :string
362
366
  method_option "group", :aliases => "-g", :type => :string
363
367
  method_option "source", :aliases => "-s", :type => :string
368
+ method_option "git", :type => :string
369
+ method_option "branch", :type => :string
364
370
  method_option "skip-install", :type => :boolean, :banner =>
365
371
  "Adds gem to the Gemfile but does not install it"
366
372
  method_option "optimistic", :type => :boolean, :banner => "Adds optimistic declaration of version to gem"
367
373
  method_option "strict", :type => :boolean, :banner => "Adds strict declaration of version to gem"
368
374
  def add(*gems)
369
- require "bundler/cli/add"
375
+ require_relative "cli/add"
370
376
  Add.new(options.dup, gems).run
371
377
  end
372
378
 
@@ -386,9 +392,10 @@ module Bundler
386
392
  "Do not attempt to fetch gems remotely and use the gem cache instead"
387
393
  method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
388
394
  method_option "source", :type => :array, :banner => "Check against a specific source"
389
- method_option "strict", :type => :boolean, :banner =>
395
+ strict_is_update = Bundler.feature_flag.forget_cli_options?
396
+ method_option "filter-strict", :type => :boolean, :aliases => strict_is_update ? [] : %w[--strict], :banner =>
390
397
  "Only list newer versions allowed by your Gemfile requirements"
391
- method_option "update-strict", :type => :boolean, :banner =>
398
+ method_option "update-strict", :type => :boolean, :aliases => strict_is_update ? %w[--strict] : [], :banner =>
392
399
  "Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major"
393
400
  method_option "minor", :type => :boolean, :banner => "Prefer updating only to next minor version"
394
401
  method_option "major", :type => :boolean, :banner => "Prefer updating to next major version (default)"
@@ -401,28 +408,12 @@ module Bundler
401
408
  method_option "only-explicit", :type => :boolean, :banner =>
402
409
  "Only list gems specified in your Gemfile, not their dependencies"
403
410
  def outdated(*gems)
404
- require "bundler/cli/outdated"
411
+ require_relative "cli/outdated"
405
412
  Outdated.new(options, gems).run
406
413
  end
407
414
 
408
- if Bundler.feature_flag.cache_command_is_package?
409
- map %w[cache] => :package
410
- else
411
- desc "cache [OPTIONS]", "Cache all the gems to vendor/cache", :hide => true
412
- unless Bundler.feature_flag.cache_command_is_package?
413
- method_option "all", :type => :boolean,
414
- :banner => "Include all sources (including path and git)."
415
- end
416
- method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not only the current one"
417
- method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
418
- def cache
419
- require "bundler/cli/cache"
420
- Cache.new(options).run
421
- end
422
- end
423
-
424
- desc "#{Bundler.feature_flag.cache_command_is_package? ? :cache : :package} [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
425
- unless Bundler.feature_flag.cache_command_is_package?
415
+ desc "#{Bundler.feature_flag.bundler_3_mode? ? :cache : :package} [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
416
+ unless Bundler.feature_flag.cache_all?
426
417
  method_option "all", :type => :boolean,
427
418
  :banner => "Include all sources (including path and git)."
428
419
  end
@@ -433,7 +424,7 @@ module Bundler
433
424
  method_option "no-install", :type => :boolean, :banner => "Don't install the gems, only the package."
434
425
  method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
435
426
  method_option "path", :type => :string, :banner =>
436
- "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
427
+ "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?}"
437
428
  method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
438
429
  method_option "frozen", :type => :boolean, :banner =>
439
430
  "Do not allow the Gemfile.lock to be updated after this package operation's install"
@@ -444,10 +435,10 @@ module Bundler
444
435
  bundle without having to download any additional gems.
445
436
  D
446
437
  def package
447
- require "bundler/cli/package"
438
+ require_relative "cli/package"
448
439
  Package.new(options).run
449
440
  end
450
- map %w[pack] => :package
441
+ map %w[cache pack] => :package
451
442
 
452
443
  desc "exec [OPTIONS]", "Run the command in context of the bundle"
453
444
  method_option :keep_file_descriptors, :type => :boolean, :default => false
@@ -459,7 +450,7 @@ module Bundler
459
450
  D
460
451
  map "e" => "exec"
461
452
  def exec(*args)
462
- require "bundler/cli/exec"
453
+ require_relative "cli/exec"
463
454
  Exec.new(options, args).run
464
455
  end
465
456
 
@@ -475,22 +466,19 @@ module Bundler
475
466
  will show the current value, as well as any superceded values and
476
467
  where they were specified.
477
468
  D
478
- method_option "parseable", :type => :boolean, :banner => "Use minimal formatting for more parseable output"
479
- def config(*args)
480
- require "bundler/cli/config"
481
- Config.new(options, args, self).run
482
- end
469
+ require_relative "cli/config"
470
+ subcommand "config", Config
483
471
 
484
472
  desc "open GEM", "Opens the source directory of the given bundled gem"
485
473
  def open(name)
486
- require "bundler/cli/open"
474
+ require_relative "cli/open"
487
475
  Open.new(options, name).run
488
476
  end
489
477
 
490
- if Bundler.feature_flag.console_command?
478
+ unless Bundler.feature_flag.bundler_3_mode?
491
479
  desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
492
480
  def console(group = nil)
493
- require "bundler/cli/console"
481
+ require_relative "cli/console"
494
482
  Console.new(options, group).run
495
483
  end
496
484
  end
@@ -524,7 +512,7 @@ module Bundler
524
512
  end
525
513
  end
526
514
 
527
- if Bundler.feature_flag.viz_command?
515
+ unless Bundler.feature_flag.bundler_3_mode?
528
516
  desc "viz [OPTIONS]", "Generates a visual dependency graph", :hide => true
529
517
  long_desc <<-D
530
518
  Viz generates a PNG file of the current Gemfile as a dependency graph.
@@ -538,7 +526,7 @@ module Bundler
538
526
  method_option :without, :type => :array, :default => [], :aliases => "-W", :banner => "GROUP[ GROUP...]", :desc => "Exclude gems that are part of the specified named group."
539
527
  def viz
540
528
  SharedHelpers.major_deprecation 2, "The `viz` command has been moved to the `bundle-viz` gem, see https://github.com/bundler/bundler-viz"
541
- require "bundler/cli/viz"
529
+ require_relative "cli/viz"
542
530
  Viz.new(options.dup).run
543
531
  end
544
532
  end
@@ -547,14 +535,15 @@ module Bundler
547
535
 
548
536
  desc "gem NAME [OPTIONS]", "Creates a skeleton for creating a rubygem"
549
537
  method_option :exe, :type => :boolean, :default => false, :aliases => ["--bin", "-b"], :desc => "Generate a binary executable for your library."
550
- method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config gem.coc true`."
538
+ method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config set gem.coc true`."
551
539
  method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
552
540
  :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? },
553
541
  :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
554
542
  method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code"
555
- method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config gem.mit true`."
543
+ method_option :git, :type => :boolean, :default => true, :desc => "Initialize a git repo inside your library."
544
+ method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config set gem.mit true`."
556
545
  method_option :test, :type => :string, :lazy_default => "rspec", :aliases => "-t", :banner => "rspec",
557
- :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`."
546
+ :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config set gem.test rspec`."
558
547
  def gem(name)
559
548
  end
560
549
 
@@ -562,7 +551,7 @@ module Bundler
562
551
  def gem_command.run(instance, args = [])
563
552
  arity = 1 # name
564
553
 
565
- require "bundler/cli/gem"
554
+ require_relative "cli/gem"
566
555
  cmd_args = args + [instance]
567
556
  cmd_args.unshift(instance.options)
568
557
 
@@ -590,7 +579,7 @@ module Bundler
590
579
  method_option "force", :type => :boolean, :default => false, :banner =>
591
580
  "Forces clean even if --path is not set"
592
581
  def clean
593
- require "bundler/cli/clean"
582
+ require_relative "cli/clean"
594
583
  Clean.new(options.dup).run
595
584
  end
596
585
 
@@ -598,7 +587,7 @@ module Bundler
598
587
  method_option "ruby", :type => :boolean, :default => false, :banner =>
599
588
  "only display ruby related platform information"
600
589
  def platform
601
- require "bundler/cli/platform"
590
+ require_relative "cli/platform"
602
591
  Platform.new(options).run
603
592
  end
604
593
 
@@ -609,7 +598,7 @@ module Bundler
609
598
  "Install gem into a bundler group"
610
599
  def inject(name, version)
611
600
  SharedHelpers.major_deprecation 2, "The `inject` command has been replaced by the `add` command"
612
- require "bundler/cli/inject"
601
+ require_relative "cli/inject"
613
602
  Inject.new(options.dup, name, version).run
614
603
  end
615
604
 
@@ -620,6 +609,8 @@ module Bundler
620
609
  "do not attempt to fetch remote gemspecs and use the local gem cache only"
621
610
  method_option "print", :type => :boolean, :default => false, :banner =>
622
611
  "print the lockfile to STDOUT instead of writing to the file system"
612
+ method_option "gemfile", :type => :string, :banner =>
613
+ "Use the specified gemfile instead of Gemfile"
623
614
  method_option "lockfile", :type => :string, :default => nil, :banner =>
624
615
  "the path the lockfile should be written to"
625
616
  method_option "full-index", :type => :boolean, :default => false, :banner =>
@@ -639,7 +630,7 @@ module Bundler
639
630
  method_option "conservative", :type => :boolean, :banner =>
640
631
  "If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated"
641
632
  def lock
642
- require "bundler/cli/lock"
633
+ require_relative "cli/lock"
643
634
  Lock.new(options).run
644
635
  end
645
636
 
@@ -659,13 +650,13 @@ module Bundler
659
650
  method_option "quiet", :type => :boolean, :banner =>
660
651
  "Only output warnings and errors."
661
652
  def doctor
662
- require "bundler/cli/doctor"
653
+ require_relative "cli/doctor"
663
654
  Doctor.new(options).run
664
655
  end
665
656
 
666
657
  desc "issue", "Learn how to report an issue in Bundler"
667
658
  def issue
668
- require "bundler/cli/issue"
659
+ require_relative "cli/issue"
669
660
  Issue.new.run
670
661
  end
671
662
 
@@ -676,12 +667,12 @@ module Bundler
676
667
  checkout --force`.
677
668
  D
678
669
  def pristine(*gems)
679
- require "bundler/cli/pristine"
670
+ require_relative "cli/pristine"
680
671
  Pristine.new(gems).run
681
672
  end
682
673
 
683
674
  if Bundler.feature_flag.plugins?
684
- require "bundler/cli/plugin"
675
+ require_relative "cli/plugin"
685
676
  desc "plugin", "Manage the bundler plugins"
686
677
  subcommand "plugin", Plugin
687
678
  end
@@ -714,7 +705,7 @@ module Bundler
714
705
 
715
706
  # Automatically invoke `bundle install` and resume if
716
707
  # Bundler.settings[:auto_install] exists. This is set through config cmd
717
- # `bundle config auto_install 1`.
708
+ # `bundle config set auto_install 1`.
718
709
  #
719
710
  # Note that this method `nil`s out the global Definition object, so it
720
711
  # should be called first, before you instantiate anything like an
@@ -786,5 +777,22 @@ module Bundler
786
777
  rescue RuntimeError
787
778
  nil
788
779
  end
780
+
781
+ def remembered_flag_deprecation(name)
782
+ option = current_command.options[name]
783
+ flag_name = option.switch_name
784
+
785
+ name_index = ARGV.find {|arg| flag_name == arg }
786
+ return unless name_index
787
+
788
+ value = options[name]
789
+ value = value.join(" ").to_s if option.type == :array
790
+
791
+ Bundler::SharedHelpers.major_deprecation 2,\
792
+ "The `#{flag_name}` flag is deprecated because it relies on being " \
793
+ "remembered accross bundler invokations, which bundler will no longer " \
794
+ "do in future versions. Instead please use `bundle config set #{name} " \
795
+ "'#{value}'`, and stop using this flag"
796
+ end
789
797
  end
790
798
  end