faster_rubygems 0.11.1 → 0.12.0

data/Rakefile

@@ -11,11 +11,10 @@ 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
+1.9 only:
+   $ export RUBYOPT=--disable-gems -rfaster_rubygems   
+   or (windows)
+   C:\>set RUBYOPT=--disable-gems -rfaster_rubygems
 
 "
   s.add_development_dependency 'test-unit', '=1.2.3'

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.12.0

data/bin/faster_rubygems

@@ -0,0 +1,2 @@
+puts 'faster_rubygems: attempting to recreate all caches' 
+require "faster_rubygems/create_cache_for_all"

data/lib/faster_rubygems/my_gem_prelude.rb

@@ -161,8 +161,7 @@ if defined?(Gem) then
         end
 
         $".delete path_to_full_rubygems_library
-        path = nil
-        if $".any? {|path| path =~ Regexp.new('/rubygems.rb$')}
+        if path = $".detect {|path2| path2 =~ Regexp.new('/rubygems.rb$')}
           raise LoadError, "another rubygems is already loaded from #{path}"
         end
         require 'rubygems'
@@ -292,15 +291,17 @@ if defined?(Gem) then
 
               if !current_version or (current_version <=> new_version) < 0 then
                 GemVersions[gem_name] = new_version
-                GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
+                GemPaths[gem_name] = File.join(gems_directory, gem_directory_name) # TODO lazy load these, too...why not?
               end
             end
           end
         end
+        # TODO don't require iterating over all these, since you can extrapolate them from the cache files...
 
         return unless load_them_into_the_require_path
         
-        # load them into $: now
+        
+        # load all lib dirs into $:...
         require_paths = []
 
         GemPaths.each_value do |path|
@@ -358,7 +359,11 @@ if defined?(Gem) then
       }
       
       # we will use a clear cache as an indication of "non success" loading caches
-      AllCaches.clear if AllCaches.index(nil)
+      if AllCaches.index(nil)
+        AllCaches.clear 
+      else
+        # success
+      end
       
     end
 
@@ -369,10 +374,10 @@ if defined?(Gem) then
   
   begin
     if !Gem::QuickLoader::AllCaches.empty?
-      puts 'faster_rubygems using caches', Gem::QuickLoader::AllCaches.map{|fn, contents| fn} if $VERBOSE
+      puts 'faster_rubygems using caches ' + Gem::QuickLoader::AllCaches.map{|fn, contents| fn + "/.faster_rubygems_cache"}.join(' ') 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"
+      # use cached loader instead of loading lib paths into the load path here (what prelude does by default)
+      require File.expand_path(File.dirname(__FILE__)) + "/prelude_cached_load.rb"
     else
       puts 'faster_rubygems not using caches!' if $VERBOSE
       Gem.calculate_all_highest_version_gems true

data/lib/faster_rubygems/prelude_bin_path.rb

@@ -44,13 +44,13 @@ module Gem
       bin_path(gem_name, exec_name, *version_requirements)
     end
 
-    # 1.9.1's gem_prelude doesn't have this for some reason...
+    # 1.9.1's gem_prelude doesn't seem to 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
         numbers << 0 if numbers.empty?
         numbers
-    end
+    end unless Gem.respond_to?(:integers_for)
     
   end
   

data/lib/faster_rubygems/prelude_cached_load.rb

@@ -1,46 +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 AllCaches.empty? # should never be empty...
-        AllCaches.each{|path, gem_list|
-          for gem_name, long_file_list in gem_list 
-            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 if $VERBOSE || $DEBUG
-                success = true
-              end
-              puts 'done activeating' + gem_name + ' ' + sub_lib if $DEBUG
-            end
-            
-          end
-        }
-        success
+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
-  end
-  
-  module Kernel
-    include Gem::QuickLoader::PreludeRequire
-    alias :require_pre_prelude :require
-    alias :require :require_prelude
-  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 AllCaches.empty? # should never be empty...
+      AllCaches.each{|path, gem_list|
+        for gem_name, long_file_list in gem_list
+          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 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

@@ -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 all caches'
+      puts 'faster_rubygems: creating caches'
       gems_paths.each do |path|
         gem_versions = {}
         gem_paths = {}

data/lib/rubygems_plugin.rb

@@ -9,6 +9,10 @@ Gem.post_uninstall {
 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
+    begin
+       require "faster_rubygems/unoverride" # just in case
+    rescue Errno::ENOENT
+      puts 'warning: unable to unoverride faster_rubygems--might be expected if you had several versions installed'
+    end  
   end
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faster_rubygems
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: false
   segments: 
   - 0
-  - 11
-  - 1
-  version: 0.11.1
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: []
 
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -06:00
-default_executable: 
+date: 2010-07-01 00:00:00 -06:00
+default_executable: faster_rubygems
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
@@ -98,8 +98,8 @@ dependencies:
   version_requirements: *id005
 description: 
 email: 
-executables: []
-
+executables: 
+- faster_rubygems
 extensions: 
 - ext/mkrf_conf.rb
 extra_rdoc_files: 
@@ -109,6 +109,7 @@ files:
 - Rakefile
 - VERSION
 - benchmarks.txt
+- bin/faster_rubygems
 - ext/mkrf_conf.rb
 - internalize.rb
 - lib/faster_rubygems.rb
@@ -141,11 +142,10 @@ post_install_message: |+
   
   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
+  1.9 only:
+     $ export RUBYOPT=--disable-gems -rfaster_rubygems   
+     or (windows)
+     C:>set RUBYOPT=--disable-gems -rfaster_rubygems
   
 rdoc_options: 
 - --charset=UTF-8