diff options
| -rw-r--r-- | lib/rubygems.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/commands/contents_command.rb | 1 | ||||
| -rw-r--r-- | lib/rubygems/commands/update_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/dependency.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/indexer.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/package/old.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/remote_fetcher.rb | 6 | ||||
| -rw-r--r-- | lib/rubygems/request/connection_pools.rb | 6 | ||||
| -rw-r--r-- | lib/rubygems/request/http_pool.rb | 9 | ||||
| -rw-r--r-- | lib/rubygems/user_interaction.rb | 1 |
10 files changed, 24 insertions, 11 deletions
@@ -9,7 +9,7 @@ require 'rbconfig' require 'thread' module Gem - VERSION = '2.4.3' end # Must be first since it unloads the prelude from 1.9.2 @@ -146,7 +146,6 @@ prefix or only the files that are requireable. def path_description spec_dirs # :nodoc: if spec_dirs.empty? then - spec_dirs = Gem::Specification.dirs "default gem paths" else "specified path" @@ -84,8 +84,6 @@ command to remove old versions. end def execute - hig = {} - if options[:system] then update_rubygems return @@ -281,7 +281,7 @@ class Gem::Dependency } end - matches = matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed end ## @@ -235,7 +235,7 @@ class Gem::Indexer sanitize spec spec - rescue SignalException => e alert_error "Received signal, exiting" raise rescue Exception => e @@ -153,10 +153,10 @@ class Gem::Package::Old < Gem::Package begin @spec = Gem::Specification.from_yaml yaml - rescue yaml_error => e raise Gem::Exception, "Failed to parse gem specification out of gem file" end - rescue ArgumentError => e raise Gem::Exception, "Failed to parse gem specification out of gem file" end @@ -326,7 +326,7 @@ class Gem::RemoteFetcher def correct_for_windows_path(path) if path[0].chr == '/' && path[1].chr =~ /[a-z]/i && path[2].chr == ':' - path = path[1..-1] else path end @@ -352,6 +352,10 @@ class Gem::RemoteFetcher uri.scheme.downcase == 'https' end protected # we have our own signing code here to avoid a dependency on the aws-sdk gem @@ -28,6 +28,10 @@ class Gem::Request::ConnectionPools # :nodoc: end end private ## @@ -69,7 +73,7 @@ class Gem::Request::ConnectionPools # :nodoc: Gem::UriFormatter.new(proxy_uri.password).unescape, ] elsif no_proxy? uri.host, no_proxy then - net_http_args += [nil, nil] else net_http_args end @@ -23,6 +23,15 @@ class Gem::Request::HTTPPool # :nodoc: @queue.push connection end private def make_connection @@ -318,7 +318,6 @@ class Gem::StreamUI elsif Gem.win_platform? def _gets_noecho require "Win32API" - char = nil password = '' while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do |