bundler 1.13.6 → 1.17.3

data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph'
 
 module Bundler::Molinillo

data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler::Molinillo
   # A state that a {Resolution} can be in
   # @attr [String] name the name of the current requirement
@@ -7,7 +8,8 @@ module Bundler::Molinillo
   # @attr [Object] requirement the current requirement
   # @attr [Object] possibilities the possibilities to satisfy the current requirement
   # @attr [Integer] depth the depth of the resolution
-  # @attr [Set<Object>] conflicts unresolved conflicts
+  # @attr [Hash] conflicts unresolved conflicts, indexed by dependency name
+  # @attr [Array<UnwindDetails>] unused_unwind_options unwinds for previous conflicts that weren't explored
   ResolutionState = Struct.new(
     :name,
     :requirements,
@@ -15,14 +17,15 @@ module Bundler::Molinillo
     :requirement,
     :possibilities,
     :depth,
-    :conflicts
+    :conflicts,
+    :unused_unwind_options
   )
 
   class ResolutionState
     # Returns an empty resolution state
     # @return [ResolutionState] an empty state
     def self.empty
-      new(nil, [], DependencyGraph.new, nil, nil, 0, Set.new)
+      new(nil, [], DependencyGraph.new, nil, nil, 0, {}, [])
     end
   end
 
@@ -40,7 +43,8 @@ module Bundler::Molinillo
         requirement,
         [possibilities.pop],
         depth + 1,
-        conflicts.dup
+        conflicts.dup,
+        unused_unwind_options.dup
       ).tap do |state|
         state.activated.tag(state)
       end

data/lib/bundler/vendor/{net → net-http-persistent/lib/net}/http/faster.rb

@@ -24,3 +24,4 @@ class Net::BufferedIO #:nodoc:
     end
   end
 end if RUBY_VERSION < '1.9'
+

data/lib/bundler/vendor/{net → net-http-persistent/lib/net}/http/persistent.rb

@@ -4,7 +4,7 @@ begin
 rescue LoadError
   # net/https or openssl
 end if RUBY_VERSION < '1.9' # but only for 1.8
-require 'net/http/faster'
+require 'bundler/vendor/net-http-persistent/lib/net/http/faster'
 require 'uri'
 require 'cgi' # for escaping
 
@@ -18,27 +18,27 @@ autoload :OpenSSL, 'openssl'
 ##
 # Persistent connections for Net::HTTP
 #
-# Net::HTTP::Persistent maintains persistent connections across all the
+# Bundler::Persistent::Net::HTTP::Persistent maintains persistent connections across all the
 # servers you wish to talk to.  For each host:port you communicate with a
 # single persistent connection is created.
 #
-# Multiple Net::HTTP::Persistent objects will share the same set of
+# Multiple Bundler::Persistent::Net::HTTP::Persistent objects will share the same set of
 # connections.
 #
 # For each thread you start a new connection will be created.  A
-# Net::HTTP::Persistent connection will not be shared across threads.
+# Bundler::Persistent::Net::HTTP::Persistent connection will not be shared across threads.
 #
 # You can shut down the HTTP connections when done by calling #shutdown.  You
-# should name your Net::HTTP::Persistent object if you intend to call this
+# should name your Bundler::Persistent::Net::HTTP::Persistent object if you intend to call this
 # method.
 #
 # Example:
 #
-#   require 'net/http/persistent'
+#   require 'bundler/vendor/net-http-persistent/lib/net/http/persistent'
 #
 #   uri = URI 'http://example.com/awesome/web/service'
 #
-#   http = Net::HTTP::Persistent.new 'my_app_name'
+#   http = Bundler::Persistent::Net::HTTP::Persistent.new 'my_app_name'
 #
 #   # perform a GET
 #   response = http.request uri
@@ -149,19 +149,19 @@ autoload :OpenSSL, 'openssl'
 #
 # The recommended way to handle non-idempotent requests is the following:
 #
-#   require 'net/http/persistent'
+#   require 'bundler/vendor/net-http-persistent/lib/net/http/persistent'
 #
 #   uri = URI 'http://example.com/awesome/web/service'
 #   post_uri = uri + 'create'
 #
-#   http = Net::HTTP::Persistent.new 'my_app_name'
+#   http = Bundler::Persistent::Net::HTTP::Persistent.new 'my_app_name'
 #
 #   post = Net::HTTP::Post.new post_uri.path
 #   # ... fill in POST request
 #
 #   begin
 #     response = http.request post_uri, post
-#   rescue Net::HTTP::Persistent::Error
+#   rescue Bundler::Persistent::Net::HTTP::Persistent::Error
 #
 #     # POST failed, make a new request to verify the server did not process
 #     # the request
@@ -178,7 +178,7 @@ autoload :OpenSSL, 'openssl'
 #
 # === Connection Termination
 #
-# If you are done using the Net::HTTP::Persistent instance you may shut down
+# If you are done using the Bundler::Persistent::Net::HTTP::Persistent instance you may shut down
 # all the connections in the current thread with #shutdown.  This is not
 # recommended for normal use, it should only be used when it will be several
 # minutes before you make another HTTP request.
@@ -188,7 +188,7 @@ autoload :OpenSSL, 'openssl'
 # Ruby will automatically garbage collect and shutdown your HTTP connections
 # when the thread terminates.
 
-class Net::HTTP::Persistent
+class Bundler::Persistent::Net::HTTP::Persistent
 
   ##
   # The beginning of Time
@@ -201,9 +201,9 @@ class Net::HTTP::Persistent
   HAVE_OPENSSL = defined? OpenSSL::SSL # :nodoc:
 
   ##
-  # The version of Net::HTTP::Persistent you are using
+  # The version of Bundler::Persistent::Net::HTTP::Persistent you are using
 
-  VERSION = '2.9.3'
+  VERSION = '2.9.4'
 
   ##
   # Exceptions rescued for automatic retry on ruby 2.0.0.  This overlaps with
@@ -221,7 +221,7 @@ class Net::HTTP::Persistent
   ].compact
 
   ##
-  # Error class for errors raised by Net::HTTP::Persistent.  Various
+  # Error class for errors raised by Bundler::Persistent::Net::HTTP::Persistent.  Various
   # SystemCallErrors are re-raised with a human-readable message under this
   # class.
 
@@ -241,7 +241,7 @@ class Net::HTTP::Persistent
   # NOTE:  This may not work on ruby > 1.9.
 
   def self.detect_idle_timeout uri, max = 10
-    uri = URI uri unless uri.is_a?(URI::Generic)
+    uri = URI uri unless URI::Generic === uri
     uri += '/'
 
     req = Net::HTTP::Head.new uri.request_uri
@@ -257,7 +257,7 @@ class Net::HTTP::Persistent
 
       $stderr.puts "HEAD #{uri} => #{response.code}" if $DEBUG
 
-      unless response.is_a?(Net::HTTPOK) then
+      unless Net::HTTPOK === response then
         raise Error, "bad response code #{response.code} detecting idle timeout"
       end
 
@@ -463,7 +463,7 @@ class Net::HTTP::Persistent
   attr_accessor :retry_change_requests
 
   ##
-  # Creates a new Net::HTTP::Persistent.
+  # Creates a new Bundler::Persistent::Net::HTTP::Persistent.
   #
   # Set +name+ to keep your connections apart from everybody else's.  Not
   # required currently, but highly recommended.  Your library name should be
@@ -594,7 +594,7 @@ class Net::HTTP::Persistent
     use_ssl = uri.scheme.downcase == 'https'
 
     if use_ssl then
-      raise Net::HTTP::Persistent::Error, 'OpenSSL is not available' unless
+      raise Bundler::Persistent::Net::HTTP::Persistent::Error, 'OpenSSL is not available' unless
         HAVE_OPENSSL
 
       ssl_generation = @ssl_generation
@@ -616,6 +616,8 @@ class Net::HTTP::Persistent
     if @proxy_uri and not proxy_bypass? uri.host, uri.port then
       connection_id << @proxy_connection_id
       net_http_args.concat @proxy_args
+    else
+      net_http_args.concat [nil, nil, nil, nil]
     end
 
     connection = connections[connection_id]
@@ -728,7 +730,7 @@ class Net::HTTP::Persistent
           } or not @reuse_ssl_sessions then
         Net::HTTP
     else
-      Net::HTTP::Persistent::SSLReuse
+      Bundler::Persistent::Net::HTTP::Persistent::SSLReuse
     end
   end
 
@@ -812,7 +814,7 @@ class Net::HTTP::Persistent
 
   ##
   # Pipelines +requests+ to the HTTP server at +uri+ yielding responses if a
-  # block is given.  Returns all responses recieved.
+  # block is given.  Returns all responses received.
   #
   # See
   # Net::HTTP::Pipeline[http://docs.seattlerb.org/net-http-pipeline/Net/HTTP/Pipeline.html]
@@ -1065,7 +1067,7 @@ class Net::HTTP::Persistent
   # Returns the request.
 
   def request_setup req_or_uri # :nodoc:
-    req = if req_or_uri.is_a?(URI) then
+    req = if URI === req_or_uri then
             Net::HTTP::Get.new req_or_uri.request_uri
           else
             req_or_uri
@@ -1092,7 +1094,7 @@ class Net::HTTP::Persistent
   #
   # Uses the current thread by default.
   #
-  # If you've used Net::HTTP::Persistent across multiple threads you should
+  # If you've used Bundler::Persistent::Net::HTTP::Persistent across multiple threads you should
   # call this in each thread when you're done making HTTP requests.
   #
   # *NOTE*: Calling shutdown for another thread can be dangerous!
@@ -1227,4 +1229,5 @@ application:
 
 end
 
-require 'net/http/persistent/ssl_reuse'
+require 'bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse'
+

data/lib/bundler/vendor/{net → net-http-persistent/lib/net}/http/persistent/ssl_reuse.rb

@@ -7,7 +7,7 @@
 # This class is an implementation detail and is subject to change or removal
 # at any time.
 
-class Net::HTTP::Persistent::SSLReuse < Net::HTTP
+class Bundler::Persistent::Net::HTTP::Persistent::SSLReuse < Net::HTTP
 
   @is_proxy_class = false
   @proxy_addr = nil
@@ -126,3 +126,4 @@ class Net::HTTP::Persistent::SSLReuse < Net::HTTP
   private :connect
 
 end
+

data/lib/bundler/vendor/thor/lib/thor.rb

@@ -1,7 +1,7 @@
 require "set"
 require "bundler/vendor/thor/lib/thor/base"
 
-class Bundler::Thor # rubocop:disable ClassLength
+class Bundler::Thor
   class << self
     # Allows for custom "Command" package naming.
     #
@@ -9,7 +9,7 @@ class Bundler::Thor # rubocop:disable ClassLength
     # name<String>
     # options<Hash>
     #
-    def package_name(name, options = {})
+    def package_name(name, _ = {})
       @package_name = name.nil? || name == "" ? nil : name
     end
 
@@ -57,7 +57,9 @@ class Bundler::Thor # rubocop:disable ClassLength
         command.usage = usage             if usage
         command.description = description if description
       else
-        @usage, @desc, @hide = usage, description, options[:hide] || false
+        @usage = usage
+        @desc = description
+        @hide = options[:hide] || false
       end
     end
 
@@ -170,7 +172,7 @@ class Bundler::Thor # rubocop:disable ClassLength
       shell.say "Usage:"
       shell.say "  #{banner(command)}"
       shell.say
-      class_options_help(shell, nil => command.options.map { |_, o| o })
+      class_options_help(shell, nil => command.options.values)
       if command.long_description
         shell.say "Description:"
         shell.print_wrapped(command.long_description, :indent => 2)
@@ -231,8 +233,12 @@ class Bundler::Thor # rubocop:disable ClassLength
 
       define_method(subcommand) do |*args|
         args, opts = Bundler::Thor::Arguments.split(args)
-        args.unshift("help") if opts.include? "--help" or opts.include? "-h"
-        invoke subcommand_class, args, opts, :invoked_via_subcommand => true, :class_options => options
+        invoke_args = [args, opts, {:invoked_via_subcommand => true, :class_options => options}]
+        invoke_args.unshift "help" if opts.delete("--help") || opts.delete("-h")
+        invoke subcommand_class, *invoke_args
+      end
+      subcommand_class.commands.each do |_meth, command|
+        command.ancestor_name = subcommand
       end
     end
     alias_method :subtask, :subcommand
@@ -319,11 +325,31 @@ class Bundler::Thor # rubocop:disable ClassLength
       command && stop_on_unknown_option.include?(command.name.to_sym)
     end
 
+    # Disable the check for required options for the given commands.
+    # This is useful if you have a command that does not need the required options
+    # to work, like help.
+    #
+    # ==== Parameters
+    # Symbol ...:: A list of commands that should be affected.
+    def disable_required_check!(*command_names)
+      disable_required_check.merge(command_names)
+    end
+
+    def disable_required_check?(command) #:nodoc:
+      command && disable_required_check.include?(command.name.to_sym)
+    end
+
   protected
+
     def stop_on_unknown_option #:nodoc:
       @stop_on_unknown_option ||= Set.new
     end
 
+    # help command has the required check disabled by default.
+    def disable_required_check #:nodoc:
+      @disable_required_check ||= Set.new([:help])
+    end
+
     # The method responsible for dispatching given the args.
     def dispatch(meth, given_args, given_opts, config) #:nodoc: # rubocop:disable MethodLength
       meth ||= retrieve_command_name(given_args)
@@ -345,12 +371,14 @@ class Bundler::Thor # rubocop:disable ClassLength
           opts.clear
         end
       else
-        args, opts = given_args, nil
+        args = given_args
+        opts = nil
         command = dynamic_command_class.new(meth)
       end
 
       opts = given_opts || opts || []
-      config.merge!(:current_command => command, :command_options => command.options)
+      config[:current_command] = command
+      config[:command_options] = command.options
 
       instance = new(args, opts, config)
       yield instance if block_given?
@@ -380,6 +408,7 @@ class Bundler::Thor # rubocop:disable ClassLength
       @usage ||= nil
       @desc ||= nil
       @long_desc ||= nil
+      @hide ||= nil
 
       if @usage && @desc
         base_class = @hide ? Bundler::Thor::HiddenCommand : Bundler::Thor::Command
@@ -389,8 +418,8 @@ class Bundler::Thor # rubocop:disable ClassLength
       elsif all_commands[meth] || meth == "method_missing"
         true
       else
-        puts "[WARNING] Attempted to create command #{meth.inspect} without usage or description. " <<
-             "Call desc if you want this method to be available as command or declare it inside a " <<
+        puts "[WARNING] Attempted to create command #{meth.inspect} without usage or description. " \
+             "Call desc if you want this method to be available as command or declare it inside a " \
              "no_commands{} block. Invoked from #{caller[1].inspect}."
         false
       end
@@ -405,11 +434,7 @@ class Bundler::Thor # rubocop:disable ClassLength
     # Retrieve the command name from given args.
     def retrieve_command_name(args) #:nodoc:
       meth = args.first.to_s unless args.empty?
-      if meth && (map[meth] || meth !~ /^\-/)
-        args.shift
-      else
-        nil
-      end
+      args.shift if meth && (map[meth] || meth !~ /^\-/)
     end
     alias_method :retrieve_task_name, :retrieve_command_name
 
@@ -421,20 +446,20 @@ class Bundler::Thor # rubocop:disable ClassLength
     # +normalize_command_name+ also converts names like +animal-prison+
     # into +animal_prison+.
     def normalize_command_name(meth) #:nodoc:
-      return default_command.to_s.gsub("-", "_") unless meth
+      return default_command.to_s.tr("-", "_") unless meth
 
       possibilities = find_command_possibilities(meth)
-      if possibilities.size > 1
-        fail AmbiguousTaskError, "Ambiguous command #{meth} matches [#{possibilities.join(', ')}]"
-      elsif possibilities.size < 1
-        meth = meth || default_command
+      raise AmbiguousTaskError, "Ambiguous command #{meth} matches [#{possibilities.join(', ')}]" if possibilities.size > 1
+
+      if possibilities.empty?
+        meth ||= default_command
       elsif map[meth]
         meth = map[meth]
       else
         meth = possibilities.first
       end
 
-      meth.to_s.gsub("-", "_") # treat foo-bar as foo_bar
+      meth.to_s.tr("-", "_") # treat foo-bar as foo_bar
     end
     alias_method :normalize_task_name, :normalize_command_name
 

data/lib/bundler/vendor/thor/lib/thor/actions.rb

@@ -1,4 +1,3 @@
-require "fileutils"
 require "uri"
 require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read"
 require "bundler/vendor/thor/lib/thor/actions/create_file"
@@ -73,14 +72,15 @@ class Bundler::Thor
     #
     def initialize(args = [], options = {}, config = {})
       self.behavior = case config[:behavior].to_s
-                      when "force", "skip"
-                        _cleanup_options_and_set(options, config[:behavior])
-                        :invoke
-                      when "revoke"
-                        :revoke
-                      else
-                        :invoke
-                      end
+      when "force", "skip"
+        _cleanup_options_and_set(options, config[:behavior])
+        :invoke
+      when "revoke"
+        :revoke
+      else
+        :invoke
+      end
+
       super
       self.destination_root = config[:destination_root]
     end
@@ -129,7 +129,7 @@ class Bundler::Thor
 
     # Receives a file or directory and search for it in the source paths.
     #
-    def find_in_source_paths(file) # rubocop:disable MethodLength
+    def find_in_source_paths(file)
       possible_files = [file, file + TEMPLATE_EXTNAME]
       relative_root = relative_to_original_destination_root(destination_root, false)
 
@@ -140,19 +140,19 @@ class Bundler::Thor
         end
       end
 
-      message = "Could not find #{file.inspect} in any of your source paths. "
+      message = "Could not find #{file.inspect} in any of your source paths. ".dup
 
       unless self.class.source_root
         message << "Please invoke #{self.class.name}.source_root(PATH) with the PATH containing your templates. "
       end
 
-      if source_paths.empty?
-        message << "Currently you have no source paths."
-      else
-        message << "Your current source paths are: \n#{source_paths.join("\n")}"
-      end
+      message << if source_paths.empty?
+                   "Currently you have no source paths."
+                 else
+                   "Your current source paths are: \n#{source_paths.join("\n")}"
+                 end
 
-      fail Error, message
+      raise Error, message
     end
 
     # Do something in the root or on a provided subfolder. If a relative path
@@ -174,6 +174,7 @@ class Bundler::Thor
 
       # If the directory doesnt exist and we're not pretending
       if !File.exist?(destination_root) && !pretend
+        require "fileutils"
         FileUtils.mkdir_p(destination_root)
       end
 
@@ -181,6 +182,7 @@ class Bundler::Thor
         # In pretend mode, just yield down to the block
         block.arity == 1 ? yield(destination_root) : yield
       else
+        require "fileutils"
         FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
       end
 
@@ -214,10 +216,10 @@ class Bundler::Thor
       say_status :apply, path, verbose
       shell.padding += 1 if verbose
 
-      if is_uri
-        contents = open(path, "Accept" => "application/x-thor-template") { |io| io.read }
+      contents = if is_uri
+        open(path, "Accept" => "application/x-thor-template", &:read)
       else
-        contents = open(path) { |io| io.read }
+        open(path, &:read)
       end
 
       instance_eval(contents, path)
@@ -251,7 +253,7 @@ class Bundler::Thor
       say_status :run, desc, config.fetch(:verbose, true)
 
       unless options[:pretend]
-        config[:capture] ? `#{command}` : system("#{command}")
+        config[:capture] ? `#{command}` : system(command.to_s)
       end
     end
 
@@ -308,7 +310,7 @@ class Bundler::Thor
     def _cleanup_options_and_set(options, key) #:nodoc:
       case options
       when Array
-        %w[--force -f --skip -s].each { |i| options.delete(i) }
+        %w(--force -f --skip -s).each { |i| options.delete(i) }
         options << "--#{key}"
       when Hash
         [:force, :skip, "force", "skip"].each { |i| options.delete(i) }