bundler 2.2.29 → 2.5.16

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

@@ -0,0 +1,23 @@
+# 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
+
+  register_scheme 'WSS', WSS
+end

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)
@@ -86,7 +85,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
@@ -102,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_net_http.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# This defined? guard can be removed once RubyGems 3.4 support is dropped.
+#
+# Bundler specs load this code from `spec/support/vendored_net_http.rb` to avoid
+# activating the Bundler gem too early. Without this guard, we get redefinition
+# warnings once Bundler is actually activated and
+# `lib/bundler/vendored_net_http.rb` is required. This is not an issue in
+# RubyGems versions including `rubygems/vendored_net_http` since `require` takes
+# care of avoiding the double load.
+#
+unless defined?(Gem::Net)
+  begin
+    require "rubygems/vendored_net_http"
+  rescue LoadError
+    begin
+      require "rubygems/net/http"
+    rescue LoadError
+      require "net/http"
+      Gem::Net = Net
+    end
+  end
+end

data/lib/bundler/vendored_persistent.rb

@@ -9,39 +9,3 @@ module Bundler
   end
 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
-end

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

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

data/lib/bundler/vendored_timeout.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+begin
+  require "rubygems/vendored_timeout"
+rescue LoadError
+  begin
+    require "rubygems/timeout"
+  rescue LoadError
+    require "timeout"
+    Gem::Timeout = Timeout
+  end
+end

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

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

data/lib/bundler/vendored_uri.rb

@@ -1,4 +1,21 @@
 # frozen_string_literal: true
 
 module Bundler; end
-require_relative "vendor/uri/lib/uri"
+
+# Use RubyGems vendored copy when available. Otherwise fallback to Bundler
+# vendored copy. The vendored copy in Bundler can be removed once support for
+# RubyGems 3.5 is dropped.
+
+begin
+  require "rubygems/vendor/uri/lib/uri"
+rescue LoadError
+  require_relative "vendor/uri/lib/uri"
+  Gem::URI = Bundler::URI
+
+  module Gem
+    def URI(uri) # rubocop:disable Naming/MethodName
+      Bundler::URI(uri)
+    end
+    module_function :URI
+  end
+end

data/lib/bundler/version.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.2.29".freeze
+  VERSION = "2.5.16".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/vlad.rb

@@ -13,5 +13,5 @@ require_relative "deployment"
 include Rake::DSL if defined? Rake::DSL
 
 namespace :vlad do
-  Bundler::Deployment.define_task(Rake::RemoteTask, :remote_task, :roles => :app)
+  Bundler::Deployment.define_task(Rake::RemoteTask, :remote_task, roles: :app)
 end

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
@@ -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/yaml_serializer.rb

@@ -17,7 +17,11 @@ module Bundler
         if v.is_a?(Hash)
           yaml << dump_hash(v).gsub(/^(?!$)/, "  ") # indent all non-empty lines
         elsif v.is_a?(Array) # Expected to be array of strings
-          yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+          if v.empty?
+            yaml << " []\n"
+          else
+            yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+          end
         else
           yaml << " " << v.to_s.gsub(/\s+/, " ").inspect << "\n"
         end
@@ -32,7 +36,7 @@ module Bundler
       (.*) # value
       \1 # matching closing quote
       $
-    /xo.freeze
+    /xo
 
     HASH_REGEX = /
       ^
@@ -44,18 +48,19 @@ module Bundler
       (.*) # value
       \3 # matching closing quote
       $
-    /xo.freeze
+    /xo
 
     def load(str)
       res = {}
       stack = [res]
       last_hash = nil
       last_empty_key = nil
-      str.split(/\r?\n/).each do |line|
+      str.split(/\r?\n/) do |line|
         if match = HASH_REGEX.match(line)
           indent, key, quote, val = match.captures
-          key = convert_to_backward_compatible_key(key)
-          depth = indent.scan(/  /).length
+          val = strip_comment(val)
+
+          depth = indent.size / 2
           if quote.empty? && val.empty?
             new_hash = {}
             stack[depth][key] = new_hash
@@ -63,10 +68,13 @@ module Bundler
             last_empty_key = key
             last_hash = stack[depth]
           else
+            val = [] if val == "[]" # empty array
             stack[depth][key] = val
           end
         elsif match = ARRAY_REGEX.match(line)
           _, val = match.captures
+          val = strip_comment(val)
+
           last_hash[last_empty_key] = [] unless last_hash[last_empty_key].is_a?(Array)
 
           last_hash[last_empty_key].push(val)
@@ -75,15 +83,16 @@ module Bundler
       res
     end
 
-    # for settings' keys
-    def convert_to_backward_compatible_key(key)
-      key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z}
-      key = key.gsub(".", "__") if key.include?(".")
-      key
+    def strip_comment(val)
+      if val.include?("#") && !val.start_with?("#")
+        val.split("#", 2).first.strip
+      else
+        val
+      end
     end
 
     class << self
-      private :dump_hash, :convert_to_backward_compatible_key
+      private :dump_hash
     end
   end
 end