rubygems-update 3.3.25 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 373bde3eddd5fd887fa27db0e32024485a807f04b0a68759ae08e9a0e745d6af
-  data.tar.gz: 260a3ca9f5340e67b7eb17bb89a8d1a82932ad166c5eebd6894eb3777e835506
+  metadata.gz: defa5f3855c57554726a4a03c00cffbe64a1ba06e3c4c95f9f9841c5bc7317bd
+  data.tar.gz: 242f793a3af341087dabd3a38fba0271b56a89c01c912b5f35246e5356982956
 SHA512:
-  metadata.gz: b48bc85ca9166963bef3dc7e4494b8c51307cbb489b11f9f523ad41a5deb645a4ac4d9b7bae481fe8ab0cebc25c6457d5f003f6ab3970ee6180173c134dfaaca
-  data.tar.gz: 27d28091a109d977ab6a276a0244c54dbc7aab80075c11ef38fa38978693ba87629f429b484076f39257ca8caa04bc9eec6f1618d4af2b44ea793af2e74f49b0
+  metadata.gz: 27c0065f1c65feb271ad19465d846e67d70781be9e34511c4e5c394f767a83f1bd2b05c76b93101f7f3dcfcc00ee8c8c8e45ae33b36184e65430a1382f2d508f
+  data.tar.gz: 45b3105bbef280a6203a7d852e7cf53b501669833b053b5a747b898a6740fd82a7cb40cd55e643509b316bae89e6b90cb27a371aa68aba2d6c505e183694629c

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+# 3.4.0 / 2022-12-24
+
+## Breaking changes:
+
+* Drop support for Ruby 2.3, 2.4, 2.5 and RubyGems 2.5, 2.6, 2.7. Pull
+  request #6107 by deivid-rodriguez
+* Remove support for deprecated OS. Pull request #6041 by peterzhu2118
+
+## Features:
+
+* Add 'call for update' to RubyGems install command. Pull request #5922 by
+  simi
+
+## Enhancements:
+
+* Add `mswin` support for cargo builder. Pull request #6167 by ianks
+* Validate Cargo.lock is present for Rust based extensions. Pull request
+  #6151 by simi
+* Clean built artifacts after building extensions. Pull request #6133 by
+  deivid-rodriguez
+* Installs bundler 2.4.0 as a default gem.
+
+## Bug fixes:
+
+* Fix crash due to `BundlerVersionFinder` not defined. Pull request #6152
+  by deivid-rodriguez
+* Don't leave corrupted partial package download around when running out
+  of disk space. Pull request #5681 by duckinator
+
+# 3.3.26 / 2022-11-16
+
+## Enhancements:
+
+* Upgrade rb-sys to 0.9.37. Pull request #6047 by ianks
+* Installs bundler 2.3.26 as a default gem.
+
 # 3.3.25 / 2022-11-02
 
 ## Enhancements:

data/CONTRIBUTING.md

@@ -29,9 +29,22 @@ here: https://guides.rubygems.org/contributing/
 
 ## Getting Started
 
+### Installing dependencies
+
     rake setup
 
-> Optionally you can configure git hooks with: rake git_hooks
+> **NOTE**: If the above fails with permission related errors, you're most
+> likely using a global Ruby installation (like the one packaged by your OS),
+> which sets `GEM_HOME` to a location regular users can't write to. Consider
+> using a Ruby version manager like [RVM](https://github.com/rvm/rvm),
+> [rbenv](https://github.com/rbenv/rbenv),
+> [chruby](https://github.com/postmodern/chruby) or [asdf](https://github.com/asdf-vm/asdf-ruby). These will install Ruby to a
+> location regular users can write to, so you won't run into permission issues.
+> Alternatively, consider setting `GEM_HOME` environment variable to a writable
+> location with something like `export GEM_HOME=/tmp/rubygems.gems` and try
+> again.
+
+### Manually trying your local changes
 
 To run commands like `gem install` from the repo:
 
@@ -75,6 +88,16 @@ To run an individual test file location for example in `spec/install/gems/standa
 
     bin/rspec spec/install/gems/standalone_spec.rb
 
+### Checking code style
+
+You can check compliance with our code style with
+
+    rake rubocop
+
+Optionally you can configure git hooks with to check this before every commit with
+
+    rake git_hooks
+
 ## Issues
 
 RubyGems uses labels to track all issues and pull requests. In order to

data/Manifest.txt

@@ -73,6 +73,7 @@ bundler/lib/bundler/fetcher/compact_index.rb
 bundler/lib/bundler/fetcher/dependency.rb
 bundler/lib/bundler/fetcher/downloader.rb
 bundler/lib/bundler/fetcher/index.rb
+bundler/lib/bundler/force_platform.rb
 bundler/lib/bundler/friendly_errors.rb
 bundler/lib/bundler/gem_helper.rb
 bundler/lib/bundler/gem_helpers.rb
@@ -167,6 +168,10 @@ bundler/lib/bundler/process_lock.rb
 bundler/lib/bundler/remote_specification.rb
 bundler/lib/bundler/resolver.rb
 bundler/lib/bundler/resolver/base.rb
+bundler/lib/bundler/resolver/candidate.rb
+bundler/lib/bundler/resolver/incompatibility.rb
+bundler/lib/bundler/resolver/package.rb
+bundler/lib/bundler/resolver/root.rb
 bundler/lib/bundler/resolver/spec_group.rb
 bundler/lib/bundler/retry.rb
 bundler/lib/bundler/ruby_dsl.rb
@@ -203,6 +208,7 @@ bundler/lib/bundler/templates/Gemfile
 bundler/lib/bundler/templates/gems.rb
 bundler/lib/bundler/templates/newgem/CHANGELOG.md.tt
 bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
+bundler/lib/bundler/templates/newgem/Cargo.toml.tt
 bundler/lib/bundler/templates/newgem/Gemfile.tt
 bundler/lib/bundler/templates/newgem/LICENSE.txt.tt
 bundler/lib/bundler/templates/newgem/README.md.tt
@@ -211,9 +217,12 @@ bundler/lib/bundler/templates/newgem/bin/console.tt
 bundler/lib/bundler/templates/newgem/bin/setup.tt
 bundler/lib/bundler/templates/newgem/circleci/config.yml.tt
 bundler/lib/bundler/templates/newgem/exe/newgem.tt
-bundler/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
+bundler/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt
+bundler/lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt
+bundler/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt
 bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
 bundler/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
+bundler/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt
 bundler/lib/bundler/templates/newgem/github/workflows/main.yml.tt
 bundler/lib/bundler/templates/newgem/gitignore.tt
 bundler/lib/bundler/templates/newgem/gitlab-ci.yml.tt
@@ -230,7 +239,6 @@ bundler/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt
 bundler/lib/bundler/templates/newgem/test/minitest/test_newgem.rb.tt
 bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt
 bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt
-bundler/lib/bundler/templates/newgem/travis.yml.tt
 bundler/lib/bundler/ui.rb
 bundler/lib/bundler/ui/rg_proxy.rb
 bundler/lib/bundler/ui/shell.rb
@@ -244,32 +252,28 @@ bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb
 bundler/lib/bundler/vendor/fileutils/LICENSE.txt
 bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
-bundler/lib/bundler/vendor/molinillo/LICENSE
-bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
-bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb
 bundler/lib/bundler/vendor/net-http-persistent/README.rdoc
 bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
 bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
 bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
 bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
+bundler/lib/bundler/vendor/pub_grub/LICENSE.txt
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
+bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb
 bundler/lib/bundler/vendor/thor/LICENSE.md
 bundler/lib/bundler/vendor/thor/lib/thor.rb
 bundler/lib/bundler/vendor/thor/lib/thor/actions.rb
@@ -302,7 +306,6 @@ bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb
 bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb
 bundler/lib/bundler/vendor/thor/lib/thor/util.rb
 bundler/lib/bundler/vendor/thor/lib/thor/version.rb
-bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb
 bundler/lib/bundler/vendor/tsort/LICENSE.txt
 bundler/lib/bundler/vendor/tsort/lib/tsort.rb
 bundler/lib/bundler/vendor/uri/LICENSE.txt
@@ -322,14 +325,12 @@ bundler/lib/bundler/vendor/uri/lib/uri/version.rb
 bundler/lib/bundler/vendor/uri/lib/uri/ws.rb
 bundler/lib/bundler/vendor/uri/lib/uri/wss.rb
 bundler/lib/bundler/vendored_fileutils.rb
-bundler/lib/bundler/vendored_molinillo.rb
 bundler/lib/bundler/vendored_persistent.rb
+bundler/lib/bundler/vendored_pub_grub.rb
 bundler/lib/bundler/vendored_thor.rb
-bundler/lib/bundler/vendored_tmpdir.rb
 bundler/lib/bundler/vendored_tsort.rb
 bundler/lib/bundler/vendored_uri.rb
 bundler/lib/bundler/version.rb
-bundler/lib/bundler/version_ranges.rb
 bundler/lib/bundler/vlad.rb
 bundler/lib/bundler/worker.rb
 bundler/lib/bundler/yaml_serializer.rb
@@ -528,6 +529,7 @@ lib/rubygems/tsort/LICENSE.txt
 lib/rubygems/tsort/lib/tsort.rb
 lib/rubygems/uninstaller.rb
 lib/rubygems/unknown_command_spell_checker.rb
+lib/rubygems/update_suggestion.rb
 lib/rubygems/uri.rb
 lib/rubygems/uri_formatter.rb
 lib/rubygems/user_interaction.rb
@@ -737,6 +739,7 @@ test/rubygems/test_gem_stub_specification.rb
 test/rubygems/test_gem_text.rb
 test/rubygems/test_gem_uninstaller.rb
 test/rubygems/test_gem_unsatisfiable_dependency_error.rb
+test/rubygems/test_gem_update_suggestion.rb
 test/rubygems/test_gem_uri.rb
 test/rubygems/test_gem_uri_formatter.rb
 test/rubygems/test_gem_util.rb

data/POLICIES.md

@@ -102,14 +102,16 @@ and not get any conflicts.
 
 *   Confirm all PRs that you want listed in changelogs are properly tagged with
     `rubygems: <type>` or `bundler: <type>` labels at GitHub.
-*   Run `rake prepare_release[<target_version>]`.
-*   Add the new stable branch `x.y` where `x.y` are the first two components of
-    the rubygems version being released to the CI workflows as an extra commit
-    on top of what the `prepare_release` task generated.
-*   Create a PR to the main branch, and merge it once CI passes.
-*   From the main branch, cut a new stable branch with `git pull && git checkout
-    -b x.y`.
-*   Push the stable branch and wait for CI to be green.
+*   Run `rake prepare_release[<target_version>]`. This will create a new stable
+    branch off the master branch, and create a PR to it with the proper version
+    bumps and changelogs. It will also create a PR to merge release changelogs
+    into master.
+*   Replace the stable branch in the workflows with the new stable branch, and
+    push that change to the release PR.
+*   Replace version numbers with the next ".dev" version, and push that change
+    to the master PR.
+*   Once CI passes, merge the release PR, switch to  the stable branch and pull
+    the PR just merged.
 *   Release `bundler` with `(cd bundler && bin/rake release)`.
 *   Release `rubygems` with `rake release`.
 

data/README.md

@@ -79,11 +79,11 @@ creating a new gem, security practices and other resources at https://guides.rub
 Got a bug and you're not sure?  You're sure you have a bug, but don't know
 what to do next?  In any case, let us know about it!  The best place
 for letting the RubyGems team know about bugs or problems you're having is
-[on the RubyGems issues page at GitHub](http://github.com/rubygems/rubygems/issues).
+[on the RubyGems issues page at GitHub](https://github.com/rubygems/rubygems/issues).
 
 ### Bundler Compatibility
 
-See http://bundler.io/compatibility for known issues.
+See https://bundler.io/compatibility for known issues.
 
 ### Supporting
 

data/bin/gem

@@ -5,9 +5,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require "rubygems"
 require "rubygems/gem_runner"
 
-args = ARGV.clone
-
-Gem::GemRunner.new.run args
+Gem::GemRunner.new.run ARGV.clone

data/bin/update_rubygems

@@ -20,7 +20,7 @@ unless ARGV.grep(/--version=([\d\.]*)/).empty?
   exec Gem.ruby, "-S", $PROGRAM_NAME, "_#{$1}_"
 end
 
-update_dir = $LOAD_PATH.find {|dir| dir =~ /rubygems-update/ }
+update_dir = $LOAD_PATH.find {|dir| dir.include?("rubygems-update") }
 
 if update_dir.nil?
   puts "Error: Cannot find RubyGems update path!"

data/bundler/CHANGELOG.md

@@ -1,3 +1,61 @@
+# 2.4.0 (December 24, 2022)
+
+## Security:
+
+  - In README generated by `bundle gem`, do not fill rubygems.org install commands with the gem name automatically [#6093](https://github.com/rubygems/rubygems/pull/6093)
+  - Use safe Marshal deserialization for dependency API response [#6141](https://github.com/rubygems/rubygems/pull/6141)
+
+## Breaking changes:
+
+  - Remove Travis CI from gem skeleton [#6150](https://github.com/rubygems/rubygems/pull/6150)
+  - Drop support for Ruby 2.3, 2.4, 2.5 and RubyGems 2.5, 2.6, 2.7 [#6107](https://github.com/rubygems/rubygems/pull/6107)
+  - Completely remove "auto-sudo" feature [#5888](https://github.com/rubygems/rubygems/pull/5888)
+
+## Deprecations:
+
+  - Turn `--ext` option of `bundle gem` into string. Deprecate usage without explicit value [#6144](https://github.com/rubygems/rubygems/pull/6144)
+
+## Features:
+
+  - Add `--ext=rust` support to `bundle gem` for creating simple gems with Rust extensions [#6149](https://github.com/rubygems/rubygems/pull/6149)
+  - Migrate our resolver engine to PubGrub [#5960](https://github.com/rubygems/rubygems/pull/5960)
+
+## Performance:
+
+  - Make cloning git repos faster [#4475](https://github.com/rubygems/rubygems/pull/4475)
+
+## Enhancements:
+
+  - Add `bundle lock --update --bundler` [#6134](https://github.com/rubygems/rubygems/pull/6134)
+  - Support for pre flag in `bundle update`/`bundle lock` [#5258](https://github.com/rubygems/rubygems/pull/5258)
+  - Improve error message when changing Gemfile to a mistyped git ref [#6130](https://github.com/rubygems/rubygems/pull/6130)
+  - Remove special handling of some `LoadError` and `NoMethodError` [#6115](https://github.com/rubygems/rubygems/pull/6115)
+
+## Bug fixes:
+
+  - Don't unlock dependencies of a gemspec when its version changes [#6184](https://github.com/rubygems/rubygems/pull/6184)
+  - Fix platform specific version for libv8-node and other allowlisted gems not being chosen in Truffleruby [#6169](https://github.com/rubygems/rubygems/pull/6169)
+  - Fix `bundle outdated` with both `--groups` and `--parseable` flags [#6148](https://github.com/rubygems/rubygems/pull/6148)
+  - Auto-heal lockfile when it's missing specs [#6132](https://github.com/rubygems/rubygems/pull/6132)
+  - Fix unintentional downgrades when gemspec DSL is used [#6131](https://github.com/rubygems/rubygems/pull/6131)
+  - Fix display of previous gem version when previously downloaded already [#6110](https://github.com/rubygems/rubygems/pull/6110)
+  - Fix hang when a lockfile gem does not resolve on the current platform [#6070](https://github.com/rubygems/rubygems/pull/6070)
+
+## Documentation:
+
+  - Improve Bundler setup docs for development [#6154](https://github.com/rubygems/rubygems/pull/6154)
+  - Fx link in bundle-platform man page [#6071](https://github.com/rubygems/rubygems/pull/6071)
+
+# 2.3.26 (November 16, 2022)
+
+## Enhancements:
+
+  - Map 'universal' to the real arch in Bundler for prebuilt gem selection [#5978](https://github.com/rubygems/rubygems/pull/5978)
+
+## Documentation:
+
+  - Fix '--force' option documentation of 'bundle clean' [#6050](https://github.com/rubygems/rubygems/pull/6050)
+
 # 2.3.25 (November 2, 2022)
 
 ## Bug fixes:

data/bundler/README.md

@@ -38,13 +38,13 @@ Still stuck? Try [filing an issue](https://github.com/rubygems/rubygems/issues/n
 
 To see what has changed in recent versions of Bundler, see the [CHANGELOG](CHANGELOG.md).
 
-To get in touch with the Bundler core team and other Bundler users, please see [getting help](doc/contributing/GETTING_HELP.md).
+To get in touch with the Bundler core team and other Bundler users, please join [the Bundler slack](https://slack.bundler.io).
 
 ### Contributing
 
 If you'd like to contribute to Bundler, that's awesome, and we <3 you. We've put together [the Bundler contributor guide](https://github.com/rubygems/rubygems/blob/master/bundler/doc/contributing/README.md) with all of the information you need to get started.
 
-If you'd like to request a substantial change to Bundler or its documentation, refer to the [Bundler RFC process](https://github.com/bundler/rfcs) for more information.
+If you'd like to request a substantial change to Bundler or its documentation, refer to the [Bundler RFC process](https://github.com/rubygems/rfcs) for more information.
 
 While some Bundler contributors are compensated by Ruby Together, the project maintainers make decisions independent of Ruby Together. As a project, we welcome contributions regardless of the author's affiliation with Ruby Together.
 

data/bundler/bundler.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/rubygems/rubygems/tree/master/bundler",
   }
 
-  s.required_ruby_version     = ">= 2.3.0"
-  s.required_rubygems_version = ">= 2.5.2"
+  s.required_ruby_version     = ">= 2.6.0"
+  s.required_rubygems_version = ">= 3.0.1"
 
   s.files = Dir.glob("lib/bundler{.rb,/**/*}", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
 

data/bundler/exe/bundle

@@ -15,10 +15,7 @@ else
   require "bundler"
 end
 
-# Workaround for non-activated bundler spec due to missing https://github.com/rubygems/rubygems/commit/4e306d7bcdee924b8d80ca9db6125aa59ee4e5a3
-gem "bundler", Bundler::VERSION if Gem.rubygems_version < Gem::Version.new("2.6.2")
-
-if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("2.6.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"]
+if Gem.rubygems_version < Gem::Version.new("3.2.3") && Gem.ruby_version < Gem::Version.new("3.0.a") && !ENV["BUNDLER_NO_OLD_RUBYGEMS_WARNING"]
   Bundler.ui.warn \
     "Your RubyGems version (#{Gem::VERSION}) has a bug that prevents " \
     "`required_ruby_version` from working for Bundler. Any scripts that use " \

data/bundler/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2022-11-02".freeze
-    @git_commit_sha = "6b0b87b1ed".freeze
+    @built_at = "2022-12-24".freeze
+    @git_commit_sha = "e67004d0fe".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/cli/add.rb

@@ -40,7 +40,7 @@ module Bundler
       raise InvalidOption, "Please specify gems to add." if gems.empty?
 
       version.to_a.each do |v|
-        raise InvalidOption, "Invalid gem requirement pattern '#{v}'" unless Gem::Requirement::PATTERN =~ v.to_s
+        raise InvalidOption, "Invalid gem requirement pattern '#{v}'" unless Gem::Requirement::PATTERN.match?(v.to_s)
       end
     end
   end

data/bundler/lib/bundler/cli/check.rb

@@ -17,7 +17,7 @@ module Bundler
       begin
         definition.resolve_only_locally!
         not_installed = definition.missing_specs
-      rescue GemNotFound, VersionConflict
+      rescue GemNotFound, SolveFailure
         Bundler.ui.error "Bundler can't satisfy your Gemfile's dependencies."
         Bundler.ui.warn "Install missing gems with `bundle install`."
         exit 1

data/bundler/lib/bundler/cli/common.rb

@@ -111,6 +111,7 @@ module Bundler
       definition.gem_version_promoter.tap do |gvp|
         gvp.level = patch_level.first || :major
         gvp.strict = options[:strict] || options["filter-strict"]
+        gvp.pre = options[:pre]
       end
     end
 

data/bundler/lib/bundler/cli/console.rb

@@ -30,9 +30,9 @@ module Bundler
 
     def get_constant(name)
       const_name = {
-        "pry"  => :Pry,
+        "pry" => :Pry,
         "ripl" => :Ripl,
-        "irb"  => :IRB,
+        "irb" => :IRB,
       }[name]
       Object.const_get(const_name)
     rescue NameError

data/bundler/lib/bundler/cli/doctor.rb

@@ -73,12 +73,10 @@ module Bundler
       definition.specs.each do |spec|
         bundles_for_gem(spec).each do |bundle|
           bad_paths = dylibs(bundle).select do |f|
-            begin
-              Fiddle.dlopen(f)
-              false
-            rescue Fiddle::DLError
-              true
-            end
+            Fiddle.dlopen(f)
+            false
+          rescue Fiddle::DLError
+            true
           end
           if bad_paths.any?
             broken_links[spec] ||= []