rubygems-update 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e97ccc1877f6b954281b807df1da89661eaa83a3
-  data.tar.gz: 5acbcfd60eefc261fbfe228f9956253f7a249167
+  metadata.gz: 401f2f6fdd7de3d75d6ee3771b3724c85f014303
+  data.tar.gz: 714ac30e7e175628d13a99f5c5f74de80e1bd5fe
 SHA512:
-  metadata.gz: 5def3e84a3f43361d02f1d0d666cc045a375c32954210c1a4593101f1180608f2ab2e89852383a6ec187068d1b153b0fe556e490839e7c7e83104a4dd7a5477d
-  data.tar.gz: 8796158be7be1294af2913a6ee140836ef0589acbe04fadcb715fa9db2423297c6945632256c4664da949aa46abd5d33d0703bc02612cc5203e102dd34256982
+  metadata.gz: adf17e7ae371343b92d21f0ae72db333aa4c295a5d30bba2fb7cbe4c66a837033531db1225cdfa1b56d9e4213c3e50e88b9c416ce3be3073e007b97043e35608
+  data.tar.gz: 6493b6a5b253715bc9388f8798451293fc87199e62a8d03df4210fcd01684d1de6ed94f08dde4176ab1cf6f7d85448cd673082cd28ce9be04afe13c041d659cb

data/History.txt

@@ -1,5 +1,32 @@
 # coding: UTF-8
 
+=== 2.2.2 / 2014-02-05
+
+Bug fixes:
+
+* Fixed ruby tests when BASERUBY is not set.  Patch for #778 by Nobuyoshi
+  Nakada.
+* Removed double requests in RemoteFetcher#cache_update_path to improve remote
+  install speed.  Pull request #772 by Charlie Somerville.
+* The mkmf.log is now placed next to gem_make.out when building extensions.
+* `gem install -g --local` no longer accesses the network.  Bug #776 by Jeremy
+  Evans.
+* RubyGems now correctly handles URL passwords with encoded characters.  Pull
+  request #781 by Brian Fletcher.
+* RubyGems now correctly escapes URL characters.  Pull request #788 by Brian
+  Fletcher.
+* RubyGems can now unpack tar files where the type flag is not given.  Pull
+  request #790 by Cody Russell.
+* Typo corrections.  Pull request ruby/ruby#506 by windwiny.
+* RubyGems now uses both the default certificates and ssl_ca_cert instead of
+  one or the other.  Pull request #795 by zebardy.
+* RubyGems can now use the bundler API against hosted gem servers in a
+  directory.  Pull request #801 by Brian Fletcher.
+* RubyGems bin stubs now ignore non-versions.  This allows RubyGems bin stubs
+  to list file names like "_foo_".  Issue #799 by Postmodern.
+* Restored behavior of Gem::Version::new when subclassed.  Issue #805 by
+  Sergio Rubio.
+
 === 2.2.1 / 2014-01-06
 
 Bug fixes:
@@ -25,6 +52,8 @@ Bug fixes:
   directories.  Bug #758 Vít Ondruch.
 * Gem.read_binary can read read-only files again.  This caused file://
   repositories to stop working.  Bug #761 by John Anderson.
+* Fixed specification file sorting for Ruby 1.8.7 compatibility.  Pull
+  request #763 by James Mead
 
 === 2.2.0 / 2013-12-26
 

data/Manifest.txt

@@ -288,6 +288,7 @@ test/rubygems/test_gem_resolver_activation_request.rb
 test/rubygems/test_gem_resolver_api_set.rb
 test/rubygems/test_gem_resolver_api_specification.rb
 test/rubygems/test_gem_resolver_best_set.rb
+test/rubygems/test_gem_resolver_composed_set.rb
 test/rubygems/test_gem_resolver_conflict.rb
 test/rubygems/test_gem_resolver_dependency_request.rb
 test/rubygems/test_gem_resolver_git_set.rb

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/available_set.rb

@@ -4,9 +4,12 @@ class Gem::AvailableSet
 
   Tuple = Struct.new(:spec, :source)
 
+  attr_accessor :remote # :nodoc:
+
   def initialize
     @set = []
     @sorted = nil
+    @remote = true
   end
 
   attr_reader :set

data/lib/rubygems/commands/generate_index_command.rb

@@ -62,7 +62,7 @@ Marshal::MINOR_VERSION constants.  It is used to ensure compatibility.
   end
 
   def execute
-    # This is always true becasue it's the only way now.
+    # This is always true because it's the only way now.
     options[:build_modern] = true
 
     if not File.exist?(options[:directory]) or

data/lib/rubygems/config_file.rb

@@ -137,9 +137,10 @@ class Gem::ConfigFile
   attr_reader :ssl_verify_mode
 
   ##
-  # Path name of directory or file of openssl CA certificate, used for remote https connection
+  # Path name of directory or file of openssl CA certificate, used for remote
+  # https connection
 
-  attr_reader :ssl_ca_cert
+  attr_accessor :ssl_ca_cert
 
   ##
   # Path name of directory or file of openssl client certificate, used for remote https connection with client authentication

data/lib/rubygems/dependency_installer.rb

@@ -419,6 +419,7 @@ class Gem::DependencyInstaller
 
     request_set = as.to_request_set install_development_deps
     request_set.soft_missing = @force
+    request_set.remote = false unless consider_remote?
 
     installer_set = Gem::Resolver::InstallerSet.new @domain
     installer_set.always_install.concat request_set.always_install

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -34,7 +34,11 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         ENV["RUBYOPT"] = ["-r#{siteconf_path}", rubyopt].compact.join(' ')
         cmd = [Gem.ruby, File.basename(extension), *args].join ' '
 
-        run cmd, results
+        begin
+          run cmd, results
+        ensure
+          FileUtils.mv 'mkmf.log', dest_path if File.exist? 'mkmf.log'
+        end
 
         ENV["DESTDIR"] = nil
         ENV["RUBYOPT"] = rubyopt

data/lib/rubygems/installer.rb

@@ -641,7 +641,7 @@ version = "#{Gem::Requirement.default}"
 if ARGV.first
   str = ARGV.first
   str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
-  if str =~ /\\A_(.*)_\\z/
+  if str =~ /\\A_(.*)_\\z/ and Gem::Version.correct?($1) then
     version = $1
     ARGV.shift
   end

data/lib/rubygems/package/tar_header.rb

@@ -134,7 +134,7 @@ class Gem::Package::TarHeader
     vals[:gid] ||= 0
     vals[:mtime] ||= 0
     vals[:checksum] ||= ""
-    vals[:typeflag] ||= "0"
+    vals[:typeflag] = "0" if vals[:typeflag].nil? || vals[:typeflag].empty?
     vals[:magic] ||= "ustar"
     vals[:version] ||= "00"
     vals[:uname] ||= "wheel"

data/lib/rubygems/remote_fetcher.rb

@@ -131,11 +131,19 @@ class Gem::RemoteFetcher
 
     FileUtils.mkdir_p cache_dir rescue nil unless File.exist? cache_dir
 
-   # Always escape URI's to deal with potential spaces and such
-    unless URI::Generic === source_uri
-      source_uri = URI.parse(URI.const_defined?(:DEFAULT_PARSER) ?
-                             URI::DEFAULT_PARSER.escape(source_uri.to_s) :
-                             URI.escape(source_uri.to_s))
+    # Always escape URI's to deal with potential spaces and such
+    # It should also be considered that source_uri may already be
+    # a valid URI with escaped characters. e.g. "{DESede}" is encoded
+    # as "%7BDESede%7D". If this is escaped again the percentage
+    # symbols will be escaped.
+    unless source_uri.is_a?(URI::Generic)
+      begin
+        source_uri = URI.parse(source_uri)
+      rescue
+        source_uri = URI.parse(URI.const_defined?(:DEFAULT_PARSER) ?
+                               URI::DEFAULT_PARSER.escape(source_uri.to_s) :
+                               URI.escape(source_uri.to_s))
+      end
     end
 
     scheme = source_uri.scheme
@@ -285,20 +293,20 @@ class Gem::RemoteFetcher
   def cache_update_path uri, path = nil, update = true
     mtime = path && File.stat(path).mtime rescue nil
 
-    if mtime && Net::HTTPNotModified === fetch_path(uri, mtime, true)
-      Gem.read_binary(path)
-    else
-      data = fetch_path(uri)
+    data = fetch_path(uri, mtime)
 
-      if update and path then
-        open(path, 'wb') do |io|
-          io.flock(File::LOCK_EX)
-          io.write data
-        end
-      end
+    if data == nil # indicates the server returned 304 Not Modified
+      return Gem.read_binary(path)
+    end
 
-      data
+    if update and path
+      open(path, 'wb') do |io|
+        io.flock(File::LOCK_EX)
+        io.write data
+      end
     end
+
+    data
   end
 
   ##

data/lib/rubygems/request.rb

@@ -48,15 +48,14 @@ class Gem::Request
       connection.key = OpenSSL::PKey::RSA.new pem
     end
 
+    store.set_default_paths
+    add_rubygems_trusted_certs(store)
     if Gem.configuration.ssl_ca_cert
       if File.directory? Gem.configuration.ssl_ca_cert
         store.add_path Gem.configuration.ssl_ca_cert
       else
         store.add_file Gem.configuration.ssl_ca_cert
       end
-    else
-      store.set_default_paths
-      add_rubygems_trusted_certs(store)
     end
     connection.cert_store = store
   rescue LoadError => e
@@ -106,7 +105,8 @@ class Gem::Request
     request = @request_class.new @uri.request_uri
 
     unless @uri.nil? || @uri.user.nil? || @uri.user.empty? then
-      request.basic_auth @uri.user, @uri.password
+      request.basic_auth Gem::UriFormatter.new(@uri.user).unescape,
+                         Gem::UriFormatter.new(@uri.password).unescape
     end
 
     request.add_field 'User-Agent', @user_agent

data/lib/rubygems/request_set.rb

@@ -38,6 +38,11 @@ class Gem::RequestSet
 
   attr_accessor :ignore_dependencies
 
+  ##
+  # When false no remote sets are used for resolving gems.
+
+  attr_accessor :remote
+
   ##
   # Sets used for resolution
 
@@ -71,6 +76,7 @@ class Gem::RequestSet
     @git_set             = nil
     @ignore_dependencies = false
     @install_dir         = Gem.dir
+    @remote              = true
     @requests            = []
     @sets                = []
     @soft_missing        = false
@@ -150,6 +156,7 @@ class Gem::RequestSet
     gemdeps = options[:gemdeps]
 
     @install_dir = options[:install_dir] || Gem.dir
+    @remote      = options[:domain] != :local
 
     load_gemdeps gemdeps, options[:without_groups]
 
@@ -235,6 +242,7 @@ class Gem::RequestSet
     @sets << @vendor_set
 
     set = Gem::Resolver.compose_sets(*@sets)
+    set.remote = @remote
 
     resolver = Gem::Resolver.new @dependencies, set
     resolver.development         = @development

data/lib/rubygems/resolver.rb

@@ -59,6 +59,8 @@ class Gem::Resolver
 
     sets = sets.map do |set|
       case set
+      when Gem::Resolver::BestSet then
+        set
       when Gem::Resolver::ComposedSet then
         set.sets
       else

data/lib/rubygems/resolver/api_set.rb

@@ -25,10 +25,12 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   # http://guides.rubygems.org/rubygems-org-api
 
   def initialize dep_uri = 'https://rubygems.org/api/v1/dependencies'
+    super()
+
     dep_uri = URI dep_uri unless URI === dep_uri # for ruby 1.8
 
     @dep_uri = dep_uri
-    @uri     = dep_uri + '../../..'
+    @uri     = dep_uri + '../..'
 
     @data   = Hash.new { |h,k| h[k] = [] }
     @source = Gem::Source.new @uri
@@ -41,6 +43,8 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   def find_all req
     res = []
 
+    return res unless @remote
+
     versions(req.name).each do |ver|
       if req.dependency.match? req.name, ver[:number]
         res << Gem::Resolver::APISpecification.new(self, ver)
@@ -55,6 +59,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set
   # data for DependencyRequests +reqs+.
 
   def prefetch reqs
+    return unless @remote
     names = reqs.map { |r| r.dependency.name }
     needed = names - @data.keys
 

data/lib/rubygems/resolver/best_set.rb

@@ -12,11 +12,30 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
   def initialize sources = Gem.sources
     super()
 
-    sources.each_source do |source|
+    @sources = sources
+  end
+
+  ##
+  # Picks which sets to use for the configured sources.
+
+  def pick_sets # :nodoc:
+    @sources.each_source do |source|
       @sets << source.dependency_resolver_set
     end
   end
 
+  def find_all req # :nodoc:
+    pick_sets if @remote and @sets.empty?
+
+    super
+  end
+
+  def prefetch reqs # :nodoc:
+    pick_sets if @remote and @sets.empty?
+
+    super
+  end
+
   def pretty_print q # :nodoc:
     q.group 2, '[BestSet', ']' do
       q.breakable

data/lib/rubygems/resolver/composed_set.rb

@@ -16,9 +16,20 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
   # Gem::Resolver::compose_sets instead.
 
   def initialize *sets
+    super()
+
     @sets = sets
   end
 
+  ##
+  # Sets the remote network access for all composed sets.
+
+  def remote= remote
+    super
+
+    @sets.each { |set| set.remote = remote }
+  end
+
   ##
   # Finds all specs matching +req+ in all sets.
 

data/lib/rubygems/resolver/git_set.rb

@@ -33,6 +33,8 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
   attr_reader :specs # :nodoc:
 
   def initialize # :nodoc:
+    super()
+
     @git             = ENV['git'] || 'git'
     @need_submodules = {}
     @repositories    = {}
@@ -91,6 +93,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set
     @repositories.each do |name, (repository, reference)|
       source = Gem::Source::Git.new name, repository, reference
       source.root_dir = @root_dir
+      source.remote = @remote
 
       source.specs.each do |spec|
         git_spec = Gem::Resolver::GitSpecification.new self, spec, source

data/lib/rubygems/resolver/index_set.rb

@@ -5,6 +5,8 @@
 class Gem::Resolver::IndexSet < Gem::Resolver::Set
 
   def initialize source = nil # :nodoc:
+    super()
+
     @f =
       if source then
         sources = Gem::SourceList.from [source]
@@ -34,6 +36,8 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
   def find_all req
     res = []
 
+    return res unless @remote
+
     name = req.dependency.name
 
     @all[name].each do |uri, n|

data/lib/rubygems/resolver/installer_set.rb

@@ -24,14 +24,17 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
   # Creates a new InstallerSet that will look for gems in +domain+.
 
   def initialize domain
+    super()
+
     @domain = domain
+    @remote = consider_remote?
 
     @f = Gem::SpecFetcher.fetcher
 
     @always_install      = []
     @ignore_dependencies = false
     @ignore_installed    = false
-    @remote_set          = Gem::Resolver::BestSet.new if consider_remote?
+    @remote_set          = Gem::Resolver::BestSet.new
     @specs               = {}
   end
 
@@ -120,5 +123,16 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     end
   end
 
+  def remote= remote # :nodoc:
+    case @domain
+    when :local then
+      @domain = :both if remote
+    when :remote then
+      @domain = nil unless remote
+    when :both then
+      @domain = :local unless remote
+    end
+  end
+
 end
 

data/lib/rubygems/resolver/lock_set.rb

@@ -9,6 +9,8 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
   # Creates a new LockSet from the given +source+
 
   def initialize source
+    super()
+
     @source = Gem::Source::Lock.new source
     @specs  = []
   end