rubygems-update 3.2.34 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c702a4165527b22d31e1cb41e0e5bc94e75428b2a69a48f5e4565df627e885
-  data.tar.gz: 2dd36e7a22f82691fe39d1384d37270843bf6705b929e92e8d6d501af21db430
+  metadata.gz: 54e94fde92dd221d68a39c5ec1116f860999c9ea55f744ff77b02e84fca6f580
+  data.tar.gz: 79682c276c94ea4e5a51d44f62f24ba38af3c41b6fda47a7ff58352143f517c0
 SHA512:
-  metadata.gz: f77785a6aac66c4e68e2f73b794c0d642cf8a962192ece73fd6e208c79ec1c29a6e824cb065c40f25b97c06aa5feb827efe8ce4419d2d103843758ae7514b378
-  data.tar.gz: b90468d920c7f6ea3217858d74ebfa2fe7e162f7408cb61987284e381f4d91d6e258d574c7f8cbc70a429b872521c50f26a92db48a3dee5394a70534acddb848
+  metadata.gz: 72363f1d7b5ba733226562c433807f0ed13543e598adc030f274db516cacac54d7e748907db269a0fd1b8ada7a567986ddfe8db25a848a4edad8203301bcf02c
+  data.tar.gz: 3c5c777ac829d9af2533e7717a4a3814266d8fc0b9c2f634a2e4173fc1763a0d80c15ffa02ec5c0ffb1ce9edc893f4121a3f9cf6731d3919532a006536e2b52b

data/CHANGELOG.md

@@ -1,3 +1,44 @@
+# 3.3.0 / 2021-12-21
+
+## Breaking changes:
+
+* Removed deprecated `gem server` command. Pull request #5034 by hsbt
+* Remove MacOS specific gem layout. Pull request #4833 by deivid-rodriguez
+* Default `gem update` documentation format is now only `ri`. Pull request
+  #3888 by hsbt
+
+## Features:
+
+* Give command misspelled suggestions via `did_you_mean` gem. Pull request
+  #3904 by hsbt
+
+## Performance:
+
+* Avoid some unnecessary stat calls. Pull request #3887 by kares
+* Improve spell checking suggestion performance by
+  vendoring`DidYouMean::Levenshtein.distance` from `did_you_mean-1.4.0`.
+  Pull request #3856 by austinpray
+
+## Enhancements:
+
+* Set `BUNDLER_VERSION` when `bundle _<version>_` is passed. Pull request
+  #5180 by deivid-rodriguez
+* Don't require `rdoc` for `gem uninstall`. Pull request #4691 by ndren
+* More focused rescue on extension builder exception to get more
+  information on errors. Pull request #4189 by deivid-rodriguez
+* Installs bundler 2.3.0 as a default gem.
+
+## Bug fixes:
+
+* Fix encoding mismatch issues when writing gem packages. Pull request
+  #5162 by deivid-rodriguez
+* Fix broken brew formula due to loading `operating_system.rb`
+  customizations too late. Pull request #5154 by deivid-rodriguez
+* Properly fetch `Gem#latest_spec_for` with multiple sources. Pull request
+  #2764 by kevlogan90
+* Fix upgrade crashing when multiple versions of `fileutils` installed.
+  Pull request #5140 by deivid-rodriguez
+
 # 3.2.33 / 2021-12-07
 
 ## Deprecations:
@@ -4601,7 +4642,7 @@ Lavena and Daniel Berger for continuing windows support.
 * Tar handling code refactoring and cleanup.
 * Gem::DependencyInstaller's API has changed.
 
-For a full list of changes to RubyGems, see the ChangeLog file.
+For a full list of changes to RubyGems, see the git log.
 
 # 1.0.1 / 2007-12-20
 
@@ -4745,7 +4786,7 @@ have permanently enabled the work around on all versions.
 
 # 0.9.1 / 2007-01-16
 
-See ChangeLog
+See git log
 
 # 0.9.0 / 2006-06-28
 
@@ -4993,11 +5034,11 @@ There has been some minor usability enhancements and changes ...
 
 # 0.7.0 / 2004-07-09
 
-See ChangeLog
+See git log
 
 # 0.6.1 / 2004-06-08
 
-See ChangeLog
+See git log
 
 # 0.6.0 / 2004-06-08
 

data/CONTRIBUTING.md

@@ -13,7 +13,6 @@ contributors to follow to reduce the time it takes to get changes merged in.
     *   Match indentation (two spaces)
     *   Match coding style (run `rake rubocop`)
 
-
 3.  If any new files are added or existing files removed in a commit or PR,
     please update the `Manifest.txt` accordingly. This can be done by running
     `rake update_manifest`
@@ -30,20 +29,51 @@ here: https://guides.rubygems.org/contributing/
 
 ## Getting Started
 
-    $ rake setup
-    $ rake test
+    rake setup
 
-> Optional you can configure git hooks with: rake git_hooks
+> Optionally you can configure git hooks with: rake git_hooks
 
 To run commands like `gem install` from the repo:
 
-    $ ruby -Ilib bin/gem install
+    ruby -Ilib bin/gem install
+
+To run commands like `bundle install` from the repo:
+
+    ruby bundler/spec/support/bundle.rb install
+
+### Running Tests
+
+To run the entire test suite you can use: 
+
+    rake test
+
+To run an individual test file located for example in `test/rubygems/test_deprecate.rb` you can use: 
+
+    ruby -Ilib:test:bundler/lib test/rubygems/test_deprecate.rb
+    
+And to run an individual test method named `test_default` within a test file, you can use: 
+
+    ruby -Ilib:test:bundler/lib test/rubygems/test_deprecate.rb -n /test_default/
+
+### Running bundler tests
+
+Everything needs to be run from the `bundler/` subfolder.
+
+To setup bundler tests:
+
+    bin/rake spec:parallel_deps
+
+To run the entire bundler test suite in parallel (it takes a while):
+
+    bin/parallel_rspec
+
+To run the entire bundler test suite sequentially (get a coffee because it's very slow):
+
+    bin/rspec
 
-To run bundler test:
+To run an individual test file location for example in `spec/install/gems/standalone_spec.rb` you can use:
 
-    $ cd bundler
-    $ bin/rake spec:deps
-    $ bin/rspec spec
+    bin/rspec spec/install/gems/standalone_spec.rb
 
 ## Issues
 
@@ -108,7 +138,7 @@ where it is in the process from being submitted to being closed.  These are
 listed in rough  progression order from submitted to closed.
 
 *   **triage** - This is an issue or pull request that needs to be properly
-    labeled by by a maintainer.
+    labeled by a maintainer.
 *   **confirmed** - This issue/pull request has been accepted as valid, but is
     not yet immediately ready for work.
 *   **ready** - An issue that is available for collaboration. This issue

data/Manifest.txt

@@ -78,7 +78,6 @@ bundler/lib/bundler/gem_helper.rb
 bundler/lib/bundler/gem_helpers.rb
 bundler/lib/bundler/gem_tasks.rb
 bundler/lib/bundler/gem_version_promoter.rb
-bundler/lib/bundler/gemdeps.rb
 bundler/lib/bundler/graph.rb
 bundler/lib/bundler/index.rb
 bundler/lib/bundler/injector.rb
@@ -166,6 +165,7 @@ bundler/lib/bundler/rubygems_ext.rb
 bundler/lib/bundler/rubygems_gem_installer.rb
 bundler/lib/bundler/rubygems_integration.rb
 bundler/lib/bundler/runtime.rb
+bundler/lib/bundler/self_manager.rb
 bundler/lib/bundler/settings.rb
 bundler/lib/bundler/settings/validator.rb
 bundler/lib/bundler/setup.rb
@@ -216,8 +216,8 @@ bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt
 bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
 bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt
 bundler/lib/bundler/templates/newgem/standard.yml.tt
-bundler/lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt
 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
@@ -309,6 +309,8 @@ bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb
 bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
 bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
 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
@@ -493,7 +495,6 @@ lib/rubygems/security/policy.rb
 lib/rubygems/security/signer.rb
 lib/rubygems/security/trust_dir.rb
 lib/rubygems/security_option.rb
-lib/rubygems/server.rb
 lib/rubygems/source.rb
 lib/rubygems/source/git.rb
 lib/rubygems/source/installed.rb
@@ -515,6 +516,7 @@ lib/rubygems/tsort/.document
 lib/rubygems/tsort/LICENSE.txt
 lib/rubygems/tsort/lib/tsort.rb
 lib/rubygems/uninstaller.rb
+lib/rubygems/unknown_command_spell_checker.rb
 lib/rubygems/uri.rb
 lib/rubygems/uri_formatter.rb
 lib/rubygems/user_interaction.rb
@@ -530,7 +532,6 @@ test/rubygems/alternate_cert.pem
 test/rubygems/alternate_cert_32.pem
 test/rubygems/alternate_key.pem
 test/rubygems/bad_rake.rb
-test/rubygems/bogussources.rb
 test/rubygems/ca_cert.pem
 test/rubygems/child_cert.pem
 test/rubygems/child_cert_32.pem
@@ -587,6 +588,7 @@ test/rubygems/ssl_key.pem
 test/rubygems/test_bundled_ca.rb
 test/rubygems/test_config.rb
 test/rubygems/test_deprecate.rb
+test/rubygems/test_exit.rb
 test/rubygems/test_gem.rb
 test/rubygems/test_gem_available_set.rb
 test/rubygems/test_gem_bundler_version_finder.rb
@@ -689,7 +691,6 @@ test/rubygems/test_gem_security.rb
 test/rubygems/test_gem_security_policy.rb
 test/rubygems/test_gem_security_signer.rb
 test/rubygems/test_gem_security_trust_dir.rb
-test/rubygems/test_gem_server.rb
 test/rubygems/test_gem_silent_ui.rb
 test/rubygems/test_gem_source.rb
 test/rubygems/test_gem_source_fetch_problem.rb

data/POLICIES.md

@@ -45,7 +45,7 @@ at version 2.7, so when RubyGems 2.8 is released, it will only support Ruby
 Releases of new versions should follow these steps, to ensure the process is
 smooth and no needed steps are missed.
 
-### Steps for security releases
+### Recommendations for security releases
 
 *   Obtain CVE numbers as needed from HackerOne or Red Hat.
 *   Agree on a release date with ruby-core, so patches can be backported to
@@ -55,16 +55,30 @@ smooth and no needed steps are missed.
 *   Continue with the regular release process below.
 
 
-### Steps for all releases
+### Steps for patch releases
 
 *   Confirm all PRs that you want backported are properly tagged with `rubygems:
-    <type>` labels at GitHub.
-*   Run `rake prepare_stable_branch[<target_version>]`, create a PR and merge it
+    <type>` or `bundler: <type>` labels at GitHub.
+*   Run `rake prepare_release[<target_version>]`, create a PR and merge it
     to the stable branch once CI passes.
-*   Create and push git tag
-*   Create and push `rubygems-update` gem and tgz
-*   Publish blog post
-
+*   Switch to the stable branch and pull the PR just merged.
+*   Release `bundler` with `(cd bundler && bin/rake release)`.
+*   Release `rubygems` with `rake release`.
+
+### Steps for minor and major releases
+
+*   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.
+*   Release `bundler` with `(cd bundler && bin/rake release)`.
+*   Release `rubygems` with `rake release`.
 
 ## Committer Access
 

data/README.md

@@ -33,9 +33,15 @@ For more information about how to use RubyGems, see our RubyGems basics guide at
 
 ## Installation
 
-RubyGems is likely already installed in your Ruby environment, you can check by running `gem --version` in your terminal emulator.
-In some cases your OS's package manager may install RubyGems as a separate package from Ruby. It's recommended to check
-with your OS's package manager before installing RubyGems manually.
+RubyGems is already installed in your Ruby environment, you can check the version you have installed by running `gem --version` in your terminal emulator.
+
+In some cases Ruby & RubyGems may be provided as OS packages. This is not a
+recommended way to use Ruby & RubyGems. It's better to use a Ruby Version
+Manager, such as [rbenv](https://github.com/rbenv/rbenv) or
+[chruby](https://github.com/postmodern/chruby). If you still want to use the
+version provided by your OS package manager, please also use your OS package
+manager to upgrade rubygems, and disregard any other installation instructions
+given below.
 
 If you would like to manually install RubyGems:
 
@@ -46,8 +52,6 @@ Install RubyGems by running:
 
     $ ruby setup.rb
 
-Note: You may need to run the install script with admin/root privileges.
-
 For more details and other options, see:
 
     $ ruby setup.rb --help
@@ -58,8 +62,6 @@ To upgrade to the latest RubyGems, run:
 
     $ gem update --system
 
-Note: You might need to run the command as an administrator or root user.
-
 See [UPGRADING](UPGRADING.md) for more details and alternative instructions.
 
 ## Documentation

data/UPGRADING.md

@@ -1,91 +1,15 @@
 # How to upgrade/downgrade Rubygems:
 
-## For RubyGems 1.5.0 and 1.5.1:
-
-RubyGems 1.5.0 and 1.5.1 shipped with a broken `gem update --system`. You will
-need to use the Manual Upgrade Recipe below.
-
-## On Ruby 1.9.x:
-
-### From stock ruby shipping with 1.9:
-
-Use the Normal Upgrade Method below. (finally!)
-
-## On Ruby 1.8.x:
-
-### From rubygems 1.3.x:
-
-Use the Normal Upgrade Recipe below.
-
-### From rubygems 1-1.x through 1.2.x:
-
-RubyGems 1.1 and 1.2 have problems upgrading when there is no rubygems-update
-installed. You will need to use the following instructions if you see "Nothing
-to update".
-
-Use the Manual Upgrade Recipe below.
-
-### From rubygems < 1.1.x:
-
-Use the Normal Upgrade Recipe below.
-
 ## Downgrade Recipe
 
-### Normal Downgrade
-
-#### With rubygems 1.5.2 and higher:
-
-    $ gem update --system 1.3.7
-
-#### With rubygems 1.5.1 and lower:
+    $ gem update --system 3.1.4
 
-Use sudo/su as appropriate:
-
-    $ gem install rubygems-update -v 1.3.7
-    $ update_rubygems _1.3.7_
-
-Replace 1.3.7 with whatever version you want to downgrade to. This recipe can
-also be used to upgrade to a specific version instead of the latest.
-
-Do make sure that you don't have any other versions of rubygems-update
-installed when you run the second command.
-
-### 1.9.2 Downgrade from Rubygems 1.4.x+ to stock 1.9 rubygems:
-
-Use sudo/su as appropriate:
-
-    $ ruby --disable-gems -S gem which rubygems
-    ~/.rvm/rubies/ruby-1.9.2-p136/lib/ruby/site_ruby/1.9.1/rubygems.rb
-    $ rm ~/.rvm/rubies/ruby-1.9.2-p136/lib/ruby/site_ruby/1.9.1/rubygems.rb
-    $ rm -rf ~/.rvm/rubies/ruby-1.9.2-p136/lib/ruby/site_ruby/1.9.1/rubygems
-    $ gem -v
-    1.3.7
-
-## Upgrade Recipes
-
-### Normal Upgrade
-
-Use sudo/su as appropriate:
+## Upgrade Recipe
 
     $ gem update --system
 
-### Manual Upgrade
-
-If you have an older version of RubyGems installed, then you can still do it
-in two steps:
-
-Use sudo/su as appropriate:
-
-    $ gem install rubygems-update
-    $ update_rubygems
-
-### Manual Install
-
-If you don't have any RubyGems install, there is still the pre-gem approach to
-getting software, doing it manually:
-
-Use sudo/su as appropriate:
+## Install from source
 
 *   Download from: https://rubygems.org/pages/download
-*   Unpack into a directory and cd there
-*   Install with: ruby setup.rb
+*   Unpack into a directory and `cd` there
+*   Install with: `ruby setup.rb`

data/bin/gem

@@ -7,12 +7,7 @@
 
 require 'rubygems'
 require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
 
 args = ARGV.clone
 
-begin
-  Gem::GemRunner.new.run args
-rescue Gem::SystemExitException => e
-  exit e.exit_code
-end
+Gem::GemRunner.new.run args

data/bundler/CHANGELOG.md

@@ -1,3 +1,30 @@
+# 2.3.0 (December 21, 2021)
+
+## Features:
+
+  - Change `bundle install` with a lockfile to respect the `BUNDLED WITH` bundler version [#4076](https://github.com/rubygems/rubygems/pull/4076)
+
+## Enhancements:
+
+  - Print warning when running Bundler on potentially problematic RubyGems & Ruby combinations [#5177](https://github.com/rubygems/rubygems/pull/5177)
+  - Error tracing should be printed to stderr [#5179](https://github.com/rubygems/rubygems/pull/5179)
+  - Add `github` and `ref` options to `bundle add` [#5159](https://github.com/rubygems/rubygems/pull/5159)
+  - Add require parameter to `bundle add` [#5021](https://github.com/rubygems/rubygems/pull/5021)
+  - Enable parallel installation on Windows by default [#4822](https://github.com/rubygems/rubygems/pull/4822)
+  - More logging when compact index is not used and we fallback to other APIs [#4546](https://github.com/rubygems/rubygems/pull/4546)
+  - `bundle gem` generated MiniTest file and class now start with 'test' [#3893](https://github.com/rubygems/rubygems/pull/3893)
+  - Add `Bundler::Definition.no_lock` accessor for skipping lock file creation/update [#3401](https://github.com/rubygems/rubygems/pull/3401)
+
+## Bug fixes:
+
+  - Fix crash when when no platform specific matches exist and show a proper error [#5168](https://github.com/rubygems/rubygems/pull/5168)
+  - Ignore dependencies not actually locked from frozen check [#5152](https://github.com/rubygems/rubygems/pull/5152)
+  - Fix `bundle cache --all-platforms` on Windows [#4552](https://github.com/rubygems/rubygems/pull/4552)
+
+## Documentation:
+
+  - Fix gemspec template typo [#4545](https://github.com/rubygems/rubygems/pull/4545)
+
 # 2.2.33 (December 7, 2021)
 
 ## Security fixes:

data/bundler/exe/bundle

@@ -18,14 +18,13 @@ 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")
 
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
-  next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
-  err = String.new
-  err << "Looks like you have a version of bundler that's older than 0.9.\n"
-  err << "Please remove your old versions.\n"
-  err << "An easy way to do this is by running `gem cleanup bundler`."
-  abort(err)
+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"]
+  Bundler.ui.warn \
+    "Your RubyGems version (#{Gem::VERSION})) has a bug that prevents " \
+    "`required_ruby_version` from working for Bundler. Any scripts that use " \
+    "`gem install bundler` will break as soon as Bundler drops support for " \
+    "your Ruby version. Please upgrade RubyGems to avoid future breakage " \
+    "and silence this warning by running `gem update --system 3.2.3`"
 end
 
 if File.exist?(base_path)

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 = "2023-02-06".freeze
-    @git_commit_sha = "c07c26df9e".freeze
+    @built_at = "2021-12-21".freeze
+    @git_commit_sha = "e7167b9a42".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/cli/gem.rb

@@ -106,7 +106,7 @@ module Bundler
         when "minitest"
           templates.merge!(
             "test/minitest/test_helper.rb.tt" => "test/test_helper.rb",
-            "test/minitest/newgem_test.rb.tt" => "test/#{namespaced_path}_test.rb"
+            "test/minitest/test_newgem.rb.tt" => "test/test_#{namespaced_path}.rb"
           )
           config[:test_task] = :test
         when "test-unit"

data/bundler/lib/bundler/cli/install.rb

@@ -12,6 +12,8 @@ module Bundler
 
       warn_if_root
 
+      Bundler.self_manager.install_locked_bundler_and_restart_with_it_if_needed
+
       Bundler::SharedHelpers.set_env "RB_USER_INSTALL", "1" if Bundler::FREEBSD
 
       # Disable color in deployment mode

data/bundler/lib/bundler/cli.rb

@@ -61,6 +61,8 @@ module Bundler
         Bundler.reset_settings_and_root!
       end
 
+      Bundler.self_manager.restart_with_locked_bundler_if_needed
+
       Bundler.settings.set_command_option_if_given :retry, options[:retry]
 
       current_cmd = args.last[:current_command].name
@@ -367,8 +369,11 @@ module Bundler
     method_option "version", :aliases => "-v", :type => :string
     method_option "group", :aliases => "-g", :type => :string
     method_option "source", :aliases => "-s", :type => :string
+    method_option "require", :aliases => "-r", :type => :string, :banner => "Adds require path to gem. Provide false, or a path as a string."
     method_option "git", :type => :string
+    method_option "github", :type => :string
     method_option "branch", :type => :string
+    method_option "ref", :type => :string
     method_option "skip-install", :type => :boolean, :banner =>
       "Adds gem to the Gemfile but does not install it"
     method_option "optimistic", :type => :boolean, :banner => "Adds optimistic declaration of version to gem"

data/bundler/lib/bundler/definition.rb

@@ -6,6 +6,11 @@ module Bundler
   class Definition
     include GemHelpers
 
+    class << self
+      # Do not create or modify a lockfile (Makes #lock a noop)
+      attr_accessor :no_lock
+    end
+
     attr_reader(
       :dependencies,
       :locked_deps,
@@ -275,6 +280,8 @@ module Bundler
     end
 
     def lock(file, preserve_unknown_sections = false)
+      return if Definition.no_lock
+
       contents = to_lock
 
       # Convert to \r\n if the existing lock has them
@@ -287,7 +294,7 @@ module Bundler
 
         if updating_major = locked_major < current_major
           Bundler.ui.warn "Warning: the lockfile is being updated to Bundler #{current_major}, " \
-                          "after which you will be unable to return to Bundler #{@locked_bundler_version.segments.first}."
+                          "after which you will be unable to return to Bundler #{locked_major}."
         end
       end
 
@@ -372,7 +379,12 @@ module Bundler
 
       both_sources = Hash.new {|h, k| h[k] = [] }
       @dependencies.each {|d| both_sources[d.name][0] = d }
-      locked_dependencies.each {|d| both_sources[d.name][1] = d }
+
+      locked_dependencies.each do |d|
+        next if !Bundler.feature_flag.bundler_3_mode? && @locked_specs[d.name].empty?
+
+        both_sources[d.name][1] = d
+      end
 
       both_sources.each do |name, (dep, lock_dep)|
         next if dep.nil? || lock_dep.nil?

data/bundler/lib/bundler/dependency.rb

@@ -7,7 +7,7 @@ require_relative "rubygems_ext"
 module Bundler
   class Dependency < Gem::Dependency
     attr_reader :autorequire
-    attr_reader :groups, :platforms, :gemfile, :git, :branch
+    attr_reader :groups, :platforms, :gemfile, :git, :github, :branch, :ref
 
     PLATFORM_MAP = {
       :ruby     => Gem::Platform::RUBY,
@@ -82,7 +82,9 @@ module Bundler
       @groups         = Array(options["group"] || :default).map(&:to_sym)
       @source         = options["source"]
       @git            = options["git"]
+      @github         = options["github"]
       @branch         = options["branch"]
+      @ref            = options["ref"]
       @platforms      = Array(options["platforms"])
       @env            = options["env"]
       @should_include = options.fetch("should_include", true)
@@ -96,15 +98,11 @@ module Bundler
     def gem_platforms(valid_platforms)
       return valid_platforms if @platforms.empty?
 
-      valid_generic_platforms = valid_platforms.map {|p| [p, GemHelpers.generic(p)] }.to_h
-      @gem_platforms ||= expanded_platforms.compact.uniq
-
-      filtered_generic_platforms = valid_generic_platforms.values & @gem_platforms
-      valid_generic_platforms.select {|_, v| filtered_generic_platforms.include?(v) }.keys
+      valid_platforms.select {|p| expanded_platforms.include?(GemHelpers.generic(p)) }
     end
 
     def expanded_platforms
-      @platforms.map {|pl| PLATFORM_MAP[pl] }
+      @expanded_platforms ||= @platforms.map {|pl| PLATFORM_MAP[pl] }.compact.uniq
     end
 
     def should_include?