faster_rubygems 0.9.2 → 0.11.1

data/README

@@ -1,3 +1,5 @@
+= Faster Rubygems =
+
 A helper gem to dramatically speedup the time it takes to startup a ruby script.
 
 i.e. it makes it so that requiring rubygems no longer takes as long.
@@ -7,18 +9,18 @@ Speed difference (a demo gem script, ruby 1.8 windows mingw):
 normal rubygems:
 
   $ timer ruby whichr
-  0.83
+  0.83s
 
 with faster_rubygems:
 
   $ timer ruby whichr
-  0.19
+  0.19s
 
 Yea!
 
-It acts as a beefed up version of gem_prelude (prelude is 1.9 only currently), but only adds load paths on demand.
+It acts like a beefed up version of gem_prelude (prelude is 1.9 only currently), with a bit more cacheing thrown in there.
 
-It makes even more of a difference when used with 1.9:
+It makes even more of a difference when used with 1.9 on windows:
 
 normal rubygems:
 
@@ -34,33 +36,46 @@ with faster_rubygems:
 
 $ gem install faster_rubygems
 
+now there is a manual step that must be followed:
+
 1.9
-:
-  $ export RUBYOPT=-rfaster_rubygems --disable-gems
+
+  Set this environment variable:
+  RUBYOPT=-rfaster_rubygems --disable-gems
 
 1.8:
+  Installs itself by default.
+  
+  
+Note that full rubygems will still be loaded when necessary (for example when installing new gems).  This is automatic.
+
 
-  you currently have to install to override normal rubygems by doing the following (in an irb session):
+== Rails ==
 
-  >> 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
+Unfortunately this gem does not greatly speed up rails--it speeds up any script that 
+doesn't require full rubygems (which is most, but not rails).
 
-  # later, to revert this override, back to normal rubygems, should you so desire, do the following:
-  >> require 'rubygems'
-  >> require 'faster_rubygems/unoverride'
+If you want to speed up rails, you'll want to use the faster_require gem 
+(though they do work together splendidly). http://github.com/rdp/faster_require
+
+See http://github.com/rdp/faster_rubygems/blob/master/benchmarks.txt for a full breakdown and more benchmarks.
+
+== Trouble Shooting ==
+
+# if you wish to revert back to normal rubygems, 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.
+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.
 
-After installation, usage is automatic.
 
+To regenerate cache files (should never really be necessary, but if you for some reason think yours are stale) do the following:
 
-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'
 
-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.
+Most of the credit for this gem goes to gem prelude.
 
 == Related projects ==
 
@@ -72,4 +87,4 @@ the Builder gem
 
 Source/feedback:
 
-http://www.github.com/rdp/faster_rubygems
+http://www.github.com/rdp/faster_rubygems

data/Rakefile

@@ -7,13 +7,22 @@ require 'jeweler'
 
   s.post_install_message = "
 
-faster_rubygems installed! see the readme for post-install instructions: http://github.com/rdp/faster_rubygems
+faster_rubygems installed into your site_ruby directory.
+
+If you're on 1.9 please set your RUBYOPT env. variable thus, to use it:
+
+$ export RUBYOPT=--disable-gems -rfaster_rubygems
+
+or (windows)
+
+C:\>set RUBYOPT=--disable-gems -rfaster_rubygems
 
 "
   s.add_development_dependency 'test-unit', '=1.2.3'
   s.add_development_dependency 'test-unit', '=2.0.6'
   s.add_development_dependency 'after', '=0.7.0'
   s.add_development_dependency 'sane'
+  s.add_development_dependency 'rspec', '>=2.0.0'
 #  s.add_dependency 'faster_require'
 
 end

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.11.1

data/benchmarks.txt

@@ -1,4 +1,8 @@
-whichr whichr benchmarks (best time seen):
+Benchmarks against normal rubygems and gem_prelude in 1.9 (its normal)
+
+
+
+benchmarks runing [$ whichr whichr] (the whichr gem just behaves like the "which" command in Linux), best time seen:
 
 mingw 1.8 
 
@@ -22,50 +26,69 @@ mingw 1.9
   faster_rubygems without cache:
     0.50  
 
-jruby, faster_rubygems with "full load path"
+jruby, 1.8 mode
 
-  faster_rubygems without cache:
+  normal rubygems:
+    2.31
+
+  faster_rubygems without cache (deleted the cache file temporarily to force it to not use it):
     1.15
     
   faster_rubygems with cache:
     1.11
     
-  normal rubygems:
-    2.31
-    
     
-    
-rails 3 [ $ ruby script\rails runner -e production "puts 3" ]
+rails 2.3.8 [ $ ruby script\runner -e production "puts 3" ] 
+    Unfortunately rails requires a load of full rubygems.  So currently faster_rubygems doesn't help it much.
 
-unfortunately with rails 3 currently it loads "full rubygems" no matter what, which is the thing we were trying to avoid.
+faster_require (other gem) seems to help, however.
 
 1.9
-    faster_rubygems with cache[RUBYOPT=-rfaster_rubygems --disable-gems]:
-      11.26
+    normal gem_prelude[RUBYOPT=]
+      20.85
+
+    faster_rubygems without cache [RUBYOPT=-rfaster_rubygems]
+      20.7
+
+    faster_rubygems with cache [RUBYOPT=-rfaster_rubygems --disable-gems]:
+      12.10
       
-    faster_rubygems without cache [RUBYOPT=-rfaster_rubygems]:
-      13.73
+    normal gem_prelude, with faster_require gem [RUBYOPT=-rfaster_require]:
+      8.93
       
-    normal rubygems (with gem prelude [straight ruby]):
-      13.88
+    faster_rubygems, without cache, with faster_require [RUBYOPT=-rfaster_rubygems -rfaster_require]:
+      8.99 
       
-    normal rubygems (ruby --disable-gems):
-      10.41
-
-rails 2.3.8 [ $ ruby script\runner -e production "puts 3" ]
+           * recommend this configuration for ruby 1.9 and rails.
       
-1.9
-    faster_rubygems with cache[RUBYOPT=-rfaster_rubygems --disable-gems]:
-      12.4
+    faster_rubygems, with cache [RUBYOPT=--disable-gems -rfaster_rubygems -rfaster_require]
+      fail (gotta fix that, then will probably be fastest option)
+    
+1.8
+
+  normal rubygems:
+    6.54
+  
+  faster_rubygems without cache:
+    6.12
+    
+  faster_rubygems with cache:
+    6.48
+    
+  normal rubygems, faster_require:
+    3.53
+    
+  faster_rubygems with cache and with faster_require (have to use it as require 'faster_require')
+    2.97
       
+       * recommend this configuration, which means you'll have to add a require 'faster_require' to your rails script at the beginning, like in boot.rb
     
+  faster_rubygems without cache and with faster_require
+    3.31
 
     
-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...
+ jruby spawning itself was *so slow* it seemed (timer.rb)  
+ only regenerate appropriate cache files after gem installs...I guess.
+ only cache lib filenames, not spec files, et al...
+ chmod after create (check if necessary first)

data/ext/mkrf_conf.rb

@@ -8,6 +8,18 @@ load File.expand_path(File.dirname(__FILE__)) + "/../internalize.rb" # install t
 
 require File.dirname(__FILE__) + "/../lib/faster_rubygems/create_cache_for_all.rb"
 
+
+if RUBY_VERSION[0..2] == '1.8'
+  begin
+    require File.dirname(__FILE__) + "/../lib/faster_rubygems/override.rb" # install it by default...
+  rescue RuntimeError => e
+    # swallow if it's a double install...for now...
+    raise e unless e.to_s =~ /cannot install twice/
+  end
+
+end
+
+
 f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") # create dummy rakefile to indicate success
 f.write("task :default\n")
 f.close

data/lib/faster_rubygems/my_gem_prelude.rb

@@ -200,12 +200,12 @@ if defined?(Gem) then
       GemsActivated = {}
       def push_gem_version_on_load_path(gem_name, *version_requirements)
         if version_requirements.empty?
-          unless path = GemPaths[(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 *not* already active
-          if !ALL_CACHES.empty?
+          if !AllCaches.empty?
             # then we are using the caches, and the stuff isn't preloaded yet
             # copied and pasted...
                   require_paths = []
@@ -256,7 +256,7 @@ if defined?(Gem) then
 
           if loaded_version = GemVersions[gem_name] then
             case requirement
-            when ">", ">=" then
+            when ">", ">=", '=' then
               return false if
                 (loaded_version <=> Gem.integers_for(version)) >= 0
             when "~>" then
@@ -345,7 +345,7 @@ if defined?(Gem) then
       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|
+       AllCaches = 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|
@@ -358,7 +358,7 @@ if defined?(Gem) then
       }
       
       # we will use a clear cache as an indication of "non success" loading caches
-      ALL_CACHES.clear if ALL_CACHES.index(nil)
+      AllCaches.clear if AllCaches.index(nil)
       
     end
 
@@ -368,8 +368,8 @@ if defined?(Gem) then
 
   
   begin
-    if !Gem::QuickLoader::ALL_CACHES.empty?
-      puts 'faster_rubygems using caches', Gem::QuickLoader::ALL_CACHES.map{|fn, contents| fn} if $VERBOSE
+    if !Gem::QuickLoader::AllCaches.empty?
+      puts 'faster_rubygems using caches', Gem::QuickLoader::AllCaches.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"

data/lib/faster_rubygems/override.rb

@@ -1,2 +1,3 @@
+require 'rubygems' # in case it helps
 require File.dirname(__FILE__) + '/install_helper'
 FasterRubyGems.install_over_rubygems!

data/lib/faster_rubygems/prelude_cached_load.rb

@@ -18,16 +18,16 @@ module Gem
       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|
+        raise if AllCaches.empty? # should never be empty...
+        AllCaches.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 long_file_list[sub_lib.downcase]
+              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
+                puts 'gem activated ' + gem_name + ' ' + sub_lib if $VERBOSE || $DEBUG
                 success = true
               end
-              puts 'done activeating' + gem_name + sub_lib if $DEBUG
+              puts 'done activeating' + gem_name + ' ' + sub_lib if $DEBUG
             end
             
           end

data/lib/faster_rubygems/prelude_create_cache.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/prelude_bin_path" # Gem.integers_for, for 1.9
 module Gem
   module QuickLoader
     def create_cache gems_paths
-      puts 'faster_rubygems: creating caches'
+      puts 'faster_rubygems: creating all caches'
       gems_paths.each do |path|
         gem_versions = {}
         gem_paths = {}
@@ -26,16 +26,23 @@ module Gem
         # 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| 
+          files = 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
           }
+          
+          hash_of_files = {}
+          files.each{|small_filename|
+            hash_of_files[small_filename] = true
+          }
+          gem_paths_with_contents[k] = hash_of_files
         }
         
         cache_path = path + '/.faster_rubygems_cache'
-        puts '.'
+        print '.'
+        puts cache_path if $VERBOSE
         $stdout.flush
         # accomodate for those not running as sudo...
         if File.writable? path

data/lib/faster_rubygems/unoverride.rb

@@ -1,2 +1,3 @@
+require 'rubygems' # in case it helps
 require File.dirname(__FILE__) + '/install_helper'
 FasterRubyGems.uninstall_over_rubygems!

data/lib/rubygems_plugin.rb

@@ -1,7 +1,14 @@
-Gem.post_install { |gem_installer_instance|
-  require File.dirname(__FILE__) + "/faster_rubygems/create_cache_for_all"
+Gem.post_install {
+  require "faster_rubygems/create_cache_for_all"
 }
 
 Gem.post_uninstall {
-  require File.dirname(__FILE__) + "/faster_rubygems/create_cache_for_all"
+  require "faster_rubygems/create_cache_for_all"
+}
+
+Gem.pre_uninstall { |gem_installer_instance, gem_spec|
+  
+  if gem_installer_instance.spec.name == 'faster_rubygems' && RUBY_VERSION[0..2] == '1.8'
+     require "faster_rubygems/unoverride" # just in case
+  end
 }

data/spec/files/test_load_sub.rb

@@ -0,0 +1,3 @@
+raise if ENV['RUBYOPT']
+require File.dirname(__FILE__) + '/../../lib/faster_rubygems'
+require 'rspec/expectations' # rspec 2 gem, unfortunately

data/spec/spec.faster_rubygems.rb

@@ -1,8 +1,7 @@
 # to test in 1.8.x, make sure to use ruby specname.rb
 require File.dirname(__FILE__) + "/../lib/faster_rubygems"
 require 'sane'
-require 'spec' # rspec 1
-require 'spec/autorun'
+require 'rspec' # rspec 2
 require 'fileutils'
 raise if ENV['RUBYOPT']
 

data/spec/{spec.can_create_cache_file.rb → spec.uses_cache_files.rb}

@@ -1,8 +1,7 @@
 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 'rspec' # rspec 2
 require 'fileutils'
 raise if ENV['RUBYOPT'] # avoid silly testing conflicts
 require 'rbconfig'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faster_rubygems
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 49
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 2
-  version: 0.9.2
+  - 11
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -06:00
+date: 2010-06-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,22 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id005
 description: 
 email: 
 executables: []
@@ -107,15 +123,13 @@ files:
 - 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/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/files/test_load_sub.rb
 - spec/spec.faster_rubygems.rb
-- things_prelude_needs.txt
-- spec/reload.rb
+- spec/spec.uses_cache_files.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -123,7 +137,15 @@ licenses: []
 post_install_message: |+
   
   
-  faster_rubygems installed! see the readme for post-install instructions: http://github.com/rdp/faster_rubygems
+  faster_rubygems installed into your site_ruby directory.
+  
+  If you're on 1.9 please set your RUBYOPT env. variable thus, to use it:
+  
+  $ export RUBYOPT=--disable-gems -rfaster_rubygems
+  
+  or (windows)
+  
+  C:>set RUBYOPT=--disable-gems -rfaster_rubygems
   
 rdoc_options: 
 - --charset=UTF-8
@@ -158,6 +180,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/files/test_load_sub.rb
 - spec/spec.faster_rubygems.rb
+- spec/spec.uses_cache_files.rb

data/lib/faster_rubygems_with_faster_require_too.rb

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

data/spec/reload.rb

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

data/things_prelude_needs.txt

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