rubygems-update 2.0.0 → 2.0.2

data/lib/rubygems/defaults.rb

@@ -11,7 +11,7 @@ module Gem
   # An Array of the default sources that come with RubyGems
 
   def self.default_sources
-    %w[http://rubygems.org/]
+    %w[https://rubygems.org/]
   end
 
   ##

data/lib/rubygems/dependency_installer.rb

@@ -88,6 +88,7 @@ class Gem::DependencyInstaller
     # we absolutely must.
     @minimal_deps        = options[:minimal_deps]
 
+    @available      = nil
     @installed_gems = []
     @toplevel_specs = nil
 
@@ -100,6 +101,22 @@ class Gem::DependencyInstaller
 
   attr_reader :errors
 
+  ##
+  # Creates an AvailableSet to install from based on +dep_or_name+ and
+  # +version+
+
+  def available_set_for dep_or_name, version # :nodoc:
+    if String === dep_or_name then
+      find_spec_by_name_and_version dep_or_name, version, @prerelease
+    else
+      dep = dep_or_name.dup
+      dep.prerelease = @prerelease
+      @available = find_gems_with_sources dep
+    end
+
+    @available.pick_best!
+  end
+
   ##
   # Indicated, based on the requested domain, if local
   # gems should be considered.
@@ -302,13 +319,7 @@ class Gem::DependencyInstaller
   # separately.
 
   def install dep_or_name, version = Gem::Requirement.default
-    if String === dep_or_name then
-      find_spec_by_name_and_version dep_or_name, version, @prerelease
-    else
-      dep = dep_or_name.dup
-      dep.prerelease = @prerelease
-      @available = find_gems_with_sources(dep).pick_best!
-    end
+    available_set_for dep_or_name, version
 
     @installed_gems = []
 
@@ -367,12 +378,9 @@ class Gem::DependencyInstaller
     # it's documentation. Ideally the hook adder could decide whether to be in
     # the background or not, and what to call it.
     in_background "Installing documentation" do
-      start = Time.now
       Gem.done_installing_hooks.each do |hook|
         hook.call self, @installed_gems
       end
-      finish = Time.now
-      say "Done installing documentation for #{@installed_gems.map(&:name).join(', ')} (#{(finish-start).to_i} sec)."
     end unless Gem.done_installing_hooks.empty?
 
     @installed_gems

data/lib/rubygems/dependency_list.rb

@@ -49,7 +49,7 @@ class Gem::DependencyList
   # Adds +gemspecs+ to the dependency list.
 
   def add(*gemspecs)
-    @specs.push(*gemspecs)
+    @specs.concat gemspecs
   end
 
   def clear

data/lib/rubygems/dependency_resolver.rb

@@ -69,6 +69,8 @@ module Gem
     # and dependencies.
     #
     class APISpecification
+      attr_reader :set # :nodoc:
+
       def initialize(set, api_data)
         @set = set
         @name = api_data[:name]
@@ -80,6 +82,14 @@ module Gem
 
       attr_reader :name, :version, :dependencies
 
+      def == other # :nodoc:
+        self.class === other and
+          @set          == other.set and
+          @name         == other.name and
+          @version      == other.version and
+          @dependencies == other.dependencies
+      end
+
       def full_name
         "#{@name}-#{@version}"
       end
@@ -91,6 +101,7 @@ module Gem
     class APISet
       def initialize
         @data = Hash.new { |h,k| h[k] = [] }
+        @dep_uri = URI 'https://rubygems.org/api/v1/dependencies'
       end
 
       # Return data for all versions of the gem +name+.
@@ -100,8 +111,8 @@ module Gem
           return @data[name]
         end
 
-        u = URI.parse "http://rubygems.org/api/v1/dependencies?gems=#{name}"
-        str = Net::HTTP.get(u)
+        uri = @dep_uri + "?gems=#{name}"
+        str = Gem::RemoteFetcher.fetcher.fetch_path uri
 
         Marshal.load(str).each do |ver|
           @data[ver[:name]] << ver
@@ -134,8 +145,8 @@ module Gem
 
         return if needed.empty?
 
-        u = URI.parse "http://rubygems.org/api/v1/dependencies?gems=#{needed.join ','}"
-        str = Net::HTTP.get(u)
+        uri = @dep_uri + "?gems=#{needed.sort.join ','}"
+        str = Gem::RemoteFetcher.fetcher.fetch_path uri
 
         Marshal.load(str).each do |ver|
           @data[ver[:name]] << ver
@@ -395,6 +406,8 @@ module Gem
           source = Gem.sources.first
         end
 
+        Gem.ensure_gem_subdirectories path
+
         source.download full_spec, path
       end
 

data/lib/rubygems/ext/builder.rb

@@ -16,13 +16,6 @@ class Gem::Ext::Builder
       raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}"
     end
 
-    mf = Gem.read_binary 'Makefile'
-    mf = mf.gsub(/^RUBYARCHDIR\s*=\s*\$[^$]*/, "RUBYARCHDIR = #{dest_path}")
-    mf = mf.gsub(/^RUBYLIBDIR\s*=\s*\$[^$]*/, "RUBYLIBDIR = #{dest_path}")
-    mf = mf.gsub(/\s*\S+\.time$/, "")
-
-    File.open('Makefile', 'wb') {|f| f.print mf}
-
     # try to find make program from Ruby configure arguments first
     RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
     make_program = $1 || ENV['MAKE'] || ENV['make']

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -6,18 +6,53 @@
 
 require 'rubygems/ext/builder'
 require 'rubygems/command'
+require 'fileutils'
+require 'tempfile'
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
+  FileEntry = FileUtils::Entry_ # :nodoc:
 
   def self.build(extension, directory, dest_path, results, args=[])
-    cmd = "#{Gem.ruby} #{File.basename extension}"
-    cmd << " #{args.join ' '}" unless args.empty?
-
-    run cmd, results
-
-    make dest_path, results
-
-    results
+    tmp_dest = Dir.mktmpdir(".gem.", ".") if File.identical?(dest_path, ".")
+
+    Tempfile.open %w"siteconf .rb", "." do |siteconf|
+      siteconf.puts "require 'rbconfig'"
+      siteconf.puts "dest_path = #{(tmp_dest || dest_path).dump}"
+      %w[sitearchdir sitelibdir].each do |dir|
+        siteconf.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
+        siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
+      end
+
+      siteconf.flush
+
+      rubyopt = ENV["RUBYOPT"]
+      destdir = ENV["DESTDIR"]
+
+      begin
+        ENV["RUBYOPT"] = ["-r#{siteconf.path}", rubyopt].compact.join(' ')
+        cmd = [Gem.ruby, File.basename(extension), *args].join ' '
+
+        run cmd, results
+
+        ENV["DESTDIR"] = nil
+
+        make dest_path, results
+
+        if tmp_dest
+          FileEntry.new(tmp_dest).traverse do |ent|
+            destent = ent.class.new(dest_path, ent.rel)
+            destent.exist? or File.rename(ent.path, destent.path)
+          end
+        end
+
+        results
+      ensure
+        ENV["RUBYOPT"] = rubyopt
+        ENV["DESTDIR"] = destdir
+      end
+    end
+  ensure
+    FileUtils.rm_rf tmp_dest if tmp_dest
   end
 
 end

data/lib/rubygems/installer.rb

@@ -132,7 +132,7 @@ class Gem::Installer
   def check_executable_overwrite filename # :nodoc:
     return if @force
 
-    generated_bin = File.join @bin_dir, filename
+    generated_bin = File.join @bin_dir, formatted_program_filename(filename)
 
     return unless File.exist? generated_bin
 
@@ -681,7 +681,7 @@ TEXT
           say results.join("\n") if Gem.configuration.really_verbose
         end
       rescue
-        extension_build_error(extension_dir, results.join("\n"))
+        extension_build_error(extension_dir, results.join("\n"), $@)
       end
     end
   end
@@ -689,7 +689,7 @@ TEXT
   ##
   # Logs the build +output+ in +build_dir+, then raises ExtensionBuildError.
 
-  def extension_build_error(build_dir, output)
+  def extension_build_error(build_dir, output, backtrace = nil)
     gem_make_out = File.join build_dir, 'gem_make.out'
 
     open gem_make_out, 'wb' do |io| io.puts output end
@@ -703,7 +703,7 @@ Gem files will remain installed in #{gem_dir} for inspection.
 Results logged to #{gem_make_out}
 EOF
 
-    raise ExtensionBuildError, message
+    raise ExtensionBuildError, message, backtrace
   end
 
   ##

data/lib/rubygems/package.rb

@@ -388,7 +388,8 @@ EOM
     when 'metadata.gz' then
       args = [entry]
       args << { :external_encoding => Encoding::UTF_8 } if
-        Object.const_defined? :Encoding
+        Object.const_defined?(:Encoding) &&
+          Zlib::GzipReader.method(:wrap).arity != 1
 
       Zlib::GzipReader.wrap(*args) do |gzio|
         @spec = Gem::Specification.from_yaml gzio.read

data/lib/rubygems/rdoc.rb

@@ -37,6 +37,7 @@ end
 class Gem::RDoc # :nodoc: all
 
   include Gem::UserInteraction
+  extend  Gem::UserInteraction
 
   @rdoc_version = nil
   @specs = []
@@ -70,7 +71,8 @@ class Gem::RDoc # :nodoc: all
   # +specs+
 
   def self.generation_hook installer, specs
-    types     = installer.document
+    start = Time.now
+    types = installer.document
 
     generate_rdoc = types.include? 'rdoc'
     generate_ri   = types.include? 'ri'
@@ -78,6 +80,13 @@ class Gem::RDoc # :nodoc: all
     specs.each do |spec|
       new(spec, generate_rdoc, generate_ri).generate
     end
+
+    return unless generate_rdoc or generate_ri
+
+    duration = (Time.now - start).to_i
+    names    = specs.map(&:name).join ', '
+
+    say "Done installing documentation for #{names} after #{duration} seconds"
   end
 
   ##

data/lib/rubygems/remote_fetcher.rb

@@ -127,8 +127,6 @@ class Gem::RemoteFetcher
   # always replaced.
 
   def download(spec, source_uri, install_dir = Gem.dir)
-    Gem.ensure_gem_subdirectories(install_dir) rescue nil
-
     cache_dir =
       if Dir.pwd == install_dir then # see fetch_command
         install_dir
@@ -403,7 +401,8 @@ class Gem::RemoteFetcher
     connection.start unless connection.started?
 
     connection
-  rescue OpenSSL::SSL::SSLError, Errno::EHOSTDOWN => e
+  rescue defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
+         Errno::EHOSTDOWN => e
     raise FetchError.new(e.message, uri)
   end
 
@@ -424,6 +423,12 @@ class Gem::RemoteFetcher
       add_rubygems_trusted_certs(store)
     end
     connection.cert_store = store
+  rescue LoadError => e
+    raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
+                 e.message =~ / -- openssl$/
+
+    raise Gem::Exception.new(
+            'Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources')
   end
 
   def add_rubygems_trusted_certs(store)

data/lib/rubygems/security.rb

@@ -5,9 +5,29 @@
 #++
 
 require 'rubygems/exceptions'
-require 'openssl'
 require 'fileutils'
 
+begin
+  require 'openssl'
+rescue LoadError => e
+  raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
+               e.message =~ / -- openssl$/
+
+  module OpenSSL # :nodoc:
+    class Digest # :nodoc:
+      class SHA1 # :nodoc:
+        def name
+          'SHA1'
+        end
+      end
+    end
+    module PKey # :nodoc:
+      class RSA # :nodoc:
+      end
+    end
+  end
+end
+
 ##
 # = Signing gems
 #

data/lib/rubygems/security/policy.rb

@@ -20,6 +20,8 @@ class Gem::Security::Policy
   # options.
 
   def initialize name, policy = {}, opt = {}
+    require 'openssl'
+
     @name = name
 
     @opt = opt

data/lib/rubygems/source.rb

@@ -141,4 +141,14 @@ class Gem::Source
     fetcher = Gem::RemoteFetcher.fetcher
     fetcher.download spec, @uri.to_s, dir
   end
+
+  ##
+  # Replaces the URI for this source with +uri+.  Used for upgrading this
+  # source to HTTPS
+
+  def uri= uri # :nodoc:
+    @api_uri = nil
+    @uri     = uri
+  end
+
 end

data/lib/rubygems/spec_fetcher.rb

@@ -188,6 +188,8 @@ class Gem::SpecFetcher
     list = {}
 
     Gem.sources.each_source do |source|
+      source = upgrade_http_source source
+
       begin
         names = case type
                 when :latest
@@ -225,5 +227,41 @@ class Gem::SpecFetcher
       cache[source.uri] ||= source.load_specs(type)
     end
   end
+
+  ##
+  # Attempts to upgrade +source+ to HTTPS if it is for http://rubygems.org
+
+  def upgrade_http_source source
+    uri = source.uri
+
+    return source unless uri.scheme.downcase == 'http' &&
+                         uri.host.downcase == 'rubygems.org'
+
+    https_uri = uri.dup
+    https_uri.scheme = 'https'
+    https_uri += '/'
+
+    https_uri = URI https_uri.to_s # cast to URI::HTTPS
+
+    begin
+      Gem::RemoteFetcher.fetcher.fetch_path https_uri, nil, true
+    rescue Gem::RemoteFetcher::FetchError => e
+      raise unless e.message =~ / Not Allowed 405 /
+    end
+
+    say "Upgraded #{uri} to HTTPS"
+
+    https_uri += uri.request_uri
+
+    source.uri = URI https_uri.to_s # cast to URI::HTTPS
+
+    source
+  rescue Gem::RemoteFetcher::FetchError
+    say "Upgrading #{uri} to HTTPS failed, continuing" if
+      Gem.configuration.really_verbose
+
+    source
+  end
+
 end
 

data/lib/rubygems/specification.rb

@@ -17,7 +17,7 @@
 #     s.authors     = ["Ruby Coder"]
 #     s.email       = 'rubycoder@example.com'
 #     s.files       = ["lib/example.rb"]
-#     s.homepage    = 'http://rubygems.org/gems/example'
+#     s.homepage    = 'https://rubygems.org/gems/example'
 #   end
 #
 #   Starting in RubyGems 1.9.0, a Specification can hold arbitrary