rubygems-update 1.4.2 → 1.5.0

data/lib/rubygems/test_utilities.rb

@@ -131,30 +131,17 @@ end
 #--
 # This class was added to flush out problems in Rubinius' IO implementation.
 
-class TempIO
-
-  @@count = 0
-
+class TempIO < Tempfile
   def initialize(string = '')
-    @tempfile = Tempfile.new "TempIO-#{@@count += 1}"
-    @tempfile.binmode
-    @tempfile.write string
-    @tempfile.rewind
-  end
-
-  def method_missing(meth, *args, &block)
-    @tempfile.send(meth, *args, &block)
-  end
-
-  def respond_to?(meth)
-    @tempfile.respond_to? meth
+    super "TempIO"
+    binmode
+    write string
+    rewind
   end
 
   def string
-    @tempfile.flush
-
-    Gem.read_binary @tempfile.path
+    flush
+    Gem.read_binary path
   end
-
 end
 

data/lib/rubygems/uninstaller.rb

@@ -121,43 +121,42 @@ class Gem::Uninstaller
   # +gemspec+.
 
   def remove_executables(spec)
-    return if spec.nil?
+    return if spec.nil? or spec.executables.empty?
 
-    unless spec.executables.empty? then
-      bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
+    bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
 
-      list = @source_index.find_name(spec.name).delete_if { |s|
-        s.version == spec.version
-      }
+    list = @source_index.find_name(spec.name).delete_if { |s|
+      s.version == spec.version
+    }
 
-      executables = spec.executables.clone
+    executables = spec.executables.clone
 
-      list.each do |s|
-        s.executables.each do |exe_name|
-          executables.delete exe_name
-        end
+    list.each do |s|
+      s.executables.each do |exe_name|
+        executables.delete exe_name
       end
+    end
 
-      return if executables.empty?
+    return if executables.empty?
 
-      answer = if @force_executables.nil? then
-                 ask_yes_no("Remove executables:\n" \
-                            "\t#{spec.executables.join(", ")}\n\nin addition to the gem?",
-                            true) # " # appease ruby-mode - don't ask
-               else
-                 @force_executables
-               end
+    remove = if @force_executables.nil? then
+               ask_yes_no("Remove executables:\n" \
+                          "\t#{spec.executables.join ', '}\n\n" \
+                          "in addition to the gem?",
+                          true)
+             else
+               @force_executables
+             end
 
-      unless answer then
-        say "Executables and scripts will remain installed."
-      else
-        raise Gem::FilePermissionError, bindir unless File.writable? bindir
+    unless remove then
+      say "Executables and scripts will remain installed."
+    else
+      raise Gem::FilePermissionError, bindir unless File.writable? bindir
 
-        spec.executables.each do |exe_name|
-          say "Removing #{exe_name}"
-          FileUtils.rm_f File.join(bindir, exe_name)
-          FileUtils.rm_f File.join(bindir, "#{exe_name}.bat")
-        end
+      spec.executables.each do |exe_name|
+        say "Removing #{exe_name}"
+        FileUtils.rm_f File.join(bindir, exe_name)
+        FileUtils.rm_f File.join(bindir, "#{exe_name}.bat")
       end
     end
   end

data/lib/rubygems/user_interaction.rb

@@ -66,7 +66,7 @@ module Gem::DefaultUserInteraction
 end
 
 ##
-# Make the default UI accessable without the "ui." prefix.  Classes
+# Make the default UI accessible 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.
 #
@@ -218,48 +218,66 @@ class Gem::StreamUI
     result
   end
 
-  ##
-  # Ask for a password. Does not echo response to terminal.
+  if RUBY_VERSION > '1.9.2' then
+    ##
+    # Ask for a password. Does not echo response to terminal.
 
-  def ask_for_password(question)
-    return nil if not @ins.tty?
+    def ask_for_password(question)
+      return nil if not @ins.tty?
 
-    @outs.print(question + "  ")
-    @outs.flush
+      require 'io/console'
 
-    Gem.win_platform? ? ask_for_password_on_windows : ask_for_password_on_unix
-  end
+      @outs.print(question + "  ")
+      @outs.flush
 
-  ##
-  # Asks for a password that works on windows. Ripped from the Heroku gem.
+      password = @ins.noecho {@ins.gets}
+      password.chomp! if password
+      password
+    end
+  else
+    ##
+    # Ask for a password. Does not echo response to terminal.
 
-  def ask_for_password_on_windows
-    require "Win32API"
-    char = nil
-    password = ''
+    def ask_for_password(question)
+      return nil if not @ins.tty?
 
-    while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
-      break if char == 10 || char == 13 # received carriage return or newline
-      if char == 127 || char == 8 # backspace and delete
-        password.slice!(-1, 1)
-      else
-        password << char.chr
-      end
+      @outs.print(question + "  ")
+      @outs.flush
+
+      Gem.win_platform? ? ask_for_password_on_windows : ask_for_password_on_unix
     end
 
-    puts
-    password
-  end
+    ##
+    # Asks for a password that works on windows. Ripped from the Heroku gem.
+
+    def ask_for_password_on_windows
+      require "Win32API"
+      char = nil
+      password = ''
+
+      while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+        break if char == 10 || char == 13 # received carriage return or newline
+        if char == 127 || char == 8 # backspace and delete
+          password.slice!(-1, 1)
+        else
+          password << char.chr
+        end
+      end
 
-  ##
-  # Asks for a password that works on unix
-
-  def ask_for_password_on_unix
-    system "stty -echo"
-    password = @ins.gets
-    password.chomp! if password
-    system "stty echo"
-    password
+      puts
+      password
+    end
+
+    ##
+    # Asks for a password that works on unix
+
+    def ask_for_password_on_unix
+      system "stty -echo"
+      password = @ins.gets
+      password.chomp! if password
+      system "stty echo"
+      password
+    end
   end
 
   ##
@@ -453,12 +471,20 @@ class Gem::StreamUI
     end
 
     def fetch(file_name, total_bytes)
-      @file_name, @total_bytes = file_name, total_bytes
+      @file_name = file_name
+      @total_bytes = total_bytes.to_i
+      @units = @total_bytes.zero? ? 'B' : '%'
+
       update_display(false)
     end
 
     def update(bytes)
-      new_progress = ((bytes.to_f * 100) / total_bytes.to_f).ceil
+      new_progress = if @units == 'B' then
+                       bytes
+                     else
+                       ((bytes.to_f * 100) / total_bytes.to_f).ceil
+                     end
+
       return if new_progress == @progress
 
       @progress = new_progress
@@ -466,7 +492,7 @@ class Gem::StreamUI
     end
 
     def done
-      @progress = 100
+      @progress = 100 if @units == '%'
       update_display(true, true)
     end
 
@@ -474,8 +500,9 @@ class Gem::StreamUI
 
     def update_display(show_progress = true, new_line = false)
       return unless @out.tty?
-      if show_progress
-        @out.print "\rFetching: %s (%3d%%)" % [@file_name, @progress]
+
+      if show_progress then
+        @out.print "\rFetching: %s (%3d%s)" % [@file_name, @progress, @units]
       else
         @out.print "Fetching: %s" % @file_name
       end
@@ -497,9 +524,21 @@ end
 ##
 # SilentUI is a UI choice that is absolutely silent.
 
-class Gem::SilentUI
-  def method_missing(sym, *args, &block)
-    self
+class Gem::SilentUI < Gem::StreamUI
+
+  def initialize
+
+    reader, writer = nil, nil
+
+    if Gem.win_platform?
+      reader = File.open('nul', 'r')
+      writer = File.open('nul', 'w')
+    else
+      reader = File.open('/dev/null', 'r')
+      writer = File.open('/dev/null', 'w')
+    end
+
+    super reader, writer, writer
   end
 end
 

data/lib/rubygems/validator.rb

@@ -7,12 +7,6 @@
 require 'rubygems/format'
 require 'rubygems/installer'
 
-begin
-  gem 'test-unit'
-rescue Gem::LoadError
-  # Ignore - use the test-unit library that's part of the standard library
-end
-
 ##
 # Validator performs various gem file and gem database validation
 
@@ -167,73 +161,6 @@ class Gem::Validator
     errors
   end
 
-  if RUBY_VERSION < '1.9' then
-    class TestRunner
-      def initialize(suite, ui)
-        @suite = suite
-        @ui = ui
-      end
-
-      def self.run(suite, ui)
-        require 'test/unit/ui/testrunnermediator'
-        return new(suite, ui).start
-      end
-
-      def start
-        @mediator = Test::Unit::UI::TestRunnerMediator.new(@suite)
-        @mediator.add_listener(Test::Unit::TestResult::FAULT, &method(:add_fault))
-        return @mediator.run_suite
-      end
-
-      def add_fault(fault)
-        if Gem.configuration.verbose then
-          @ui.say fault.long_display
-        end
-      end
-    end
-
-    autoload :TestRunner, 'test/unit/ui/testrunnerutilities'
-  end
-
-  ##
-  # Runs unit tests for a given gem specification
-
-  def unit_test(gem_spec)
-    start_dir = Dir.pwd
-    Dir.chdir(gem_spec.full_gem_path)
-    $: << gem_spec.full_gem_path
-    # XXX: why do we need this gem_spec when we've already got 'spec'?
-    test_files = gem_spec.test_files
-
-    if test_files.empty? then
-      say "There are no unit tests to run for #{gem_spec.full_name}"
-      return nil
-    end
-
-    gem gem_spec.name, "= #{gem_spec.version.version}"
-
-    test_files.each do |f| require f end
-
-    if RUBY_VERSION < '1.9' then
-      suite = Test::Unit::TestSuite.new("#{gem_spec.name}-#{gem_spec.version}")
-
-      ObjectSpace.each_object(Class) do |klass|
-        suite << klass.suite if (klass < Test::Unit::TestCase)
-      end
-
-      result = TestRunner.run suite, ui
-
-      alert_error result.to_s unless result.passed?
-    else
-      result = MiniTest::Unit.new
-      result.run
-    end
-
-    result
-  ensure
-    Dir.chdir(start_dir)
-  end
-
   def remove_leading_dot_dir(path)
     path.sub(/^\.\//, "")
   end

data/test/{simple_gem.rb → rubygems/simple_gem.rb}

@@ -1,5 +1,5 @@
 SIMPLE_GEM = <<-GEMDATA
-        MD5SUM = "b12a4d48febeb2289c539c2574c4b6f8"
+        MD5SUM = "989bf34a1cbecd52e0ea66b662b3a405"
         if $0 == __FILE__
           require 'optparse'
 
@@ -7,7 +7,7 @@ SIMPLE_GEM = <<-GEMDATA
           ARGV.options do |opts|
             opts.on_tail("--help", "show this message") {puts opts; exit}
             opts.on('--dir=DIRNAME', "Installation directory for the Gem") {|options[:directory]|}
-            opts.on('--force', "Force Gem to intall, bypassing dependency checks") {|options[:force]|}
+            opts.on('--force', "Force Gem to install, bypassing dependency checks") {|options[:force]|}
             opts.on('--gen-rdoc', "Generate RDoc documentation for the Gem") {|options[:gen_rdoc]|}
             opts.parse!
           end

data/test/{test_config.rb → rubygems/test_config.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems'
 
-class TestConfig < RubyGemTestCase
+class TestConfig < Gem::TestCase
 
   def test_datadir
     _, err = capture_io do

data/test/{test_gem.rb → rubygems/test_gem.rb}

@@ -1,11 +1,11 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems'
 require 'rubygems/gem_openssl'
 require 'rubygems/installer'
 require 'pathname'
 require 'tmpdir'
 
-class TestGem < RubyGemTestCase
+class TestGem < Gem::TestCase
 
   def setup
     super
@@ -301,6 +301,7 @@ class TestGem < RubyGemTestCase
     ]
 
     assert_equal expected, Gem.find_files('sff/discover')
+    assert_equal expected, Gem.find_files('sff/**.rb'), '[ruby-core:31730]'
   ensure
     assert_equal cwd, $LOAD_PATH.shift
   end
@@ -329,11 +330,18 @@ class TestGem < RubyGemTestCase
     assert_equal true, Gem.loaded_specs.keys.include?('foo')
   end
 
+  def util_path
+    ENV.delete "GEM_HOME"
+    ENV.delete "GEM_PATH"
+  end
+
   def test_self_path
     assert_equal [Gem.dir], Gem.path
   end
 
   def test_self_path_default
+    util_path
+
     if defined? APPLE_GEM_HOME
       orig_APPLE_GEM_HOME = APPLE_GEM_HOME
       Object.send :remove_const, :APPLE_GEM_HOME
@@ -347,6 +355,8 @@ class TestGem < RubyGemTestCase
 
   unless win_platform?
     def test_self_path_APPLE_GEM_HOME
+      util_path
+
       Gem.clear_paths
       apple_gem_home = File.join @tempdir, 'apple_gem_home'
       Gem.const_set :APPLE_GEM_HOME, apple_gem_home