faster_require 0.6.0 → 0.7.0

data/README

@@ -2,7 +2,7 @@ A little utility to make
 
 require 'xxx'
 
-take much less time.
+take much less time.  As in much less.  Well, on windows at least.
 
 Well, mostly on windows--on linux it's a speedup of only 0.41 to 0.45s, or so. [1]
 
@@ -35,7 +35,7 @@ rails app, running script/console "puts 333"
    with:
        6s
        
-rake -T
+running "rake -T"
 
  1.9.1
    without: 3.75s
@@ -48,4 +48,32 @@ rake -T
 Note: in reality what we should do is fix core so that it doesn't have such awful I/O time in windows.  There may be some gross inefficiency in there.  For now, this is a work-around.
    
 [1] A sister project to this one, faster_gem_script, can make ruby scripts in linux run faster by 0.1s :) http://github.com/rdp/faster_gem_script
-(in windows it's a much higher gain).  Eventually they'll be combined into one "gem optimizer" gem.
+(in windows it's a much higher gain).  Eventually they'll be combined into one "gem optimizer" gem.
+
+== How to use in Rails ==
+
+You can either install the gem, then add a
+
+require 'rubygems'
+require 'faster_require'
+
+
+in your config/environment.rb, or (the best way is as follows):
+
+Unpack it somewhere, like lib
+$ cd my_rails_app/lib
+$ gem unpack faster_require
+
+Now add this line to your config/environment.rb:
+
+require File.dirname(__FILE__) + "/../lib/faster_require-0.7.0/lib/faster_require" # faster speeds all around...
+
+*before* this other (existing) line:
+
+require File.join(File.dirname(__FILE__), 'boot')
+
+Now it will speedup loading rubygems and everything. Happiness.
+
+Any problems report back: https://github.com/rdp/faster_require
+
+Enjoy.

data/Rakefile

@@ -1,4 +1,10 @@
   require 'rubygems' if RUBY_VERSION < "1.9'"
+  
+begin
+  require 'psych' # sigh
+rescue ::LoadError
+end
+  
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "faster_require"
@@ -8,6 +14,8 @@
     s.homepage = "http://github.com/rdp/faster_require"
     s.authors = ["Roger Pack"]
     s.add_development_dependency 'redparse'
+    s.add_development_dependency 'active_support', '= 2.3.10'
+#    s.add_development_dependency 'ruby-debug' too... or ruby-debug19 pick your poison
     s.add_development_dependency 'jeweler'
     s.add_development_dependency 'rspec', '>= 2'
     s.add_development_dependency 'sane'

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/faster_require.rb

@@ -1,7 +1,9 @@
 require 'rbconfig'
+#require 'rubygems'
+#require 'ruby-debug'
 
 module FastRequire
-  $FAST_REQUIRE_DEBUG ||= $DEBUG # can set it via $DEBUG, or by itself
+  $FAST_REQUIRE_DEBUG ||= $DEBUG # can set via $DEBUG, or on its own.
 
   def self.setup
     @@dir = File.expand_path('~/.ruby_faster_require_cache')
@@ -83,9 +85,9 @@ module FastRequire
   }
 
   @@already_loaded[File.expand_path(__FILE__)] = true # this file itself isn't in loaded features, yet, but very soon will be..
-  # special case--I hope...
+  # a special case--I hope...
 
-  # disallow re-requiring $0
+  # also disallow re- $0
   @@require_locs[$0] = File.expand_path($0) # so when we run into it on a require, we will skip it...
   @@already_loaded[File.expand_path($0)] = true
 
@@ -125,115 +127,162 @@ module FastRequire
     @@require_locs.clear
     setup
   end
-#   require 'ruby-debug'
+  
+  private
+  def last_caller
+   caller[-2]
+  end
+  
+  IN_PROCESS = []
+  ALL_IN_PROCESS = []
+  @@count = 0
+  public
+  
   def require_cached lib
     lib = lib.to_s # might not be zactly 1.9 compat... to_path ??
-   # p 'doing require ' + lib
-    if known_loc = @@require_locs[lib]
-      if @@already_loaded[known_loc]
-        p 'already loaded ' + known_loc if $FAST_REQUIRE_DEBUG
-        return false 
-      end
-      @@already_loaded[known_loc] = true
-      if known_loc =~ /\.#{RbConfig::CONFIG['DLEXT']}$/
-        puts 'doing original_non_cached_require on .so full path ' + known_loc if $FAST_REQUIRE_DEBUG
-        original_non_cached_require known_loc # not much we can do there...too bad...well at least we pass it a full path though :P
-      else
-        unless $LOADED_FEATURES.include? known_loc
-          if known_loc =~ /rubygems.rb$/
-            puts 'requiring rubygems ' + known_loc if $FAST_REQUIRE_DEBUG
-            original_non_cached_require(known_loc) # normal require so rubygems doesn't freak out when it finds itself already in $LOADED_FEATURES :P
-          else
-            if $FAST_REQUIRE_DEBUG
-              puts 'doing cached loc eval on ' + lib + '=>' + known_loc 
-            end
-            $LOADED_FEATURES << known_loc
-            # fakely add the load path, too, so that autoload for the same file will work <sigh> [rspec2]
-            no_suffix_full_path = known_loc.gsub(/\.[^.]+$/, '')
-            no_suffix_lib = lib.gsub(/\.[^.]+$/, '')
-            libs_path = no_suffix_full_path.gsub(no_suffix_lib, '')
-            libs_path = File.expand_path(libs_path) # strip off trailing '/'
-            $: << libs_path unless $:.index(libs_path)
-            # load(known_loc, false) # too slow
-            eval(File.open(known_loc, 'rb') {|f| f.read}, TOPLEVEL_BINDING, known_loc) # note the rb here--this means it's reading .rb files as binary, which *typically* works...maybe unnecessary?
-            # --if it breaks re-save the offending file in binary mode, or file an issue on the tracker...
-            return true
-          end
-        else
-          puts 'ignoring already loaded? ' + known_loc if $FAST_REQUIRE_DEBUG
+    ALL_IN_PROCESS << [lib, @@count += 1]
+    begin
+      p 'doing require ' + lib + ' from ' + caller[-1] if $FAST_REQUIRE_DEBUG
+      if known_loc = @@require_locs[lib]
+        if @@already_loaded[known_loc]
+          p 'already loaded ' + known_loc + ' ' + lib if $FAST_REQUIRE_DEBUG
+          return false 
         end
-      end
-    else
-      # we don't know the location--let Ruby's original require do the heavy lifting for us here
-      old = $LOADED_FEATURES.dup
-      if(original_non_cached_require lib)
-        # debugger might land here the first time you run a script and it doesn't have a require
-        # cached yet...
-        new = $LOADED_FEATURES - old
-        found = new.last
-
-        # incredibly, in 1.8.6, this doesn't always get set to a full path
-        if RUBY_VERSION < '1.9'
-          if !File.file?(found)
-            # discover the full path.
-            dir = $:.find{|path| File.file?(path + '/' + found)}
-            return true unless dir # give up, case jruby socket.jar "mysterious"
-            found = dir + '/' + found
+        @@already_loaded[known_loc] = true
+        if known_loc =~ /\.#{RbConfig::CONFIG['DLEXT']}$/
+          puts 'doing original_non_cached_require on .so full path ' + known_loc if $FAST_REQUIRE_DEBUG
+          original_non_cached_require known_loc # not much we can do there...too bad...well at least we pass it a full path though :P
+        else
+          unless $LOADED_FEATURES.include? known_loc
+            if known_loc =~ /rubygems.rb$/
+              puts 'requiring rubygems ' + lib if $FAST_REQUIRE_DEBUG
+              original_non_cached_require(lib) # revert to normal require so rubygems doesn't freak out when it finds itself already in $LOADED_FEATURES with rubygems > 1.6 :P
+            else
+              IN_PROCESS << known_loc
+              begin
+                if $FAST_REQUIRE_DEBUG
+                  puts 'doing cached loc eval on ' + lib + '=>' + known_loc + " with stack:" + IN_PROCESS.join(' ')
+                end
+                $LOADED_FEATURES << known_loc
+                # fakely add the load path, too, so that autoload for the same file/path in gems will work <sigh> [rspec2]
+                no_suffix_full_path = known_loc.gsub(/\.[^.]+$/, '')
+                no_suffix_lib = lib.gsub(/\.[^.]+$/, '')
+                libs_path = no_suffix_full_path.gsub(no_suffix_lib, '')
+                libs_path = File.expand_path(libs_path) # strip off trailing '/'
+                $: << libs_path unless $:.index(libs_path)
+                # try some more autoload conivings...so that it won't attempt to autoload if it runs into it later...
+                relative_full_path = known_loc.sub(libs_path, '')[1..-1]
+            #    $LOADED_FEATURES << relative_full_path.gsub('.rb', '') # don't think you need this one
+                $LOADED_FEATURES << relative_full_path # add in with .rb, too. 
+                  
+                # load(known_loc, false) # too slow
+                eval(File.open(known_loc, 'rb') {|f| f.read}, TOPLEVEL_BINDING, known_loc) # note the 'rb' here--this means it's reading .rb files as binary, which *typically* works...maybe unnecessary though?
+              ensure
+                raise 'unexpected' unless IN_PROCESS.pop == known_loc
+              end
+              # --if it breaks re-save the offending file in binary mode, or file an issue on the tracker...
+              return true
+            end
+          else
+            puts 'ignoring already loaded [circular require?] ' + known_loc + ' ' + lib if $FAST_REQUIRE_DEBUG
           end
-          found = File.expand_path(found);
         end
-        puts 'found new loc:' + lib + '=>' + found if $FAST_REQUIRE_DEBUG
-        @@require_locs[lib] = found
-        @@already_loaded[found] = true
-        return true
       else
-        puts 'already loaded, apparently' + lib if $FAST_REQUIRE_DEBUG
-        # this probably was something like
-        # the first pass was require 'regdeferred'
-        # now it's a different require 'regdeferred.rb'
-        # which fails (or vice versa)
-        # so figure out why
-        # calc location, expand, map back
-        where_found = FastRequire.guess_discover(lib, true)
-        if where_found
-          puts 'inferred lib loc:' + lib + '=>' + where_found if $FAST_REQUIRE_DEBUG
-          @@require_locs[lib] = where_found
-          # unfortunately if it's our first pass
-          # and we are in the middle of a "real" require
-          # that is circular
-          # then $LOADED_FEATURES or (AFAIK) nothing will have been set
-          # for us to be able to assert that
-          # so...I think we'll end up
-          # just fudging for a bit
-          #	raise 'not found' unless @@already_loaded[where_found] # should have already been set...I think...
+        # we don't know the location--let Ruby's original require do the heavy lifting for us here
+        old = $LOADED_FEATURES.dup
+        if(original_non_cached_require(lib))
+          # debugger might land here the first time you run a script and it doesn't have a require
+          # cached yet...
+          new = $LOADED_FEATURES - old
+          found = new.last
+  
+          # incredibly, in 1.8.x, this doesn't always get set to a full path.
+          if RUBY_VERSION < '1.9'
+            if !File.file?(found)
+              # discover the full path.
+              dir = $:.find{|path| File.file?(path + '/' + found)}
+              return true unless dir # give up, case jruby socket.jar "mysterious"
+              found = dir + '/' + found
+            end
+            found = File.expand_path(found);
+          end
+          puts 'found new loc:' + lib + '=>' + found if $FAST_REQUIRE_DEBUG
+          @@require_locs[lib] = found
+          @@already_loaded[found] = true
+          return true
         else
-          if $FAST_REQUIRE_DEBUG
-            # happens for enumerator XXXX
-            puts 'unable to infer' + lib + ' in ' if $FAST_REQUIRE_DEBUG
-            @@already_loaded[found] = true # hacky
+        
+          # this is expected if it's for libraries required before faster_require was [like rbconfig]
+          # raise 'actually expected' + lib if RUBY_VERSION >= '1.9.0'
+          puts 'already loaded, apparently [require returned false], trying to discover how it was redundant... ' + lib if $FAST_REQUIRE_DEBUG
+          # this probably was something like
+          # the first pass was require 'regdeferred'
+          # now it's a different require 'regdeferred.rb'
+          # which fails (or vice versa)
+          # so figure out why
+          # calc location, expand, map back
+          where_found = FastRequire.guess_discover(lib, true)
+          if where_found
+            puts 'inferred lib loc:' + lib + '=>' + where_found if $FAST_REQUIRE_DEBUG
+            @@require_locs[lib] = where_found
+            # unfortunately if it's our first pass
+            # and we are in the middle of a "real" require
+            # that is circular
+            # then $LOADED_FEATURES or (AFAIK) nothing will have been set
+            # for us to be able to assert that
+            # so...I think we'll end up
+            # just fudging for a bit
+            #	raise 'not found' unless @@already_loaded[where_found] # should have already been set...I think...
+          else
+            if $FAST_REQUIRE_DEBUG
+              # happens for enumerator XXXX
+              puts 'unable to infer ' + lib + ' location' if $FAST_REQUIRE_DEBUG
+              @@already_loaded[found] = true # so hacky...
+            end
           end
+          return false # XXXX test all these return values
         end
-        return false # XXXX test all these return values
       end
+    ensure
+      raise 'huh' unless ALL_IN_PROCESS.pop[0] == lib
     end
   end
 
-  def self.resetup!
-    eval "module ::Kernel; alias :require :require_cached; end"
-  end
 end
 
 module Kernel
 
   if(defined?(@already_using_faster_require))
-    raise 'twice not allowed...'
-    # *shouldn't* ever get here...unless I'm wrong...
+    raise 'loading twice not allowed...we should never get here!'
+  end
+  @already_using_faster_require = true
+  # overwrite old require...
+  include FastRequire
+  if defined?(gem_original_require)
+    class << self
+      alias :original_remove_method :remove_method
+      
+      def remove_method method # I think this actually might be needed <sigh>
+        if method.to_s == 'require'
+          #p 'not removing old require, since that\'s ours now'
+        else
+          original_remove_method method
+        end
+      end
+    
+    end
+    
+  #  unused?
+  #    def remove_method method
+  #     p 'in mine2'
+  #    end
+  
+    # similarly overwrite this one...I guess...1.9.x...rubygems uses this as its default...I think...
+    alias :original_non_cached_require :gem_original_require
+    alias :gem_original_require :require_cached
   else
-    @already_using_faster_require = true
-    include FastRequire
-    # overwrite old require...
     alias :original_non_cached_require :require
-    FastRequire.resetup!
-  end
+    alias :require :require_cached
+  end
 
-end
+end

data/spec/eval_me1.rb

@@ -0,0 +1 @@
+eval(File.read('eval_me2.rb'), binding, File.expand_path('./eval_me2.rb'))

data/spec/eval_me2.rb

@@ -0,0 +1 @@
+require_relative 'eval_me1.rb'

data/spec/files/active_support_no_double_load.rb

@@ -0,0 +1,15 @@
+$: << '.'
+$: << 'files'
+if true
+  require 'gem_after.rb'
+else
+ p 'warning not using faster'
+ require 'rubygems'
+end
+require 'active_support'
+raise 'poor acctive support' unless ActiveSupport::Inflector::Inflections.instance.plurals.length > 0
+# d:/Ruby192/lib/ruby/gems/1.9.1/gems/diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb:53: warning: already initialized constant SequenceCallbacks
+require 'action_pack'
+require 'action_pack'
+# warning: already initialized constant JS_ESCAPE_MAP
+p 'success'

data/spec/files/gem_after.rb

@@ -1,4 +1,5 @@
 $: << '.'
+
 require '../lib/faster_require.rb'
 require 'rubygems'
 Gem::Specification
@@ -6,4 +7,5 @@ Gem::Specification
 raise if FastRequire.already_loaded.to_a.flatten.grep(/files\/b.rb/).length > 0
 require 'files/b.rb'
 raise if(require 'files/b.rb')
-raise unless  FastRequire.already_loaded.to_a.flatten.grep(/files\/b.rb/).length > 0
+raise 'lacking b.rb ' + FastRequire.already_loaded.to_a.join(' ') unless FastRequire.already_loaded.to_a.flatten.grep(/files\/b.rb/).length > 0
+p 'success'

data/spec/files/load_various_gems.rb

@@ -0,0 +1,12 @@
+$: << '.'
+$: << 'files'
+if true
+  require 'gem_after.rb'
+else
+  p 'warning not using faster require'
+  require 'rubygems'
+end
+require 'ruby-debug'
+require 'rspec'
+# d:/Ruby192/lib/ruby/gems/1.9.1/gems/diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb:53: warning: already initialized constant SequenceCallbacks
+p 'success'

data/spec/files/load_various_gems2.rb

@@ -0,0 +1,7 @@
+$: << '.'
+$: << 'files'
+require 'gem_before.rb'
+require 'rspec'
+require 'ruby-debug'
+# d:/Ruby192/lib/ruby/gems/1.9.1/gems/diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb:53: warning: already initialized constant SequenceCallbacks
+p 'success'

data/spec/files/socket_load.rb

@@ -0,0 +1,8 @@
+$: << '.'
+
+require '../lib/faster_require.rb'
+raise if FastRequire.already_loaded.to_a.flatten.grep(/files\/b.rb/).length > 0
+require 'socket'
+TCPSocket
+raise 'lacking socket ' + FastRequire.already_loaded.to_a.join(' ') unless FastRequire.already_loaded.to_a.flatten.grep(/socket/).length > 0
+p 'success'

data/spec/spec.fast_require.rb

@@ -20,13 +20,11 @@ unless RUBY_PLATFORM =~ /java/
  FastRequire.load cached if File.exist? cached
  FastRequire.save cached
 else
-  
-require 'spec/autorun'
- require_relative '../lib/faster_require'
-  
+  require 'spec/autorun'
+  require_relative '../lib/faster_require'
 end
 
-describe "requires faster" do
+describe "requires faster!" do
 
   before do
     FastRequire.clear_all!
@@ -134,18 +132,25 @@ describe "requires faster" do
     ruby "files/gem_before.rb"    
   end  
   
-  it "should not double load gems" do
-    a = `#{@ruby} files/gem_after.rb 2>&1`
-    a.should_not match('already initialized')
- end
-  
-  it "should throw if you require it twice" do
+ ['gem_after.rb', 'load_various_gems.rb', 'load_various_gems2.rb', 'active_support_no_double_load.rb', 'fast.rb'].each{|filename| 
+    it "should not double load gems #{filename}" do
+      3.times {
+        a = `#{@ruby} -v files/#{filename} 2>&1`
+        a.should_not match('already initialized')
+        a.should_not match('from ') # an error backtrace...
+        a.should_not match('discarding old deep_const_get')
+        a.length.should be > 0
+      }
+    end
+  }
+
+  it "should throw if you require itself twice" do
     Dir.chdir('files') do
       assert !system(@ruby + 'attempt_double_load.rb')
     end
   end
   
-  it "should force require 'abc' to not load file called exactly abc" do
+  it "require 'abc' should not attempt to load file called exactly abc" do
     Dir.chdir('files') do
       ruby 'require_non_dot_rb_fails.rb'
     end
@@ -174,12 +179,15 @@ describe "requires faster" do
     end
   end
 
-  it "should" do
+  it "should do this type loading too" do
     Dir.chdir('files') do
       ruby 'fast2.rb'
     end
   end
-
+  
+  it "should be able to infer .so files like socket.so" #do
+#    ruby "files/socket_load.rb" # LODO reproduce failure
+#  end
 
 
 end

metadata

@@ -1,102 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: faster_require
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Roger Pack
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-25 00:00:00 -07:00
+date: 2011-03-09 00:00:00.000000000 -07:00
 default_executable: faster_require
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redparse
+  requirement: &18274344 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *18274344
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: &18273984 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.3.10
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *18273984
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &18273696 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *18273696
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &18273336 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sane
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *18273336
+- !ruby/object:Gem::Dependency
+  name: sane
+  requirement: &18272976 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ruby-prof
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *18272976
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: &18272652 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: A tool designed to speedup library loading in Ruby by caching library locations
+  prerelease: false
+  version_requirements: *18272652
+description: A tool designed to speedup library loading in Ruby by caching library
+  locations
 email: rogerdpack@gmail.com
-executables: 
+executables:
 - faster_require
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - README
 - Rakefile
 - VERSION
@@ -117,6 +107,8 @@ files:
 - spec/files/gem_after.rb
 - spec/files/gem_before.rb
 - spec/files/large.rb
+- spec/files/load_various_gems.rb
+- spec/files/load_various_gems2.rb
 - spec/files/non_dot_rb.rb
 - spec/files/require_full_path.rb
 - spec/files/require_non_dot_rb_fails.rb
@@ -125,46 +117,44 @@ files:
 - spec/files/should_put_modules_in_right_place.rb
 - spec/files/slow.rb
 - spec/spec.fast_require.rb
+- spec/eval_me1.rb
+- spec/eval_me2.rb
 - spec/files/a.rb
+- spec/files/active_support_no_double_load.rb
+- spec/files/socket_load.rb
 - spec/temp/slow.rb
 - spec/temp/yo.rb
 has_rdoc: true
 homepage: http://github.com/rdp/faster_require
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Speed library loading in Ruby
-test_files: 
+test_files:
+- spec/eval_me1.rb
+- spec/eval_me2.rb
 - spec/files/a.rb
 - spec/files/a_requires_b.rb
+- spec/files/active_support_no_double_load.rb
 - spec/files/attempt_double_load.rb
 - spec/files/b.rb
 - spec/files/c.rb
@@ -175,6 +165,8 @@ test_files:
 - spec/files/gem_after.rb
 - spec/files/gem_before.rb
 - spec/files/large.rb
+- spec/files/load_various_gems.rb
+- spec/files/load_various_gems2.rb
 - spec/files/non_dot_rb.rb
 - spec/files/require_full_path.rb
 - spec/files/require_non_dot_rb_fails.rb
@@ -182,6 +174,7 @@ test_files:
 - spec/files/requires_itself.rb
 - spec/files/should_put_modules_in_right_place.rb
 - spec/files/slow.rb
+- spec/files/socket_load.rb
 - spec/spec.fast_require.rb
 - spec/temp/slow.rb
 - spec/temp/yo.rb