rubygems-update 1.3.1 → 1.3.2

data/lib/rubygems/text.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+
+##
+# A collection of text-wrangling methods
+
+module Gem::Text
+
+  ##
+  # Wraps +text+ to +wrap+ characters and optionally indents by +indent+
+  # characters
+
+  def format_text(text, wrap, indent=0)
+    result = []
+    work = text.dup
+
+    while work.length > wrap do
+      if work =~ /^(.{0,#{wrap}})[ \n]/ then
+        result << $1
+        work.slice!(0, $&.length)
+      else
+        result << work.slice!(0, wrap)
+      end
+    end
+
+    result << work if work.length.nonzero?
+    result.join("\n").gsub(/^/, " " * indent)
+  end
+
+end
+

data/lib/rubygems/timer.rb

@@ -1,6 +1,6 @@
 #
-# This file defines a $log variable for logging, and a time() method for recording timing
-# information.
+# This file defines a $log variable for logging, and a time() method for
+# recording timing information.
 #
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
@@ -8,18 +8,21 @@
 # See LICENSE.txt for permissions.
 #++
 
+require 'rubygems'
+
+file, lineno = Gem.location_of_caller
+
+warn "#{file}:#{lineno}:Warning: RubyGems' lib/rubygems/timer.rb deprecated and will be removed on or after June 2009."
 
 $log = Object.new
-def $log.debug(str)
-  STDERR.puts str
+
+# :stopdoc:
+def $log.debug(message)
+  Gem.debug message
 end
 
-def time(msg, width=25)
-  t = Time.now
-  return_value = yield
-  elapsed = Time.now.to_f - t.to_f
-  elapsed = sprintf("%3.3f", elapsed)
-  $log.debug "#{msg.ljust(width)}: #{elapsed}s"
-  return_value
+def time(msg, width=25, &block)
+  Gem.time(msg, width, &block)
 end
+# :startdoc:
 

data/lib/rubygems/uninstaller.rb

@@ -12,6 +12,11 @@ require 'rubygems/user_interaction'
 
 ##
 # An Uninstaller.
+#
+# The uninstaller fires pre and post uninstall hooks.  Hooks can be added
+# either through a rubygems_plugin.rb file in an installed gem or via a
+# rubygems/defaults/#{RUBY_ENGINE}.rb or rubygems/defaults/operating_system.rb
+# file.  See Gem.pre_uninstall and Gem.post_uninstall for details.
 
 class Gem::Uninstaller
 
@@ -46,8 +51,17 @@ class Gem::Uninstaller
     @force_ignore = options[:ignore]
     @bin_dir = options[:bin_dir]
 
+    # only add user directory if install_dir is not set
+    @user_install = false
+    @user_install = options[:user_install] unless options[:install_dir]
+
     spec_dir = File.join @gem_home, 'specifications'
     @source_index = Gem::SourceIndex.from_gems_in spec_dir
+
+    if @user_install then
+      user_dir = File.join Gem.user_dir, 'specifications'
+      @user_index = Gem::SourceIndex.from_gems_in user_dir
+    end
   end
 
   ##
@@ -56,9 +70,10 @@ class Gem::Uninstaller
 
   def uninstall
     list = @source_index.find_name @gem, @version
+    list += @user_index.find_name @gem, @version if @user_install
 
     if list.empty? then
-      raise Gem::InstallError, "Unknown gem #{@gem} #{@version}"
+      raise Gem::InstallError, "cannot uninstall, check `gem list -d #{@gem}`"
 
     elsif list.size > 1 and @force_all then
       remove_all list.dup
@@ -169,7 +184,8 @@ class Gem::Uninstaller
             "Uninstallation aborted due to dependent gem(s)"
     end
 
-    unless path_ok? spec then
+    unless path_ok?(@gem_home, spec) or
+           (@user_install and path_ok?(Gem.user_dir, spec)) then
       e = Gem::GemNotInHomeException.new \
             "Gem is not installed in directory #{@gem_home}"
       e.spec = spec
@@ -210,9 +226,12 @@ class Gem::Uninstaller
     list.delete spec
   end
 
-  def path_ok?(spec)
-    full_path = File.join @gem_home, 'gems', spec.full_name
-    original_path = File.join @gem_home, 'gems', spec.original_name
+  ##
+  # Is +spec+ in +gem_dir+?
+
+  def path_ok?(gem_dir, spec)
+    full_path = File.join gem_dir, 'gems', spec.full_name
+    original_path = File.join gem_dir, 'gems', spec.original_name
 
     full_path == spec.full_gem_path || original_path == spec.full_gem_path
   end
@@ -221,6 +240,7 @@ class Gem::Uninstaller
     return true if @force_ignore
 
     deplist = Gem::DependencyList.from_source_index @source_index
+    deplist.add(*@user_index.gems.values) if @user_install
     deplist.ok_to_remove?(spec.full_name) || ask_if_ok(spec)
   end
 

data/lib/rubygems/user_interaction.rb

@@ -4,357 +4,387 @@
 # See LICENSE.txt for permissions.
 #++
 
-module Gem
+##
+# Module that defines the default UserInteraction.  Any class including this
+# module will have access to the +ui+ method that returns the default UI.
 
-  ##
-  # Module that defines the default UserInteraction.  Any class including this
-  # module will have access to the +ui+ method that returns the default UI.
+module Gem::DefaultUserInteraction
 
-  module DefaultUserInteraction
+  ##
+  # The default UI is a class variable of the singleton class for this
+  # module.
 
-    ##
-    # The default UI is a class variable of the singleton class for this
-    # module.
+  @ui = nil
 
-    @ui = nil
+  ##
+  # Return the default UI.
 
-    ##
-    # Return the default UI.
+  def self.ui
+    @ui ||= Gem::ConsoleUI.new
+  end
 
-    def self.ui
-      @ui ||= Gem::ConsoleUI.new
-    end
+  ##
+  # Set the default UI.  If the default UI is never explicitly set, a simple
+  # console based UserInteraction will be used automatically.
 
-    ##
-    # Set the default UI.  If the default UI is never explicitly set, a simple
-    # console based UserInteraction will be used automatically.
+  def self.ui=(new_ui)
+    @ui = new_ui
+  end
 
-    def self.ui=(new_ui)
-      @ui = new_ui
-    end
+  ##
+  # Use +new_ui+ for the duration of +block+.
+
+  def self.use_ui(new_ui)
+    old_ui = @ui
+    @ui = new_ui
+    yield
+  ensure
+    @ui = old_ui
+  end
 
-    ##
-    # Use +new_ui+ for the duration of +block+.
-
-    def self.use_ui(new_ui)
-      old_ui = @ui
-      @ui = new_ui
-      yield
-    ensure
-      @ui = old_ui
-    end
+  ##
+  # See DefaultUserInteraction::ui
 
-    ##
-    # See DefaultUserInteraction::ui
+  def ui
+    Gem::DefaultUserInteraction.ui
+  end
 
-    def ui
-      DefaultUserInteraction.ui
-    end
+  ##
+  # See DefaultUserInteraction::ui=
 
-    ##
-    # See DefaultUserInteraction::ui=
+  def ui=(new_ui)
+    Gem::DefaultUserInteraction.ui = new_ui
+  end
 
-    def ui=(new_ui)
-      DefaultUserInteraction.ui = new_ui
-    end
+  ##
+  # See DefaultUserInteraction::use_ui
 
-    ##
-    # See DefaultUserInteraction::use_ui
+  def use_ui(new_ui, &block)
+    Gem::DefaultUserInteraction.use_ui(new_ui, &block)
+  end
 
-    def use_ui(new_ui, &block)
-      DefaultUserInteraction.use_ui(new_ui, &block)
-    end
+end
 
-  end
+##
+# Make the default UI accessable without the "ui." prefix.  Classes
+# including this module may use the interaction methods on the default UI
+# directly.  Classes may also reference the ui and ui= methods.
+#
+# Example:
+#
+#   class X
+#     include Gem::UserInteraction
+#
+#     def get_answer
+#       n = ask("What is the meaning of life?")
+#     end
+#   end
+
+module Gem::UserInteraction
+
+  include Gem::DefaultUserInteraction
 
   ##
-  # Make the default UI accessable without the "ui." prefix.  Classes
-  # including this module may use the interaction methods on the default UI
-  # directly.  Classes may also reference the ui and ui= methods.
-  #
-  # Example:
-  #
-  #   class X
-  #     include Gem::UserInteraction
-  #
-  #     def get_answer
-  #       n = ask("What is the meaning of life?")
-  #     end
-  #   end
-
-  module UserInteraction
-
-    include DefaultUserInteraction
-
-    [:alert,
-     :alert_error,
-     :alert_warning,
-     :ask,
-     :ask_yes_no,
-     :choose_from_list,
-     :say,
-     :terminate_interaction ].each do |methname|
-      class_eval %{
-        def #{methname}(*args)
-          ui.#{methname}(*args)
-        end
-      }, __FILE__, __LINE__
-    end
-  end
+  # :method: alert
 
   ##
-  # StreamUI implements a simple stream based user interface.
+  # :method: alert_error
 
-  class StreamUI
+  ##
+  # :method: alert_warning
 
-    attr_reader :ins, :outs, :errs
+  ##
+  # :method: ask
 
-    def initialize(in_stream, out_stream, err_stream=STDERR)
-      @ins = in_stream
-      @outs = out_stream
-      @errs = err_stream
-    end
+  ##
+  # :method: ask_yes_no
 
-    ##
-    # Choose from a list of options.  +question+ is a prompt displayed above
-    # the list.  +list+ is a list of option strings.  Returns the pair
-    # [option_name, option_index].
+  ##
+  # :method: choose_from_list
 
-    def choose_from_list(question, list)
-      @outs.puts question
+  ##
+  # :method: say
 
-      list.each_with_index do |item, index|
-        @outs.puts " #{index+1}. #{item}"
+  ##
+  # :method: terminate_interaction
+
+  [:alert,
+   :alert_error,
+   :alert_warning,
+   :ask,
+   :ask_yes_no,
+   :choose_from_list,
+   :say,
+   :terminate_interaction ].each do |methname|
+    class_eval %{
+      def #{methname}(*args)
+        ui.#{methname}(*args)
       end
+    }, __FILE__, __LINE__
+  end
+end
+
+##
+# Gem::StreamUI implements a simple stream based user interface.
+
+class Gem::StreamUI
+
+  attr_reader :ins, :outs, :errs
 
-      @outs.print "> "
-      @outs.flush
+  def initialize(in_stream, out_stream, err_stream=STDERR)
+    @ins = in_stream
+    @outs = out_stream
+    @errs = err_stream
+  end
 
-      result = @ins.gets
+  ##
+  # Choose from a list of options.  +question+ is a prompt displayed above
+  # the list.  +list+ is a list of option strings.  Returns the pair
+  # [option_name, option_index].
 
-      return nil, nil unless result
+  def choose_from_list(question, list)
+    @outs.puts question
 
-      result = result.strip.to_i - 1
-      return list[result], result
+    list.each_with_index do |item, index|
+      @outs.puts " #{index+1}. #{item}"
     end
 
-    ##
-    # Ask a question.  Returns a true for yes, false for no.  If not connected
-    # to a tty, raises an exception if default is nil, otherwise returns
-    # default.
-
-    def ask_yes_no(question, default=nil)
-      unless @ins.tty? then
-        if default.nil? then
-          raise Gem::OperationNotSupportedError,
-                "Not connected to a tty and no default specified"
-        else
-          return default
-        end
-      end
+    @outs.print "> "
+    @outs.flush
 
-      qstr = case default
-             when nil
-               'yn'
-             when true
-               'Yn'
-             else
-               'yN'
-             end
-
-      result = nil
-
-      while result.nil?
-        result = ask("#{question} [#{qstr}]")
-        result = case result
-        when /^[Yy].*/
-          true
-        when /^[Nn].*/
-          false
-        when /^$/
-          default
-        else
-          nil
-        end
+    result = @ins.gets
+
+    return nil, nil unless result
+
+    result = result.strip.to_i - 1
+    return list[result], result
+  end
+
+  ##
+  # Ask a question.  Returns a true for yes, false for no.  If not connected
+  # to a tty, raises an exception if default is nil, otherwise returns
+  # default.
+
+  def ask_yes_no(question, default=nil)
+    unless @ins.tty? then
+      if default.nil? then
+        raise Gem::OperationNotSupportedError,
+              "Not connected to a tty and no default specified"
+      else
+        return default
       end
+    end
 
-      return result
+    qstr = case default
+           when nil
+             'yn'
+           when true
+             'Yn'
+           else
+             'yN'
+           end
+
+    result = nil
+
+    while result.nil?
+      result = ask("#{question} [#{qstr}]")
+      result = case result
+      when /^[Yy].*/
+        true
+      when /^[Nn].*/
+        false
+      when /^$/
+        default
+      else
+        nil
+      end
     end
 
-    ##
-    # Ask a question.  Returns an answer if connected to a tty, nil otherwise.
+    return result
+  end
 
-    def ask(question)
-      return nil if not @ins.tty?
+  ##
+  # Ask a question.  Returns an answer if connected to a tty, nil otherwise.
 
-      @outs.print(question + "  ")
-      @outs.flush
+  def ask(question)
+    return nil if not @ins.tty?
 
-      result = @ins.gets
-      result.chomp! if result
-      result
-    end
+    @outs.print(question + "  ")
+    @outs.flush
 
-    ##
-    # Display a statement.
+    result = @ins.gets
+    result.chomp! if result
+    result
+  end
 
-    def say(statement="")
-      @outs.puts statement
-    end
+  ##
+  # Display a statement.
 
-    ##
-    # Display an informational alert.  Will ask +question+ if it is not nil.
+  def say(statement="")
+    @outs.puts statement
+  end
 
-    def alert(statement, question=nil)
-      @outs.puts "INFO:  #{statement}"
-      ask(question) if question
-    end
+  ##
+  # Display an informational alert.  Will ask +question+ if it is not nil.
 
-    ##
-    # Display a warning in a location expected to get error messages.  Will
-    # ask +question+ if it is not nil.
+  def alert(statement, question=nil)
+    @outs.puts "INFO:  #{statement}"
+    ask(question) if question
+  end
 
-    def alert_warning(statement, question=nil)
-      @errs.puts "WARNING:  #{statement}"
-      ask(question) if question
-    end
+  ##
+  # Display a warning in a location expected to get error messages.  Will
+  # ask +question+ if it is not nil.
 
-    ##
-    # Display an error message in a location expected to get error messages.
-    # Will ask +question+ if it is not nil.
+  def alert_warning(statement, question=nil)
+    @errs.puts "WARNING:  #{statement}"
+    ask(question) if question
+  end
 
-    def alert_error(statement, question=nil)
-      @errs.puts "ERROR:  #{statement}"
-      ask(question) if question
-    end
+  ##
+  # Display an error message in a location expected to get error messages.
+  # Will ask +question+ if it is not nil.
 
-    ##
-    # Terminate the application with exit code +status+, running any exit
-    # handlers that might have been defined.
+  def alert_error(statement, question=nil)
+    @errs.puts "ERROR:  #{statement}"
+    ask(question) if question
+  end
 
-    def terminate_interaction(status = 0)
-      raise Gem::SystemExitException, status
-    end
+  ##
+  # Display a debug message on the same location as error messages.
 
-    ##
-    # Return a progress reporter object chosen from the current verbosity.
-
-    def progress_reporter(*args)
-      case Gem.configuration.verbose
-      when nil, false
-        SilentProgressReporter.new(@outs, *args)
-      when true
-        SimpleProgressReporter.new(@outs, *args)
-      else
-        VerboseProgressReporter.new(@outs, *args)
-      end
-    end
+  def debug(statement)
+    @errs.puts statement
+  end
 
-    ##
-    # An absolutely silent progress reporter.
+  ##
+  # Terminate the application with exit code +status+, running any exit
+  # handlers that might have been defined.
 
-    class SilentProgressReporter
-      attr_reader :count
+  def terminate_interaction(status = 0)
+    raise Gem::SystemExitException, status
+  end
 
-      def initialize(out_stream, size, initial_message, terminal_message = nil)
-      end
+  ##
+  # Return a progress reporter object chosen from the current verbosity.
+
+  def progress_reporter(*args)
+    case Gem.configuration.verbose
+    when nil, false
+      SilentProgressReporter.new(@outs, *args)
+    when true
+      SimpleProgressReporter.new(@outs, *args)
+    else
+      VerboseProgressReporter.new(@outs, *args)
+    end
+  end
 
-      def updated(message)
-      end
+  ##
+  # An absolutely silent progress reporter.
 
-      def done
-      end
+  class SilentProgressReporter
+    attr_reader :count
+
+    def initialize(out_stream, size, initial_message, terminal_message = nil)
     end
 
-    ##
-    # A basic dotted progress reporter.
+    def updated(message)
+    end
 
-    class SimpleProgressReporter
-      include DefaultUserInteraction
+    def done
+    end
+  end
 
-      attr_reader :count
+  ##
+  # A basic dotted progress reporter.
 
-      def initialize(out_stream, size, initial_message,
-                     terminal_message = "complete")
-        @out = out_stream
-        @total = size
-        @count = 0
-        @terminal_message = terminal_message
+  class SimpleProgressReporter
 
-        @out.puts initial_message
-      end
+    include Gem::DefaultUserInteraction
 
-      ##
-      # Prints out a dot and ignores +message+.
+    attr_reader :count
 
-      def updated(message)
-        @count += 1
-        @out.print "."
-        @out.flush
-      end
+    def initialize(out_stream, size, initial_message,
+                   terminal_message = "complete")
+      @out = out_stream
+      @total = size
+      @count = 0
+      @terminal_message = terminal_message
 
-      ##
-      # Prints out the terminal message.
+      @out.puts initial_message
+    end
 
-      def done
-        @out.puts "\n#{@terminal_message}"
-      end
+    ##
+    # Prints out a dot and ignores +message+.
 
+    def updated(message)
+      @count += 1
+      @out.print "."
+      @out.flush
     end
 
     ##
-    # A progress reporter that prints out messages about the current progress.
+    # Prints out the terminal message.
 
-    class VerboseProgressReporter
-      include DefaultUserInteraction
+    def done
+      @out.puts "\n#{@terminal_message}"
+    end
 
-      attr_reader :count
+  end
 
-      def initialize(out_stream, size, initial_message,
-                     terminal_message = 'complete')
-        @out = out_stream
-        @total = size
-        @count = 0
-        @terminal_message = terminal_message
+  ##
+  # A progress reporter that prints out messages about the current progress.
 
-        @out.puts initial_message
-      end
+  class VerboseProgressReporter
 
-      ##
-      # Prints out the position relative to the total and the +message+.
+    include Gem::DefaultUserInteraction
 
-      def updated(message)
-        @count += 1
-        @out.puts "#{@count}/#{@total}: #{message}"
-      end
+    attr_reader :count
 
-      ##
-      # Prints out the terminal message.
+    def initialize(out_stream, size, initial_message,
+                   terminal_message = 'complete')
+      @out = out_stream
+      @total = size
+      @count = 0
+      @terminal_message = terminal_message
 
-      def done
-        @out.puts @terminal_message
-      end
+      @out.puts initial_message
     end
-  end
 
-  ##
-  # Subclass of StreamUI that instantiates the user interaction using STDIN,
-  # STDOUT, and STDERR.
+    ##
+    # Prints out the position relative to the total and the +message+.
 
-  class ConsoleUI < StreamUI
-    def initialize
-      super(STDIN, STDOUT, STDERR)
+    def updated(message)
+      @count += 1
+      @out.puts "#{@count}/#{@total}: #{message}"
     end
-  end
 
-  ##
-  # SilentUI is a UI choice that is absolutely silent.
+    ##
+    # Prints out the terminal message.
 
-  class SilentUI
-    def method_missing(sym, *args, &block)
-      self
+    def done
+      @out.puts @terminal_message
     end
   end
 
 end
 
+##
+# Subclass of StreamUI that instantiates the user interaction using STDIN,
+# STDOUT, and STDERR.
+
+class Gem::ConsoleUI < Gem::StreamUI
+  def initialize
+    super STDIN, STDOUT, STDERR
+  end
+end
+
+##
+# SilentUI is a UI choice that is absolutely silent.
+
+class Gem::SilentUI
+  def method_missing(sym, *args, &block)
+    self
+  end
+end
+