rubygems-update 1.5.3 → 1.6.0

data/lib/rubygems/doc_manager.rb

@@ -162,10 +162,10 @@ class Gem::DocManager
   def run_rdoc(*args)
     args << @spec.rdoc_options
     args << self.class.configured_args
-    args << '--quiet'
     args << @spec.require_paths.clone
     args << @spec.extra_rdoc_files
     args << '--title' << "#{@spec.full_name} Documentation"
+    args << '--quiet'
     args = args.flatten.map do |arg| arg.to_s end
 
     if self.class.rdoc_version >= Gem::Version.new('2.4.0') then
@@ -176,6 +176,8 @@ class Gem::DocManager
       # HACK more
     end
 
+    debug_args = args.dup
+
     r = RDoc::RDoc.new
 
     old_pwd = Dir.pwd
@@ -193,10 +195,10 @@ class Gem::DocManager
     rescue Exception => ex
       alert_error "While generating documentation for #{@spec.full_name}"
       ui.errs.puts "... MESSAGE:   #{ex}"
-      ui.errs.puts "... RDOC args: #{args.join(' ')}"
+      ui.errs.puts "... RDOC args: #{debug_args.join(' ')}"
       ui.errs.puts "\t#{ex.backtrace.join "\n\t"}" if
-      Gem.configuration.backtrace
-      ui.errs.puts "(continuing with the rest of the installation)"
+        Gem.configuration.backtrace
+      terminate_interaction 1
     ensure
       Dir.chdir old_pwd
     end

data/lib/rubygems/gem_path_searcher.rb

@@ -10,6 +10,7 @@ class Gem::GemPathSearcher
   def initialize
     # We want a record of all the installed gemspecs, in the order we wish to
     # examine them.
+    # TODO: remove this stupid method
     @gemspecs = init_gemspecs
 
     # Map gem spec to glob of full require_path directories.  Preparing this
@@ -42,7 +43,9 @@ class Gem::GemPathSearcher
   # only that there is a match.
 
   def find(glob)
+    # HACK violation of encapsulation
     @gemspecs.find do |spec|
+      # TODO: inverted responsibility
       matching_file? spec, glob
     end
   end
@@ -51,9 +54,39 @@ class Gem::GemPathSearcher
   # Works like #find, but finds all gemspecs matching +glob+.
 
   def find_all(glob)
+    # HACK violation of encapsulation
     @gemspecs.select do |spec|
+      # TODO: inverted responsibility
       matching_file? spec, glob
+    end || []
+  end
+
+  def find_in_unresolved(glob)
+    # HACK violation
+    specs = Gem.unresolved_deps.values.map { |dep|
+      Gem.source_index.search dep, true
+    }.flatten
+
+    specs.select do |spec|
+      # TODO: inverted responsibility
+      matching_file? spec, glob
+    end || []
+  end
+
+  def find_in_unresolved_tree glob
+    # HACK violation
+    # TODO: inverted responsibility
+    specs = Gem.unresolved_deps.values.map { |dep|
+      Gem.source_index.search dep, true
+    }.flatten
+
+    specs.reverse_each do |spec|
+      trails = matching_paths(spec, glob)
+      next if trails.empty?
+      return trails.map(&:reverse).sort.first.reverse
     end
+
+    []
   end
 
   ##
@@ -61,7 +94,18 @@ class Gem::GemPathSearcher
   # +spec+.
 
   def matching_file?(spec, path)
-    !matching_files(spec, path).empty?
+    not matching_files(spec, path).empty?
+  end
+
+  def matching_paths(spec, path)
+    trails = []
+
+    spec.traverse do |from_spec, dep, to_spec, trail|
+      next unless to_spec.conflicts.empty?
+      trails << trail unless matching_files(to_spec, path).empty?
+    end
+
+    trails
   end
 
   ##

data/lib/rubygems/gemcutter_utilities.rb

@@ -1,6 +1,28 @@
 require 'rubygems/remote_fetcher'
 
 module Gem::GemcutterUtilities
+  OptionParser.accept Symbol do |value|
+    value.to_sym
+  end
+
+  ##
+  # Add the --key option
+
+  def add_key_option
+    add_option('-k', '--key KEYNAME', Symbol,
+               'Use the given API key',
+               'from ~/.gem/credentials') do |value,options|
+      options[:key] = value
+    end
+  end
+
+  def api_key
+    if options[:key] then
+      verify_api_key options[:key]
+    else
+      Gem.configuration.rubygems_api_key
+    end
+  end
 
   def sign_in
     return if Gem.configuration.rubygems_api_key
@@ -27,6 +49,8 @@ module Gem::GemcutterUtilities
     host = ENV['RUBYGEMS_HOST'] if ENV['RUBYGEMS_HOST']
     uri = URI.parse "#{host}/#{path}"
 
+    say "Pushing gem to #{host}..."
+
     request_method = Net::HTTP.const_get method.to_s.capitalize
 
     Gem::RemoteFetcher.fetcher.request(uri, request_method, &block)
@@ -46,4 +70,13 @@ module Gem::GemcutterUtilities
     end
   end
 
+  def verify_api_key(key)
+    if Gem.configuration.api_keys.key? key then
+      Gem.configuration.api_keys[key]
+    else
+      alert_error "No such API key. You can add it with gem keys --add #{key}"
+      terminate_interaction 1
+    end
+  end
+
 end

data/lib/rubygems/indexer.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rubygems/format'
+require 'time'
 
 begin
   gem 'builder'

data/lib/rubygems/installer.rb

@@ -150,6 +150,9 @@ class Gem::Installer
 
     Gem.ensure_gem_subdirectories @gem_home
 
+    # Completely remove any previous gem files
+    FileUtils.rm_rf(@gem_dir) if File.exist?(@gem_dir)
+
     FileUtils.mkdir_p @gem_dir
 
     extract_files
@@ -173,10 +176,9 @@ class Gem::Installer
 
     write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE
 
-    # HACK remove?  Isn't this done in multiple places?
-    cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop
+    cached_gem = Gem.cache_gem(File.basename(@gem), @gem_home)
     unless File.exist? cached_gem then
-      FileUtils.cp @gem, File.join(@gem_home, "cache")
+      FileUtils.cp @gem, Gem.cache_dir(@gem_home)
     end
 
     say @spec.post_install_message unless @spec.post_install_message.nil?
@@ -229,7 +231,7 @@ class Gem::Installer
   # specifications directory.
 
   def write_spec
-    rubycode = @spec.to_ruby
+    rubycode = @spec.to_ruby_for_cache
 
     file_name = File.join @gem_home, 'specifications', @spec.spec_name
 
@@ -269,8 +271,10 @@ class Gem::Installer
     @spec.executables.each do |filename|
       filename.untaint
       bin_path = File.expand_path "#{@spec.bindir}/#{filename}", @gem_dir
-      mode = File.stat(bin_path).mode | 0111
-      File.chmod mode, bin_path
+      if File.exist?(bin_path)
+        mode = File.stat(bin_path).mode | 0111
+        File.chmod mode, bin_path
+      end
 
       if @wrappers then
         generate_bin_script filename, bindir
@@ -292,7 +296,7 @@ class Gem::Installer
 
     FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers
 
-    File.open bin_script_path, 'w', 0755 do |file|
+    File.open bin_script_path, 'wb', 0755 do |file|
       file.print app_script_text(filename)
     end
 

data/lib/rubygems/installer_test_case.rb

@@ -58,12 +58,15 @@ class Gem::InstallerTestCase < Gem::TestCase
     super
 
     @spec = quick_gem 'a'
+    util_make_exec @spec
 
     @gem = File.join @tempdir, @spec.file_name
 
     @installer = util_installer @spec, @gem, @gemhome
 
     @user_spec = quick_gem 'b'
+    util_make_exec @user_spec
+
     @user_gem = File.join @tempdir, @user_spec.file_name
 
     @user_installer = util_installer @user_spec, @user_gem, Gem.user_dir
@@ -71,31 +74,38 @@ class Gem::InstallerTestCase < Gem::TestCase
                                         @user_spec.full_name)
   end
 
-  def util_gem_bindir(version = '2')
-    File.join util_gem_dir(version), "bin"
+  def util_gem_bindir spec = @spec
+    File.join util_gem_dir(spec), "bin"
   end
 
-  def util_gem_dir(version = '2')
-    File.join @gemhome, "gems", "a-#{version}" # HACK
+  def util_gem_dir spec = @spec
+    File.join @gemhome, "gems", spec.full_name
   end
 
   def util_inst_bindir
     File.join @gemhome, "bin"
   end
 
-  def util_make_exec(version = '2', shebang = "#!/usr/bin/ruby")
-    @spec.executables = ["my_exec"]
+  def util_make_exec(spec = @spec, shebang = "#!/usr/bin/ruby")
+    spec.executables = %w[executable]
+    spec.files << 'bin/executable'
+
+    bindir = util_gem_bindir spec
+    FileUtils.mkdir_p bindir
+    exec_path = File.join bindir, 'executable'
+    open exec_path, 'w' do |io|
+      io.puts shebang
+    end
 
-    FileUtils.mkdir_p util_gem_bindir(version)
-    exec_path = File.join util_gem_bindir(version), "my_exec"
-    File.open exec_path, 'w' do |f|
-      f.puts shebang
+    temp_bin = File.join(@tempdir, 'bin')
+    FileUtils.mkdir_p temp_bin
+    open File.join(temp_bin, 'executable'), 'w' do |io|
+      io.puts shebang
     end
   end
 
   def util_setup_gem(ui = @ui) # HACK fix use_ui to make this automatic
-    @spec.files = File.join('lib', 'code.rb')
-    @spec.executables << 'executable'
+    @spec.files << File.join('lib', 'code.rb')
     @spec.extensions << File.join('ext', 'a', 'mkrf_conf.rb')
 
     Dir.chdir @tempdir do
@@ -121,9 +131,7 @@ class Gem::InstallerTestCase < Gem::TestCase
 
   def util_installer(spec, gem_path, gem_home)
     util_build_gem spec
-    FileUtils.mv File.join(@gemhome, 'cache', spec.file_name),
-                 @tempdir
-
+    FileUtils.mv Gem.cache_gem(spec.file_name), @tempdir
     installer = Gem::Installer.new gem_path
     installer.gem_dir = util_gem_dir
     installer.gem_home = gem_home

data/lib/rubygems/mock_gem_ui.rb

@@ -31,7 +31,7 @@ class Gem::MockGemUi < Gem::StreamUI
     outs.extend TTY
     errs.extend TTY
 
-    super ins, outs, errs
+    super ins, outs, errs, true
 
     @terminated = false
   end

data/lib/rubygems/remote_fetcher.rb

@@ -71,6 +71,23 @@ class Gem::RemoteFetcher
       end
   end
 
+  ##
+  # Given a name and requirement, downloads this gem into cache and returns the
+  # filename. Returns nil if the gem cannot be located.
+  #--
+  # Should probably be integrated with #download below, but that will be a
+  # larger, more emcompassing effort. -erikh
+
+  def download_to_cache dependency
+    found = Gem::SpecFetcher.fetcher.fetch dependency
+
+    return if found.empty?
+
+    spec, source_uri = found.first
+
+    download spec, source_uri
+  end
+
   ##
   # Moves the gem +spec+ from +source_uri+ to the cache dir unless it is
   # already there.  If the source_uri is local the gem cache dir copy is
@@ -80,9 +97,9 @@ class Gem::RemoteFetcher
     Gem.ensure_gem_subdirectories(install_dir) rescue nil
 
     if File.writable?(install_dir)
-      cache_dir = File.join install_dir, 'cache'
+      cache_dir = Gem.cache_dir(install_dir)
     else
-      cache_dir = File.join(Gem.user_dir, 'cache')
+      cache_dir = Gem.cache_dir(Gem.user_dir)
     end
 
     gem_file_name = spec.file_name
@@ -134,7 +151,7 @@ class Gem::RemoteFetcher
         path = source_uri.path
         path = File.dirname(path) if File.extname(path) == '.gem'
 
-        remote_gem_path = File.join(path, 'gems', gem_file_name)
+        remote_gem_path = correct_for_windows_path(File.join(path, 'gems', gem_file_name))
 
         FileUtils.cp(remote_gem_path, local_gem_path)
       rescue Errno::EACCES
@@ -270,6 +287,14 @@ class Gem::RemoteFetcher
     raise FetchError.new(e.message, uri)
   end
 
+  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
+  end
+
   ##
   # Read the data from the (source based) URI, but if it is a file:// URI,
   # read from the filesystem instead.
@@ -287,13 +312,7 @@ class Gem::RemoteFetcher
     end
 
     if uri.scheme == 'file'
-      path = uri.path
-
-      # Deal with leading slash on Windows paths
-      if path[0].chr == '/' && path[1].chr =~ /[a-zA-Z]/ && path[2].chr == ':'
-         path = path[1..-1]
-      end
-
+      path = correct_for_windows_path(uri.path)
       return Gem.read_binary(path)
     end
 

data/lib/rubygems/requirement.rb

@@ -102,7 +102,7 @@ class Gem::Requirement
   end
 
   def as_list # :nodoc:
-    requirements.map { |op, version| "#{op} #{version}" }
+    requirements.map { |op, version| "#{op} #{version}" }.sort
   end
 
   def hash # :nodoc:

data/lib/rubygems/security.rb

@@ -6,6 +6,7 @@
 
 require 'rubygems/exceptions'
 require 'rubygems/gem_openssl'
+require 'fileutils'
 
 #
 # = Signed Gems README

data/lib/rubygems/source_index.rb

@@ -125,7 +125,7 @@ class Gem::SourceIndex
   # Returns an Array specifications for the latest released versions
   # of each gem in this index.
 
-  def latest_specs
+  def latest_specs(include_prerelease=false)
     result = Hash.new { |h,k| h[k] = [] }
     latest = {}
 
@@ -134,7 +134,7 @@ class Gem::SourceIndex
       curr_ver = spec.version
       prev_ver = latest.key?(name) ? latest[name].version : nil
 
-      next if curr_ver.prerelease?
+      next if !include_prerelease && curr_ver.prerelease?
       next unless prev_ver.nil? or curr_ver >= prev_ver or
                   latest[name].platform != Gem::Platform::RUBY
 
@@ -267,6 +267,7 @@ class Gem::SourceIndex
     when Gem::Dependency then
       only_platform = platform_only
       requirement = gem_pattern.requirement
+
       gem_pattern = if Regexp === gem_pattern.name then
                       gem_pattern.name
                     elsif gem_pattern.name.empty? then

data/lib/rubygems/spec_fetcher.rb

@@ -70,7 +70,8 @@ class Gem::SpecFetcher
   # Returns the local directory to write +uri+ to.
 
   def cache_dir(uri)
-    File.join @dir, "#{uri.host}%#{uri.port}", File.dirname(uri.path)
+    escaped_path = uri.path.sub(%r[^/([a-z]):/]i, '/\\1-/') # Correct for windows paths
+    File.join @dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
   end
 
   ##
@@ -94,6 +95,7 @@ class Gem::SpecFetcher
   end
 
   def fetch_spec(spec, source_uri)
+    source_uri = URI.parse source_uri if String === source_uri
     spec = spec - [nil, 'ruby', '']
     spec_file_name = "#{spec.join '-'}.gemspec"
 

data/lib/rubygems/specification.rb

@@ -333,7 +333,8 @@ class Gem::Specification
   # List of dependencies that will automatically be activated at runtime.
 
   def runtime_dependencies
-    dependencies.select { |d| d.type == :runtime || d.type == nil }
+    # TODO: fix #type to return :runtime if nil
+    dependencies.select { |d| d.type == :runtime }
   end
 
   ##
@@ -678,6 +679,14 @@ class Gem::Specification
 
   alias eql? == # :nodoc:
 
+  ##
+  # A macro to yield cached gem path
+  #
+  def cache_gem
+    cache_name = File.join(Gem.dir, 'cache', file_name)
+    return File.exist?(cache_name) ? cache_name : nil
+  end
+
   ##
   # True if this gem has the same attributes as +other+.
 
@@ -791,21 +800,17 @@ class Gem::Specification
 
     result << "    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then"
 
-    unless dependencies.empty? then
-      dependencies.each do |dep|
-        version_reqs_param = dep.requirements_list.inspect
-        dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
-        result << "      s.add_#{dep.type}_dependency(%q<#{dep.name}>, #{version_reqs_param})"
-      end
+    dependencies.each do |dep|
+      req = dep.requirements_list.inspect
+      dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
+      result << "      s.add_#{dep.type}_dependency(%q<#{dep.name}>, #{req})"
     end
 
     result << "    else"
 
-    unless dependencies.empty? then
-      dependencies.each do |dep|
-        version_reqs_param = dep.requirements_list.inspect
-        result << "      s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
-      end
+    dependencies.each do |dep|
+      version_reqs_param = dep.requirements_list.inspect
+      result << "      s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
     end
 
     result << '    end'
@@ -823,6 +828,15 @@ class Gem::Specification
     result.join "\n"
   end
 
+  def to_ruby_for_cache
+    s = dup
+    # remove large blobs that aren't used at runtime:
+    s.files = nil
+    s.extra_rdoc_files = nil
+    s.rdoc_options = nil
+    s.to_ruby
+  end
+
   ##
   # Checks that the specification contains all required fields, and does a
   # very basic sanity check.
@@ -1520,4 +1534,32 @@ class Gem::Specification
               @extensions,
              ].flatten.uniq.compact
   end
+
+  def conflicts
+    conflicts = {}
+    Gem.loaded_specs.values.each do |spec|
+      bad = self.runtime_dependencies.find_all { |dep|
+        spec.name == dep.name and not spec.satisfies_requirement? dep
+      }
+
+      conflicts[spec] = bad unless bad.empty?
+    end
+    conflicts
+  end
+
+  def traverse trail = [], &b
+    trail = trail + [self]
+    runtime_dependencies.each do |dep|
+      dep_specs = Gem.source_index.search dep, true
+      dep_specs.each do |dep_spec|
+        b[self, dep, dep_spec, trail + [dep_spec]]
+        dep_spec.traverse(trail, &b) unless
+          trail.map(&:name).include? dep_spec.name
+      end
+    end
+  end
+
+  def dependent_specs
+    runtime_dependencies.map { |dep| Gem.source_index.search dep, true }.flatten
+  end
 end