fast_require 0.3.3 → 0.4.0

data/README

@@ -1,22 +1,51 @@
 A little utility to make
+
 require 'xxx'
 
 take much less time.
 
-This is almost *necessary* for using 1.9.x on windows, and helps with 1.8, too.
+Well, mostly on windows--on linux it's a speedup of only 0.41 to 0.45s, or so. [1]
 
-If you've ever wondered why ruby feels slow...sometimes it's just the startup time, my friend.  This helps with that.
+If you've ever wondered why ruby feels slow on doze...sometimes it's just the startup time.  This helps.
 
 Benchmarks:
 
-loading
+loading a spec file:
 
-  fast 0.34375 slow 3.203125
+  1.9.1   
+    without 3.20s
+    with 0.34s (10x improvement)
 
+  1.8.6
+    without 3.6s
+    with 1.25s
+    
 
-test rails app, running script/console "puts 333"
+rails app, running script/console "puts 333"
 
-windows:
  1.9.1
    without:
-  
+      20s
+    with:
+      10s
+ 
+ 1.8.6 
+   without:
+       9s
+   with:
+       6s
+       
+rake -T
+
+ 1.9.1
+   without: 3.75s
+   with: 1.5s       
+
+ 1.8.6
+   without: 1.37s
+   with:    1.25s
+   
+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.

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/fast_require.rb

@@ -1,10 +1,13 @@
 module FastRequire
   $FAST_REQUIRE_DEBUG ||= false
+  
   def self.setup
     @@dir = File.expand_path('~/.ruby_fast_require_cache')
 
     Dir.mkdir @@dir unless File.directory?(@@dir)
-    @@loc = @@dir + '/' + RUBY_VERSION + '-' + RUBY_PLATFORM + '-' + sanitize(File.expand_path($0).gsub(/[\/:]/, '_')) + sanitize(Dir.pwd)
+    @@loc = @@dir + '/' + RUBY_VERSION + '-' + RUBY_PLATFORM + '-' + 
+       sanitize(File.expand_path($0).gsub(/[\/:]/, '_')) + 
+       sanitize(Dir.pwd)
   end
 
   def self.sanitize filename
@@ -12,12 +15,17 @@ module FastRequire
   end
 
   FastRequire.setup
+  
+  def self.load filename
+    @@require_locs = Marshal.restore( File.open(filename, 'rb') {|f| f.read})
+  end
 
   if File.exist?(@@loc)
-    @@require_locs = Marshal.restore( File.open(@@loc, 'rb') {|f| f.read})
+    FastRequire.load @@loc
   else
     @@require_locs = {}
   end
+  
   @@already_loaded = {}
 
   # try to see where this file was loaded from, from $:
@@ -99,11 +107,15 @@ module FastRequire
   end
 
   at_exit {
-    FastRequire.save
+    FastRequire.default_save
   }
+  
+  def self.default_save
+    self.save @@loc
+  end
 
-  def self.save
-    File.open(@@loc, 'wb'){|f| f.write Marshal.dump(@@require_locs)}
+  def self.save to_file
+    File.open(to_file, 'wb'){|f| f.write Marshal.dump(@@require_locs)}
   end
 
   def self.clear_all!
@@ -172,6 +184,7 @@ module FastRequire
           if $FAST_REQUIRE_DEBUG
             # happens for enumerator XXXX
             puts 'unable to infer' + lib + ' in ' if $FAST_REQUIRE_DEBUG
+            @@already_loaded[found] = true # hacky
           end
         end
         return false # XXXX test all these return values

data/spec/files/gem_after.rb

@@ -2,9 +2,7 @@ require '../lib/fast_require.rb'
 require 'rubygems'
 Gem::Specification
 
-#require '_dbg'
 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 'I dont trust this'

data/spec/files/requires_itself.rb

@@ -1,7 +1,4 @@
 require '../lib/fast_require.rb'
-puts $0
 raise if $already_here
 $already_here = true
-#require '_dbg'
-3
 require $0

data/spec/spec.fast_require.rb

@@ -1,10 +1,17 @@
 # $FAST_REQUIRE_DEBUG
-require 'rubygems' if RUBY_VERSION < '1.9'
-require 'sane'
-require 'spec/autorun'
-require 'benchmark'
+if RUBY_VERSION < '1.9'
+  require 'faster_rubygems'
+  require 'sane'
+end
 
+cached = '.cached_spec_locs' + RUBY_VERSION
+puts cached
 require_relative '../lib/fast_require'
+# use it for our own local test specs
+FastRequire.load cached if File.exist? cached
+require 'spec/autorun'
+require 'benchmark'
+FastRequire.save cached
 
 describe "faster requires" do
 
@@ -22,16 +29,13 @@ describe "faster requires" do
   end  
   
   it "should be able to do a single require" do
-    old = $LOADED_FEATURES.dup
     Dir.chdir('files') do
-      3
-      #require '_dbg'
-      3
+      old = $LOADED_FEATURES.dup
       assert require('c')
       assert !(require 'c')
+      new = $LOADED_FEATURES - old
+      raise new.inspect if new.length != 1    
     end
-    new = $LOADED_FEATURES - old
-    raise new.inspect if new.length > 1    
   end
 
   it "should be able to go two sub-requires deep appropriately" do
@@ -77,7 +81,7 @@ describe "faster requires" do
 
   it "should save a file as a cache in a dir" do    
     assert Dir[FastRequire.dir + '/*'].length == 0 # all clear
-    FastRequire.save
+    FastRequire.default_save
     assert Dir[FastRequire.dir + '/*'].length > 0
   end
   
@@ -99,8 +103,9 @@ describe "faster requires" do
   end
   
   private
+  
   def ruby filename
-    assert system(@ruby  + " " + filename)
+    3.times { assert system(@ruby  + " " + filename) }    
   end
   
   it "should override rubygems' require if rubygems is loaded after the fact...maybe by hooking to Gem::const_defined or something" do
@@ -109,7 +114,12 @@ describe "faster requires" do
   
   it "should override rubygems' require if rubygems is loaded before the fact" do
     ruby "files/gem_before.rb"    
-  end
+  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
     Dir.chdir('files') do
@@ -120,20 +130,18 @@ describe "faster requires" do
   it "should force require 'abc' to not load file called exactly abc" do
     Dir.chdir('files') do
       ruby 'require_non_dot_rb_fails.rb'
-      ruby 'require_non_dot_rb_fails.rb' # should succeed
     end
   end
   
-  it "should be able to handle full paths" do
+  it "should handle full path requires" do
     Dir.chdir('files') do
      ruby 'require_full_path.rb' 
-     ruby 'require_full_path.rb'
     end
   end
   
-  it "should handle Pathname too" do
+  it "should handle Pathname requires, too" do
     require 'pathname'
-    require Pathname.new('spec.fast_require.rb')
+    require Pathname.new('pathname')
   end  
   
   it "should work well with rubygems for gem libs (installed), themselves"
@@ -143,8 +151,4 @@ describe "faster requires" do
     ruby 'files/requires_itself.rb'    
   end
   
-  
-  
-  
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fast_require
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors: 
 - Roger Pack
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -07:00
+date: 2010-01-28 00:00:00 -07:00
 default_executable: fast_require
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,10 +67,13 @@ files:
 - spec/files/e.rb
 - spec/files/fast.rb
 - spec/files/gem_after.rb
+- spec/files/gem_before.rb
 - spec/files/large.rb
 - spec/files/non_dot_rb.rb
 - spec/files/require_full_path.rb
+- spec/files/require_non_dot_rb_fails.rb
 - spec/files/require_twice_in_dir_pwd.rb
+- spec/files/requires_itself.rb
 - spec/files/slow.rb
 - spec/spec.fast_require.rb
 has_rdoc: true