rubygems-update 1.7.2 → 1.8.0

data/lib/rubygems/dependency_list.rb

@@ -5,6 +5,7 @@
 #++
 
 require 'tsort'
+require 'rubygems/deprecate'
 
 ##
 # Gem::DependencyList is used for installing and uninstalling gems in the
@@ -22,16 +23,21 @@ class Gem::DependencyList
   attr_accessor :development
 
   ##
-  # Creates a DependencyList from a Gem::SourceIndex +source_index+
+  # Creates a DependencyList from the current specs.
 
-  def self.from_source_index(source_index)
+  def self.from_specs
     list = new
+    list.add(*Gem::Specification.map)
+    list
+  end
 
-    source_index.each do |full_name, spec|
-      list.add spec
-    end
+  ##
+  # Creates a DependencyList from a Gem::SourceIndex +source_index+
 
-    list
+  def self.from_source_index(ignored=nil)
+    warn "NOTE: DependencyList.from_source_index ignores it's arg" if ignored
+
+    from_specs
   end
 
   ##
@@ -114,10 +120,9 @@ class Gem::DependencyList
 
   def why_not_ok? quick = false
     unsatisfied = Hash.new { |h,k| h[k] = [] }
-    source_index = Gem.source_index
     each do |spec|
       spec.runtime_dependencies.each do |dep|
-        inst = source_index.any? { |_, installed_spec|
+        inst = Gem::Specification.any? { |installed_spec|
           dep.name == installed_spec.name and
             dep.requirement.satisfied_by? installed_spec.version
         }
@@ -128,6 +133,7 @@ class Gem::DependencyList
         end
       end
     end
+
     unsatisfied
   end
 
@@ -236,6 +242,11 @@ class Gem::DependencyList
   def active_count(specs, ignored)
     specs.count { |spec| ignored[spec.full_name].nil? }
   end
-
 end
 
+class Gem::DependencyList
+  class << self
+    extend Deprecate
+    deprecate :from_source_index, "from_specs", 2011, 11
+  end
+end

data/lib/rubygems/deprecate.rb

@@ -50,16 +50,16 @@ module Deprecate
     class_eval {
       old = "_deprecated_#{name}"
       alias_method old, name
-      define_method name do |*args|
+      define_method name do |*args, &block| # TODO: really works on 1.8.7?
         klass = self.kind_of? Module
         target = klass ? "#{self}." : "#{self.class}#"
         msg = [ "NOTE: #{target}#{name} is deprecated",
                 repl == :none ? " with no replacement" : ", use #{repl}",
                 ". It will be removed on or after %4d-%02d-01." % [year, month],
-                "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}\n",
+                "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
               ]
         warn "#{msg.join}." unless Deprecate.skip
-        send old, *args
+        send old, *args, &block
       end
     }
   end

data/lib/rubygems/doc_manager.rb

@@ -86,7 +86,7 @@ class Gem::DocManager
   def initialize(spec, rdoc_args="")
     require 'fileutils'
     @spec = spec
-    @doc_dir = File.join(spec.installation_path, "doc", spec.full_name)
+    @doc_dir = spec.doc_dir
     @rdoc_args = rdoc_args.nil? ? [] : rdoc_args.split
   end
 
@@ -218,25 +218,24 @@ class Gem::DocManager
   # Remove RDoc and RI documentation
 
   def uninstall_doc
-    raise Gem::FilePermissionError.new(@spec.installation_path) unless
-    File.writable? @spec.installation_path
+    base_dir = @spec.base_dir
+    raise Gem::FilePermissionError.new base_dir unless File.writable? base_dir
 
-    original_name = [
+    # TODO: ok... that's twice... ugh
+    old_name = [
       @spec.name, @spec.version, @spec.original_platform].join '-'
 
-    doc_dir = File.join @spec.installation_path, 'doc', @spec.full_name
+    doc_dir = @spec.doc_dir
     unless File.directory? doc_dir then
-      doc_dir = File.join @spec.installation_path, 'doc', original_name
+      doc_dir = File.join File.dirname(doc_dir), old_name
     end
 
-    FileUtils.rm_rf doc_dir
-
-    ri_dir = File.join @spec.installation_path, 'ri', @spec.full_name
-
+    ri_dir = @spec.ri_dir
     unless File.directory? ri_dir then
-      ri_dir = File.join @spec.installation_path, 'ri', original_name
+      ri_dir = File.join File.dirname(ri_dir), old_name
     end
 
+    FileUtils.rm_rf doc_dir
     FileUtils.rm_rf ri_dir
   end
 

data/lib/rubygems/ext/rake_builder.rb

@@ -17,7 +17,7 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
     end
 
     # Deal with possible spaces in the path, e.g. C:/Program Files
-    dest_path = '"' + dest_path + '"' if dest_path.include?(' ')
+    dest_path = '"' + dest_path.to_s + '"' if dest_path.to_s.include?(' ')
 
     rake = ENV['rake']
 

data/lib/rubygems/gem_path_searcher.rb

@@ -50,6 +50,15 @@ class Gem::GemPathSearcher
     end
   end
 
+  # Looks through the available gemspecs and finds the first
+  # one that contains +file+ as a requirable file.
+
+  def find_spec_for_file(file)
+    @gemspecs.find do |spec|
+      return spec if spec.contains_requirable_file?(file)
+    end
+  end
+
   def find_active(glob)
     # HACK violation of encapsulation
     @gemspecs.find do |spec|
@@ -132,9 +141,7 @@ class Gem::GemPathSearcher
   # in reverse version order.  (bar-2, bar-1, foo-2)
 
   def init_gemspecs
-    specs = Gem.source_index.map { |_, spec| spec }
-
-    specs.sort { |a, b|
+    Gem::Specification.sort { |a, b|
       names = a.name <=> b.name
       next names if names.nonzero?
       b.version <=> a.version
@@ -150,5 +157,13 @@ class Gem::GemPathSearcher
       spec.require_paths
   end
 
-end
+  extend Deprecate
 
+  deprecate :initialize,              :none,  2011, 10
+  deprecate :find,                    :none,  2011, 10
+  deprecate :find_active,             :none,  2011, 10
+  deprecate :find_all,                :none,  2011, 10
+  deprecate :find_in_unresolved,      :none,  2011, 10
+  deprecate :find_in_unresolved_tree, :none,  2011, 10
+  deprecate :find_spec_for_file,      :none,  2011, 10
+end

data/lib/rubygems/gem_runner.rb

@@ -75,7 +75,7 @@ class Gem::GemRunner
 
   def do_configuration(args)
     Gem.configuration = @config_file_class.new(args)
-    Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
+    Gem.use_paths Gem.configuration[:gemhome], Gem.configuration[:gempath]
     Gem::Command.extra_args = Gem.configuration[:gem]
     @doc_manager_class.configured_args = Gem.configuration[:rdoc]
   end

data/lib/rubygems/indexer.rb

@@ -73,32 +73,31 @@ class Gem::Indexer
     @rss_gems_host = options[:rss_gems_host]
 
     @dest_directory = directory
-    @directory = File.join Dir.tmpdir, "gem_generate_index_#{$$}"
+    @directory = File.join(Dir.tmpdir, "gem_generate_index_#{$$}")
 
     marshal_name = "Marshal.#{Gem.marshal_version}"
 
     @master_index = File.join @directory, 'yaml'
     @marshal_index = File.join @directory, marshal_name
 
-    @quick_dir = File.join @directory, 'quick'
-
+    @quick_dir = File.join, @directory, 'quick'
     @quick_marshal_dir = File.join @quick_dir, marshal_name
+    @quick_marshal_dir_base = File.join "quick", marshal_name # FIX: UGH
 
     @quick_index = File.join @quick_dir, 'index'
     @latest_index = File.join @quick_dir, 'latest_index'
 
     @specs_index = File.join @directory, "specs.#{Gem.marshal_version}"
-    @latest_specs_index = File.join @directory,
-                                    "latest_specs.#{Gem.marshal_version}"
-    @prerelease_specs_index = File.join(@directory,
-                                        "prerelease_specs.#{Gem.marshal_version}")
-
-    @dest_specs_index = File.join @dest_directory,
-                                  "specs.#{Gem.marshal_version}"
-    @dest_latest_specs_index = File.join @dest_directory,
-                                         "latest_specs.#{Gem.marshal_version}"
-    @dest_prerelease_specs_index = File.join @dest_directory,
-                                            "prerelease_specs.#{Gem.marshal_version}"
+    @latest_specs_index =
+      File.join(@directory, "latest_specs.#{Gem.marshal_version}")
+    @prerelease_specs_index =
+      File.join(@directory, "prerelease_specs.#{Gem.marshal_version}")
+    @dest_specs_index =
+      File.join(@dest_directory, "specs.#{Gem.marshal_version}")
+    @dest_latest_specs_index =
+      File.join(@dest_directory, "latest_specs.#{Gem.marshal_version}")
+    @dest_prerelease_specs_index =
+      File.join(@dest_directory, "prerelease_specs.#{Gem.marshal_version}")
 
     @rss_index = File.join @directory, 'index.rss'
 
@@ -123,12 +122,16 @@ class Gem::Indexer
   ##
   # Build various indicies
 
-  def build_indicies(index)
+  def build_indicies
     # Marshal gemspecs are used by both modern and legacy RubyGems
-    build_marshal_gemspecs index
-    build_legacy_indicies index if @build_legacy
-    build_modern_indicies index if @build_modern
-    build_rss index
+
+    Gem::Specification.dirs = []
+    Gem::Specification.add_specs(*map_gems_to_specs(gem_file_list))
+
+    build_marshal_gemspecs
+    build_legacy_indicies if @build_legacy
+    build_modern_indicies if @build_modern
+    build_rss
 
     compress_indicies
   end
@@ -136,7 +139,9 @@ class Gem::Indexer
   ##
   # Builds indicies for RubyGems older than 1.2.x
 
-  def build_legacy_indicies(index)
+  def build_legacy_indicies
+    index = collect_specs
+
     say "Generating Marshal master index"
 
     Gem.time 'Generated Marshal master index' do
@@ -152,16 +157,17 @@ class Gem::Indexer
   ##
   # Builds Marshal quick index gemspecs.
 
-  def build_marshal_gemspecs(index)
-    progress = ui.progress_reporter index.size,
-                                    "Generating Marshal quick index gemspecs for #{index.size} gems",
+  def build_marshal_gemspecs
+    count = Gem::Specification.count
+    progress = ui.progress_reporter count,
+                                    "Generating Marshal quick index gemspecs for #{count} gems",
                                     "Complete"
 
     files = []
 
     Gem.time 'Generated Marshal quick index gemspecs' do
-      index.gems.each do |original_name, spec|
-        spec_file_name = "#{original_name}.gemspec.rz"
+      Gem::Specification.each do |spec|
+        spec_file_name = "#{spec.original_name}.gemspec.rz"
         marshal_name = File.join @quick_marshal_dir, spec_file_name
 
         marshal_zipped = Gem.deflate Marshal.dump(spec)
@@ -169,7 +175,7 @@ class Gem::Indexer
 
         files << marshal_name
 
-        progress.updated original_name
+        progress.updated spec.original_name
       end
 
       progress.done
@@ -189,8 +195,8 @@ class Gem::Indexer
     Gem.time "Generated #{name} index" do
       open(file, 'wb') do |io|
         specs = index.map do |*spec|
-          # We have to splat here because latest_specs is an array,
-          # while the others are hashes. See the TODO in source_index.rb
+          # We have to splat here because latest_specs is an array, while the
+          # others are hashes.
           spec = spec.flatten.last
           platform = spec.original_platform
 
@@ -213,13 +219,15 @@ class Gem::Indexer
   ##
   # Builds indicies for RubyGems 1.2 and newer. Handles full, latest, prerelease
 
-  def build_modern_indicies(index)
-    build_modern_index(index.released_specs.sort, @specs_index, 'specs')
-    build_modern_index(index.latest_specs.sort,
-                       @latest_specs_index,
-                       'latest specs')
-    build_modern_index(index.prerelease_specs.sort,
-                       @prerelease_specs_index,
+  def build_modern_indicies
+    prerelease, released = Gem::Specification.partition { |s|
+      s.version.prerelease?
+    }
+    latest_specs = Gem::Specification.latest_specs
+
+    build_modern_index(released.sort, @specs_index, 'specs')
+    build_modern_index(latest_specs.sort, @latest_specs_index, 'latest specs')
+    build_modern_index(prerelease.sort, @prerelease_specs_index,
                        'prerelease specs')
 
     @files += [@specs_index,
@@ -234,7 +242,7 @@ class Gem::Indexer
   # Builds an RSS feed for past two days gem releases according to the gem's
   # date.
 
-  def build_rss(index)
+  def build_rss
     if @rss_host.nil? or @rss_gems_host.nil? then
       if Gem.configuration.really_verbose then
         alert_warning "no --rss-host or --rss-gems-host, RSS generation disabled"
@@ -266,31 +274,18 @@ class Gem::Indexer
         today = Gem::Specification::TODAY
         yesterday = today - 86400
 
-        index = index.select do |_, spec|
-          spec_date = spec.date
-
-          case spec_date
-          when Date
-            Time.parse(spec_date.to_s) >= yesterday
-          when Time
-            spec_date >= yesterday
-          end
-        end
-
-        index = index.select do |_, spec|
+        index = Gem::Specification.select do |spec|
           spec_date = spec.date
+          # TODO: remove this and make YAML based specs properly normalized
+          spec_date = Time.parse(spec_date.to_s) if Date === spec_date
 
-          case spec_date
-          when Date
-            Time.parse(spec_date.to_s) <= today
-          when Time
-            spec_date <= today
-          end
+          spec_date >= yesterday && spec_date <= today
         end
 
-        index.sort_by { |_, spec| [-spec.date.to_i, spec] }.each do |_, spec|
-          gem_path = CGI.escapeHTML "http://#{@rss_gems_host}/gems/#{spec.file_name}"
-          size = File.stat(spec.loaded_from).size rescue next
+        index.sort_by { |spec| [-spec.date.to_i, spec] }.each do |spec|
+          file_name = File.basename spec.cache_file
+          gem_path = CGI.escapeHTML "http://#{@rss_gems_host}/gems/#{file_name}"
+          size = File.stat(spec.loaded_from).size # rescue next
 
           description = spec.description || spec.summary || ''
           authors = Array spec.authors
@@ -341,54 +336,56 @@ class Gem::Indexer
     @files << @rss_index
   end
 
+  def map_gems_to_specs gems
+    gems.map { |gemfile|
+      if File.size(gemfile) == 0 then
+        alert_warning "Skipping zero-length gem: #{gemfile}"
+        next
+      end
+
+      begin
+        spec = Gem::Format.from_file_by_path(gemfile).spec
+        spec.loaded_from = gemfile
+
+        # HACK: fuck this shit - borks all tests that use pl1
+        # if File.basename(gemfile, ".gem") != spec.original_name then
+        #   exp = spec.full_name
+        #   exp << " (#{spec.original_name})" if
+        #     spec.original_name != spec.full_name
+        #   msg = "Skipping misnamed gem: #{gemfile} should be named #{exp}"
+        #   alert_warning msg
+        #   next
+        # end
+
+        abbreviate spec
+        sanitize spec
+
+        spec
+      rescue SignalException => e
+        alert_error "Received signal, exiting"
+        raise
+      rescue Exception => e
+        msg = ["Unable to process #{gemfile}",
+               "#{e.message} (#{e.class})",
+               "\t#{e.backtrace.join "\n\t"}"].join("\n")
+        alert_error msg
+      end
+    }.compact
+  end
+
   ##
   # Collect specifications from .gem files from the gem directory.
 
   def collect_specs(gems = gem_file_list)
-    index = Gem::SourceIndex.new
-
-    progress = ui.progress_reporter gems.size,
-                                    "Loading #{gems.size} gems from #{@dest_directory}",
-                                    "Loaded all gems"
+    Deprecate.skip_during do
+      index = Gem::SourceIndex.new
 
-    Gem.time 'loaded' do
-      gems.each do |gemfile|
-        if File.size(gemfile.to_s) == 0 then
-          alert_warning "Skipping zero-length gem: #{gemfile}"
-          next
-        end
-
-        begin
-          spec = Gem::Format.from_file_by_path(gemfile).spec
-          spec.loaded_from = gemfile
-
-          unless gemfile =~ /\/#{Regexp.escape spec.original_name}.*\.gem\z/i then
-            expected_name = spec.full_name
-            expected_name << " (#{spec.original_name})" if
-              spec.original_name != spec.full_name
-            alert_warning "Skipping misnamed gem: #{gemfile} should be named #{expected_name}"
-            next
-          end
-
-          abbreviate spec
-          sanitize spec
-
-          index.add_spec spec, spec.original_name
-
-          progress.updated spec.original_name
-
-        rescue SignalException => e
-          alert_error "Received signal, exiting"
-          raise
-        rescue Exception => e
-          alert_error "Unable to process #{gemfile}\n#{e.message} (#{e.class})\n\t#{e.backtrace.join "\n\t"}"
-        end
+      map_gems_to_specs(gems).each do |spec|
+        index.add_spec spec, spec.original_name
       end
 
-      progress.done
+      index
     end
-
-    index
   end
 
   ##
@@ -448,7 +445,7 @@ class Gem::Indexer
   # List of gem file names to index.
 
   def gem_file_list
-    Dir.glob(File.join(@dest_directory, "gems", "*.gem"))
+    Dir[File.join(@dest_directory, "gems", '*.gem')]
   end
 
   ##
@@ -456,8 +453,7 @@ class Gem::Indexer
 
   def generate_index
     make_temp_directories
-    index = collect_specs
-    build_indicies index
+    build_indicies
     install_indicies
   rescue SignalException
   ensure
@@ -481,24 +477,22 @@ class Gem::Indexer
 
     say "Moving index into production dir #{@dest_directory}" if verbose
 
-    files = @files.dup
+    files = @files
     files.delete @quick_marshal_dir if files.include? @quick_dir
 
-    if files.include? @quick_marshal_dir and
-       not files.include? @quick_dir then
+    if files.include? @quick_marshal_dir and not files.include? @quick_dir then
       files.delete @quick_marshal_dir
-      quick_marshal_dir = @quick_marshal_dir.sub @directory, ''
 
-      dst_name = File.join @dest_directory, quick_marshal_dir
+      dst_name = File.join(@dest_directory, @quick_marshal_dir_base)
 
       FileUtils.mkdir_p File.dirname(dst_name), :verbose => verbose
       FileUtils.rm_rf dst_name, :verbose => verbose
-      FileUtils.mv @quick_marshal_dir, dst_name, :verbose => verbose,
-                   :force => true
+      FileUtils.mv(@quick_marshal_dir, dst_name,
+                   :verbose => verbose, :force => true)
     end
 
     files = files.map do |path|
-      path.sub @directory, ''
+      path.sub(/^#{Regexp.escape @directory}\/?/, '') # HACK?
     end
 
     files.each do |file|
@@ -506,8 +500,8 @@ class Gem::Indexer
       dst_name = File.join @dest_directory, file
 
       FileUtils.rm_rf dst_name, :verbose => verbose
-      FileUtils.mv src_name, @dest_directory, :verbose => verbose,
-                   :force => true
+      FileUtils.mv(src_name, @dest_directory,
+                   :verbose => verbose, :force => true)
     end
   end
 
@@ -538,10 +532,10 @@ class Gem::Indexer
   # be replaced by their XML entity equivalent.
 
   def sanitize(spec)
-    spec.summary = sanitize_string(spec.summary)
-    spec.description = sanitize_string(spec.description)
+    spec.summary              = sanitize_string(spec.summary)
+    spec.description          = sanitize_string(spec.description)
     spec.post_install_message = sanitize_string(spec.post_install_message)
-    spec.authors = spec.authors.collect { |a| sanitize_string(a) }
+    spec.authors              = spec.authors.collect { |a| sanitize_string(a) }
 
     spec
   end
@@ -587,14 +581,16 @@ class Gem::Indexer
       terminate_interaction 0
     end
 
-    index = collect_specs updated_gems
+    specs = map_gems_to_specs updated_gems
+    prerelease, released = specs.partition { |s| s.version.prerelease? }
 
-    files = build_marshal_gemspecs index
+    files = build_marshal_gemspecs
 
     Gem.time 'Updated indexes' do
-      update_specs_index index.released_gems, @dest_specs_index, @specs_index
-      update_specs_index index.released_gems, @dest_latest_specs_index, @latest_specs_index
-      update_specs_index(index.prerelease_gems, @dest_prerelease_specs_index,
+      update_specs_index released, @dest_specs_index, @specs_index
+      update_specs_index released, @dest_latest_specs_index, @latest_specs_index
+      update_specs_index(prerelease,
+                         @dest_prerelease_specs_index,
                          @prerelease_specs_index)
     end
 
@@ -612,12 +608,12 @@ class Gem::Indexer
     files << "#{@prerelease_specs_index}.gz"
 
     files = files.map do |path|
-      path.sub @directory, ''
+      path.sub(/^#{Regexp.escape @directory}\/?/, '') # HACK?
     end
 
     files.each do |file|
       src_name = File.join @directory, file
-      dst_name = File.join @dest_directory, File.dirname(file)
+      dst_name = File.join @dest_directory, file # REFACTOR: duped above
 
       FileUtils.mv src_name, dst_name, :verbose => verbose,
                    :force => true
@@ -633,7 +629,7 @@ class Gem::Indexer
   def update_specs_index(index, source, dest)
     specs_index = Marshal.load Gem.read_binary(source)
 
-    index.each do |_, spec|
+    index.each do |spec|
       platform = spec.original_platform
       platform = Gem::Platform::RUBY if platform.nil? or platform.empty?
       specs_index << [spec.name, spec.version, platform]
@@ -645,6 +641,4 @@ class Gem::Indexer
       Marshal.dump specs_index, io
     end
   end
-
 end
-