rubygems-update 3.2.32 → 3.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e453bd13f69a120fdadd84b3a57e16527b54f7283a5077d742eb218b634bfa
-  data.tar.gz: ce3cfe1c1c8a515e4904fdcddae871c2012b374aea224ce66ffdd92dfd007d8f
+  metadata.gz: c0ad3f54099eb51ea11d57eb8da10dd84729d075b26073b687ed49f7e7f8b018
+  data.tar.gz: fa02cdd3863c8ead6ebc2594f6e7c4b0065a8dff28eb9412cf16c18e5e38e05e
 SHA512:
-  metadata.gz: 57fe0ccc4919643d63c6bf2016458924af17d3ec8aab9ddca552781aceebe44bfc8ac350a20e8323265ef6d3e943c4399bf0ccd280cdc000fbe4be9acdfa1a0a
-  data.tar.gz: c354269b3a4e084d76ada0c3547cf2890aaa989554a4011f51654cea114677ccf76c5944ea669c93b9ad7dc09d9b533d51ade69f96f167aadd372311bc208bac
+  metadata.gz: 5416de9788161fd52b5619e8579134cc6abf4431819d23e56f06ae1b0fd5e511db5fb042b67824dc7a257403ab982528f52e39895f9f56d69472f86827d1a756
+  data.tar.gz: 61d7407de87425e910d2dd2282dfb1de6b6ed472aac1cb5059387c946bdd3564c4bc65d3d6d8d07587010185bbd06679cb1d77e718672ee0de3be6a813f00b7b

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+# 3.2.33 / 2021-12-07
+
+## Deprecations:
+
+* Deprecate typo name. Pull request #5109 by nobu
+
+## Enhancements:
+
+* Add login & logout alias for the signin & signout commands. Pull request
+  #5133 by colby-swandale
+* Fix race conditions when reading & writing gemspecs concurrently. Pull
+  request #4408 by deivid-rodriguez
+* Installs bundler 2.2.33 as a default gem.
+
+## Bug fixes:
+
+* Fix `ruby setup.rb` trying to write outside of `--destdir`. Pull request
+  #5053 by deivid-rodriguez
+
+## Documentation:
+
+* Move required_ruby_version gemspec attribute to recommended section.
+  Pull request #5130 by simi
+* Ignore to generate the documentation from vendored libraries. Pull
+  request #5118 by hsbt
+
 # 3.2.32 / 2021-11-23
 
 ## Enhancements:
@@ -20,6 +46,7 @@
   deivid-rodriguez
 * Use a vendored copy of `tsort` internally. Pull request #5027 by
   deivid-rodriguez
+* Install bundler 2.2.31 as a default gem.
 
 ## Bug fixes:
 
@@ -40,6 +67,7 @@
   by deivid-rodriguez
 * Add missing `require` of `time` within
   `Gem::Request.verify_certificate_message`. Pull request #4975 by nobu
+* Install bundler 2.2.30 as a default gem.
 
 ## Performance:
 
@@ -52,6 +80,7 @@
 
 * Only disallow FIXME/TODO for first word of gemspec description. Pull
   request #4937 by duckinator
+* Install bundler 2.2.29 as a default gem.
 
 ## Bug fixes:
 
@@ -72,6 +101,7 @@
   by duckinator
 * Avoid loading `uri` unnecessarily when activating gems. Pull request
   #4897 by deivid-rodriguez
+* Install bundler 2.2.28 as a default gem.
 
 ## Bug fixes:
 
@@ -87,6 +117,7 @@
   request #4858 by deivid-rodriguez
 * Prioritise gems with higher version for fetching metadata, and stop
   fetching once we find a valid candidate. Pull request #4843 by intuxicated
+* Install bundler 2.2.27 as a default gem.
 
 # 3.2.26 / 2021-08-17
 
@@ -97,6 +128,7 @@
   intuxicated
 * Ignore `RUBYGEMS_GEMDEPS` for the bundler gem. Pull request #4532 by
   deivid-rodriguez
+* Install bundler 2.2.26 as a default gem.
 
 ## Bug fixes:
 
@@ -114,6 +146,7 @@
 * Lazily load `shellwords` library. Pull request #4783 by deivid-rodriguez
 * Check requirements class before loading marshalled requirements. Pull
   request #4651 by nobu
+* Install bundler 2.2.25 as a default gem.
 
 ## Bug fixes:
 
@@ -122,6 +155,10 @@
 
 # 3.2.24 / 2021-07-15
 
+## Enhancements:
+
+* Install bundler 2.2.24 as a default gem.
+
 ## Bug fixes:
 
 * Fix contradictory message about deletion of default gem. Pull request
@@ -138,6 +175,7 @@
 
 * Rewind IO source to allow working with contents in memory. Pull request
   #4729 by drcapulet
+* Install bundler 2.2.23 as a default gem.
 
 # 3.2.22 / 2021-07-06
 
@@ -147,6 +185,7 @@
   CGA1123
 * Fixes for the edge case when openssl library is missing. Pull request
   #4695 by rhenium
+* Install bundler 2.2.22 as a default gem.
 
 # 3.2.21 / 2021-06-23
 
@@ -156,6 +195,7 @@
 * Add the most recent licenses from spdx.org. Pull request #4662 by nobu
 * Simplify setup.rb code to allow installing rubygems from source on
   truffleruby 21.0 and 21.1. Pull request #4624 by deivid-rodriguez
+* Install bundler 2.2.21 as a default gem.
 
 ## Bug fixes:
 
@@ -173,12 +213,14 @@
 
 * Add better specification policy error description. Pull request #4658 by
   ceritium
+* Install bundler 2.2.20 as a default gem.
 
 # 3.2.19 / 2021-05-31
 
 ## Enhancements:
 
 * Fix `gem help build` output format. Pull request #4613 by tnir
+* Install bundler 2.2.19 as a default gem.
 
 # 3.2.18 / 2021-05-25
 
@@ -186,6 +228,7 @@
 
 * Don't leave temporary directory around when building extensions to
   improve build reproducibility. Pull request #4610 by baloo
+* Install bundler 2.2.18 as a default gem.
 
 # 3.2.17 / 2021-05-05
 
@@ -197,6 +240,7 @@
   #4558 by mame
 * Update the default bindir on macOS. Pull request #4524 by nobu
 * Prefer File.open instead of Kernel#open. Pull request #4529 by mame
+* Install bundler 2.2.17 as a default gem.
 
 ## Documentation:
 
@@ -205,6 +249,10 @@
 
 # 3.2.16 / 2021-04-08
 
+## Enhancements:
+
+* Install bundler 2.2.16 as a default gem.
+
 ## Bug fixes:
 
 * Correctly handle symlinks. Pull request #2836 by voxik
@@ -215,6 +263,7 @@
 
 * Prevent downgrades to untested rubygems versions. Pull request #4460 by
   deivid-rodriguez
+* Install bundler 2.2.15 as a default gem.
 
 ## Bug fixes:
 
@@ -225,6 +274,7 @@
 ## Enhancements:
 
 * Less wrapping of network errors. Pull request #4064 by deivid-rodriguez
+* Install bundler 2.2.14 as a default gem.
 
 ## Bug fixes:
 
@@ -233,12 +283,20 @@
 
 # 3.2.13 / 2021-03-03
 
+## Enhancements:
+
+* Install bundler 2.2.13 as a default gem.
+
 ## Bug fixes:
 
 * Support non-gnu libc linux platforms. Pull request #4082 by lloeki
 
 # 3.2.12 / 2021-03-01
 
+## Enhancements:
+
+* Install bundler 2.2.12 as a default gem.
+
 ## Bug fixes:
 
 * Restore the ability to manually install extension gems. Pull request
@@ -250,9 +308,14 @@
 
 * Optionally fallback to IPv4 when IPv6 is unreachable. Pull request #2662
   by sonalkr132
+* Install bundler 2.2.11 as a default gem.
 
 # 3.2.10 / 2021-02-15
 
+## Enhancements:
+
+* Install bundler 2.2.10 as a default gem.
+
 ## Documentation:
 
 * Add a `gem push` example to `gem help`. Pull request #4373 by
@@ -262,6 +325,10 @@
 
 # 3.2.9 / 2021-02-08
 
+## Enhancements:
+
+* Install bundler 2.2.9 as a default gem.
+
 ## Bug fixes:
 
 * Fix error message when underscore selection can't find bundler. Pull
@@ -275,6 +342,10 @@
 
 # 3.2.8 / 2021-02-02
 
+## Enhancements:
+
+* Install bundler 2.2.8 as a default gem.
+
 ## Bug fixes:
 
 * Fix `gem install` crashing on gemspec with nil required_ruby_version.
@@ -282,6 +353,10 @@
 
 # 3.2.7 / 2021-01-26
 
+## Enhancements:
+
+* Install bundler 2.2.7 as a default gem.
+
 ## Bug fixes:
 
 * Generate plugin wrappers with relative requires. Pull request #4317 by
@@ -293,6 +368,7 @@
 
 * Fix `Gem::Platform#inspect` showing duplicate information. Pull request
   #4276 by deivid-rodriguez
+* Install bundler 2.2.6 as a default gem.
 
 ## Bug fixes:
 
@@ -303,6 +379,10 @@
 
 # 3.2.5 / 2021-01-11
 
+## Enhancements:
+
+* Install bundler 2.2.5 as a default gem.
+
 ## Bug fixes:
 
 * Don't load more specs after the whole set of specs has been setup. Pull
@@ -318,6 +398,7 @@
   deivid-rodriguez
 * Never spawn subshells when building extensions. Pull request #4190 by
   deivid-rodriguez
+* Install bundler 2.2.4 as a default gem.
 
 ## Bug fixes:
 
@@ -331,6 +412,7 @@
 ## Enhancements:
 
 * Fix misspellings in default API key name. Pull request #4177 by hsbt
+* Install bundler 2.2.3 as a default gem.
 
 ## Bug fixes:
 
@@ -340,6 +422,10 @@
 
 # 3.2.2 / 2020-12-17
 
+## Enhancements:
+
+* Install bundler 2.2.2 as a default gem.
+
 ## Bug fixes:
 
 * Fix issue where CLI commands making more than one request to
@@ -356,6 +442,7 @@
 
 * Added help message for gem i webrick in gem server command. Pull request
   #4117 by hsbt
+* Install bundler 2.2.1 as a default gem.
 
 ## Bug fixes:
 
@@ -384,6 +471,7 @@
 * Lazily load `openssl`. Pull request #3850 by deivid-rodriguez
 * Pass more information when comparing platforms. Pull request #3817 by
   eregon
+* Install bundler 2.2.0 as a default gem.
 
 ## Bug fixes:
 

data/Manifest.txt

@@ -212,6 +212,7 @@ bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt
 bundler/lib/bundler/templates/newgem/newgem.gemspec.tt
 bundler/lib/bundler/templates/newgem/rspec.tt
 bundler/lib/bundler/templates/newgem/rubocop.yml.tt
+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
@@ -225,6 +226,7 @@ bundler/lib/bundler/ui/rg_proxy.rb
 bundler/lib/bundler/ui/shell.rb
 bundler/lib/bundler/ui/silent.rb
 bundler/lib/bundler/uri_credentials_filter.rb
+bundler/lib/bundler/vendor/.document
 bundler/lib/bundler/vendor/connection_pool/LICENSE
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
@@ -395,6 +397,7 @@ lib/rubygems/mock_gem_ui.rb
 lib/rubygems/name_tuple.rb
 lib/rubygems/openssl.rb
 lib/rubygems/optparse.rb
+lib/rubygems/optparse/.document
 lib/rubygems/optparse/COPYING
 lib/rubygems/optparse/lib/optionparser.rb
 lib/rubygems/optparse/lib/optparse.rb
@@ -508,6 +511,7 @@ lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 lib/rubygems/stub_specification.rb
 lib/rubygems/text.rb
 lib/rubygems/tsort.rb
+lib/rubygems/tsort/.document
 lib/rubygems/tsort/LICENSE.txt
 lib/rubygems/tsort/lib/tsort.rb
 lib/rubygems/uninstaller.rb

data/bundler/CHANGELOG.md

@@ -1,3 +1,32 @@
+# 2.2.33 (December 7, 2021)
+
+## Security fixes:
+
+  - Pass "--" to git commands to separate positional and optional args [#5142](https://github.com/rubygems/rubygems/pull/5142)
+
+## Enhancements:
+
+  - Accept pull request URLs as github source [#5126](https://github.com/rubygems/rubygems/pull/5126)
+  - Add `--version` parameter to `bundle info` command [#5137](https://github.com/rubygems/rubygems/pull/5137)
+  - Let original `Errno::EACCES` error be raised in compact index updater [#5110](https://github.com/rubygems/rubygems/pull/5110)
+  - Improve gemfile-lockfile source equivalence errors [#5120](https://github.com/rubygems/rubygems/pull/5120)
+  - Avoid float-to-string loss of characters in GitHub Actions configuration labels in new gem template [#5089](https://github.com/rubygems/rubygems/pull/5089)
+  - Add an initial rbs template to `bundle gem` skeleton [#5041](https://github.com/rubygems/rubygems/pull/5041)
+  - Avoid shared libraries not getting environment passed right after argv in memory when `bundle exec` is used [#4815](https://github.com/rubygems/rubygems/pull/4815)
+
+## Bug fixes:
+
+  - Don't cleanup paths from gems already activated from `$LOAD_PATH` [#5111](https://github.com/rubygems/rubygems/pull/5111)
+  - Fix handling prereleases of 0 versions, like 0.0.0.dev or 0.0.0.SNAPSHOT [#5116](https://github.com/rubygems/rubygems/pull/5116)
+  - Fix escape of filenames in `bundle doctor` [#5102](https://github.com/rubygems/rubygems/pull/5102)
+  - Don't unlock dependencies when running `bundle install` after changing global source [#5090](https://github.com/rubygems/rubygems/pull/5090)
+  - Fix missing locked specs when depended on another platform [#5092](https://github.com/rubygems/rubygems/pull/5092)
+  - Fix `bundle info` sometimes claiming that bundler has been deleted [#5097](https://github.com/rubygems/rubygems/pull/5097)
+
+## Documentation:
+
+  - Ignore to generate the documentation from vendored libraries [#5118](https://github.com/rubygems/rubygems/pull/5118)
+
 # 2.2.32 (November 23, 2021)
 
 ## Enhancements:

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 = "2021-11-23".freeze
-    @git_commit_sha = "20d4957649".freeze
+    @built_at = "2021-12-07".freeze
+    @git_commit_sha = "9b5e2a350b".freeze
     @release = true
     # end ivars
 

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rbconfig"
+require "shellwords"
 
 module Bundler
   class CLI::Doctor
@@ -22,14 +23,14 @@ module Bundler
     end
 
     def dylibs_darwin(path)
-      output = `/usr/bin/otool -L "#{path}"`.chomp
+      output = `/usr/bin/otool -L #{path.shellescape}`.chomp
       dylibs = output.split("\n")[1..-1].map {|l| l.match(DARWIN_REGEX).captures[0] }.uniq
       # ignore @rpath and friends
       dylibs.reject {|dylib| dylib.start_with? "@" }
     end
 
     def dylibs_ldd(path)
-      output = `/usr/bin/ldd "#{path}"`.chomp
+      output = `/usr/bin/ldd #{path.shellescape}`.chomp
       output.split("\n").map do |l|
         match = l.match(LDD_REGEX)
         next if match.nil?

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

@@ -76,6 +76,7 @@ module Bundler
         "#{Bundler.preferred_gemfile_name}.tt" => Bundler.preferred_gemfile_name,
         "lib/newgem.rb.tt" => "lib/#{namespaced_path}.rb",
         "lib/newgem/version.rb.tt" => "lib/#{namespaced_path}/version.rb",
+        "sig/newgem.rbs.tt" => "sig/#{namespaced_path}.rbs",
         "newgem.gemspec.tt" => "#{name}.gemspec",
         "Rakefile.tt" => "Rakefile",
         "README.md.tt" => "README.md",

data/bundler/lib/bundler/cli/info.rb

@@ -18,6 +18,7 @@ module Bundler
 
       if spec
         return print_gem_path(spec) if @options[:path]
+        return print_gem_version(spec) if @options[:version]
         print_gem_info(spec)
       end
     end
@@ -39,6 +40,10 @@ module Bundler
       raise GemNotFound, Bundler::CLI::Common.gem_not_found_message(gem_name, Bundler.definition.dependencies)
     end
 
+    def print_gem_version(spec)
+      Bundler.ui.info spec.version.to_s
+    end
+
     def print_gem_path(spec)
       name = spec.name
       if name == "bundler"
@@ -70,7 +75,7 @@ module Bundler
       gem_info << "\tPath: #{spec.full_gem_path}\n"
       gem_info << "\tDefault Gem: yes" if spec.respond_to?(:default_gem?) && spec.default_gem?
 
-      if spec.deleted_gem?
+      if name != "bundler" && spec.deleted_gem?
         return Bundler.ui.warn "The gem #{name} has been deleted. Gemspec information is still available though:\n#{gem_info}"
       end
 

data/bundler/lib/bundler/cli/update.rb

@@ -66,7 +66,7 @@ module Bundler
 
       if locked_gems = Bundler.definition.locked_gems
         previous_locked_info = locked_gems.specs.reduce({}) do |h, s|
-          h[s.name] = { :spec => s, :version => s.version, :source => s.source.to_s }
+          h[s.name] = { :spec => s, :version => s.version, :source => s.source.identifier }
           h
         end
       end
@@ -95,7 +95,7 @@ module Bundler
           end
 
           locked_source = locked_info[:source]
-          new_source = new_spec.source.to_s
+          new_source = new_spec.source.identifier
           next if locked_source != new_source
 
           new_version = new_spec.version

data/bundler/lib/bundler/cli.rb

@@ -331,6 +331,7 @@ module Bundler
 
     desc "info GEM [OPTIONS]", "Show information for the given gem"
     method_option "path", :type => :boolean, :banner => "Print full path to gem"
+    method_option "version", :type => :boolean, :banner => "Print gem version"
     def info(gem_name)
       require_relative "cli/info"
       Info.new(options, gem_name).run

data/bundler/lib/bundler/compact_index_client/updater.rb

@@ -76,11 +76,6 @@ module Bundler
 
           update(local_path, remote_path, :retrying)
         end
-      rescue Errno::EACCES
-        raise Bundler::PermissionError,
-          "Bundler does not have write access to create a temp directory " \
-          "within #{Dir.tmpdir}. Bundler must have write access to your " \
-          "systems temp directory to function properly. "
       rescue Zlib::GzipFile::Error
         raise Bundler::HTTPError
       end

data/bundler/lib/bundler/definition.rb

@@ -158,10 +158,6 @@ module Bundler
       end
     end
 
-    def multisource_allowed?
-      @multisource_allowed
-    end
-
     def resolve_only_locally!
       @remote = false
       sources.local_only!
@@ -368,44 +364,26 @@ module Bundler
       added.concat new_platforms.map {|p| "* platform: #{p}" }
       deleted.concat deleted_platforms.map {|p| "* platform: #{p}" }
 
-      gemfile_sources = sources.lock_sources
-
-      new_sources = gemfile_sources - @locked_sources
-      deleted_sources = @locked_sources - gemfile_sources
-
       new_deps = @dependencies - locked_dependencies
       deleted_deps = locked_dependencies - @dependencies
 
-      # Check if it is possible that the source is only changed thing
-      if (new_deps.empty? && deleted_deps.empty?) && (!new_sources.empty? && !deleted_sources.empty?)
-        new_sources.reject! {|source| (source.path? && source.path.exist?) || equivalent_rubygems_remotes?(source) }
-        deleted_sources.reject! {|source| (source.path? && source.path.exist?) || equivalent_rubygems_remotes?(source) }
-      end
-
-      if @locked_sources != gemfile_sources
-        if new_sources.any?
-          added.concat new_sources.map {|source| "* source: #{source}" }
-        end
-
-        if deleted_sources.any?
-          deleted.concat deleted_sources.map {|source| "* source: #{source}" }
-        end
-      end
-
       added.concat new_deps.map {|d| "* #{pretty_dep(d)}" } if new_deps.any?
-      if deleted_deps.any?
-        deleted.concat deleted_deps.map {|d| "* #{pretty_dep(d)}" }
-      end
+      deleted.concat deleted_deps.map {|d| "* #{pretty_dep(d)}" } if deleted_deps.any?
 
       both_sources = Hash.new {|h, k| h[k] = [] }
       @dependencies.each {|d| both_sources[d.name][0] = d }
-      @locked_deps.each  {|name, d| both_sources[name][1] = d.source }
+      locked_dependencies.each {|d| both_sources[d.name][1] = d }
 
-      both_sources.each do |name, (dep, lock_source)|
-        next if lock_source.nil? || (dep && lock_source.can_lock?(dep))
-        gemfile_source_name = (dep && dep.source) || "no specified source"
-        lockfile_source_name = lock_source
-        changed << "* #{name} from `#{gemfile_source_name}` to `#{lockfile_source_name}`"
+      both_sources.each do |name, (dep, lock_dep)|
+        next if dep.nil? || lock_dep.nil?
+
+        gemfile_source = dep.source || sources.default_source
+        lock_source = lock_dep.source || sources.default_source
+        next if lock_source.include?(gemfile_source)
+
+        gemfile_source_name = dep.source ? gemfile_source.identifier : "no specified source"
+        lockfile_source_name = lock_dep.source ? lock_source.identifier : "no specified source"
+        changed << "* #{name} from `#{lockfile_source_name}` to `#{gemfile_source_name}`"
       end
 
       reason = change_reason
@@ -649,15 +627,13 @@ module Bundler
     end
 
     def converge_dependencies
-      (@dependencies + locked_dependencies).each do |dep|
+      changes = false
+
+      @dependencies.each do |dep|
         if dep.source
           dep.source = sources.get(dep.source)
         end
-      end
 
-      changes = false
-
-      @dependencies.each do |dep|
         unless locked_dep = @locked_deps[dep.name]
           changes = true
           next
@@ -711,11 +687,8 @@ module Bundler
           deps << dep
         end
 
-        s.source = (dep && dep.source) || sources.get(s.source) unless multisource_allowed?
+        s.source = (dep && dep.source) || sources.get(s.source) || sources.default_source unless Bundler.frozen_bundle?
 
-        # Don't add a spec to the list if its source is expired. For example,
-        # if you change a Git gem to RubyGems.
-        next if s.source.nil?
         next if @unlock[:sources].include?(s.source.name)
 
         # If the spec is from a path source and it doesn't exist anymore
@@ -744,7 +717,7 @@ module Bundler
           s.dependencies.replace(new_spec.dependencies)
         end
 
-        if dep.nil? && @dependencies.find {|d| s.name == d.name }
+        if dep.nil? && requested_dependencies.find {|d| s.name == d.name }
           @unlock[:gems] << s.name
         else
           converged << s
@@ -852,12 +825,6 @@ module Bundler
       end
     end
 
-    def equivalent_rubygems_remotes?(source)
-      return false unless source.is_a?(Source::Rubygems)
-
-      Bundler.settings[:allow_deployment_source_credential_changes] && source.equivalent_remotes?(sources.rubygems_remotes)
-    end
-
     def source_map
       @source_map ||= SourceMap.new(sources, dependencies)
     end

data/bundler/lib/bundler/dsl.rb

@@ -18,6 +18,8 @@ module Bundler
     VALID_KEYS = %w[group groups git path glob name branch ref tag require submodules
                     platform platforms type source install_if gemfile].freeze
 
+    GITHUB_PULL_REQUEST_URL = %r{\Ahttps://github\.com/([A-Za-z0-9_\-\.]+/[A-Za-z0-9_\-\.]+)/pull/(\d+)\z}.freeze
+
     attr_reader :gemspecs
     attr_accessor :dependencies
 
@@ -278,8 +280,17 @@ module Bundler
         warn_deprecated_git_source(:github, <<-'RUBY'.strip, 'Change any "reponame" :github sources to "username/reponame".')
 "https://github.com/#{repo_name}.git"
         RUBY
-        repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-        "https://github.com/#{repo_name}.git"
+        if repo_name =~ GITHUB_PULL_REQUEST_URL
+          {
+            "git" => "https://github.com/#{$1}.git",
+            "branch" => "refs/pull/#{$2}/head",
+            "ref" => nil,
+            "tag" => nil,
+          }
+        else
+          repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+          "https://github.com/#{repo_name}.git"
+        end
       end
 
       git_source(:gist) do |repo_name|
@@ -365,7 +376,11 @@ repo_name ||= user_name
 
       git_name = (git_names & opts.keys).last
       if @git_sources[git_name]
-        opts["git"] = @git_sources[git_name].call(opts[git_name])
+        git_opts = @git_sources[git_name].call(opts[git_name])
+        git_opts = { "git" => git_opts } if git_opts.is_a?(String)
+        opts.merge!(git_opts) do |key, _gemfile_value, _git_source_value|
+          raise GemfileError, %(The :#{key} option can't be used with `#{git_name}: #{opts[git_name].inspect}`)
+        end
       end
 
       %w[git path].each do |type|

data/bundler/lib/bundler/environment_preserver.rb

@@ -38,7 +38,10 @@ module Bundler
 
     # Replaces `ENV` with the bundler environment variables backed up
     def replace_with_backup
-      ENV.replace(backup) unless Gem.win_platform?
+      unless Gem.win_platform?
+        ENV.replace(backup)
+        return
+      end
 
       # Fallback logic for Windows below to workaround
       # https://bugs.ruby-lang.org/issues/16798. Can be dropped once all