bundler 2.3.12 → 2.4.17

data/lib/bundler/vendor/uri/lib/uri.rb

@@ -30,7 +30,7 @@
 #     class RSYNC < Generic
 #       DEFAULT_PORT = 873
 #     end
-#     @@schemes['RSYNC'] = RSYNC
+#     register_scheme 'RSYNC', RSYNC
 #   end
 #   #=> Bundler::URI::RSYNC
 #
@@ -70,7 +70,6 @@
 # - Bundler::URI::REGEXP - (in uri/common.rb)
 #   - Bundler::URI::REGEXP::PATTERN - (in uri/common.rb)
 # - Bundler::URI::Util - (in uri/common.rb)
-# - Bundler::URI::Escape - (in uri/common.rb)
 # - Bundler::URI::Error - (in uri/common.rb)
 #   - Bundler::URI::InvalidURIError - (in uri/common.rb)
 #   - Bundler::URI::InvalidComponentError - (in uri/common.rb)
@@ -101,3 +100,5 @@ require_relative 'uri/https'
 require_relative 'uri/ldap'
 require_relative 'uri/ldaps'
 require_relative 'uri/mailto'
+require_relative 'uri/ws'
+require_relative 'uri/wss'

data/lib/bundler/vendored_persistent.rb

@@ -11,37 +11,5 @@ end
 require_relative "vendor/net-http-persistent/lib/net/http/persistent"
 
 module Bundler
-  class PersistentHTTP < Persistent::Net::HTTP::Persistent
-    def connection_for(uri)
-      super(uri) do |connection|
-        result = yield connection
-        warn_old_tls_version_rubygems_connection(uri, connection)
-        result
-      end
-    end
-
-    def warn_old_tls_version_rubygems_connection(uri, connection)
-      return unless connection.http.use_ssl?
-      return unless (uri.host || "").end_with?("rubygems.org")
-
-      socket = connection.instance_variable_get(:@socket)
-      return unless socket
-      socket_io = socket.io
-      return unless socket_io.respond_to?(:ssl_version)
-      ssl_version = socket_io.ssl_version
-
-      case ssl_version
-      when /TLSv([\d\.]+)/
-        version = Gem::Version.new($1)
-        if version < Gem::Version.new("1.2")
-          Bundler.ui.warn \
-            "Warning: Your Ruby version is compiled against a copy of OpenSSL that is very old. " \
-            "Starting in January 2018, RubyGems.org will refuse connection requests from these " \
-            "very old versions of OpenSSL. If you will need to continue installing gems after " \
-            "January 2018, please follow this guide to upgrade: http://ruby.to/tls-outdated.",
-            :wrap => true
-        end
-      end
-    end
-  end
+  PersistentHTTP = Persistent::Net::HTTP::Persistent
 end

data/lib/bundler/{vendored_tmpdir.rb → vendored_pub_grub.rb}

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 module Bundler; end
-require_relative "vendor/tmpdir/lib/tmpdir"
+require_relative "vendor/pub_grub/lib/pub_grub"

data/lib/bundler/version.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.3.12".freeze
+  VERSION = "2.4.17".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i
   end
+
+  def self.gem_version
+    @gem_version ||= Gem::Version.create(VERSION)
+  end
 end

data/lib/bundler/worker.rb

@@ -87,14 +87,12 @@ module Bundler
       creation_errors = []
 
       @threads = Array.new(@size) do |i|
-        begin
-          Thread.start { process_queue(i) }.tap do |thread|
-            thread.name = "#{name} Worker ##{i}" if thread.respond_to?(:name=)
-          end
-        rescue ThreadError => e
-          creation_errors << e
-          nil
+        Thread.start { process_queue(i) }.tap do |thread|
+          thread.name = "#{name} Worker ##{i}" if thread.respond_to?(:name=)
         end
+      rescue ThreadError => e
+        creation_errors << e
+        nil
       end.compact
 
       add_interrupt_handler unless @threads.empty?

data/lib/bundler.rb

@@ -19,7 +19,7 @@ require_relative "bundler/build_metadata"
 #
 # Since Ruby 2.6, Bundler is a part of Ruby's standard library.
 #
-# Bunder is used by creating _gemfiles_ listing all the project dependencies
+# Bundler is used by creating _gemfiles_ listing all the project dependencies
 # and (optionally) their versions and then using
 #
 #   require 'bundler/setup'
@@ -41,7 +41,6 @@ module Bundler
 
   autoload :Definition,             File.expand_path("bundler/definition", __dir__)
   autoload :Dependency,             File.expand_path("bundler/dependency", __dir__)
-  autoload :DepProxy,               File.expand_path("bundler/dep_proxy", __dir__)
   autoload :Deprecate,              File.expand_path("bundler/deprecate", __dir__)
   autoload :Digest,                 File.expand_path("bundler/digest", __dir__)
   autoload :Dsl,                    File.expand_path("bundler/dsl", __dir__)
@@ -58,7 +57,7 @@ module Bundler
   autoload :Installer,              File.expand_path("bundler/installer", __dir__)
   autoload :LazySpecification,      File.expand_path("bundler/lazy_specification", __dir__)
   autoload :LockfileParser,         File.expand_path("bundler/lockfile_parser", __dir__)
-  autoload :MatchPlatform,          File.expand_path("bundler/match_platform", __dir__)
+  autoload :MatchRemoteMetadata,    File.expand_path("bundler/match_remote_metadata", __dir__)
   autoload :ProcessLock,            File.expand_path("bundler/process_lock", __dir__)
   autoload :RemoteSpecification,    File.expand_path("bundler/remote_specification", __dir__)
   autoload :Resolver,               File.expand_path("bundler/resolver", __dir__)
@@ -76,11 +75,12 @@ module Bundler
   autoload :StubSpecification,      File.expand_path("bundler/stub_specification", __dir__)
   autoload :UI,                     File.expand_path("bundler/ui", __dir__)
   autoload :URICredentialsFilter,   File.expand_path("bundler/uri_credentials_filter", __dir__)
-  autoload :VersionRanges,          File.expand_path("bundler/version_ranges", __dir__)
+  autoload :URINormalizer,          File.expand_path("bundler/uri_normalizer", __dir__)
+  autoload :SafeMarshal,            File.expand_path("bundler/safe_marshal", __dir__)
 
   class << self
     def configure
-      @configured ||= configure_gem_home_and_path
+      @configure ||= configure_gem_home_and_path
     end
 
     def ui
@@ -97,6 +97,17 @@ module Bundler
       @bundle_path ||= Pathname.new(configured_bundle_path.path).expand_path(root)
     end
 
+    def create_bundle_path
+      SharedHelpers.filesystem_access(bundle_path.to_s) do |p|
+        mkdir_p(p)
+      end unless bundle_path.exist?
+
+      @bundle_path = bundle_path.realpath
+    rescue Errno::EEXIST
+      raise PathError, "Could not install to path `#{bundle_path}` " \
+        "because a file already exists at that path. Either remove or rename the file so the directory can be created."
+    end
+
     def configured_bundle_path
       @configured_bundle_path ||= settings.path.tap(&:validate!)
     end
@@ -199,9 +210,10 @@ module Bundler
     end
 
     def frozen_bundle?
-      frozen = settings[:deployment]
-      frozen ||= settings[:frozen]
-      frozen
+      frozen = settings[:frozen]
+      return frozen unless frozen.nil?
+
+      settings[:deployment]
     end
 
     def locked_gems
@@ -320,9 +332,9 @@ module Bundler
       FileUtils.remove_entry_secure(path) if path && File.exist?(path)
     rescue ArgumentError
       message = <<EOF
-It is a security vulnerability to allow your home directory to be world-writable, and bundler can not continue.
+It is a security vulnerability to allow your home directory to be world-writable, and bundler cannot continue.
 You should probably consider fixing this issue by running `chmod o-w ~` on *nix.
-Please refer to https://ruby-doc.org/stdlib-2.1.2/libdoc/fileutils/rdoc/FileUtils.html#method-c-remove_entry_secure for details.
+Please refer to https://ruby-doc.org/stdlib-3.1.2/libdoc/fileutils/rdoc/FileUtils.html#method-c-remove_entry_secure for details.
 EOF
       File.world_writable?(path) ? Bundler.ui.warn(message) : raise
       raise PathError, "Please fix the world-writable issue with your #{path} directory"
@@ -444,7 +456,7 @@ EOF
     end
 
     def local_platform
-      return Gem::Platform::RUBY if settings[:force_ruby_platform] || Gem.platforms == [Gem::Platform::RUBY]
+      return Gem::Platform::RUBY if settings[:force_ruby_platform]
       Gem::Platform.local
     end
 
@@ -477,41 +489,9 @@ EOF
       configured_bundle_path.use_system_gems?
     end
 
-    def requires_sudo?
-      return @requires_sudo if defined?(@requires_sudo_ran)
-
-      sudo_present = which "sudo" if settings.allow_sudo?
-
-      if sudo_present
-        # the bundle path and subdirectories need to be writable for RubyGems
-        # to be able to unpack and install gems without exploding
-        path = bundle_path
-        path = path.parent until path.exist?
-
-        # bins are written to a different location on OS X
-        bin_dir = Pathname.new(Bundler.system_bindir)
-        bin_dir = bin_dir.parent until bin_dir.exist?
-
-        # if any directory is not writable, we need sudo
-        files = [path, bin_dir] | Dir[bundle_path.join("build_info/*").to_s] | Dir[bundle_path.join("*").to_s]
-        unwritable_files = files.reject {|f| File.writable?(f) }
-        sudo_needed = !unwritable_files.empty?
-        if sudo_needed
-          Bundler.ui.warn "Following files may not be writable, so sudo is needed:\n  #{unwritable_files.map(&:to_s).sort.join("\n  ")}"
-        end
-      end
-
-      @requires_sudo_ran = true
-      @requires_sudo = settings.allow_sudo? && sudo_present && sudo_needed
-    end
-
     def mkdir_p(path, options = {})
-      if requires_sudo? && !options[:no_sudo]
-        sudo "mkdir -p '#{path}'" unless File.exist?(path)
-      else
-        SharedHelpers.filesystem_access(path, :write) do |p|
-          FileUtils.mkdir_p(p)
-        end
+      SharedHelpers.filesystem_access(path, :write) do |p|
+        FileUtils.mkdir_p(p)
       end
     end
 
@@ -519,7 +499,7 @@ EOF
       if File.file?(executable) && File.executable?(executable)
         executable
       elsif paths = ENV["PATH"]
-        quote = '"'.freeze
+        quote = '"'
         paths.split(File::PATH_SEPARATOR).find do |path|
           path = path[1..-2] if path.start_with?(quote) && path.end_with?(quote)
           executable_path = File.expand_path(executable, path)
@@ -528,41 +508,14 @@ EOF
       end
     end
 
-    def sudo(str)
-      SUDO_MUTEX.synchronize do
-        prompt = "\n\n" + <<-PROMPT.gsub(/^ {6}/, "").strip + " "
-        Your user account isn't allowed to install to the system RubyGems.
-        You can cancel this installation and run:
-
-            bundle config set --local path 'vendor/bundle'
-            bundle install
-
-        to install the gems into ./vendor/bundle/, or you can enter your password
-        and install the bundled gems to RubyGems using sudo.
-
-        Password:
-        PROMPT
-
-        unless @prompted_for_sudo ||= system(%(sudo -k -p "#{prompt}" true))
-          raise SudoNotPermittedError,
-            "Bundler requires sudo access to install at the moment. " \
-            "Try installing again, granting Bundler sudo access when prompted, or installing into a different path."
-        end
-
-        `sudo -p "#{prompt}" #{str}`
-      end
-    end
-
     def read_file(file)
       SharedHelpers.filesystem_access(file, :read) do
         File.open(file, "r:UTF-8", &:read)
       end
     end
 
-    def load_marshal(data)
-      Marshal.load(data)
-    rescue TypeError => e
-      raise MarshalError, "#{e.class}: #{e.message}"
+    def safe_load_marshal(data)
+      load_marshal(data, :marshal_proc => SafeMarshal.proc)
     end
 
     def load_gemspec(file, validate = false)
@@ -598,7 +551,7 @@ EOF
 
     def git_present?
       return @git_present if defined?(@git_present)
-      @git_present = Bundler.which("git") || Bundler.which("git.exe")
+      @git_present = Bundler.which("git#{RbConfig::CONFIG["EXEEXT"]}")
     end
 
     def feature_flag
@@ -620,7 +573,7 @@ EOF
       @bin_path = nil
       @bundler_major_version = nil
       @bundle_path = nil
-      @configured = nil
+      @configure = nil
       @configured_bundle_path = nil
       @definition = nil
       @load = nil
@@ -653,6 +606,12 @@ EOF
 
     private
 
+    def load_marshal(data, marshal_proc: nil)
+      Marshal.load(data, marshal_proc)
+    rescue TypeError => e
+      raise MarshalError, "#{e.class}: #{e.message}"
+    end
+
     def eval_yaml_gemspec(path, contents)
       Kernel.require "psych"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.3.12
+  version: 2.4.17
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -80,7 +80,6 @@ files:
 - lib/bundler/constants.rb
 - lib/bundler/current_ruby.rb
 - lib/bundler/definition.rb
-- lib/bundler/dep_proxy.rb
 - lib/bundler/dependency.rb
 - lib/bundler/deployment.rb
 - lib/bundler/deprecate.rb
@@ -97,6 +96,7 @@ files:
 - lib/bundler/fetcher/dependency.rb
 - lib/bundler/fetcher/downloader.rb
 - lib/bundler/fetcher/index.rb
+- lib/bundler/force_platform.rb
 - lib/bundler/friendly_errors.rb
 - lib/bundler/gem_helper.rb
 - lib/bundler/gem_helpers.rb
@@ -126,12 +126,16 @@ files:
 - lib/bundler/man/bundle-clean.1.ronn
 - lib/bundler/man/bundle-config.1
 - lib/bundler/man/bundle-config.1.ronn
+- lib/bundler/man/bundle-console.1
+- lib/bundler/man/bundle-console.1.ronn
 - lib/bundler/man/bundle-doctor.1
 - lib/bundler/man/bundle-doctor.1.ronn
 - lib/bundler/man/bundle-exec.1
 - lib/bundler/man/bundle-exec.1.ronn
 - lib/bundler/man/bundle-gem.1
 - lib/bundler/man/bundle-gem.1.ronn
+- lib/bundler/man/bundle-help.1
+- lib/bundler/man/bundle-help.1.ronn
 - lib/bundler/man/bundle-info.1
 - lib/bundler/man/bundle-info.1.ronn
 - lib/bundler/man/bundle-init.1
@@ -150,6 +154,8 @@ files:
 - lib/bundler/man/bundle-outdated.1.ronn
 - lib/bundler/man/bundle-platform.1
 - lib/bundler/man/bundle-platform.1.ronn
+- lib/bundler/man/bundle-plugin.1
+- lib/bundler/man/bundle-plugin.1.ronn
 - lib/bundler/man/bundle-pristine.1
 - lib/bundler/man/bundle-pristine.1.ronn
 - lib/bundler/man/bundle-remove.1
@@ -158,6 +164,8 @@ files:
 - lib/bundler/man/bundle-show.1.ronn
 - lib/bundler/man/bundle-update.1
 - lib/bundler/man/bundle-update.1.ronn
+- lib/bundler/man/bundle-version.1
+- lib/bundler/man/bundle-version.1.ronn
 - lib/bundler/man/bundle-viz.1
 - lib/bundler/man/bundle-viz.1.ronn
 - lib/bundler/man/bundle.1
@@ -165,7 +173,9 @@ files:
 - lib/bundler/man/gemfile.5
 - lib/bundler/man/gemfile.5.ronn
 - lib/bundler/man/index.txt
+- lib/bundler/match_metadata.rb
 - lib/bundler/match_platform.rb
+- lib/bundler/match_remote_metadata.rb
 - lib/bundler/mirror.rb
 - lib/bundler/plugin.rb
 - lib/bundler/plugin/api.rb
@@ -180,6 +190,11 @@ files:
 - lib/bundler/process_lock.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
+- lib/bundler/resolver/base.rb
+- lib/bundler/resolver/candidate.rb
+- lib/bundler/resolver/incompatibility.rb
+- lib/bundler/resolver/package.rb
+- lib/bundler/resolver/root.rb
 - lib/bundler/resolver/spec_group.rb
 - lib/bundler/retry.rb
 - lib/bundler/ruby_dsl.rb
@@ -188,6 +203,7 @@ files:
 - lib/bundler/rubygems_gem_installer.rb
 - lib/bundler/rubygems_integration.rb
 - lib/bundler/runtime.rb
+- lib/bundler/safe_marshal.rb
 - lib/bundler/self_manager.rb
 - lib/bundler/settings.rb
 - lib/bundler/settings/validator.rb
@@ -213,9 +229,9 @@ files:
 - lib/bundler/templates/Executable.bundler
 - lib/bundler/templates/Executable.standalone
 - lib/bundler/templates/Gemfile
-- lib/bundler/templates/gems.rb
 - lib/bundler/templates/newgem/CHANGELOG.md.tt
 - lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
+- lib/bundler/templates/newgem/Cargo.toml.tt
 - lib/bundler/templates/newgem/Gemfile.tt
 - lib/bundler/templates/newgem/LICENSE.txt.tt
 - lib/bundler/templates/newgem/README.md.tt
@@ -224,9 +240,12 @@ files:
 - lib/bundler/templates/newgem/bin/setup.tt
 - lib/bundler/templates/newgem/circleci/config.yml.tt
 - lib/bundler/templates/newgem/exe/newgem.tt
-- lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
+- lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt
+- lib/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt
+- lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt
 - lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
 - lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
+- lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt
 - lib/bundler/templates/newgem/github/workflows/main.yml.tt
 - lib/bundler/templates/newgem/gitignore.tt
 - lib/bundler/templates/newgem/gitlab-ci.yml.tt
@@ -243,12 +262,12 @@ files:
 - lib/bundler/templates/newgem/test/minitest/test_newgem.rb.tt
 - lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt
 - lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt
-- lib/bundler/templates/newgem/travis.yml.tt
 - lib/bundler/ui.rb
 - lib/bundler/ui/rg_proxy.rb
 - lib/bundler/ui/shell.rb
 - lib/bundler/ui/silent.rb
 - lib/bundler/uri_credentials_filter.rb
+- lib/bundler/uri_normalizer.rb
 - lib/bundler/vendor/.document
 - lib/bundler/vendor/connection_pool/LICENSE
 - lib/bundler/vendor/connection_pool/lib/connection_pool.rb
@@ -257,32 +276,28 @@ files:
 - lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb
 - lib/bundler/vendor/fileutils/LICENSE.txt
 - lib/bundler/vendor/fileutils/lib/fileutils.rb
-- lib/bundler/vendor/molinillo/LICENSE
-- lib/bundler/vendor/molinillo/lib/molinillo.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
-- lib/bundler/vendor/molinillo/lib/molinillo/state.rb
 - lib/bundler/vendor/net-http-persistent/README.rdoc
 - lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
 - lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
 - lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
 - lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
+- lib/bundler/vendor/pub_grub/LICENSE.txt
+- lib/bundler/vendor/pub_grub/lib/pub_grub.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
+- lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb
 - lib/bundler/vendor/thor/LICENSE.md
 - lib/bundler/vendor/thor/lib/thor.rb
 - lib/bundler/vendor/thor/lib/thor/actions.rb
@@ -315,7 +330,6 @@ files:
 - lib/bundler/vendor/thor/lib/thor/shell/html.rb
 - lib/bundler/vendor/thor/lib/thor/util.rb
 - lib/bundler/vendor/thor/lib/thor/version.rb
-- lib/bundler/vendor/tmpdir/lib/tmpdir.rb
 - lib/bundler/vendor/tsort/LICENSE.txt
 - lib/bundler/vendor/tsort/lib/tsort.rb
 - lib/bundler/vendor/uri/LICENSE.txt
@@ -335,14 +349,12 @@ files:
 - lib/bundler/vendor/uri/lib/uri/ws.rb
 - lib/bundler/vendor/uri/lib/uri/wss.rb
 - lib/bundler/vendored_fileutils.rb
-- lib/bundler/vendored_molinillo.rb
 - lib/bundler/vendored_persistent.rb
+- lib/bundler/vendored_pub_grub.rb
 - lib/bundler/vendored_thor.rb
-- lib/bundler/vendored_tmpdir.rb
 - lib/bundler/vendored_tsort.rb
 - lib/bundler/vendored_uri.rb
 - lib/bundler/version.rb
-- lib/bundler/version_ranges.rb
 - lib/bundler/vlad.rb
 - lib/bundler/worker.rb
 - lib/bundler/yaml_serializer.rb
@@ -353,7 +365,7 @@ metadata:
   bug_tracker_uri: https://github.com/rubygems/rubygems/issues?q=is%3Aopen+is%3Aissue+label%3ABundler
   changelog_uri: https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md
   homepage_uri: https://bundler.io/
-  source_code_uri: https://github.com/rubygems/rubygems/
+  source_code_uri: https://github.com/rubygems/rubygems/tree/master/bundler
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -362,14 +374,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.2
+      version: 3.0.1
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: The best way to manage your application's dependencies

data/lib/bundler/dep_proxy.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class DepProxy
-    attr_reader :__platform, :dep
-
-    @proxies = {}
-
-    def self.get_proxy(dep, platform)
-      @proxies[[dep, platform]] ||= new(dep, platform).freeze
-    end
-
-    def initialize(dep, platform)
-      @dep = dep
-      @__platform = platform
-    end
-
-    private_class_method :new
-
-    alias_method :eql?, :==
-
-    def type
-      @dep.type
-    end
-
-    def name
-      @dep.name
-    end
-
-    def requirement
-      @dep.requirement
-    end
-
-    def to_s
-      s = name.dup
-      s << " (#{requirement})" unless requirement == Gem::Requirement.default
-      s << " #{__platform}" unless __platform == Gem::Platform::RUBY
-      s
-    end
-
-    def dup
-      raise NoMethodError.new("DepProxy cannot be duplicated")
-    end
-
-    def clone
-      raise NoMethodError.new("DepProxy cannot be cloned")
-    end
-
-    private
-
-    def method_missing(*args, &blk)
-      @dep.send(*args, &blk)
-    end
-  end
-end

data/lib/bundler/templates/gems.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# gem "rails"

data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require "mkmf"
-
-create_makefile(<%= config[:makefile_path].inspect %>)

data/lib/bundler/templates/newgem/travis.yml.tt

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - <%= RUBY_VERSION %>
-before_install: gem install bundler -v <%= Bundler::VERSION %>

data/lib/bundler/vendor/molinillo/LICENSE

@@ -1,9 +0,0 @@
-This project is licensed under the MIT license.
-
-Copyright (c) 2014 Samuel E. Giddins segiddins@segiddins.me
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.