rubygems-update 3.5.23 → 3.6.1

data/bundler/lib/bundler/man/bundle-show.1.ronn

@@ -5,6 +5,7 @@ bundle-show(1) -- Shows all the gems in your bundle, or the path to a gem
 
 `bundle show` [GEM]
               [--paths]
+              [--outdated]
 
 ## DESCRIPTION
 
@@ -19,3 +20,6 @@ machine.
 * `--paths`:
   List the paths of all gems that are required by your [`Gemfile(5)`][Gemfile(5)],
   sorted by gem name.
+
+* `--outdated`:
+  Show verbose output including whether gems are outdated.

data/bundler/lib/bundler/man/bundle-update.1

@@ -1,10 +1,10 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-UPDATE" "1" "October 2024" ""
+.TH "BUNDLE\-UPDATE" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-update\fR \- Update your gems to the latest available versions
 .SH "SYNOPSIS"
-\fBbundle update\fR \fI*gems\fR [\-\-all] [\-\-group=NAME] [\-\-source=NAME] [\-\-local] [\-\-ruby] [\-\-bundler[=VERSION]] [\-\-full\-index] [\-\-jobs=JOBS] [\-\-quiet] [\-\-patch|\-\-minor|\-\-major] [\-\-redownload] [\-\-strict] [\-\-conservative]
+\fBbundle update\fR \fI*gems\fR [\-\-all] [\-\-group=NAME] [\-\-source=NAME] [\-\-local] [\-\-ruby] [\-\-bundler[=VERSION]] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-jobs=NUMBER] [\-\-quiet] [\-\-patch|\-\-minor|\-\-major] [\-\-pre] [\-\-redownload] [\-\-strict] [\-\-conservative]
 .SH "DESCRIPTION"
 Update the gems specified (all gems, if \fB\-\-all\fR flag is used), ignoring the previously installed gems specified in the \fBGemfile\.lock\fR\. In general, you should use bundle install(1) \fIbundle\-install\.1\.html\fR to install the same exact gems and versions across machines\.
 .P
@@ -14,10 +14,10 @@ You would use \fBbundle update\fR to explicitly update the version of a gem\.
 \fB\-\-all\fR
 Update all gems specified in Gemfile\.
 .TP
-\fB\-\-group=<name>\fR, \fB\-g=[<name>]\fR
+\fB\-\-group=<list>\fR, \fB\-g=<list>\fR
 Only update the gems in the specified group\. For instance, you can update all gems in the development group with \fBbundle update \-\-group development\fR\. You can also call \fBbundle update rails \-\-group test\fR to update the rails gem and all gems in the test group, for example\.
 .TP
-\fB\-\-source=<name>\fR
+\fB\-\-source=<list>\fR
 The name of a \fB:git\fR or \fB:path\fR source used in the Gemfile(5)\. For instance, with a \fB:git\fR source of \fBhttp://github\.com/rails/rails\.git\fR, you would call \fBbundle update \-\-source rails\fR
 .TP
 \fB\-\-local\fR
@@ -26,13 +26,16 @@ Do not attempt to fetch gems remotely and use the gem cache instead\.
 \fB\-\-ruby\fR
 Update the locked version of Ruby to the current version of Ruby\.
 .TP
-\fB\-\-bundler\fR
+\fB\-\-bundler[=BUNDLER]\fR
 Update the locked version of bundler to the invoked bundler version\.
 .TP
 \fB\-\-full\-index\fR
 Fall back to using the single\-file index of all gems\.
 .TP
-\fB\-\-jobs=[<number>]\fR, \fB\-j[<number>]\fR
+\fB\-\-gemfile=GEMFILE\fR
+Use the specified gemfile instead of [\fBGemfile(5)\fR][Gemfile(5)]\.
+.TP
+\fB\-\-jobs=<number>\fR, \fB\-j=<number>\fR
 Specify the number of jobs to run in parallel\. The default is the number of available processors\.
 .TP
 \fB\-\-retry=[<number>]\fR
@@ -41,7 +44,7 @@ Retry failed network or git requests for \fInumber\fR times\.
 \fB\-\-quiet\fR
 Only output warnings and errors\.
 .TP
-\fB\-\-redownload\fR
+\fB\-\-redownload\fR, \fB\-\-force\fR
 Force downloading every gem\.
 .TP
 \fB\-\-patch\fR
@@ -53,6 +56,9 @@ Prefer updating only to next minor version\.
 \fB\-\-major\fR
 Prefer updating to next major version (default)\.
 .TP
+\fB\-\-pre\fR
+Always choose the highest allowed version, regardless of prerelease status\.
+.TP
 \fB\-\-strict\fR
 Do not allow any gem to be updated past latest \fB\-\-patch\fR | \fB\-\-minor\fR | \fB\-\-major\fR\.
 .TP

data/bundler/lib/bundler/man/bundle-update.1.ronn

@@ -10,9 +10,11 @@ bundle-update(1) -- Update your gems to the latest available versions
                         [--ruby]
                         [--bundler[=VERSION]]
                         [--full-index]
-                        [--jobs=JOBS]
+                        [--gemfile=GEMFILE]
+                        [--jobs=NUMBER]
                         [--quiet]
                         [--patch|--minor|--major]
+                        [--pre]
                         [--redownload]
                         [--strict]
                         [--conservative]
@@ -32,13 +34,13 @@ gem.
 * `--all`:
   Update all gems specified in Gemfile.
 
-* `--group=<name>`, `-g=[<name>]`:
+* `--group=<list>`, `-g=<list>`:
   Only update the gems in the specified group. For instance, you can update all gems
   in the development group with `bundle update --group development`. You can also
   call `bundle update rails --group test` to update the rails gem and all gems in
   the test group, for example.
 
-* `--source=<name>`:
+* `--source=<list>`:
   The name of a `:git` or `:path` source used in the Gemfile(5). For
   instance, with a `:git` source of `http://github.com/rails/rails.git`,
   you would call `bundle update --source rails`
@@ -49,13 +51,16 @@ gem.
 * `--ruby`:
   Update the locked version of Ruby to the current version of Ruby.
 
-* `--bundler`:
+* `--bundler[=BUNDLER]`:
   Update the locked version of bundler to the invoked bundler version.
 
 * `--full-index`:
   Fall back to using the single-file index of all gems.
 
-* `--jobs=[<number>]`, `-j[<number>]`:
+* `--gemfile=GEMFILE`:
+  Use the specified gemfile instead of [`Gemfile(5)`][Gemfile(5)].
+
+* `--jobs=<number>`, `-j=<number>`:
   Specify the number of jobs to run in parallel. The default is the number of
   available processors.
 
@@ -65,7 +70,7 @@ gem.
 * `--quiet`:
   Only output warnings and errors.
 
-* `--redownload`:
+* `--redownload`, `--force`:
   Force downloading every gem.
 
 * `--patch`:
@@ -77,6 +82,9 @@ gem.
 * `--major`:
   Prefer updating to next major version (default).
 
+* `--pre`:
+  Always choose the highest allowed version, regardless of prerelease status.
+
 * `--strict`:
   Do not allow any gem to be updated past latest `--patch` | `--minor` | `--major`.
 

data/bundler/lib/bundler/man/bundle-version.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-VERSION" "1" "October 2024" ""
+.TH "BUNDLE\-VERSION" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-version\fR \- Prints Bundler version information
 .SH "SYNOPSIS"

data/bundler/lib/bundler/man/bundle-viz.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE\-VIZ" "1" "October 2024" ""
+.TH "BUNDLE\-VIZ" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile
 .SH "SYNOPSIS"
@@ -13,10 +13,10 @@ The associated gems must also be installed via \fBbundle install(1)\fR \fIbundle
 \fBviz\fR command was deprecated in Bundler 2\.2\. Use bundler\-graph plugin \fIhttps://github\.com/rubygems/bundler\-graph\fR instead\.
 .SH "OPTIONS"
 .TP
-\fB\-\-file\fR, \fB\-f\fR
+\fB\-\-file=FILE\fR, \fB\-f=FILE\fR
 The name to use for the generated file\. See \fB\-\-format\fR option
 .TP
-\fB\-\-format\fR, \fB\-F\fR
+\fB\-\-format=FORMAT\fR, \fB\-F=FORMAT\fR
 This is output format option\. Supported format is png, jpg, svg, dot \|\.\|\.\|\.
 .TP
 \fB\-\-requirements\fR, \fB\-R\fR
@@ -25,6 +25,6 @@ Set to show the version of each required dependency\.
 \fB\-\-version\fR, \fB\-v\fR
 Set to show each gem version\.
 .TP
-\fB\-\-without\fR, \fB\-W\fR
+\fB\-\-without=<list>\fR, \fB\-W=<list>\fR
 Exclude gems that are part of the specified named group\.
 

data/bundler/lib/bundler/man/bundle-viz.1.ronn

@@ -20,13 +20,17 @@ The associated gems must also be installed via [`bundle install(1)`](bundle-inst
 
 ## OPTIONS
 
-* `--file`, `-f`:
+* `--file=FILE`, `-f=FILE`:
   The name to use for the generated file. See `--format` option
-* `--format`, `-F`:
+
+* `--format=FORMAT`, `-F=FORMAT`:
   This is output format option. Supported format is png, jpg, svg, dot ...
+
 * `--requirements`, `-R`:
   Set to show the version of each required dependency.
+
 * `--version`, `-v`:
   Set to show each gem version.
-* `--without`, `-W`:
+
+* `--without=<list>`, `-W=<list>`:
   Exclude gems that are part of the specified named group.

data/bundler/lib/bundler/man/bundle.1

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "BUNDLE" "1" "October 2024" ""
+.TH "BUNDLE" "1" "December 2024" ""
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management
 .SH "SYNOPSIS"

data/bundler/lib/bundler/man/gemfile.5

@@ -1,6 +1,6 @@
 .\" generated with nRonn/v0.11.1
 .\" https://github.com/n-ronn/nronn/tree/0.11.1
-.TH "GEMFILE" "5" "October 2024" ""
+.TH "GEMFILE" "5" "December 2024" ""
 .SH "NAME"
 \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
 .SH "SYNOPSIS"

data/bundler/lib/bundler/man/index.txt

@@ -8,13 +8,17 @@ bundle-clean(1)       bundle-clean.1
 bundle-config(1)      bundle-config.1
 bundle-console(1)     bundle-console.1
 bundle-doctor(1)      bundle-doctor.1
+bundle-env(1)         bundle-env.1
 bundle-exec(1)        bundle-exec.1
+bundle-fund(1)        bundle-fund.1
 bundle-gem(1)         bundle-gem.1
 bundle-help(1)        bundle-help.1
 bundle-info(1)        bundle-info.1
 bundle-init(1)        bundle-init.1
 bundle-inject(1)      bundle-inject.1
 bundle-install(1)     bundle-install.1
+bundle-issue(1)       bundle-issue.1
+bundle-licenses(1)    bundle-licenses.1
 bundle-list(1)        bundle-list.1
 bundle-lock(1)        bundle-lock.1
 bundle-open(1)        bundle-open.1

data/bundler/lib/bundler/materialization.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Bundler
+  #
+  # This class materializes a set of resolved specifications (`LazySpecification`)
+  # for a given gem into the most appropriate real specifications
+  # (`StubSepecification`, `EndpointSpecification`, etc), given a dependency and a
+  # target platform.
+  #
+  class Materialization
+    def initialize(dep, platform, candidates:)
+      @dep = dep
+      @platform = platform
+      @candidates = candidates
+    end
+
+    def complete?
+      specs.any?
+    end
+
+    def specs
+      @specs ||= if @candidates.nil?
+        []
+      elsif platform
+        GemHelpers.select_best_platform_match(@candidates, platform, force_ruby: dep.force_ruby_platform)
+      else
+        GemHelpers.select_best_local_platform_match(@candidates, force_ruby: dep.force_ruby_platform || dep.default_force_ruby_platform)
+      end
+    end
+
+    def dependencies
+      specs.first.runtime_dependencies.map {|d| [d, platform] }
+    end
+
+    def materialized_spec
+      specs.reject(&:missing?).first&.materialization
+    end
+
+    def completely_missing_specs
+      return [] unless specs.all?(&:missing?)
+
+      specs
+    end
+
+    def partially_missing_specs
+      specs.select(&:missing?)
+    end
+
+    def incomplete_specs
+      return [] if complete?
+
+      @candidates || LazySpecification.new(dep.name, nil, nil)
+    end
+
+    private
+
+    attr_reader :dep, :platform
+  end
+end

data/bundler/lib/bundler/plugin/events.rb

@@ -56,6 +56,30 @@ module Bundler
       #   Includes an Array of Bundler::Dependency objects
       #   GEM_AFTER_INSTALL_ALL = "after-install-all"
       define :GEM_AFTER_INSTALL_ALL,  "after-install-all"
+
+      # @!parse
+      #   A hook called before each individual gem is required
+      #   Includes a Bundler::Dependency.
+      #   GEM_BEFORE_REQUIRE = "before-require"
+      define :GEM_BEFORE_REQUIRE, "before-require"
+
+      # @!parse
+      #   A hook called after each individual gem is required
+      #   Includes a Bundler::Dependency.
+      #   GEM_AFTER_REQUIRE = "after-require"
+      define :GEM_AFTER_REQUIRE,  "after-require"
+
+      # @!parse
+      #   A hook called before any gems require
+      #   Includes an Array of Bundler::Dependency objects.
+      #   GEM_BEFORE_REQUIRE_ALL = "before-require-all"
+      define :GEM_BEFORE_REQUIRE_ALL, "before-require-all"
+
+      # @!parse
+      #   A hook called after all gems required
+      #   Includes an Array of Bundler::Dependency objects.
+      #   GEM_AFTER_REQUIRE_ALL = "after-require-all"
+      define :GEM_AFTER_REQUIRE_ALL,  "after-require-all"
     end
   end
 end

data/bundler/lib/bundler/plugin/installer.rb

@@ -34,7 +34,7 @@ module Bundler
       # @return [Hash] map of names to their specs they are installed with
       def install_definition(definition)
         def definition.lock(*); end
-        definition.resolve_remotely!
+        definition.remotely!
         specs = definition.specs
 
         install_from_specs specs

data/bundler/lib/bundler/process_lock.rb

@@ -6,7 +6,7 @@ module Bundler
       lock_file_path = File.join(bundle_path, "bundler.lock")
       base_lock_file_path = lock_file_path.delete_suffix(".lock")
 
-      require "fileutils" if Bundler.rubygems.provides?("< 3.5.23")
+      require "fileutils" if Bundler.rubygems.provides?("< 3.6.0")
 
       begin
         SharedHelpers.filesystem_access(lock_file_path, :write) do

data/bundler/lib/bundler/remote_specification.rb

@@ -12,7 +12,7 @@ module Bundler
 
     attr_reader :name, :version, :platform
     attr_writer :dependencies
-    attr_accessor :source, :remote
+    attr_accessor :source, :remote, :locked_platform
 
     def initialize(name, version, platform, spec_fetcher)
       @name         = name
@@ -21,6 +21,11 @@ module Bundler
       @platform     = Gem::Platform.new(platform)
       @spec_fetcher = spec_fetcher
       @dependencies = nil
+      @locked_platform = nil
+    end
+
+    def insecurely_materialized?
+      @locked_platform.to_s != @platform.to_s
     end
 
     # Needed before installs, since the arch matters then and quick

data/bundler/lib/bundler/resolver/base.rb

@@ -16,7 +16,7 @@ module Bundler
           hash[name] = Package.new(name, platforms, **options)
         end
 
-        @requirements = dependencies.map do |dep|
+        @requirements = dependencies.filter_map do |dep|
           dep_platforms = dep.gem_platforms(platforms)
 
           # Dependencies scoped to external platforms are ignored
@@ -27,11 +27,7 @@ module Bundler
           @packages[name] = Package.new(name, dep_platforms, **options.merge(dependency: dep))
 
           dep
-        end.compact
-      end
-
-      def specs_compatible_with(result)
-        @base.specs_compatible_with(result)
+        end
       end
 
       def [](name)

data/bundler/lib/bundler/resolver/candidate.rb

@@ -34,10 +34,10 @@ module Bundler
         @spec_group.dependencies
       end
 
-      def to_specs(package)
+      def to_specs(package, most_specific_locked_platform)
         return [] if package.meta?
 
-        @spec_group.to_specs(package.force_ruby_platform?)
+        @spec_group.to_specs(package.force_ruby_platform?, most_specific_locked_platform)
       end
 
       def prerelease?

data/bundler/lib/bundler/resolver/spec_group.rb

@@ -25,10 +25,11 @@ module Bundler
         @source ||= exemplary_spec.source
       end
 
-      def to_specs(force_ruby_platform)
+      def to_specs(force_ruby_platform, most_specific_locked_platform)
         @specs.map do |s|
           lazy_spec = LazySpecification.from_spec(s)
           lazy_spec.force_ruby_platform = force_ruby_platform
+          lazy_spec.most_specific_locked_platform = most_specific_locked_platform
           lazy_spec
         end
       end
@@ -38,9 +39,9 @@ module Bundler
       end
 
       def dependencies
-        @dependencies ||= @specs.map do |spec|
+        @dependencies ||= @specs.flat_map do |spec|
           __dependencies(spec) + metadata_dependencies(spec)
-        end.flatten.uniq.sort
+        end.uniq.sort
       end
 
       def ==(other)

data/bundler/lib/bundler/resolver.rb

@@ -15,10 +15,11 @@ module Bundler
 
     include GemHelpers
 
-    def initialize(base, gem_version_promoter)
+    def initialize(base, gem_version_promoter, most_specific_locked_platform = nil)
       @source_requirements = base.source_requirements
       @base = base
       @gem_version_promoter = gem_version_promoter
+      @most_specific_locked_platform = most_specific_locked_platform
     end
 
     def start
@@ -79,8 +80,7 @@ module Bundler
     def solve_versions(root:, logger:)
       solver = PubGrub::VersionSolver.new(source: self, root: root, logger: logger)
       result = solver.solve
-      resolved_specs = result.map {|package, version| version.to_specs(package) }.flatten
-      resolved_specs |= @base.specs_compatible_with(SpecSet.new(resolved_specs))
+      result.flat_map {|package, version| version.to_specs(package, @most_specific_locked_platform) }
     rescue PubGrub::SolveFailure => e
       incompatibility = e.incompatibility
 
@@ -417,7 +417,7 @@ module Bundler
     end
 
     def prepare_dependencies(requirements, packages)
-      to_dependency_hash(requirements, packages).map do |dep_package, dep_constraint|
+      to_dependency_hash(requirements, packages).filter_map do |dep_package, dep_constraint|
         name = dep_package.name
 
         next [dep_package, dep_constraint] if name == "bundler"
@@ -443,7 +443,7 @@ module Bundler
         next unless dep_package.current_platform?
 
         raise_not_found!(dep_package)
-      end.compact.to_h
+      end.to_h
     end
 
     def select_sorted_versions(package, range)

data/bundler/lib/bundler/rubygems_ext.rb

@@ -79,14 +79,18 @@ module Gem
     include ::Bundler::MatchMetadata
     include ::Bundler::MatchPlatform
 
-    attr_accessor :remote, :location, :relative_loaded_from
+    attr_accessor :remote, :relative_loaded_from
 
-    remove_method :source
-    attr_writer :source
-    def source
-      (defined?(@source) && @source) || Gem::Source::Installed.new
+    module AllowSettingSource
+      attr_writer :source
+
+      def source
+        (defined?(@source) && @source) || super
+      end
     end
 
+    prepend AllowSettingSource
+
     alias_method :rg_full_gem_path, :full_gem_path
     alias_method :rg_loaded_from,   :loaded_from
 
@@ -122,7 +126,9 @@ module Gem
       end
     end
 
-    remove_method :gem_dir
+    # Can be removed once RubyGems 3.5.21 support is dropped
+    remove_method :gem_dir if method_defined?(:gem_dir, false)
+
     def gem_dir
       full_gem_path
     end
@@ -144,6 +150,10 @@ module Gem
       end
     end
 
+    def insecurely_materialized?
+      false
+    end
+
     def groups
       @groups ||= []
     end
@@ -278,23 +288,6 @@ module Gem
     end
   end
 
-  # Requirements using lambda operator differentiate trailing zeros since rubygems 3.2.6
-  if Gem::Requirement.new("~> 2.0").hash == Gem::Requirement.new("~> 2.0.0").hash
-    class Requirement
-      module CorrectHashForLambdaOperator
-        def hash
-          if requirements.any? {|r| r.first == "~>" }
-            requirements.map {|r| r.first == "~>" ? [r[0], r[1].to_s] : r }.sort.hash
-          else
-            super
-          end
-        end
-      end
-
-      prepend CorrectHashForLambdaOperator
-    end
-  end
-
   require "rubygems/platform"
 
   class Platform
@@ -344,10 +337,6 @@ module Gem
         without_gnu_nor_abi_modifiers
       end
     end
-
-    if RUBY_ENGINE == "truffleruby" && !defined?(REUSE_AS_BINARY_ON_TRUFFLERUBY)
-      REUSE_AS_BINARY_ON_TRUFFLERUBY = %w[libv8 libv8-node sorbet-static].freeze
-    end
   end
 
   Platform.singleton_class.module_eval do
@@ -453,7 +442,7 @@ module Gem
     end
   end
 
-  unless Gem.rubygems_version >= Gem::Version.new("3.5.23")
+  if Gem.rubygems_version < Gem::Version.new("3.6.0")
     class Package; end
     require "rubygems/package/tar_reader"
     require "rubygems/package/tar_reader/entry"
@@ -466,4 +455,15 @@ module Gem
 
     Package::TarReader::Entry.prepend(FixFullNameEncoding)
   end
+
+  require "rubygems/uri"
+
+  # Can be removed once RubyGems 3.3.15 support is dropped
+  unless Gem::Uri.respond_to?(:redact)
+    class Uri
+      def self.redact(uri)
+        new(uri).redacted
+      end
+    end
+  end
 end

data/bundler/lib/bundler/rubygems_gem_installer.rb

@@ -147,7 +147,6 @@ module Bundler
       SharedHelpers.filesystem_access(extension_dir, :create) do
         FileUtils.mkdir_p extension_dir
       end
-      require "shellwords" unless Bundler.rubygems.provides?(">= 3.2.25")
     end
 
     def strict_rm_rf(dir)

data/bundler/lib/bundler/rubygems_integration.rb

@@ -20,10 +20,6 @@ module Bundler
       Gem::Requirement.new(req_str).satisfied_by?(version)
     end
 
-    def supports_bundler_trampolining?
-      provides?(">= 3.3.0.a")
-    end
-
     def build_args
       require "rubygems/command"
       Gem::Command.build_args
@@ -34,6 +30,10 @@ module Bundler
       Gem::Command.build_args = args
     end
 
+    def set_target_rbconfig(path)
+      Gem.set_target_rbconfig(path)
+    end
+
     def loaded_specs(name)
       Gem.loaded_specs[name]
     end
@@ -134,6 +134,18 @@ module Bundler
       loaded_gem_paths.flatten
     end
 
+    def load_plugins
+      Gem.load_plugins
+    end
+
+    def load_plugin_files(plugin_files)
+      Gem.load_plugin_files(plugin_files)
+    end
+
+    def load_env_plugins
+      Gem.load_env_plugins
+    end
+
     def ui=(obj)
       Gem::DefaultUserInteraction.ui = obj
     end
@@ -304,11 +316,7 @@ module Bundler
       @replaced_methods.each do |(sym, klass), method|
         redefine_method(klass, sym, method)
       end
-      if Binding.public_method_defined?(:source_location)
-        post_reset_hooks.reject! {|proc| proc.binding.source_location[0] == __FILE__ }
-      else
-        post_reset_hooks.reject! {|proc| proc.binding.eval("__FILE__") == __FILE__ }
-      end
+      post_reset_hooks.reject! {|proc| proc.binding.source_location[0] == __FILE__ }
       @replaced_methods.clear
     end
 
@@ -385,7 +393,9 @@ module Bundler
     def download_gem(spec, uri, cache_dir, fetcher)
       require "rubygems/remote_fetcher"
       uri = Bundler.settings.mirror_for(uri)
-      Bundler::Retry.new("download gem from #{uri}").attempts do
+      redacted_uri = Gem::Uri.redact(uri)
+
+      Bundler::Retry.new("download gem from #{redacted_uri}").attempts do
         gem_file_name = spec.file_name
         local_gem_path = File.join cache_dir, gem_file_name
         return if File.exist? local_gem_path
@@ -407,7 +417,7 @@ module Bundler
         end
       end
     rescue Gem::RemoteFetcher::FetchError => e
-      raise Bundler::HTTPError, "Could not download gem from #{uri} due to underlying error <#{e.message}>"
+      raise Bundler::HTTPError, "Could not download gem from #{redacted_uri} due to underlying error <#{e.message}>"
     end
 
     def build(spec, skip_validation = false)