+ #require now checks unresolved dependencies first

rubygems · Feb 24, 2011 · b06875e · miaout17 · Feb 25, 2011 · zenspider
1 parent 06bcc8d
commit b06875e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/lib/rubygems/custom_require.rb b/lib/rubygems/custom_require.rb
@@ -25,8 +25,21 @@ module Kernel
   # The normal <tt>require</tt> functionality of returning false if
   # that file has already been loaded is preserved.
 
-  def require(path) # :doc:
-    gem_original_require path
+  def require path
+    if Gem._unresolved.specs.empty? then
+      gem_original_require path
+    else
+      specs = Gem.searcher.find_all path
+
+      if specs.empty? then
+        gem_original_require path
+      else
+        # TODO: actually check the unresolves specs only
+        spec = specs.first
+        Gem.activate spec.name, spec.version # FIX: holy shit this is dumb
+        return gem_original_require(path)
+      end
+    end
   rescue LoadError => load_error
     if load_error.message.end_with?(path) and Gem.try_activate(path) then
       return gem_original_require(path)

diff --git a/lib/rubygems/gem_path_searcher.rb b/lib/rubygems/gem_path_searcher.rb
@@ -43,7 +43,8 @@ def initialize
   # only that there is a match.
 
   def find(glob)
-    @gemspecs.find do |spec|
+    # HACK violation
+    (Gem._unresolved.specs + @gemspecs).find do |spec|
       # TODO: inverted responsibility
       matching_file? spec, glob
     end
@@ -53,7 +54,8 @@ def find(glob)
   # Works like #find, but finds all gemspecs matching +glob+.
 
   def find_all(glob)
-    @gemspecs.select do |spec|
+    # HACK violation
+    (Gem._unresolved.specs + @gemspecs).select do |spec|
       # TODO: inverted responsibility
       matching_file? spec, glob
     end || []

diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
@@ -43,6 +43,18 @@ def test_self_activate
     assert_activate %w[foo-1], foo
   end
 
+  def test_self_activate_via_require
+    a1 = new_spec "a", "1", "b" => "= 1"
+    b1 = new_spec "b", "1", nil, "lib/b/c.rb"
+    b2 = new_spec "b", "2", nil, "lib/b/c.rb"
+
+    install_specs a1, b1
+
+    Gem.activate "a", "= 1"
+    require "b/c"
+    assert_equal %w(a-1 b-1), Gem.loaded_specs.values.map(&:full_name).sort
+  end
+
   def test_self_activate_loaded
     util_spec 'foo', '1'
     assert Gem.activate 'foo'