faster_rubygems 0.2.1 → 0.5.1

data/README

@@ -1,58 +1,67 @@
-A helper to dramatically speedup the time it takes to load rubygems
+A helper to dramatically speedup the time it takes to load rubygems.
 
-i.e. "require 'rubygems'" no longer has to sap valuable time from your life.
-
-inspired by a request from Yehuda Katz [1] and 1.9's fast gem_prelude.
+i.e. it makes it so that "require 'rubygems'" no longer has to sap valuable time from your life.
 
 Speed difference (windows box, lots of gem):
 
 $ time ruby examples/require_rubygems_normal.rb
-
 real    0m1.109s
 
 $ time ruby examples/require_fast_start.rb
-
 real    0m0.500s
 
-Yea! Finally ruby script startup times that don't spend forever just reloading gem paths.
+Yea! Finally ruby script startup times that don't spend forever just reloading gem specs every single time...
 
 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.
 
+It is also good for 1.9 makes script startup faster.  To use it with 1.9 do an
+$ export RUBYOPTS=-rfaster_rubygems
+
+somewhere.
+
 == installation ==
 
-git clone git://github.com/rdp/faster_rubygems.git
-ruby faster_rubygems/install.rb # done
+$ gem install faster_rubygems
 
 == usage ==
-require 'frubygems'
-or
-require 'rubygemsf'
 
-(both do the same thing).
+1.9:
+$ export RUBYOPTS=-rfaster_rubygems
+
+1.8:
+
+require 'faster_rubygems' 
+at the top of your script, or install it to be used by default thus:
 
-If you were really clever I suppose you could figure out how to override the default rubygem behavior to do this, always :)
+>> require 'rubygems'
+>> require 'faster_rubygems/install'
+>> FasterRubyGems.install_over_rubygems! # installs this to be the default for rubygems
 
-== Speed differences == 
+
+# later, to revert back to normal, should you so desire:
+>> require 'rubygems'
+>> require 'faster_rubygems/install'
+>> FasterRubyGems.uninstall_over_rubygems!
+
+If all else fails, you can reinstall rubygems by running setup.rb from within its package: http://rubyforge.org/frs/?group_id=126
+
+== More Speed Comparisons == 
 
 For those interested, speed difference example on linux (250 gems):
+
 $ time ruby examples/require_rubygems_normal.rb
-ruby examples/require_rubygems_normal.rb  0.57s user 0.05s system 85%
-cpu 0.726 total
+ruby examples/require_rubygems_normal.rb  0.57s user 0.05s system 85% cpu 0.726 total
 
 $ time ruby examples/require_fast_start.rb
-ruby examples/require_fast_start.rb  0.04s user 0.02s system 46% cpu
-0.121 total
+ruby examples/require_fast_start.rb  0.04s user 0.02s system 46% cpu 0.121 total
 
 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).
 
-Note: you don't need this for ruby 1.9, which already preloads via gem_prelude, but it won't hurt to use it in 1.9--it defaults to a no-op, so doesn't hurt.
-
 Related projects:
 
 http://github.com/fabien/minigems/tree/master
-1.9's gem_prelude
+1.9's gem_prelude.rb
 http://www.ruby-forum.com/topic/191673
 
-Author may be reached via github rogerdpack
-
-[1] http://rubyforge.org/tracker/index.php?func=detail&aid=21288&group_id=126&atid=578
+Source/contact:
+http://www.github.com/rdp/faster_rubygems

data/Rakefile

@@ -11,7 +11,9 @@ require 'jeweler'
 installed! use -> require 'faster_rubygems'
 
 "
-
   s.add_development_dependency 'test-unit', '=1.2.3'
   s.add_development_dependency 'test-unit', '=2.0.6'
- end
+  s.add_development_dependency 'after', '=0.7.0'
+  s.add_development_dependency 'sane'
+
+end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.5.1

data/examples/require_fast_start.rb

@@ -1,3 +1,7 @@
-require File.dirname(__FILE__) + '/../rubygems_fast'
-require 'fastercsv' # load a gem
-puts 'done'
+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,3 +1,7 @@
-require 'rubygems'
-require 'fastercsv'
-puts 'done'
+require 'benchmark'
+puts Benchmark.realtime {
+  require 'rubygems'
+  gem 'ruby-prof'
+  Gem.bin_path('ruby-prof')
+  require 'ruby-prof' # load a gem
+}

data/ext/mkrf_conf.rb

@@ -1,11 +1,10 @@
 require 'rubygems'
 
-# stolen from http://wiki.github.com/rdp/ruby_tutorials_core/gem
+# do some ruby stuff...
 
 puts File.dirname(__FILE__)
-a = File.expand_path(File.dirname(__FILE__)) + "/../install.rb" # install it for them
-load a
+load File.expand_path(File.dirname(__FILE__)) + "/../internalize.rb" # install this gem locally
 
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w") # create dummy rakefile to indicate success
 f.write("task :default\n")
 f.close

data/{install.rb → internalize.rb}

@@ -7,6 +7,4 @@ Dir.chdir File.dirname(__FILE__) + '/lib' do
   end
 end
 
-require 'frubygems' # test it out now :P
-
 puts 'Installed--thank you for trying out -- require \'faster_rubygems\''

data/lib/faster_rubygems/install.rb

@@ -0,0 +1,29 @@
+
+  module FasterRubyGems
+    def self.install_over_rubygems!
+      raise 'only needed on 1.8 -- for 1.9 you have to \n $ export RUBYOPT=$RUBYOPT -rfaster_rubygems' if RUBY_VERSION >= '1.9.0'
+      require 'fileutils'
+      old = rubygems_path
+      FileUtils.cp old, old + ".bak.rb"
+      File.open(old, 'w') do |f|
+        f.write "require 'faster_rubygems'"
+      end
+      'success--it will load by default in place of normal rubygems'
+    end
+    
+    def self.rubygems_path
+      Gem::Dependency
+      raise unless $LOADED_FEATURES.include? "rubygems.rb"
+      # now go and look for it
+      $:.detect{|path| File.exist?(path + '/rubygems.rb') || File.exist?(path + '/rubygems.bak.rb')} + "/rubygems.rb"
+    end
+    
+    def self.uninstall_over_rubygems!
+      raise 'only needed on 1.8' if RUBY_VERSION >= '1.9.0'
+      require 'fileutils'
+      old = rubygems_path + ".bak.rb"
+      FileUtils.cp old, rubygems_path
+      File.delete old
+      'success!'
+    end
+  end

data/lib/faster_rubygems.rb

@@ -1,33 +1,8 @@
-if RUBY_VERSION < '1.9'
-  require File.dirname(__FILE__) + '/faster_rubygems_lib.rb'
-  all = FasterRubyGems.gem_prelude_paths
-  all.each{|path|
-    $: << path
-  }
-  
-  module Kernel
-    
-    def gem *args
-      undef :gem
-      require 'rubygems' # punt!
-      gem *args
-    end    
-    
-  end
-  
-  module ::Gem
-    def self.const_missing const
-      require 'rubygems' # punt!
-      return Gem.const_get(const)
-    end
-    
-    def self.method_missing meth, *args
-      require 'rubygems' # punt!
-      return Gem.send(meth, *args)
-    end
-  end
-  
-  
-else
- # not needed in 1.9, which by default loads gem_prelude
+if RUBY_VERSION < '1.9.0'
+  raise 'rubygems was already loaded' if defined?(Gem) 
+  module Gem; end # define it so gem_prelude will execute...
+  require File.dirname(__FILE__) + "/my_gem_prelude.rb"  
 end
+
+# both 1.8 and 1.9 now want this one though...
+require File.dirname(__FILE__) + "/prelude_bin_path"

data/lib/my_defaults.rb

@@ -0,0 +1,101 @@
+module Gem
+
+  @post_install_hooks   ||= []
+  @post_uninstall_hooks ||= []
+  @pre_uninstall_hooks  ||= []
+  @pre_install_hooks    ||= []
+
+  ##
+  # An Array of the default sources that come with RubyGems
+
+  def self.default_sources
+    %w[http://rubygems.org/]
+  end
+
+  ##
+  # Default home directory path to be used if an alternate value is not
+  # specified in the environment
+
+  def self.default_dir
+    if defined? RUBY_FRAMEWORK_VERSION then
+      File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
+                ConfigMap[:ruby_version]
+    elsif ConfigMap[:rubylibprefix] then
+      File.join(ConfigMap[:rubylibprefix], 'gems',
+                ConfigMap[:ruby_version])
+    else
+      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+                ConfigMap[:ruby_version])
+    end
+  end
+
+  ##
+  # Path for gems in the user's home directory
+
+  def self.user_dir
+    File.join Gem.user_home, '.gem', ruby_engine, ConfigMap[:ruby_version]
+  end
+
+  ##
+  # Default gem load path
+
+  def self.default_path
+    if File.exist? Gem.user_home then
+      [user_dir, default_dir]
+    else
+      [default_dir]
+    end
+  end
+
+  ##
+  # Deduce Ruby's --program-prefix and --program-suffix from its install name
+
+  def self.default_exec_format
+    exec_format = ConfigMap[:ruby_install_name].sub('ruby', '%s') rescue '%s'
+
+    unless exec_format =~ /%s/ then
+      raise Gem::Exception,
+        "[BUG] invalid exec_format #{exec_format.inspect}, no %s"
+    end
+
+    exec_format
+  end
+
+  ##
+  # The default directory for binaries
+
+  def self.default_bindir
+    if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
+      '/usr/bin'
+    else # generic install
+      ConfigMap[:bindir]
+    end
+  end
+
+  ##
+  # The default system-wide source info cache directory
+
+  def self.default_system_source_cache_dir
+    File.join Gem.dir, 'source_cache'
+  end
+
+  ##
+  # The default user-specific source info cache directory
+
+  def self.default_user_source_cache_dir
+    File.join Gem.user_home, '.gem', 'source_cache'
+  end
+
+  ##
+  # A wrapper around RUBY_ENGINE const that may not be defined
+
+  def self.ruby_engine
+    if defined? RUBY_ENGINE then
+      RUBY_ENGINE
+    else
+      'ruby'
+    end
+  end
+
+end
+

data/lib/my_gem_prelude.rb

@@ -0,0 +1,313 @@
+# copied from 1.9.2
+
+# in reality, this file will only be ever run via 1.8
+
+# depends on: array.rb dir.rb env.rb file.rb hash.rb module.rb regexp.rb
+# vim: filetype=ruby
+
+# NOTICE: Ruby is during initialization here.
+# * Encoding.default_external does not reflects -E.
+# * Should not expect Encoding.default_internal.
+# * Locale encoding is available.
+if defined?(Gem) then
+
+  require 'rbconfig'
+  # :stopdoc:
+
+  module Kernel
+
+    def gem(gem_name, *version_requirements)
+      Gem.push_gem_version_on_load_path(gem_name, *version_requirements)
+    end
+    private :gem
+  end
+
+  module Gem
+
+    ConfigMap = {
+      :EXEEXT            => RbConfig::CONFIG["EXEEXT"],
+      :RUBY_SO_NAME      => RbConfig::CONFIG["RUBY_SO_NAME"],
+      :arch              => RbConfig::CONFIG["arch"],
+      :bindir            => RbConfig::CONFIG["bindir"],
+      :libdir            => RbConfig::CONFIG["libdir"],
+      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
+      :ruby_version      => RbConfig::CONFIG["ruby_version"],
+      :rubylibprefix     => (RbConfig::CONFIG["rubylibprefix"] ||  RbConfig::CONFIG['rubylibdir'].split('/')[0..-2].join('/')),
+      :sitedir           => RbConfig::CONFIG["sitedir"],
+      :sitelibdir        => RbConfig::CONFIG["sitelibdir"],
+    }
+
+    def self.dir
+      @gem_home ||= nil
+      set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
+      @gem_home
+    end
+
+    def self.path
+      @gem_path ||= nil
+      unless @gem_path
+        paths = [ENV['GEM_PATH'] || default_path]
+        paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
+        set_paths(paths.compact.join(File::PATH_SEPARATOR))
+      end
+      @gem_path
+    end
+
+    def self.post_install(&hook)
+      @post_install_hooks << hook
+    end
+
+    def self.post_uninstall(&hook)
+      @post_uninstall_hooks << hook
+    end
+
+    def self.pre_install(&hook)
+      @pre_install_hooks << hook
+    end
+
+    def self.pre_uninstall(&hook)
+      @pre_uninstall_hooks << hook
+    end
+
+    def self.set_home(home)
+      home = home.dup
+      home.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+      @gem_home = home
+    end
+
+    def self.set_paths(gpaths)
+      if gpaths
+        @gem_path = gpaths.split(File::PATH_SEPARATOR)
+
+        if File::ALT_SEPARATOR then
+          @gem_path.map! do |path|
+            path.gsub File::ALT_SEPARATOR, File::SEPARATOR
+          end
+        end
+
+        @gem_path << Gem.dir
+      else
+        # TODO: should this be Gem.default_path instead?
+        @gem_path = [Gem.dir]
+      end
+
+      @gem_path.uniq!
+    end
+
+    def self.user_home
+      @user_home ||= File.expand_path("~")
+    rescue
+      if File::ALT_SEPARATOR then
+        "C:/"
+      else
+        "/"
+      end
+    end
+
+    # begin rubygems/defaults
+    # NOTE: this require will be replaced with in-place eval before compilation.
+    require File.dirname(__FILE__) + '/my_defaults.rb'
+    # end rubygems/defaults
+
+
+    ##
+    # Methods before this line will be removed when QuickLoader is replaced
+    # with the real RubyGems
+
+    GEM_PRELUDE_METHODS = Gem.methods(false)
+
+    begin
+      verbose, debug = $VERBOSE, $DEBUG
+      $VERBOSE = $DEBUG = nil
+
+      begin
+        require 'rubygems/defaults/operating_system'
+      rescue ::LoadError
+      end
+
+      if defined?(RUBY_ENGINE) then
+        begin
+          require "rubygems/defaults/#{RUBY_ENGINE}"
+        rescue ::LoadError
+        end
+      end
+    ensure
+      $VERBOSE, $DEBUG = verbose, debug
+    end
+
+    module QuickLoader
+
+      @loaded_full_rubygems_library = false
+
+      def self.load_full_rubygems_library
+        if $DEBUG || $VERBOSE
+          $stderr.puts 'warning, loading full rubygems'
+        end
+        return if @loaded_full_rubygems_library
+
+        @loaded_full_rubygems_library = true
+
+        class << Gem
+          undef_method(*Gem::GEM_PRELUDE_METHODS)
+          undef_method :const_missing
+          undef_method :method_missing
+        end
+
+        Kernel.module_eval do
+          undef_method :gem if method_defined? :gem
+        end
+
+        $".delete path_to_full_rubygems_library
+        if $".any? {|path| path =~ Regexp.new('/rubygems.rb$')}
+          raise LoadError, "another rubygems is already loaded from #{path}"
+        end
+        require 'rubygems'
+        begin
+          require 'rubygems.rb.bak' # just in case
+        rescue LoadError
+          # ok
+        end
+      end
+
+      def self.fake_rubygems_as_loaded
+        path = path_to_full_rubygems_library
+        $" << path unless $".include?(path)
+      end
+
+      def self.path_to_full_rubygems_library
+        # null rubylibprefix may mean 'you have loaded the other rubygems already somehow...' hmm
+        prefix = (RbConfig::CONFIG["rubylibprefix"] ||  RbConfig::CONFIG['rubylibdir'].split('/')[0..-2].join('/'))
+        installed_path = File.join(prefix, Gem::ConfigMap[:ruby_version])
+        if $:.include?(installed_path)
+          return File.join(installed_path, 'rubygems.rb')
+        else # e.g., on test-all
+          $:.each do |dir|
+            if File.exist?( path = File.join(dir, 'rubygems.rb') )
+              return path
+            end
+          end
+          raise LoadError, 'rubygems.rb'
+        end
+      end
+
+      GemPaths = {}
+      GemVersions = {}
+
+      def push_gem_version_on_load_path(gem_name, *version_requirements)
+        if version_requirements.empty?
+          unless GemPaths.has_key?(gem_name) then
+            raise Gem::LoadError, "Could not find RubyGem #{gem_name} (>= 0)\n"
+          end
+
+          # highest version gems already active
+          return false
+        else
+          if version_requirements.length > 1 then
+            QuickLoader.load_full_rubygems_library
+            return gem(gem_name, *version_requirements)
+          end
+
+          requirement, version = version_requirements[0].split
+          requirement.strip!
+
+          if loaded_version = GemVersions[gem_name] then
+            case requirement
+            when ">", ">=" then
+              return false if
+                (loaded_version <=> Gem.integers_for(version)) >= 0
+            when "~>" then
+              required_version = Gem.integers_for version
+
+              return false if loaded_version.first == required_version.first
+            end
+          end
+
+          QuickLoader.load_full_rubygems_library
+          gem gem_name, *version_requirements
+        end
+      end
+
+      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
+
+      def push_all_highest_version_gems_on_load_path
+        Gem.path.each do |path|
+          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 = GemVersions[gem_name]
+
+              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)
+              end
+            end
+          end
+        end
+
+        require_paths = []
+
+        GemPaths.each_value do |path|
+          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
+            require_paths << file if File.exist?(file = File.join(path, "bin"))
+            require_paths << file if File.exist?(file = File.join(path, "lib"))
+          end
+        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']
+        $:[$:.find{|e|e.instance_variable_defined?(:@gem_prelude_index)}||-1,0] = require_paths
+      end
+
+      def const_missing(constant)
+        QuickLoader.load_full_rubygems_library
+
+        if Gem.const_defined?(constant) then
+          Gem.const_get constant
+        else
+          super
+        end
+      end
+      
+      def method_missing(method, *args, &block)
+        QuickLoader.load_full_rubygems_library
+        super unless Gem.respond_to?(method)
+        Gem.send(method, *args, &block)
+      end
+    end
+
+    extend QuickLoader
+
+  end
+
+  begin
+    Gem.push_all_highest_version_gems_on_load_path
+    Gem::QuickLoader.fake_rubygems_as_loaded
+  rescue Exception => e
+    puts "Error loading gem paths on load path in gem_prelude"
+    puts e
+    puts e.backtrace.join("\n")
+  end
+
+end
+

data/lib/prelude_bin_path.rb

@@ -0,0 +1,59 @@
+module Gem
+
+  module QuickLoader
+    def bin_path(gem_name, exec_name = null, *version_requirements)
+      unless GemPaths.has_key?(gem_name) then
+        raise Gem::LoadError, "Could not find RubyGem #{gem_name} (>= 0)\n"
+      end
+
+      version_match = false
+      if version_requirements.empty?
+        version_match = true
+      else
+        if version_requirements.length > 1 then
+          version_match = false
+        else
+
+          requirement, version = version_requirements[0].split
+          requirement.strip!
+
+          if loaded_version = GemVersions[gem_name] then
+            case requirement
+            when ">", ">=" then
+              if  (loaded_version <=> Gem.integers_for(version)) >= 0
+                version_match = true
+              end
+            when "~>" then
+              required_version = Gem.integers_for version
+
+              if loaded_version.first == required_version.first
+                version_match = true
+              end
+            end
+          end
+        end
+      end
+
+      if version_match && exec_name
+        full_path = GemPaths[gem_name] + '/bin/' + exec_name
+        if File.exist? full_path
+          return full_path
+        end
+      end
+      QuickLoader.load_full_rubygems_library
+      bin_path(gem_name, exec_name, *version_requirements)
+    end
+
+    # 1.9.1 doesn't have this...
+    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
+  
+  extend QuickLoader
+
+end

data/spec/spec.faster_rubygems_cacheing.rb

@@ -0,0 +1,31 @@
+# to test in 1.8.x, make sure to use ruby specname.rb
+require File.dirname(__FILE__) + "/../lib/faster_rubygems"
+require 'sane'
+require 'spec/autorun'
+require 'fileutils'
+
+describe Gem do
+
+  before do
+    ENV['GEM_PATH'] = 'test_dir'
+    @gem_path = 'test_dir/gems/' # wow.
+    FileUtils.rm_rf @gem_path
+    FileUtils.mkdir_p @gem_path
+  end
+
+  context "speeding Gem.bin_path the fake sick way" 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/
+      # should not have loaded full gems...
+      # if this line fails then make sure you are running the spec file like ruby xxx not spec xxx
+      assert !defined?(Gem::Dependency)
+    end
+
+  end
+
+  context "gem xxx" do
+    it "should allow you to load 'older' gem versions somehow, like maybe cacheing" # lower prio
+  end
+
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faster_rubygems
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  hash: 9
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: []
 
@@ -9,29 +15,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 -07:00
+date: 2010-06-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
         version: 1.2.3
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        - 6
         version: 2.0.6
-    version: 
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: after
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sane
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: 
 email: 
 executables: []
@@ -47,15 +95,18 @@ files:
 - examples/require_fast_start.rb
 - examples/require_rubygems_normal.rb
 - ext/mkrf_conf.rb
-- install.rb
+- internalize.rb
 - lib/faster_rubygems.rb
-- lib/faster_rubygems_lib.rb
+- lib/faster_rubygems/install.rb
 - lib/frubygems.rb
-- lib/ubygemsf.rb
+- lib/my_defaults.rb
+- lib/my_gem_prelude.rb
+- lib/prelude_bin_path.rb
+- spec/common.rb
 - spec/files/test_gem.rb
 - spec/files/test_gem_const.rb
 - spec/files/test_gem_func.rb
-- spec/spec.faster_rubygems.rb
+- spec/spec.faster_rubygems_cacheing.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -70,28 +121,35 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: faster gem loading
 test_files: 
+- spec/common.rb
 - spec/files/test_gem.rb
 - spec/files/test_gem_const.rb
 - spec/files/test_gem_func.rb
-- spec/spec.faster_rubygems.rb
+- spec/spec.faster_rubygems_cacheing.rb
 - examples/require_fast_start.rb
 - examples/require_rubygems_normal.rb

data/lib/faster_rubygems_lib.rb

@@ -1,64 +0,0 @@
-class FasterRubyGems
-  def self.gem_prelude_paths
-    # note: the RUBY_VERSION[0..2] thing below fails for 1.9...
-    raise 'bad version' if RUBY_VERSION[0..2] > '1.8'
-    require 'rbconfig'
-
-    gem_paths = []
-    # add the default gem path
-     
-    gem_paths << Config::CONFIG['libdir'] + '/ruby/gems/' + RUBY_VERSION[0..2] + '/gems'
-
-    # add ~/.gem
-    gem_paths << File.expand_path('~') + '/.gem/ruby/' + RUBY_VERSION[0..2] + '/gems'
-
-    # add ENV['GEM_PATH'] if it exists
-    if ENV['GEM_PATH']
-      gem_paths = ENV['GEM_PATH'].split(File::PATH_SEPARATOR).collect{|path| path + '/gems'} 
-    end
-
-    all_gems = []
-
-    for gem_path in gem_paths.flatten do
-      all_gems << Dir.glob(gem_path + '/*')
-    end
-    all_gems.flatten!
-    all_gems = all_gems.sort_by{|gem| gem.split('-')[-1].split('.').map{|n| n.to_i}} # 0.10.0 > 0.9.0 so straight sort won't work for us
-    all_gems.reverse!
-
-    already_loaded_gems = {}
-
-    prelude_paths = []
-
-    for gem in all_gems do
-
-      version = gem.split('-')[-1]
-      if version =~ /\d+\.\d+\.\d+/
-        name = gem.split('-')[0..-2]
-      else
-        gem =~ /(.*)(\d+\.\d+\.\d+).*$/ # like abc-1.2.3-mswin32-60 or what not
-        version = $2
-        name = $1
-        next unless version # a few oddities like rbfind-1.1
-      end
-
-      if(!already_loaded_gems[name])
-        already_loaded_gems[name] = true
-        if File.directory? gem + '/lib'
-          prelude_paths << gem + '/lib'
-        else
-          # unfortunately a few gems load from, say gem/something_not_lib/gemname.rb
-          for dir in Dir.glob(gem + '/*') do
-            if File.directory? dir
-              $: << dir
-              # if anybody wants anything lower than that, let me know
-            end
-          end
-        end
-      end
-
-    end
-    prelude_paths
-  end
-end
-

data/lib/ubygemsf.rb

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

data/spec/spec.faster_rubygems.rb

@@ -1,55 +0,0 @@
-require 'rubygems' if RUBY_VERSION[0..2] < '1.9'
-require 'sane'
-require_relative '../lib/faster_rubygems_lib'
-require 'spec/autorun'
-require 'fileutils'
-    
-describe FasterRubyGems do
-
-  before do
-    ENV['GEM_PATH'] = 'test_dir'
-    @gem_path = 'test_dir/gems/' # boo
-    FileUtils.rm_rf @gem_path
-    raise 'you dont need to test this on 1.9' if RUBY_VERSION > '1.9'
-  end
-  
-  it "should calculate something" do
-    paths = FasterRubyGems.gem_prelude_paths
-    assert paths.length == 0
-    FileUtils.mkdir_p @gem_path + '/abc-0.9.0/lib'
-    paths = FasterRubyGems.gem_prelude_paths
-    assert paths.length == 1    
-  end
-  
-  it "should calculate 0.10.0 as greater than 0.9.0" do
-    
-    FileUtils.mkdir_p @gem_path + '/abc-0.9.0/lib'
-    FileUtils.mkdir_p @gem_path + '/abc-0.10.0/lib'
-    paths = FasterRubyGems.gem_prelude_paths
-    assert( (paths.grep /abc-0.10.0/).length > 0)
-  end
-  
-  it "should find highest version of normal numbered gems" do
-    FileUtils.mkdir_p @gem_path + '/abc-0.8.0/lib'
-    FileUtils.mkdir_p @gem_path + '/abc-0.9.0/lib'
-    paths = FasterRubyGems.gem_prelude_paths
-    assert( (paths.grep /abc-0.9.0/).length > 0)    
-  end
-  
-  it "with multiple paths should find all files"
-  
-  it "should respect file::separator"
-  
-  
-  def ruby lib
-    assert system(OS.ruby_bin + ' ' + lib)
-    assert system(OS.ruby_bin + ' ' + lib)
-  end
-  
-  it "should load full rubygems on gem xxx" do
-    ruby('files/test_gem.rb')
-    ruby('files/test_gem_const.rb')
-     ruby('files/test_gem_func.rb')
-  end
-
-end