rubygems-update 1.3.1 → 1.3.2

data/lib/rubygems/command_manager.rb

@@ -8,139 +8,167 @@ require 'timeout'
 require 'rubygems/command'
 require 'rubygems/user_interaction'
 
-module Gem
-
-  ####################################################################
-  # The command manager registers and installs all the individual
-  # sub-commands supported by the gem command.
-  class CommandManager
-    include UserInteraction
-    
-    # Return the authoritative instance of the command manager.
-    def self.instance
-      @command_manager ||= CommandManager.new
-    end
-    
-    # Register all the subcommands supported by the gem command.
-    def initialize
-      @commands = {}
-      register_command :build
-      register_command :cert
-      register_command :check
-      register_command :cleanup
-      register_command :contents
-      register_command :dependency
-      register_command :environment
-      register_command :fetch
-      register_command :generate_index
-      register_command :help
-      register_command :install
-      register_command :list
-      register_command :lock
-      register_command :mirror
-      register_command :outdated
-      register_command :pristine
-      register_command :query
-      register_command :rdoc
-      register_command :search
-      register_command :server
-      register_command :sources
-      register_command :specification
-      register_command :stale
-      register_command :uninstall
-      register_command :unpack
-      register_command :update
-      register_command :which
-    end
-    
-    # Register the command object.
-    def register_command(command_obj)
-      @commands[command_obj] = false
-    end
-    
-    # Return the registered command from the command name.
-    def [](command_name)
-      command_name = command_name.intern
-      return nil if @commands[command_name].nil?
-      @commands[command_name] ||= load_and_instantiate(command_name)
-    end
-    
-    # Return a list of all command names (as strings).
-    def command_names
-      @commands.keys.collect {|key| key.to_s}.sort
-    end
-    
-    # Run the config specified by +args+.
-    def run(args)
-      process_args(args)
-    rescue StandardError, Timeout::Error => ex
-      alert_error "While executing gem ... (#{ex.class})\n    #{ex.to_s}"
-      ui.errs.puts "\t#{ex.backtrace.join "\n\t"}" if
-        Gem.configuration.backtrace
+##
+# The command manager registers and installs all the individual sub-commands
+# supported by the gem command.
+#
+# Extra commands can be provided by writing a rubygems_plugin.rb
+# file in an installed gem.  You should register your command against the
+# Gem::CommandManager instance, like this:
+#
+#   # file rubygems_plugin.rb
+#   require 'rubygems/command_manager'
+#
+#   class Gem::Commands::EditCommand < Gem::Command
+#     # ...
+#   end
+#
+#   Gem::CommandManager.instance.register_command :edit
+#
+# See Gem::Command for instructions on writing gem commands.
+
+class Gem::CommandManager
+
+  include Gem::UserInteraction
+  
+  ##
+  # Return the authoritative instance of the command manager.
+
+  def self.instance
+    @command_manager ||= new
+  end
+  
+  ##
+  # Register all the subcommands supported by the gem command.
+
+  def initialize
+    @commands = {}
+    register_command :build
+    register_command :cert
+    register_command :check
+    register_command :cleanup
+    register_command :contents
+    register_command :dependency
+    register_command :environment
+    register_command :fetch
+    register_command :generate_index
+    register_command :help
+    register_command :install
+    register_command :list
+    register_command :lock
+    register_command :mirror
+    register_command :outdated
+    register_command :pristine
+    register_command :query
+    register_command :rdoc
+    register_command :search
+    register_command :server
+    register_command :sources
+    register_command :specification
+    register_command :stale
+    register_command :uninstall
+    register_command :unpack
+    register_command :update
+    register_command :which
+  end
+  
+  ##
+  # Register the command object.
+
+  def register_command(command_obj)
+    @commands[command_obj] = false
+  end
+  
+  ##
+  # Return the registered command from the command name.
+
+  def [](command_name)
+    command_name = command_name.intern
+    return nil if @commands[command_name].nil?
+    @commands[command_name] ||= load_and_instantiate(command_name)
+  end
+  
+  ##
+  # Return a sorted list of all command names (as strings).
+
+  def command_names
+    @commands.keys.collect {|key| key.to_s}.sort
+  end
+  
+  ##
+  # Run the config specified by +args+.
+
+  def run(args)
+    process_args(args)
+  rescue StandardError, Timeout::Error => ex
+    alert_error "While executing gem ... (#{ex.class})\n    #{ex.to_s}"
+    ui.errs.puts "\t#{ex.backtrace.join "\n\t"}" if
+      Gem.configuration.backtrace
+    terminate_interaction(1)
+  rescue Interrupt
+    alert_error "Interrupted"
+    terminate_interaction(1)
+  end
+
+  def process_args(args)
+    args = args.to_str.split(/\s+/) if args.respond_to?(:to_str)
+    if args.size == 0
+      say Gem::Command::HELP
       terminate_interaction(1)
-    rescue Interrupt
-      alert_error "Interrupted"
+    end 
+    case args[0]
+    when '-h', '--help'
+      say Gem::Command::HELP
+      terminate_interaction(0)
+    when '-v', '--version'
+      say Gem::RubyGemsVersion
+      terminate_interaction(0)
+    when /^-/
+      alert_error "Invalid option: #{args[0]}.  See 'gem --help'."
       terminate_interaction(1)
+    else
+      cmd_name = args.shift.downcase
+      cmd = find_command(cmd_name)
+      cmd.invoke(*args)
     end
+  end
 
-    def process_args(args)
-      args = args.to_str.split(/\s+/) if args.respond_to?(:to_str)
-      if args.size == 0
-        say Gem::Command::HELP
-        terminate_interaction(1)
-      end 
-      case args[0]
-      when '-h', '--help'
-        say Gem::Command::HELP
-        terminate_interaction(0)
-      when '-v', '--version'
-        say Gem::RubyGemsVersion
-        terminate_interaction(0)
-      when /^-/
-        alert_error "Invalid option: #{args[0]}.  See 'gem --help'."
-        terminate_interaction(1)
-      else
-        cmd_name = args.shift.downcase
-        cmd = find_command(cmd_name)
-        cmd.invoke(*args)
-      end
+  def find_command(cmd_name)
+    possibilities = find_command_possibilities cmd_name
+    if possibilities.size > 1 then
+      raise "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
+    elsif possibilities.size < 1 then
+      raise "Unknown command #{cmd_name}"
     end
 
-    def find_command(cmd_name)
-      possibilities = find_command_possibilities(cmd_name)
-      if possibilities.size > 1
-        raise "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
-      end
-      if possibilities.size < 1
-        raise "Unknown command #{cmd_name}"
-      end
+    self[possibilities.first]
+  end
 
-      self[possibilities.first]
-    end
+  def find_command_possibilities(cmd_name)
+    len = cmd_name.length
 
-    def find_command_possibilities(cmd_name)
-      len = cmd_name.length
-      self.command_names.select { |n| cmd_name == n[0,len] }
-    end
-    
-    private
-
-    def load_and_instantiate(command_name)
-      command_name = command_name.to_s
-      retried = false
-
-      begin
-        const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase }
-        Gem::Commands.const_get("#{const_name}Command").new
-      rescue NameError
-        if retried then
-          raise
-        else
-          retried = true
-          require "rubygems/commands/#{command_name}_command"
-          retry
-        end
+    command_names.select { |n| cmd_name == n[0, len] }
+  end
+  
+  private
+
+  def load_and_instantiate(command_name)
+    command_name = command_name.to_s
+    retried = false
+
+    begin
+      const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase }
+      Gem::Commands.const_get("#{const_name}Command").new
+    rescue NameError
+      if retried then
+        raise
+      else
+        retried = true
+        require "rubygems/commands/#{command_name}_command"
+        retry
       end
     end
   end
-end 
+
+end
+

data/lib/rubygems/commands/check_command.rb

@@ -21,6 +21,10 @@ class Gem::Commands::CheckCommand < Gem::Command
       options[:alien] = true
     end
 
+    add_option('-v', '--verbose', "Spew more words") do |value, options|
+      options[:verbose] = true
+    end
+
     add_option('-t', '--test', "Run unit tests for gem") do |value, options|
       options[:test] = true
     end
@@ -38,16 +42,17 @@ class Gem::Commands::CheckCommand < Gem::Command
 
     if options[:alien]
       say "Performing the 'alien' operation"
-      Gem::Validator.new.alien.each do |key, val|
-        if(val.size > 0)
+      say
+      gems = get_all_gem_names rescue []
+      Gem::Validator.new.alien(gems).sort.each do |key, val|
+        unless val.empty? then
           say "#{key} has #{val.size} problems"
           val.each do |error_entry|
-            say "\t#{error_entry.path}:"
-            say "\t#{error_entry.problem}"
-            say
+            say "  #{error_entry.path}:"
+            say "    #{error_entry.problem}"
           end
-        else  
-          say "#{key} is error-free"
+        else
+          say "#{key} is error-free" if options[:verbose]
         end
         say
       end

data/lib/rubygems/commands/cleanup_command.rb

@@ -1,6 +1,7 @@
 require 'rubygems/command'
 require 'rubygems/source_index'
 require 'rubygems/dependency_list'
+require 'rubygems/uninstaller'
 
 class Gem::Commands::CleanupCommand < Gem::Command
 
@@ -22,6 +23,13 @@ class Gem::Commands::CleanupCommand < Gem::Command
     "--no-dryrun"
   end
 
+  def description # :nodoc:
+    <<-EOF
+The cleanup command removes old gems from GEM_HOME.  If an older version is
+installed elsewhere in GEM_PATH the cleanup command won't touch it.
+    EOF
+  end
+
   def usage # :nodoc:
     "#{program_name} [GEMNAME ...]"
   end
@@ -41,7 +49,8 @@ class Gem::Commands::CleanupCommand < Gem::Command
 
     unless options[:args].empty? then
       options[:args].each do |gem_name|
-        specs = Gem.cache.search(/^#{gem_name}$/i)
+        dep = Gem::Dependency.new gem_name, Gem::Requirement.default
+        specs = Gem.source_index.search dep
         specs.each do |spec|
           gems_to_cleanup << spec
         end
@@ -56,7 +65,6 @@ class Gem::Commands::CleanupCommand < Gem::Command
       primary_gems[spec.name].version != spec.version
     }
 
-    uninstall_command = Gem::CommandManager.instance['uninstall']
     deplist = Gem::DependencyList.new
     gems_to_cleanup.uniq.each do |spec| deplist.add spec end
 
@@ -77,6 +85,7 @@ class Gem::Commands::CleanupCommand < Gem::Command
         begin
           uninstaller.uninstall
         rescue Gem::DependencyRemovalException,
+               Gem::InstallError,
                Gem::GemNotInHomeException => e
           say "Unable to uninstall #{spec.full_name}:"
           say "\t#{e.class}: #{e.message}"

data/lib/rubygems/commands/contents_command.rb

@@ -11,6 +11,11 @@ class Gem::Commands::ContentsCommand < Gem::Command
 
     add_version_option
 
+    add_option(      '--all',
+               "Contents for all gems") do |all, options|
+      options[:all] = all
+    end
+
     add_option('-s', '--spec-dir a,b,c', Array,
                "Search for gems under specific paths") do |spec_dirs, options|
       options[:specdirs] = spec_dirs
@@ -20,6 +25,11 @@ class Gem::Commands::ContentsCommand < Gem::Command
                "Only return files in the Gem's lib_dirs") do |lib_only, options|
       options[:lib_only] = lib_only
     end
+
+    add_option(      '--[no-]prefix',
+               "Don't include installed path prefix") do |prefix, options|
+      options[:prefix] = prefix
+    end
   end
 
   def arguments # :nodoc:
@@ -27,46 +37,60 @@ class Gem::Commands::ContentsCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--no-lib-only"
+    "--no-lib-only --prefix"
   end
 
   def usage # :nodoc:
-    "#{program_name} GEMNAME"
+    "#{program_name} GEMNAME [GEMNAME ...]"
   end
 
   def execute
     version = options[:version] || Gem::Requirement.default
-    gem = get_one_gem_name
 
-    s = options[:specdirs].map do |i|
+    spec_dirs = options[:specdirs].map do |i|
       [i, File.join(i, "specifications")]
     end.flatten
 
-    path_kind = if s.empty? then
-                  s = Gem::SourceIndex.installed_spec_directories
+    path_kind = if spec_dirs.empty? then
+                  spec_dirs = Gem::SourceIndex.installed_spec_directories
                   "default gem paths"
                 else
                   "specified path"
                 end
 
-    si = Gem::SourceIndex.from_gems_in(*s)
+    si = Gem::SourceIndex.from_gems_in(*spec_dirs)
 
-    gem_spec = si.find_name(gem, version).last
+    gem_names = if options[:all] then
+                  si.map { |_, spec| spec.name }
+                else
+                  get_all_gem_names
+                end
 
-    unless gem_spec then
-      say "Unable to find gem '#{gem}' in #{path_kind}"
+    gem_names.each do |name|
+      gem_spec = si.find_name(name, version).last
 
-      if Gem.configuration.verbose then
-        say "\nDirectories searched:"
-        s.each { |dir| say dir }
+      unless gem_spec then
+        say "Unable to find gem '#{name}' in #{path_kind}"
+
+        if Gem.configuration.verbose then
+          say "\nDirectories searched:"
+          spec_dirs.each { |dir| say dir }
+        end
+
+        terminate_interaction 1 if gem_names.length == 1
       end
 
-      terminate_interaction
-    end
+      files = options[:lib_only] ? gem_spec.lib_files : gem_spec.files
 
-    files = options[:lib_only] ? gem_spec.lib_files : gem_spec.files
-    files.each do |f|
-      say File.join(gem_spec.full_gem_path, f)
+      files.each do |f|
+        path = if options[:prefix] then
+                 File.join gem_spec.full_gem_path, f
+               else
+                 f
+               end
+
+        say path
+      end
     end
   end