r3215@asus: jeremy | 2005-11-20 02:05:56 -0800

 Eliminate double-requires due to Ruby seeing different paths to the same file.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3127 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activesupport/lib/active_support/breakpoint.rb

@@ -16,7 +16,7 @@
 # license please contact me.
 
 require 'irb'
-require File.dirname(__FILE__) + '/binding_of_caller'
+require File.dirname(__FILE__) + '/binding_of_caller' unless defined? Binding.of_caller
 require 'drb'
 require 'drb/acl'
 

activesupport/lib/active_support/core_ext/integer/inflections.rb

-require File.dirname(__FILE__) + '/../../inflector'
+require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module Integer #:nodoc:

activesupport/lib/active_support/core_ext/string/inflections.rb

-require File.dirname(__FILE__) + '/../../inflector'
+require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
     module String #:nodoc:

activesupport/test/core_ext/string_ext_test.rb

 require 'test/unit'
 require 'date'
 require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/string'
-require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/kernel'
-
-silence_warnings do
-  require File.dirname(__FILE__) + '/../inflector_test'
-end
+require File.dirname(__FILE__) + '/../inflector_test' unless defined? InflectorTest
 
 class StringInflectionsTest < Test::Unit::TestCase
   def test_pluralize

activesupport/test/inflector_test.rb

 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/active_support/inflector'
+require File.dirname(__FILE__) + '/../lib/active_support/inflector' unless defined? Inflector
 
 module Ace
   module Base