rubygems-update 2.0.0.preview2.2 → 2.0.0.rc.1

data/History.txt

@@ -1,10 +1,10 @@
 # coding: UTF-8
 
-=== 2.0.0.preview2.2 / 2012-12-14
+=== 2.0.0.rc.1 / 2013-01-08
 
 As a preview release, please file bugs for any problems you have with RubyGems
-at https://github.com/rubygems/rubygems/issues.  To update to preview releases
-use gem update --system=2.0.0.preview2.2
+at https://github.com/rubygems/rubygems/issues.  To update to this preview
+release use gem update --system=2.0.0.preview3
 
 RubyGems 2.0 includes several new features and many breaking changes.  Some of
 these changes will cause existing software to break.  These changes are a
@@ -14,8 +14,23 @@ maintainable and improve APIs for RubyGems users.
 If you are using bundler be sure to install version 1.3.0.pre.  Older versions
 of bundler will not work with RubyGems 2.0.
 
+* Minor enhancements:
+  * This release of RubyGems can push gems to rubygems.org.  Ordinarily
+    prerelease versions of RubyGems cannot push gems.
+  * Added `gem check --doctor` to clean up after failed uninstallation.  Bug
+    #419 by Erik Hollensbe
+
+* Bug fixes:
+  * Fixed exception raised when attempting to push gems to rubygems.org.  Bug
+    #418 by André Arko
+  * Gem installation will fail if RubyGems cannot load the specification from
+    the gem.  Bug #419 by Erik Hollensbe
+
+=== 2.0.0.preview2.2 / 2012-12-14
+
 * Minor enhancements:
   * Added a cmake builder.  Pull request #265 by Allan Espinosa.
+  * Removed rubyforge page from gem list output
 
 * Bug fixes:
   * Restored RubyGems 1.8 packaging behavior of omitting directories.  Bug

data/Manifest.txt

@@ -56,6 +56,7 @@ lib/rubygems/dependency_installer.rb
 lib/rubygems/dependency_list.rb
 lib/rubygems/dependency_resolver.rb
 lib/rubygems/deprecate.rb
+lib/rubygems/doctor.rb
 lib/rubygems/errors.rb
 lib/rubygems/exceptions.rb
 lib/rubygems/ext.rb
@@ -202,6 +203,7 @@ test/rubygems/test_gem_dependency.rb
 test/rubygems/test_gem_dependency_installer.rb
 test/rubygems/test_gem_dependency_list.rb
 test/rubygems/test_gem_dependency_resolver.rb
+test/rubygems/test_gem_doctor.rb
 test/rubygems/test_gem_ext_cmake_builder.rb
 test/rubygems/test_gem_ext_configure_builder.rb
 test/rubygems/test_gem_ext_ext_conf_builder.rb

data/lib/rubygems.rb

@@ -98,7 +98,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.0.0.preview2.2'
+  VERSION = '2.0.0.rc.1'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -123,7 +123,22 @@ module Gem
     /wince/i,
   ]
 
-  GEM_DEP_FILES = %w!gem.deps.rb Gemfile Isolate!
+  GEM_DEP_FILES = %w[
+    gem.deps.rb
+    Gemfile
+    Isolate
+  ]
+
+  ##
+  # Subdirectories in a gem repository
+
+  REPOSITORY_SUBDIRECTORIES = %w[
+    build_info
+    cache
+    doc
+    gems
+    specifications
+  ]
 
   @@win_platform = nil
 
@@ -388,7 +403,7 @@ module Gem
 
     require 'fileutils'
 
-    %w[cache build_info doc gems specifications].each do |name|
+    REPOSITORY_SUBDIRECTORIES.each do |name|
       subdir = File.join dir, name
       next if File.exist? subdir
       FileUtils.mkdir_p subdir rescue nil # in case of perms issues -- lame
@@ -750,33 +765,35 @@ module Gem
     @ruby
   end
 
-  # DOC: needs doc'd or :nodoc'd
+  ##
+  # Returns the latest release-version specification for the gem +name+.
+
   def self.latest_spec_for name
-    dependency  = Gem::Dependency.new name
-    fetcher     = Gem::SpecFetcher.fetcher
-    spec_tuples = fetcher.find_matching dependency
+    dependency   = Gem::Dependency.new name
+    fetcher      = Gem::SpecFetcher.fetcher
+    spec_tuples, = fetcher.spec_for_dependency dependency
 
-    match = spec_tuples.select { |(n, _, p), _|
-      n == name and Gem::Platform.match p
-    }.sort_by { |(_, version, _), _|
-      version
-    }.last
+    spec, = spec_tuples.first
 
-    match and fetcher.fetch_spec(*match)
+    spec
   end
 
-  # DOC: needs doc'd or :nodoc'd
-  def self.latest_version_for name
-    spec = latest_spec_for name
-    spec and spec.version
-  end
+  ##
+  # Returns the latest release version of RubyGems.
 
-  # DOC: needs doc'd or :nodoc'd
   def self.latest_rubygems_version
-    latest_version_for("rubygems-update") or
+    latest_version_for('rubygems-update') or
       raise "Can't find 'rubygems-update' in any repo. Check `gem source list`."
   end
 
+  ##
+  # Returns the version of the latest release-version of gem +name+
+
+  def self.latest_version_for name
+    spec = latest_spec_for name
+    spec and spec.version
+  end
+
   ##
   # A Gem::Version for the currently running ruby.
 

data/lib/rubygems/commands/check_command.rb

@@ -1,25 +1,44 @@
 require 'rubygems/command'
 require 'rubygems/version_option'
 require 'rubygems/validator'
+require 'rubygems/doctor'
 
 class Gem::Commands::CheckCommand < Gem::Command
 
   include Gem::VersionOption
 
   def initialize
-    super 'check', 'Check installed gems',
-          :alien => true
+    super 'check', 'Check a gem repository for added or missing files',
+          :alien => true, :doctor => false, :dry_run => false, :gems => true
 
-    add_option('-a', '--alien', "Report 'unmanaged' or rogue files in the",
-               "gem repository") do |value, options|
-      options[:alien] = true
+    add_option('-a', '--[no-]alien',
+               'Report "unmanaged" or rogue files in the',
+               'gem repository') do |value, options|
+      options[:alien] = value
+    end
+
+    add_option('--[no-]doctor',
+               'Clean up uninstalled gems and broken',
+               'specifications') do |value, options|
+      options[:doctor] = value
+    end
+
+    add_option('--[no-]dry-run',
+               'Do not remove files, only report what',
+               'would be removed') do |value, options|
+      options[:dry_run] = value
+    end
+
+    add_option('--[no-]gems',
+               'Check installed gems for problems') do |value, options|
+      options[:gems] = value
     end
 
     add_version_option 'check'
   end
 
-  def execute
-    say "Checking gems..."
+  def check_gems
+    say 'Checking gems...'
     say
     gems = get_all_gem_names rescue []
 
@@ -37,4 +56,31 @@ class Gem::Commands::CheckCommand < Gem::Command
     end
   end
 
+  def doctor
+    say 'Checking for files from uninstalled gems...'
+    say
+
+    Gem.path.each do |gem_repo|
+      doctor = Gem::Doctor.new gem_repo, options[:dry_run]
+      doctor.doctor
+    end
+  end
+
+  def execute
+    check_gems if options[:gems]
+    doctor if options[:doctor]
+  end
+
+  def arguments # :nodoc:
+    'GEMNAME       name of gem to check'
+  end
+
+  def defaults_str # :nodoc:
+    '--gems --alien'
+  end
+
+  def usage # :nodoc:
+    "#{program_name} [OPTIONS] [GEMNAME ...]"
+  end
+
 end

data/lib/rubygems/commands/cleanup_command.rb

@@ -12,6 +12,14 @@ class Gem::Commands::CleanupCommand < Gem::Command
     add_option('-d', '--dryrun', "") do |value, options|
       options[:dryrun] = true
     end
+
+    @candidate_gems  = nil
+    @default_gems    = []
+    @full            = nil
+    @gems_to_cleanup = nil
+    @original_home   = nil
+    @original_path   = nil
+    @primary_gems    = nil
   end
 
   def arguments # :nodoc:
@@ -38,79 +46,119 @@ are not removed.
 
   def execute
     say "Cleaning up installed gems..."
-    primary_gems = {}
 
-    Gem::Specification.each do |spec|
-      if primary_gems[spec.name].nil? or
-         primary_gems[spec.name].version < spec.version then
-        primary_gems[spec.name] = spec
+    if options[:args].empty? then
+      done     = false
+      last_set = nil
+
+      until done do
+        clean_gems
+
+        this_set = @gems_to_cleanup.map { |spec| spec.full_name }.sort
+
+        done = this_set.empty? || last_set == this_set
+
+        last_set = this_set
       end
+    else
+      clean_gems
     end
 
-    candidate_gems = unless options[:args].empty? then
-                       options[:args].map do |gem_name|
-                         Gem::Specification.find_all_by_name gem_name
-                       end.flatten
-                     else
-                       Gem::Specification.to_a
-                     end
-
-    gems_to_cleanup = candidate_gems.select { |spec|
-      !spec.default_gem? and
-        primary_gems[spec.name].version != spec.version
-    }
+    say "Clean Up Complete"
 
-    full = Gem::DependencyList.from_specs
+    if Gem.configuration.really_verbose then
+      skipped = @default_gems.map { |spec| spec.full_name }
+
+      say "Skipped default gems: #{skipped.join ', '}"
+    end
+  end
+
+  def clean_gems
+    get_primary_gems
+    get_candidate_gems
+    get_gems_to_cleanup
+
+    @full = Gem::DependencyList.from_specs
 
     deplist = Gem::DependencyList.new
-    gems_to_cleanup.uniq.each do |spec| deplist.add spec end
+    @gems_to_cleanup.each do |spec| deplist.add spec end
+
+    deps = deplist.strongly_connected_components.flatten
 
-    deps = deplist.strongly_connected_components.flatten.reverse
+    @original_home = Gem.dir
+    @original_path = Gem.path
 
-    original_home = Gem.dir
-    original_path = Gem.path
+    deps.reverse_each do |spec|
+      uninstall_dep spec
+    end
 
-    deps.each do |spec|
-      next unless full.ok_to_remove?(spec.full_name)
+    Gem::Specification.reset
+  end
 
-      if options[:dryrun] then
-        say "Dry Run Mode: Would uninstall #{spec.full_name}"
-      else
-        say "Attempting to uninstall #{spec.full_name}"
+  def get_candidate_gems
+    @candidate_gems = unless options[:args].empty? then
+                        options[:args].map do |gem_name|
+                          Gem::Specification.find_all_by_name gem_name
+                        end.flatten
+                      else
+                        Gem::Specification.to_a
+                      end
+  end
 
-        options[:args] = [spec.name]
+  def get_gems_to_cleanup
+    gems_to_cleanup = @candidate_gems.select { |spec|
+      @primary_gems[spec.name].version != spec.version
+    }
 
-        uninstall_options = {
-          :executables => false,
-          :version => "= #{spec.version}",
-        }
+    default_gems, gems_to_cleanup = gems_to_cleanup.partition { |spec|
+      spec.default_gem?
+    }
 
-        uninstall_options[:user_install] = Gem.user_dir == spec.base_dir
+    @default_gems += default_gems
+    @default_gems.uniq!
+    @gems_to_cleanup = gems_to_cleanup.uniq
+  end
 
-        uninstaller = Gem::Uninstaller.new spec.name, uninstall_options
+  def get_primary_gems
+    @primary_gems = {}
 
-        begin
-          uninstaller.uninstall
-        rescue Gem::DependencyRemovalException, Gem::InstallError,
-               Gem::GemNotInHomeException, Gem::FilePermissionError => e
-          say "Unable to uninstall #{spec.full_name}:"
-          say "\t#{e.class}: #{e.message}"
-        end
+    Gem::Specification.each do |spec|
+      if @primary_gems[spec.name].nil? or
+         @primary_gems[spec.name].version < spec.version then
+        @primary_gems[spec.name] = spec
       end
+    end
+  end
+
+  def uninstall_dep spec
+    return unless @full.ok_to_remove?(spec.full_name)
 
-      # Restore path Gem::Uninstaller may have change
-      Gem.use_paths(original_home, *original_path)
+    if options[:dryrun] then
+      say "Dry Run Mode: Would uninstall #{spec.full_name}"
+      return
     end
 
-    say "Clean Up Complete"
+    say "Attempting to uninstall #{spec.full_name}"
 
-    if Gem.configuration.really_verbose then
-      skipped = candidate_gems.
-        select { |spec| spec.default_gem? }.
-        map { |spec| spec.full_name}
+    uninstall_options = {
+      :executables => false,
+      :version => "= #{spec.version}",
+    }
 
-      say "Skipped default gems: #{skipped.join ', '}"
+    uninstall_options[:user_install] = Gem.user_dir == spec.base_dir
+
+    uninstaller = Gem::Uninstaller.new spec.name, uninstall_options
+
+    begin
+      uninstaller.uninstall
+    rescue Gem::DependencyRemovalException, Gem::InstallError,
+           Gem::GemNotInHomeException, Gem::FilePermissionError => e
+      say "Unable to uninstall #{spec.full_name}:"
+      say "\t#{e.class}: #{e.message}"
     end
+  ensure
+    # Restore path Gem::Uninstaller may have changed
+    Gem.use_paths @original_home, *@original_path
   end
 
 end

data/lib/rubygems/commands/push_command.rb

@@ -40,9 +40,17 @@ class Gem::Commands::PushCommand < Gem::Command
   def send_gem name
     args = [:post, "api/v1/gems"]
 
+    latest_rubygems_version = Gem.latest_rubygems_version
 
-    if Gem.latest_rubygems_version < Gem::Version.new(Gem::VERSION) then
-      alert_error "Using beta/unreleased version of rubygems. Not pushing."
+    if latest_rubygems_version < Gem.rubygems_version and
+         Gem.rubygems_version.prerelease? and
+         Gem::Version.new('2.0.0.preview3') != Gem.rubygems_version then
+      alert_error <<-ERROR
+You are using a beta release of RubyGems (#{Gem::VERSION}) which is not
+allowed to push gems.  Please downgrade or upgrade to a release version.
+
+The latest released RubyGems version is #{latest_rubygems_version}
+      ERROR
       terminate_interaction 1
     end
 

data/lib/rubygems/commands/query_command.rb

@@ -162,12 +162,18 @@ class Gem::Commands::QueryCommand < Gem::Command
       n.downcase
     end
 
+    output_versions output, versions
+
+    say output.join(options[:details] ? "\n\n" : "\n")
+  end
+
+  def output_versions output, versions
     versions.each do |gem_name, matching_tuples|
       matching_tuples = matching_tuples.sort_by { |n,_| n.version }.reverse
 
       platforms = Hash.new { |h,version| h[version] = [] }
 
-      matching_tuples.map do |n,_|
+      matching_tuples.each do |n, _|
         platforms[n.version] << n.platform if n.platform
       end
 
@@ -182,97 +188,125 @@ class Gem::Commands::QueryCommand < Gem::Command
         end
       end
 
-      entry = gem_name.dup
-
-      if options[:versions] then
-        list = if platforms.empty? or options[:details] then
-                 matching_tuples.map { |n,_| n.version }.uniq
-               else
-                 platforms.sort.reverse.map do |version, pls|
-                   if pls == [Gem::Platform::RUBY] then
-                     version
-                   else
-                     ruby = pls.delete Gem::Platform::RUBY
-                     platform_list = [ruby, *pls.sort].compact
-                     "#{version} #{platform_list.join ' '}"
-                   end
-                 end
-               end.join ', '
-
-        entry << " (#{list})"
-      end
-
-      if options[:details] then
-        detail_tuple = matching_tuples.first
+      output << make_entry(matching_tuples, platforms)
+    end
+  end
 
-        spec = detail_tuple.last
+  def entry_details entry, spec, specs, platforms
+    return unless options[:details]
 
-        unless spec.kind_of? Gem::Specification
-          spec = spec.fetch_spec detail_tuple.first
-        end
+    entry << "\n"
 
-        entry << "\n"
+    spec_platforms   entry, platforms
+    spec_authors     entry, spec
+    spec_homepage    entry, spec
+    spec_license     entry, spec
+    spec_loaded_from entry, spec, specs
+    spec_summary     entry, spec
+  end
 
-        non_ruby = platforms.any? do |_, pls|
-          pls.any? { |pl| pl != Gem::Platform::RUBY }
-        end
+  def entry_versions entry, name_tuples, platforms
+    return unless options[:versions]
 
-        if non_ruby then
-          if platforms.length == 1 then
-            title = platforms.values.length == 1 ? 'Platform' : 'Platforms'
-            entry << "    #{title}: #{platforms.values.sort.join ', '}\n"
+    list =
+      if platforms.empty? or options[:details] then
+        name_tuples.map { |n| n.version }.uniq
+      else
+        platforms.sort.reverse.map do |version, pls|
+          if pls == [Gem::Platform::RUBY] then
+            version
           else
-            entry << "    Platforms:\n"
-            platforms.sort_by do |version,|
-              version
-            end.each do |version, pls|
-              label = "        #{version}: "
-              data = format_text pls.sort.join(', '), 68, label.length
-              data[0, label.length] = label
-              entry << data << "\n"
-            end
+            ruby = pls.delete Gem::Platform::RUBY
+            platform_list = [ruby, *pls.sort].compact
+            "#{version} #{platform_list.join ' '}"
           end
         end
+      end
 
-        authors = "Author#{spec.authors.length > 1 ? 's' : ''}: "
-        authors << spec.authors.join(', ')
-        entry << format_text(authors, 68, 4)
+    entry << " (#{list.join ', '})"
+  end
 
-        if spec.rubyforge_project and not spec.rubyforge_project.empty? then
-          rubyforge = "Rubyforge: http://rubyforge.org/projects/#{spec.rubyforge_project}"
-          entry << "\n" << format_text(rubyforge, 68, 4)
-        end
+  def make_entry entry_tuples, platforms
+    detail_tuple = entry_tuples.first
+    name_tuple, latest_spec = detail_tuple
 
-        if spec.homepage and not spec.homepage.empty? then
-          entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4)
-        end
+    latest_spec = latest_spec.fetch_spec name_tuple unless
+      Gem::Specification === latest_spec
 
-        if spec.license and not spec.license.empty? then
-          licenses = "License#{spec.licenses.length > 1 ? 's' : ''}: "
-          licenses << spec.licenses.join(', ')
-          entry << "\n" << format_text(licenses, 68, 4)
-        end
+    name_tuples, specs = entry_tuples.flatten.partition do |item|
+      Gem::NameTuple === item
+    end
 
-        if spec.loaded_from then
-          if matching_tuples.length == 1 then
-            loaded_from = File.dirname File.dirname(spec.loaded_from)
-            entry << "\n" << "    Installed at: #{loaded_from}"
-          else
-            label = 'Installed at'
-            matching_tuples.each do |n,s|
-              loaded_from = File.dirname File.dirname(s.loaded_from)
-              entry << "\n" << "    #{label} (#{n.version}): #{loaded_from}"
-              label = ' ' * label.length
-            end
-          end
-        end
+    entry = [latest_spec.name]
+
+    entry_versions entry, name_tuples, platforms
+    entry_details  entry, latest_spec, specs, platforms
+
+    entry.join
+  end
+
+  def spec_authors entry, spec
+    authors = "Author#{spec.authors.length > 1 ? 's' : ''}: "
+    authors << spec.authors.join(', ')
+    entry << format_text(authors, 68, 4)
+  end
+
+  def spec_homepage entry, spec
+    return if spec.homepage.nil? or spec.homepage.empty?
+
+    entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4)
+  end
+
+  def spec_license entry, spec
+    return if spec.license.nil? or spec.license.empty?
 
-        entry << "\n\n" << format_text(spec.summary, 68, 4)
+    licenses = "License#{spec.licenses.length > 1 ? 's' : ''}: "
+    licenses << spec.licenses.join(', ')
+    entry << "\n" << format_text(licenses, 68, 4)
+  end
+
+  def spec_loaded_from entry, spec, specs
+    return unless spec.loaded_from
+
+    if specs.length == 1 then
+      default = spec.default_gem? ? ' (default)' : nil
+      entry << "\n" << "    Installed at#{default}: #{spec.base_dir}"
+    else
+      label = 'Installed at'
+      specs.each do |s|
+        version = s.version.to_s
+        version << ', default' if s.default_gem?
+        entry << "\n" << "    #{label} (#{version}): #{s.base_dir}"
+        label = ' ' * label.length
       end
-      output << entry
     end
+  end
 
-    say output.join(options[:details] ? "\n\n" : "\n")
+  def spec_platforms entry, platforms
+    non_ruby = platforms.any? do |_, pls|
+      pls.any? { |pl| pl != Gem::Platform::RUBY }
+    end
+
+    return unless non_ruby
+
+    if platforms.length == 1 then
+      title = platforms.values.length == 1 ? 'Platform' : 'Platforms'
+      entry << "    #{title}: #{platforms.values.sort.join ', '}\n"
+    else
+      entry << "    Platforms:\n"
+      platforms.sort_by do |version,|
+        version
+      end.each do |version, pls|
+        label = "        #{version}: "
+        data = format_text pls.sort.join(', '), 68, label.length
+        data[0, label.length] = label
+        entry << data << "\n"
+      end
+    end
+  end
+
+  def spec_summary entry, spec
+    entry << "\n\n" << format_text(spec.summary, 68, 4)
   end
 
 end