faster_rubygems 0.6.4 → 0.9.2

data/README

@@ -1,78 +1,75 @@
-A helper to dramatically speedup the time it takes to load rubygems.
+A helper gem to dramatically speedup the time it takes to startup a ruby script.
 
-i.e. it makes it so that "require 'rubygems'" no longer has to sap valuable time from your life.
+i.e. it makes it so that requiring rubygems no longer takes as long.
 
-Speed difference (windows box, lots of gem):
+Speed difference (a demo gem script, ruby 1.8 windows mingw):
 
-$ time ruby examples/require_rubygems_normal.rb
-real    0m1.109s
+normal rubygems:
 
-$ time ruby examples/require_fast_start.rb
-real    0m0.500s
+  $ timer ruby whichr
+  0.83
 
-Yea! Finally ruby script startup times that don't spend forever just reloading gem specs every single time...
+with faster_rubygems:
 
-It acts about the same as gem_prelude (prelude is 1.9 only currently) -- adds the paths of the highest version of each gem into your load path so they're ready to be required.
+  $ timer ruby whichr
+  0.19
 
-It is also good for 1.9 makes script startup faster.  To use it with 1.9 do an
-$ export RUBYOPTS=-rfaster_rubygems
+Yea!
 
-somewhere.
+It acts as a beefed up version of gem_prelude (prelude is 1.9 only currently), but only adds load paths on demand.
 
-== installation ==
-
-$ gem install faster_rubygems
-
-== usage ==
+It makes even more of a difference when used with 1.9:
 
-require 'faster_rubygems' at the top of your script.
+normal rubygems:
 
-Or
+  $ timer ruby whichr
+  3.8s
 
-1.9:
-  $ export RUBYOPTS=-rfaster_rubygems
+with faster_rubygems:
 
-1.8:
-  you can install it to be used by default thus:
-
-  >> require 'rubygems'
-  >> require 'faster_rubygems/install' # installs faster_rubygems to be use in place of normal rubygems when you do a "require 'rubygems'"
+  $ timer ruby whichr
+  0.24s
 
-  # later, to revert back to normal, should you so desire:
-  >> require 'rubygems'
-  >> require 'faster_rubygems/uninstall'
+== installation ==
 
-  If all else fails in this process (it typically works fine), you can reinstall normal rubygems by running setup.rb from within its package.
+$ gem install faster_rubygems
 
-== More Speed Comparisons ==
+1.9
+:
+  $ export RUBYOPT=-rfaster_rubygems --disable-gems
 
-For those interested, speed difference example on linux (250 gems):
+1.8:
 
-$ time ruby examples/require_rubygems_normal.rb
-ruby examples/require_rubygems_normal.rb  0.57s user 0.05s system 85% cpu 0.726 total
+  you currently have to install to override normal rubygems by doing the following (in an irb session):
 
-$ time ruby examples/require_fast_start.rb
-ruby examples/require_fast_start.rb  0.04s user 0.02s system 46% cpu 0.121 total
+  >> require 'rubygems'
+  >> require 'faster_rubygems/override' # installs faster_rubygems to be use in place of normal rubygems when you do a "require 'rubygems'" so you don't have to worry about anything
 
-Note also that a few non conforming gems require the use of require 'rubygems' no matter what (they're pretty rare, though--you probably won't run into them, and I'm not aware of any).
+  # later, to revert this override, back to normal rubygems, should you so desire, do the following:
+  >> require 'rubygems'
+  >> require 'faster_rubygems/unoverride'
 
+  If all else fails in this process (it has typically worked fine), you can 
+  reinstall normal rubygems by downloading its package (.tgz) and running ruby setup.rb within it.
 
-== Experimental ==
+After installation, usage is automatic.
 
-If you want to be more aggressive you can try loading it with its cousin, faster_require:
 
-$ gem install faster_require
+To regenerate cache files (should never be necessary, but if you for some reason think yours are stale) do
+>> require 'rubygems'
+>> require 'faster_rubygems/create_cache_for_all'
 
-Now use it by default:
-  
-1.9:  $ export RUBYOPTS=-rfaster_rubygems_with_faster_require_too
-1.8:  >> require 'faster_rubygems/install_with_faster_require_too' # installs faster_rubygems, as above, but also loads faster_require along with it.
+Note that it still loads full rubygems when it necessary (like when installing gems).  This is also automatic.
+Most of the credit for this goes to gem prelude.
 
 == Related projects ==
 
+rubygems (of course)
 http://github.com/fabien/minigems/tree/master
-1.9's gem_prelude.rb
+1.9's gem_prelude
 http://www.ruby-forum.com/topic/191673
+the Builder gem
+
+Source/feedback:
 
-Source/contact:
-http://www.github.com/rdp/faster_rubygems
+http://www.github.com/rdp/faster_rubygems

data/Rakefile

@@ -7,12 +7,7 @@ require 'jeweler'
 
   s.post_install_message = "
 
-installed! 1.9 use -> require 'faster_rubygems' 
-
-1.8: use require 'faster_rubygems' or install as the default thus:
-
->> require 'rubygems'
->> require 'faster_rubygems/install'
+faster_rubygems installed! see the readme for post-install instructions: http://github.com/rdp/faster_rubygems
 
 "
   s.add_development_dependency 'test-unit', '=1.2.3'

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.9.2

data/benchmarks.txt

@@ -0,0 +1,71 @@
+whichr whichr benchmarks (best time seen):
+
+mingw 1.8 
+
+  normal rubygems
+    0.77
+
+  faster_rubygems with cache
+    0.14
+    
+  faster_rubygems without cache:
+    0.20
+
+mingw 1.9
+
+  normal rubygems:
+    3.79
+
+  faster_rubygems with cache:
+    0.19
+    
+  faster_rubygems without cache:
+    0.50  
+
+jruby, faster_rubygems with "full load path"
+
+  faster_rubygems without cache:
+    1.15
+    
+  faster_rubygems with cache:
+    1.11
+    
+  normal rubygems:
+    2.31
+    
+    
+    
+rails 3 [ $ ruby script\rails runner -e production "puts 3" ]
+
+unfortunately with rails 3 currently it loads "full rubygems" no matter what, which is the thing we were trying to avoid.
+
+1.9
+    faster_rubygems with cache[RUBYOPT=-rfaster_rubygems --disable-gems]:
+      11.26
+      
+    faster_rubygems without cache [RUBYOPT=-rfaster_rubygems]:
+      13.73
+      
+    normal rubygems (with gem prelude [straight ruby]):
+      13.88
+      
+    normal rubygems (ruby --disable-gems):
+      10.41
+
+rails 2.3.8 [ $ ruby script\runner -e production "puts 3" ]
+      
+1.9
+    faster_rubygems with cache[RUBYOPT=-rfaster_rubygems --disable-gems]:
+      12.4
+      
+    
+
+    
+lacking:
+  rails benchmarks, faster_require for everybody...
+  
+TODO:
+ jruby spawning itself was *so slow* it seemed (timer.rb)
+  
+ only regenerate appropriate cache files after gem installs...
+ only cache lib filenames, not spec files, et al...

data/ext/mkrf_conf.rb

@@ -2,8 +2,11 @@ require 'rubygems'
 
 # do some ruby stuff...
 
-puts File.dirname(__FILE__)
-load File.expand_path(File.dirname(__FILE__)) + "/../internalize.rb" # install this gem locally
+load File.expand_path(File.dirname(__FILE__)) + "/../internalize.rb" # install this gem locally...
+
+# create as many as possible at install time ...
+
+require File.dirname(__FILE__) + "/../lib/faster_rubygems/create_cache_for_all.rb"
 
 f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") # create dummy rakefile to indicate success
 f.write("task :default\n")

data/internalize.rb

@@ -2,9 +2,12 @@ require 'fileutils'
 require 'rbconfig'
 
 Dir.chdir File.dirname(__FILE__) + '/lib' do
-  for file in Dir['*.rb'] do
-    FileUtils.cp file, Config::CONFIG['sitelibdir'] + '/' + file
+  for file in Dir['*'] do
+    next if file =~ /rubygems_plugin/ # don't want to copy that one over
+    new_file = Config::CONFIG['sitelibdir'] + '/' + file
+    FileUtils.rm_rf new_file if File.exist?(new_file)
+    FileUtils.cp_r file, new_file
   end
 end
 
-puts 'Installed--thank you for trying out -- require \'faster_rubygems\''
+puts 'Installed--thank you for trying out faster_rubygems' # they never see this message tho...

data/lib/faster_rubygems/create_cache_for_all.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + "/prelude_create_cache"
+Gem.create_cache_for_all!  

data/lib/faster_rubygems/install_helper.rb

@@ -6,7 +6,7 @@
       require 'fileutils'
       old = rubygems_path
       new =  old + ".bak.rb"
-      raise 'cannot install twice--please run uninstall first' if File.exist?(new)
+      raise 'cannot install twice--please run unoverride first' if File.exist?(new)
       FileUtils.cp old, new
       File.open(old, 'w') do |f|
         f.write "require 'faster_rubygems'\n"

data/lib/faster_rubygems/ir_session.rb

@@ -0,0 +1,29 @@
+TOPLEVEL_BINDING = binding unless defined?(TOPLEVEL_BINDING)
+
+def repl(scope = TOPLEVEL_BINDING)
+  Repl.start(scope)
+end
+
+module Repl
+  def self.start(scope = TOPLEVEL_BINDING)
+    quitstr = ['quit', 'exit', '']
+    while true
+      stack = eval("caller[3..-1]", scope)
+      print "\n#{stack.first}\n" if stack and not stack.empty?
+      print 'rb> '
+      input = gets.strip rescue 'quit'
+      break if quitstr.include?(input)
+      puts "=> #{
+        begin
+          eval(input, scope).inspect
+        rescue LoadError => le
+          puts le.inspect
+        rescue SyntaxError => se
+          puts se.inspect
+        rescue => e
+          puts e.inspect
+        end
+      }"
+    end
+  end
+end

data/lib/{my_gem_prelude.rb → faster_rubygems/my_gem_prelude.rb}

@@ -10,7 +10,7 @@
 # * Should not expect Encoding.default_internal.
 # * Locale encoding is available.
 if defined?(Gem) then
-
+  start = Time.now if $VERBOSE
   require 'rbconfig'
   # :stopdoc:
 
@@ -142,6 +142,7 @@ if defined?(Gem) then
       @loaded_full_rubygems_library = false
 
       def self.load_full_rubygems_library
+        puts 'faster_rubygems: loading full rubygems',caller if $VERBOSE
         if $DEBUG || $VERBOSE
           $stderr.puts 'warning, loading full rubygems'
         end
@@ -167,7 +168,7 @@ if defined?(Gem) then
         require 'rubygems'
         begin
           require 'rubygems.rb.bak' # just in case
-        rescue LoadError
+        rescue ::LoadError
           # ok
         end
       end
@@ -196,13 +197,48 @@ if defined?(Gem) then
       GemPaths = {}
       GemVersions = {}
 
+      GemsActivated = {}
       def push_gem_version_on_load_path(gem_name, *version_requirements)
         if version_requirements.empty?
-          unless GemPaths.has_key?(gem_name) then
+          unless path = GemPaths[(gem_name)] then
+            puts "Could not find RubyGem #{gem_name} (>= 0)\n" if $VERBOSE || $DEBUG
             raise Gem::LoadError, "Could not find RubyGem #{gem_name} (>= 0)\n"
           end
-
-          # highest version gems already active
+          # highest version gems *not* already active
+          if !ALL_CACHES.empty?
+            # then we are using the caches, and the stuff isn't preloaded yet
+            # copied and pasted...
+                  require_paths = []
+                  if GemsActivated[gem_name]
+                    return false
+                  else
+                    GemsActivated[gem_name] = true
+                  end
+                  if File.exist?(file = File.join(path, ".require_paths")) then
+                    paths = File.read(file).split.map do |require_path|
+                      File.join path, require_path
+                    end
+                    
+                    require_paths.concat paths
+                  else
+                    # bin shouldn't be necessary...
+                    # require_paths << file if File.exist?(file = File.join(path, "bin"))
+                    require_paths << file if File.exist?(file = File.join(path, "lib"))
+                  end
+
+                    # "tag" the first require_path inserted into the $LOAD_PATH to enable
+                    # indexing correctly with rubygems proper when it inserts an explicitly
+                    # gem version
+                    unless require_paths.empty? then
+                      require_paths.first.instance_variable_set(:@gem_prelude_index, true)
+                    end
+                    # gem directories must come after -I and ENV['RUBYLIB']
+                   # TODO  puts $:.index{|e|e.instance_variable_defined?(:@gem_prelude_index)}
+                   # $:[$:.index{|e|e.instance_variable_defined?(:@gem_prelude_index)}||-1,0] = require_paths
+                    $:[0,0] = require_paths
+                    return true
+          end
+          # normal flow when not using caches--it's already on the path
           return false
         else
           if version_requirements.length > 1 then
@@ -212,6 +248,11 @@ if defined?(Gem) then
 
           requirement, version = version_requirements[0].split
           requirement.strip!
+          # accomodate for gem 'xxx', '2.3.8'
+          if !version
+            version = requirement
+            requirement = '='
+          end
 
           if loaded_version = GemVersions[gem_name] then
             case requirement
@@ -237,7 +278,7 @@ if defined?(Gem) then
         numbers
       end
 
-      def push_all_highest_version_gems_on_load_path
+      def calculate_all_highest_version_gems load_them_into_the_require_path
         Gem.path.each do |path|
           gems_directory = File.join(path, "gems")
 
@@ -257,6 +298,9 @@ if defined?(Gem) then
           end
         end
 
+        return unless load_them_into_the_require_path
+        
+        # load them into $: now
         require_paths = []
 
         GemPaths.each_value do |path|
@@ -267,7 +311,8 @@ if defined?(Gem) then
 
             require_paths.concat paths
           else
-            require_paths << file if File.exist?(file = File.join(path, "bin"))
+          # bin shouldn't be necessary...
+          # require_paths << file if File.exist?(file = File.join(path, "bin"))
             require_paths << file if File.exist?(file = File.join(path, "lib"))
           end
         end
@@ -281,8 +326,9 @@ if defined?(Gem) then
         # gem directories must come after -I and ENV['RUBYLIB']
         $:[$:.find{|e|e.instance_variable_defined?(:@gem_prelude_index)}||-1,0] = require_paths
       end
-
+      
       def const_missing(constant)
+        puts 'gem_prelude: const missing', constant if $VERBOSE || $DEBUG
         QuickLoader.load_full_rubygems_library
 
         if Gem.const_defined?(constant) then
@@ -297,20 +343,45 @@ if defined?(Gem) then
         super unless Gem.respond_to?(method)
         Gem.send(method, *args, &block)
       end
+  
+       # if the gem dir doesn't exist, don't count it against us
+       ALL_CACHES = Gem.path.select{|path| File.exist?(path)}.map{|path|
+         cache_name = path + '/.faster_rubygems_cache'
+         if File.exist?(cache_name)
+            File.open(cache_name, 'rb') do |f|
+              [path, Marshal.load(f)]
+            end
+         else
+           $stderr.puts 'faster_rubygems: a cache file does not exist! reverting to full load path ' + cache_name
+           nil
+         end
+      }
+      
+      # we will use a clear cache as an indication of "non success" loading caches
+      ALL_CACHES.clear if ALL_CACHES.index(nil)
+      
     end
 
     extend QuickLoader
 
   end
 
+  
   begin
-    Gem.push_all_highest_version_gems_on_load_path
-    Gem::QuickLoader.fake_rubygems_as_loaded
+    if !Gem::QuickLoader::ALL_CACHES.empty?
+      puts 'faster_rubygems using caches', Gem::QuickLoader::ALL_CACHES.map{|fn, contents| fn} if $VERBOSE
+      Gem.calculate_all_highest_version_gems false
+      # use cached load instead of loading lib paths into the load path here
+      require File.expand_path(File.dirname(__FILE__)) + "/prelude_cached_load"
+    else
+      puts 'faster_rubygems not using caches!' if $VERBOSE
+      Gem.calculate_all_highest_version_gems true
+    end
+    Gem::QuickLoader.fake_rubygems_as_loaded # won't be needing that regardless
   rescue Exception => e
     puts "Error loading gem paths on load path in gem_prelude"
     puts e
     puts e.backtrace.join("\n")
   end
-
-end
-
+  puts "faster_rubygems total load time:" + (Time.now - start).to_s if $VERBOSE
+end

data/lib/{prelude_bin_path.rb → faster_rubygems/prelude_bin_path.rb}

@@ -1,7 +1,7 @@
 module Gem
 
   module QuickLoader
-    def bin_path(gem_name, exec_name = null, *version_requirements)
+    def bin_path(gem_name, exec_name = nil, *version_requirements)
       unless GemPaths.has_key?(gem_name) then
         raise Gem::LoadError, "Could not find RubyGem #{gem_name} (>= 0)\n"
       end
@@ -44,7 +44,7 @@ module Gem
       bin_path(gem_name, exec_name, *version_requirements)
     end
 
-    # 1.9.1 doesn't have this...
+    # 1.9.1's gem_prelude doesn't have this for some reason...
     def integers_for(gem_version)
         numbers = gem_version.split(".").collect {|n| n.to_i}
         numbers.pop while numbers.last == 0

data/lib/faster_rubygems/prelude_cached_load.rb

@@ -0,0 +1,46 @@
+module Gem
+    module QuickLoader
+      module PreludeRequire
+        def require_prelude lib          
+          begin
+            require_pre_prelude lib
+          rescue ::LoadError => e
+            if Gem.push_all_gems_that_might_match_and_reload_files(lib, e)
+              require_pre_prelude lib
+            else
+              # re-raise
+              raise e
+            end
+          end
+        end
+      end
+      
+      def push_all_gems_that_might_match_and_reload_files lib, error
+        sub_lib = lib.gsub("\\", '/').split('/')[-1].split('.')[0]
+        success = false
+        raise if ALL_CACHES.empty? # should never be empty...
+        ALL_CACHES.each{|path, gem_list|
+          for gem_name, long_file_list in gem_list 
+            if idx = long_file_list.index(sub_lib)
+              puts 'activating' + gem_name + sub_lib.to_s if $DEBUG
+              if gem(gem_name)
+                puts 'gem activated ' + gem_name + ' ' + sub_lib + ' ' + long_file_list[idx] if $VERBOSE || $DEBUG
+                success = true
+              end
+              puts 'done activeating' + gem_name + sub_lib if $DEBUG
+            end
+            
+          end
+        }
+        success
+      end
+      
+    end
+  end
+  
+  module Kernel
+    include Gem::QuickLoader::PreludeRequire
+    alias :require_pre_prelude :require
+    alias :require :require_prelude
+  end
+

data/lib/faster_rubygems/prelude_create_cache.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + "/prelude_bin_path" # Gem.integers_for, for 1.9.1
+
+module Gem
+  module QuickLoader
+    def create_cache gems_paths
+      puts 'faster_rubygems: creating caches'
+      gems_paths.each do |path|
+        gem_versions = {}
+        gem_paths = {}
+        gems_directory = File.join(path, "gems")
+        if File.exist?(gems_directory) then
+          Dir.entries(gems_directory).each do |gem_directory_name|
+            next if gem_directory_name == "." || gem_directory_name == ".."
+
+            next unless gem_name = gem_directory_name[/(.*)-(.*)/, 1]
+            new_version = integers_for($2)
+            current_version = gem_versions[gem_name]
+
+            if !current_version or (current_version <=> new_version) < 0 then
+              gem_versions[gem_name] = new_version
+              gem_paths[gem_name] = File.join(gems_directory, gem_directory_name)
+            end
+          end
+        end
+        gem_paths_with_contents = {}
+        # strip out directories, and the gem-d.d.d prefix
+        gem_paths.each{|k, v| 
+          
+          gem_paths_with_contents[k] = Dir[v + '/**/*.{rb,so,bundle}'].select{|f| 
+            !File.directory? f
+          }.map{ |full_name| 
+            full_name.sub(v + '/', '')
+            full_name.split('/')[-1].split('.')[0] # just a of a.b.c.rb, for now
+          }
+        }
+        
+        cache_path = path + '/.faster_rubygems_cache'
+        puts '.'
+        $stdout.flush
+        # accomodate for those not running as sudo...
+        if File.writable? path
+          File.open(cache_path, 'wb') do |f|
+            f.write Marshal.dump(gem_paths_with_contents)            
+          end
+        else
+          $stderr.puts "warning, unable to write cache to:" + cache_path
+        end
+      end
+
+    end
+    
+    def create_cache_for_all!
+      puts 'recreating all faster_rubygems caches'
+      create_cache Gem.path
+    end
+    
+  end
+extend QuickLoader
+end

data/lib/faster_rubygems.rb

@@ -1,21 +1,25 @@
 # :stopdoc:
 
-# don't load it if normal rubygems is already defined
-if !defined?(Gem::Dependency)
-
-  if RUBY_VERSION < '1.9.0'
    
+# don't load it if normal rubygems is already loaded
+
+if !defined?(Gem::Dependency)
+  if( (RUBY_VERSION < '1.9.0') || !defined?(Gem))
    # we're either 1.8 or 1.9 with --disable-gems
     # define it so gem_prelude will execute...
     module Gem; 
-    end 
    
-    require File.expand_path(File.dirname(__FILE__)) + "/my_gem_prelude.rb"
+    end 
+    require File.expand_path(File.dirname(__FILE__)) + "/faster_rubygems/my_gem_prelude"
+  else
+    if RUBY_VERSION >= '1.9.0'
+      puts 'warning: faster_rubygems: you loaded gem_prelude already so I cant speed that up' if $VERBOSE
+    end
   end
 
-  # both 1.8 and 1.9 want this one always though...
-  require File.expand_path(File.dirname(__FILE__)) + "/prelude_bin_path"
+  # both 1.8 and 1.9 want this one no matter what though though...
+  require File.expand_path(File.dirname(__FILE__)) + "/faster_rubygems/prelude_bin_path"
   
 else
   if $VERBOSE || $DEBUG
-    puts 'warning: faster_rubygems unable to load because normal rubygems already loaded (expected in certain instances, like when running the gem command)'
+    puts 'warning: faster_rubygems unable to load because normal rubygems already loaded (which thing is expected in certain instances, like when running the gem command)'
   end
 end
 

data/lib/rubygems_plugin.rb

@@ -0,0 +1,7 @@
+Gem.post_install { |gem_installer_instance|
+  require File.dirname(__FILE__) + "/faster_rubygems/create_cache_for_all"
+}
+
+Gem.post_uninstall {
+  require File.dirname(__FILE__) + "/faster_rubygems/create_cache_for_all"
+}

data/spec/files/test_gem.rb

@@ -1,4 +1,4 @@
 require File.dirname(__FILE__) + '/../../lib/faster_rubygems'
 gem 'test-unit', '= 1.2.3'
 require 'test/unit/version'
-raise unless Test::Unit::VERSION == '1.2.3'
+raise 'bad version' unless Test::Unit::VERSION == '1.2.3'

data/spec/reload.rb

@@ -0,0 +1,4 @@
+require 'benchmark'
+puts Benchmark.realtime {
+  puts Marshal.load File.open("c:/ruby19/lib/ruby/gems/1.9.1/.faster_rubygems_cache", "rb")
+}

data/spec/spec.can_create_cache_file.rb

@@ -0,0 +1,121 @@
+require File.dirname(__FILE__) + "/../lib/faster_rubygems"
+require File.dirname(__FILE__) + "/../lib/faster_rubygems/prelude_create_cache"
+require 'sane'
+require 'spec' # rspec 1
+require 'spec/autorun'
+require 'fileutils'
+raise if ENV['RUBYOPT'] # avoid silly testing conflicts
+require 'rbconfig'
+
+describe 'can create cache file apropo' do
+  before do
+    @ruby_ver = RbConfig::CONFIG['ruby_version']
+    @gem_dir = 'test_dir/gems/' + @ruby_ver
+    @gem_dir_cache = @gem_dir + '/.faster_rubygems_cache'
+    clean
+    create_gem 'gem1'
+    cache!
+  end
+  
+  def clean
+    FileUtils.rm_rf Dir['test_dir/gems/*']
+    FileUtils.rm_rf Dir['test_dir/.faster*']  
+    FileUtils.rm_rf 'test_file.rb'
+  end
+  
+  after do
+    clean
+  end
+  
+  private
+  
+  def create_gem name, version = '0.0.0'
+    new_name = @gem_dir + '/gems/' + name  + "-" + version
+    FileUtils.mkdir_p new_name + '/lib'
+    File.write new_name + '/lib/a_file.rb', name.upcase + '= "abc"'
+  end
+  
+  def cache!
+    Gem.create_cache [@gem_dir]
+  end
+  
+  it 'should be able to create a cache file' do
+    assert File.exist?(@gem_dir_cache)
+  end
+  
+  it 'should be bigger with more gems' do
+    size = File.size(@gem_dir_cache)
+    create_gem 'gem2'
+    cache!
+    size2 = File.size(@gem_dir_cache)
+    assert size2 > size
+  end
+  
+  it 'should be same size if two versions, same gem' do
+    size = File.size(@gem_dir_cache)
+    create_gem 'gem1', '0.0.1'    
+    cache!
+    size2 = File.size(@gem_dir_cache)
+    assert size2 == size
+  end
+  
+  it "should cache the version numbers of gems, too" do
+    Marshal.load(File.open(@gem_dir_cache)).to_s.should_not include "0.0.0"
+  end
+  
+  it "should create two caches if you pass it two dirs" do
+    Dir['**/.faster_rubygems_cache'].length.should == 1
+    gem_dir2 = 'test_dir2/gems/' + @ruby_ver
+    FileUtils.mkdir_p gem_dir2
+    Gem.create_cache [@gem_dir, gem_dir2]
+    Dir['**/.faster_rubygems_cache'].length.should == 2
+    FileUtils.rm_rf 'test_dir2'
+  end
+  
+  def create_file use_gem
+    all = <<-EOS
+      ENV['GEM_PATH'] = 'test_dir/gems/#{@ruby_ver}'
+      require File.dirname(__FILE__) + '/../lib/faster_rubygems'
+      #{use_gem ? "gem 'gem1'" : nil}
+      require 'a_file'
+      unless defined?(GEM1)
+        puts 'GEM1 not defined'
+        exit 1
+      end
+      if defined?(Gem::Dependency)
+        puts 'Gem::Dependency defined'
+        exit 1
+      end
+    EOS
+    File.write 'test_file.rb', all
+    if RUBY_VERSION >= '1.9.0'
+      assert system(OS.ruby_bin + " --disable-gems test_file.rb")
+    else
+      assert system(OS.ruby_bin + " test_file.rb")
+    end
+  end
+  
+  it "should not load full rubygems--load the cache files instead" do
+    create_file false
+  end
+
+  it "should work with the gem 'xxx' command" do
+    create_file true
+  end
+  
+  it "should create the caches on install/uninstall" do
+    FileUtils.rm_rf Gem.path[0] + "/.faster_rubygems_cache"
+    Gem.create_cache_for_all! 
+    assert File.exist?(Gem.path[0] + "/.faster_rubygems_cache")
+    puts Gem.path[0] + "/.faster_rubygems_cache"
+  end
+  
+  it "should not cause a cyclic require that just calls and fails, calls and fails"
+  
+  it "should use that phreaky marker well (set it, et al)"
+  
+  it "should be ok if certain .paths aren't writable"
+  
+  it "should revert to full load of all paths into $: in the case of missing cache files"
+  
+end

data/spec/spec.faster_rubygems.rb

@@ -1,14 +1,10 @@
 # to test in 1.8.x, make sure to use ruby specname.rb
 require File.dirname(__FILE__) + "/../lib/faster_rubygems"
 require 'sane'
-require 'rspec' # rspec 2
-
-begin
-  require 'spec/autorun'
-rescue LoadError
-  # ok
-end
-  require 'fileutils'
+require 'spec' # rspec 1
+require 'spec/autorun'
+require 'fileutils'
+raise if ENV['RUBYOPT']
 
 describe Gem do
 
@@ -19,7 +15,7 @@ describe Gem do
     FileUtils.mkdir_p @gem_path
   end
 
-  context "speeding Gem.bin_path the fake sick way" do
+  context "speeding Gem.bin_path by inferring" do
 
     it "should fake guess the right path instead of loading full rubygems for now" do
       assert Gem.bin_path('after', 'after', ">= 0") =~ /after.*bin.*after/
@@ -30,6 +26,12 @@ describe Gem do
 
   end
 
+  it "should pass test files" do
+    Dir['files/*'].each{|f|
+      raise f unless system(OS.ruby_bin + " #{f}")
+    }
+  end
+  
   context "gem xxx" do
     it "should allow you to load 'older' gem versions somehow, like maybe cacheing" # lower prio
   end

data/things_prelude_needs.txt

@@ -0,0 +1,2 @@
+handle gem 'rails', '2.3.8'
+it uses find instead of index for $:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faster_rubygems
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 4
-  version: 0.6.4
+  - 9
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -06:00
+date: 2010-06-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,25 +92,30 @@ files:
 - README
 - Rakefile
 - VERSION
-- examples/require_fast_start.rb
-- examples/require_rubygems_normal.rb
+- benchmarks.txt
 - ext/mkrf_conf.rb
 - internalize.rb
 - lib/faster_rubygems.rb
-- lib/faster_rubygems/install.rb
+- lib/faster_rubygems/create_cache_for_all.rb
 - lib/faster_rubygems/install_helper.rb
 - lib/faster_rubygems/install_with_faster_require_too.rb
-- lib/faster_rubygems/uninstall.rb
+- lib/faster_rubygems/ir_session.rb
+- lib/faster_rubygems/my_defaults.rb
+- lib/faster_rubygems/my_gem_prelude.rb
+- lib/faster_rubygems/override.rb
+- lib/faster_rubygems/prelude_bin_path.rb
+- lib/faster_rubygems/prelude_cached_load.rb
+- lib/faster_rubygems/prelude_create_cache.rb
+- lib/faster_rubygems/unoverride.rb
 - lib/faster_rubygems_with_faster_require_too.rb
-- lib/frubygems.rb
-- lib/my_defaults.rb
-- lib/my_gem_prelude.rb
-- lib/prelude_bin_path.rb
+- lib/rubygems_plugin.rb
 - spec/files/test_gem.rb
 - spec/files/test_gem_const.rb
 - spec/files/test_gem_func.rb
+- spec/spec.can_create_cache_file.rb
 - spec/spec.faster_rubygems.rb
-- spec/test.spec.rb
+- things_prelude_needs.txt
+- spec/reload.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -118,12 +123,7 @@ licenses: []
 post_install_message: |+
   
   
-  installed! 1.9 use -> require 'faster_rubygems' 
-  
-  1.8: use require 'faster_rubygems' or install as the default thus:
-  
-  >> require 'rubygems'
-  >> require 'faster_rubygems/install'
+  faster_rubygems installed! see the readme for post-install instructions: http://github.com/rdp/faster_rubygems
   
 rdoc_options: 
 - --charset=UTF-8
@@ -158,7 +158,6 @@ test_files:
 - spec/files/test_gem.rb
 - spec/files/test_gem_const.rb
 - spec/files/test_gem_func.rb
+- spec/reload.rb
+- spec/spec.can_create_cache_file.rb
 - spec/spec.faster_rubygems.rb
-- spec/test.spec.rb
-- examples/require_fast_start.rb
-- examples/require_rubygems_normal.rb

data/examples/require_fast_start.rb

@@ -1,7 +0,0 @@
-require 'benchmark'
-puts Benchmark.realtime {
-  require File.dirname(__FILE__) + '/../lib/faster_rubygems'
-  gem 'ruby-prof'
-  Gem.bin_path 'ruby-prof'
-  require 'ruby-prof' # load a gem
-}

data/examples/require_rubygems_normal.rb

@@ -1,7 +0,0 @@
-require 'benchmark'
-puts Benchmark.realtime {
-  require 'rubygems'
-  gem 'ruby-prof'
-  Gem.bin_path('ruby-prof')
-  require 'ruby-prof' # load a gem
-}

data/lib/frubygems.rb

@@ -1 +0,0 @@
-require 'faster_rubygems'

data/spec/test.spec.rb

@@ -1,9 +0,0 @@
-#require "spec/autorun" 
-require "spec" 
-require "spec/rake/spectask" 
-RAILS_ENV = 'test' 
-
-namespace :go do
-  describe "yoyo" do
-  end
-end