bundler 2.2.26 → 2.3.4

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

@@ -7,7 +7,6 @@
 # License::
 #   Bundler::URI::LDAP is copyrighted free software by Takaaki Tateishi and Akira Yamada.
 #   You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 # See Bundler::URI for general documentation
 #
@@ -119,6 +118,7 @@ module Bundler::URI
 
     # Private method to cleanup +dn+ from using the +path+ component attribute.
     def parse_dn
+      raise InvalidURIError, 'bad LDAP URL' unless @path
       @dn = @path[1..-1]
     end
     private :parse_dn

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

@@ -3,7 +3,6 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 # See Bundler::URI for general documentation
 #

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

@@ -3,7 +3,6 @@
 # = uri/common.rb
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
-# Revision:: $Id$
 # License::
 #   You can redistribute it and/or modify it under the same term as Ruby.
 #
@@ -208,21 +207,9 @@ module Bundler::URI
     #   #=> #<Bundler::URI::LDAP ldap://ldap.example.com/dc=example?user=john>
     #
     def parse(uri)
-      scheme, userinfo, host, port,
-        registry, path, opaque, query, fragment = self.split(uri)
-
-      if scheme && Bundler::URI.scheme_list.include?(scheme.upcase)
-        Bundler::URI.scheme_list[scheme.upcase].new(scheme, userinfo, host, port,
-                                           registry, path, opaque, query,
-                                           fragment, self)
-      else
-        Generic.new(scheme, userinfo, host, port,
-                    registry, path, opaque, query,
-                    fragment, self)
-      end
+      Bundler::URI.for(*self.split(uri), self)
     end
 
-
     #
     # == Args
     #

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

@@ -69,18 +69,7 @@ module Bundler::URI
     end
 
     def parse(uri) # :nodoc:
-      scheme, userinfo, host, port,
-        registry, path, opaque, query, fragment = self.split(uri)
-      scheme_list = Bundler::URI.scheme_list
-      if scheme && scheme_list.include?(uc = scheme.upcase)
-        scheme_list[uc].new(scheme, userinfo, host, port,
-                            registry, path, opaque, query,
-                            fragment, self)
-      else
-        Generic.new(scheme, userinfo, host, port,
-                    registry, path, opaque, query,
-                    fragment, self)
-      end
+      Bundler::URI.for(*self.split(uri), self)
     end
 
 

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

@@ -1,6 +1,6 @@
 module Bundler::URI
   # :stopdoc:
-  VERSION_CODE = '001000'.freeze
+  VERSION_CODE = '001001'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
   # :startdoc:
 end

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

@@ -0,0 +1,84 @@
+# frozen_string_literal: false
+# = uri/ws.rb
+#
+# Author:: Matt Muller <mamuller@amazon.com>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Bundler::URI
+
+  #
+  # The syntax of WS URIs is defined in RFC6455 section 3.
+  #
+  # Note that the Ruby Bundler::URI library allows WS URLs containing usernames and
+  # passwords. This is not legal as per the RFC, but used to be
+  # supported in Internet Explorer 5 and 6, before the MS04-004 security
+  # update. See <URL:http://support.microsoft.com/kb/834489>.
+  #
+  class WS < Generic
+    # A Default port of 80 for Bundler::URI::WS.
+    DEFAULT_PORT = 80
+
+    # An Array of the available components for Bundler::URI::WS.
+    COMPONENT = %i[
+      scheme
+      userinfo host port
+      path
+      query
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::WS object from components, with syntax checking.
+    #
+    # The components accepted are userinfo, host, port, path, and query.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[userinfo, host, port, path, query]</code>.
+    #
+    # Example:
+    #
+    #     uri = Bundler::URI::WS.build(host: 'www.example.com', path: '/foo/bar')
+    #
+    #     uri = Bundler::URI::WS.build([nil, "www.example.com", nil, "/path", "query"])
+    #
+    # Currently, if passed userinfo components this method generates
+    # invalid WS URIs as per RFC 1738.
+    #
+    def self.build(args)
+      tmp = Util.make_components_hash(self, args)
+      super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Returns the full path for a WS Bundler::URI, as required by Net::HTTP::Get.
+    #
+    # If the Bundler::URI contains a query, the full path is Bundler::URI#path + '?' + Bundler::URI#query.
+    # Otherwise, the path is simply Bundler::URI#path.
+    #
+    # Example:
+    #
+    #     uri = Bundler::URI::WS.build(path: '/foo/bar', query: 'test=true')
+    #     uri.request_uri #  => "/foo/bar?test=true"
+    #
+    def request_uri
+      return unless @path
+
+      url = @query ? "#@path?#@query" : @path.dup
+      url.start_with?(?/.freeze) ? url : ?/ + url
+    end
+  end
+
+  @@schemes['WS'] = WS
+
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: false
+# = uri/wss.rb
+#
+# Author:: Matt Muller <mamuller@amazon.com>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'ws'
+
+module Bundler::URI
+
+  # The default port for WSS URIs is 443, and the scheme is 'wss:' rather
+  # than 'ws:'. Other than that, WSS URIs are identical to WS URIs;
+  # see Bundler::URI::WS.
+  class WSS < WS
+    # A Default port of 443 for Bundler::URI::WSS
+    DEFAULT_PORT = 443
+  end
+  @@schemes['WSS'] = WSS
+end

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

@@ -86,7 +86,6 @@
 # License::
 #  Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
 #  You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id$
 #
 
 module Bundler::URI

data/lib/bundler/vendored_tsort.rb

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

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.26".freeze
+  VERSION = "2.3.4".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

data/lib/bundler/worker.rb

@@ -21,8 +21,8 @@ module Bundler
     # @param func [Proc] job to run in inside the worker pool
     def initialize(size, name, func)
       @name = name
-      @request_queue = Queue.new
-      @response_queue = Queue.new
+      @request_queue = Thread::Queue.new
+      @response_queue = Thread::Queue.new
       @func = func
       @size = size
       @threads = nil

data/lib/bundler.rb

@@ -37,12 +37,13 @@ module Bundler
   environment_preserver = EnvironmentPreserver.from_env
   ORIGINAL_ENV = environment_preserver.restore
   environment_preserver.replace_with_backup
-  SUDO_MUTEX = Mutex.new
+  SUDO_MUTEX = Thread::Mutex.new
 
   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__)
   autoload :EndpointSpecification,  File.expand_path("bundler/endpoint_specification", __dir__)
   autoload :Env,                    File.expand_path("bundler/env", __dir__)
@@ -65,6 +66,7 @@ module Bundler
   autoload :RubyDsl,                File.expand_path("bundler/ruby_dsl", __dir__)
   autoload :RubyVersion,            File.expand_path("bundler/ruby_version", __dir__)
   autoload :Runtime,                File.expand_path("bundler/runtime", __dir__)
+  autoload :SelfManager,            File.expand_path("bundler/self_manager", __dir__)
   autoload :Settings,               File.expand_path("bundler/settings", __dir__)
   autoload :SharedHelpers,          File.expand_path("bundler/shared_helpers", __dir__)
   autoload :Source,                 File.expand_path("bundler/source", __dir__)
@@ -636,15 +638,26 @@ EOF
       @rubygems = nil
     end
 
+    def configure_gem_home_and_path(path = bundle_path)
+      configure_gem_path
+      configure_gem_home(path)
+      Bundler.rubygems.clear_paths
+    end
+
+    def self_manager
+      @self_manager ||= begin
+                          require_relative "bundler/self_manager"
+                          Bundler::SelfManager.new
+                        end
+    end
+
     private
 
     def eval_yaml_gemspec(path, contents)
       require_relative "bundler/psyched_yaml"
 
-      # If the YAML is invalid, Syck raises an ArgumentError, and Psych
-      # raises a Psych::SyntaxError. See psyched_yaml.rb for more info.
       Gem::Specification.from_yaml(contents)
-    rescue YamlLibrarySyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
+    rescue ::Psych::SyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
       eval_gemspec(path, contents)
     end
 
@@ -656,29 +669,17 @@ EOF
       raise GemspecError, Dsl::DSLError.new(msg, path, e.backtrace, contents)
     end
 
-    def configure_gem_home_and_path
-      configure_gem_path
-      configure_gem_home
-      bundle_path
-    end
-
-    def configure_gem_path(env = ENV)
-      blank_home = env["GEM_HOME"].nil? || env["GEM_HOME"].empty?
-      if !use_system_gems?
+    def configure_gem_path
+      unless use_system_gems?
         # this needs to be empty string to cause
         # PathSupport.split_gem_path to only load up the
         # Bundler --path setting as the GEM_PATH.
-        env["GEM_PATH"] = ""
-      elsif blank_home
-        possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
-        paths = possibles.flatten.compact.uniq.reject(&:empty?)
-        env["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
+        Bundler::SharedHelpers.set_env "GEM_PATH", ""
       end
     end
 
-    def configure_gem_home
-      Bundler::SharedHelpers.set_env "GEM_HOME", File.expand_path(bundle_path, root)
-      Bundler.rubygems.clear_paths
+    def configure_gem_home(path)
+      Bundler::SharedHelpers.set_env "GEM_HOME", path.to_s
     end
 
     def tmp_home_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.2.26
+  version: 2.3.4
 platform: ruby
 authors:
 - André Arko
@@ -19,10 +19,10 @@ authors:
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -41,6 +41,7 @@ files:
 - exe/bundle
 - exe/bundler
 - lib/bundler.rb
+- lib/bundler/.document
 - lib/bundler/build_metadata.rb
 - lib/bundler/capistrano.rb
 - lib/bundler/cli.rb
@@ -83,6 +84,7 @@ files:
 - lib/bundler/dependency.rb
 - lib/bundler/deployment.rb
 - lib/bundler/deprecate.rb
+- lib/bundler/digest.rb
 - lib/bundler/dsl.rb
 - lib/bundler/endpoint_specification.rb
 - lib/bundler/env.rb
@@ -100,7 +102,6 @@ files:
 - lib/bundler/gem_helpers.rb
 - lib/bundler/gem_tasks.rb
 - lib/bundler/gem_version_promoter.rb
-- lib/bundler/gemdeps.rb
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
 - lib/bundler/injector.rb
@@ -188,6 +189,7 @@ files:
 - lib/bundler/rubygems_gem_installer.rb
 - lib/bundler/rubygems_integration.rb
 - lib/bundler/runtime.rb
+- lib/bundler/self_manager.rb
 - lib/bundler/settings.rb
 - lib/bundler/settings/validator.rb
 - lib/bundler/setup.rb
@@ -234,10 +236,12 @@ files:
 - lib/bundler/templates/newgem/newgem.gemspec.tt
 - lib/bundler/templates/newgem/rspec.tt
 - lib/bundler/templates/newgem/rubocop.yml.tt
+- lib/bundler/templates/newgem/sig/newgem.rbs.tt
 - lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
 - lib/bundler/templates/newgem/spec/spec_helper.rb.tt
-- lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt
+- lib/bundler/templates/newgem/standard.yml.tt
 - lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt
+- 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
@@ -246,11 +250,15 @@ files:
 - lib/bundler/ui/shell.rb
 - lib/bundler/ui/silent.rb
 - lib/bundler/uri_credentials_filter.rb
+- lib/bundler/vendor/.document
+- lib/bundler/vendor/connection_pool/LICENSE
 - lib/bundler/vendor/connection_pool/lib/connection_pool.rb
-- lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb
 - lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
 - lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
+- 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
@@ -271,10 +279,12 @@ files:
 - 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/thor/LICENSE.md
 - lib/bundler/vendor/thor/lib/thor.rb
 - lib/bundler/vendor/thor/lib/thor/actions.rb
 - lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
@@ -307,6 +317,9 @@ files:
 - 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
 - lib/bundler/vendor/uri/lib/uri.rb
 - lib/bundler/vendor/uri/lib/uri/common.rb
 - lib/bundler/vendor/uri/lib/uri/file.rb
@@ -320,11 +333,14 @@ files:
 - lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
 - lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
 - lib/bundler/vendor/uri/lib/uri/version.rb
+- 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_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
@@ -339,7 +355,7 @@ metadata:
   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/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -354,8 +370,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.2.26
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []

data/lib/bundler/gemdeps.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class Gemdeps
-    def initialize(runtime)
-      @runtime = runtime
-    end
-
-    def requested_specs
-      @runtime.requested_specs
-    end
-
-    def specs
-      @runtime.specs
-    end
-
-    def dependencies
-      @runtime.dependencies
-    end
-
-    def current_dependencies
-      @runtime.current_dependencies
-    end
-
-    def requires
-      @runtime.requires
-    end
-  end
-end

data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb

@@ -1,66 +0,0 @@
-# Global monotonic clock from Concurrent Ruby 1.0.
-# Copyright (c) Jerry D'Antonio -- released under the MIT license.
-# Slightly modified; used with permission.
-# https://github.com/ruby-concurrency/concurrent-ruby
-
-require 'thread'
-
-class Bundler::ConnectionPool
-
-  class_definition = Class.new do
-
-    if defined?(Process::CLOCK_MONOTONIC)
-
-      # @!visibility private
-      def get_time
-        Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      end
-
-    elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-
-      # @!visibility private
-      def get_time
-        java.lang.System.nanoTime() / 1_000_000_000.0
-      end
-
-    else
-
-      # @!visibility private
-      def initialize
-        @mutex = Mutex.new
-        @last_time = Time.now.to_f
-      end
-
-      # @!visibility private
-      def get_time
-        @mutex.synchronize do
-          now = Time.now.to_f
-          if @last_time < now
-            @last_time = now
-          else # clock has moved back in time
-            @last_time += 0.000_001
-          end
-        end
-      end
-    end
-  end
-
-  ##
-  # Clock that cannot be set and represents monotonic time since
-  # some unspecified starting point.
-  #
-  # @!visibility private
-  GLOBAL_MONOTONIC_CLOCK = class_definition.new
-  private_constant :GLOBAL_MONOTONIC_CLOCK
-
-  class << self
-    ##
-    # Returns the current time a tracked by the application monotonic clock.
-    #
-    # @return [Float] The current monotonic time when `since` not given else
-    #   the elapsed monotonic time between `since` and the current time
-    def monotonic_time
-      GLOBAL_MONOTONIC_CLOCK.get_time
-    end
-  end
-end