From b6074e51f2f9442153aa4da74cd6a7782274efe4 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 30 Dec 2009 08:45:55 +0000
Subject: * lib/rubygems/source_index.rb (Gem#load_specification): don't use  
 RUBY_VERSION to branch.

* lib/rubygems/validator.rb (Gem::TestRunner, Gem#alien): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/source_index.rb | 2 +-
 lib/rubygems/validator.rb    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/rubygems/source_index.rb b/lib/rubygems/source_index.rb
index d033fd40f..8caf7b2e3 100644
--- a/lib/rubygems/source_index.rb
+++ b/lib/rubygems/source_index.rb
@@ -85,7 +85,7 @@ class Gem::SourceIndex
     def load_specification(file_name)
       return nil unless file_name and File.exist? file_name
 
-      spec_code = if RUBY_VERSION < '1.9' then
+      spec_code = if !defined?(Encoding) then
                     File.read file_name
                   else
                     File.read file_name, :encoding => 'UTF-8'
diff --git a/lib/rubygems/validator.rb b/lib/rubygems/validator.rb
index f568227b9..c8384f158 100644
--- a/lib/rubygems/validator.rb
+++ b/lib/rubygems/validator.rb
@@ -167,6 +167,7 @@ class Gem::Validator
     errors
   end
 
+=begin
   if RUBY_VERSION < '1.9' then
     class TestRunner
       def initialize(suite, ui)
@@ -194,6 +195,7 @@ class Gem::Validator
 
     autoload :TestRunner, 'test/unit/ui/testrunnerutilities'
   end
+=end
 
   ##
   # Runs unit tests for a given gem specification
@@ -214,6 +216,7 @@ class Gem::Validator
 
     test_files.each do |f| require f end
 
+=begin
     if RUBY_VERSION < '1.9' then
       suite = Test::Unit::TestSuite.new("#{gem_spec.name}-#{gem_spec.version}")
 
@@ -228,6 +231,9 @@ class Gem::Validator
       result = MiniTest::Unit.new
       result.run
     end
+=end
+    result = MiniTest::Unit.new
+    result.run
 
     result
   ensure
-- 
cgit