faster_rubygems 0.0.4 → 0.1.0

data/Rakefile

@@ -0,0 +1,17 @@
+require 'jeweler'
+  Jeweler::Tasks.new do |s|
+  s.name = %q{faster_rubygems}
+
+
+  s.summary = %q{faster gem loading}
+  s.extensions = ["ext/mkrf_conf.rb"]
+
+  s.post_install_message = "
+
+installed! use -> require 'faster_rubygems'
+
+"
+
+  s.add_development_dependency 'test-unit', '=1.2.3'
+  s.add_development_dependency 'test-unit', '=2.0.6'
+ end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.2.0

data/install.rb

@@ -9,4 +9,4 @@ end
 
 require 'frubygems' # test it out now :P
 
-puts 'Installed--thank you for trying out -- require \'frubygems\''
+puts 'Installed--thank you for trying out -- require \'faster_rubygems\''

data/lib/faster_rubygems.rb

@@ -1,58 +1,28 @@
 if RUBY_VERSION < '1.9'
-  require 'rbconfig'
-
-  gem_paths = []
-  gem_paths << Config::CONFIG['libdir'] + '/ruby/gems/' + RUBY_VERSION[0..2] + '/gems'
-
-  # handle ~/.gem
-  gem_paths << File.expand_path('~') + '/.gem/ruby/' + RUBY_VERSION[0..2] + '/gems'
-
-  # handle ENV['GEM_PATH'] if it exists
-  gem_paths << ENV['GEM_PATH'].split(':').select{|path| path + '/.gems'} if ENV['GEM_PATH'] # TODO should this override or supplement?
-
-  # TODO
-  # spec: should find highest version of files
-  # spec: with multiple paths should find all files :P
-
-  all_gems = []
-
-  for gem_path in gem_paths.flatten do
-
-    all_gems << Dir.glob(gem_path + '/*')
-
+  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
-  all_gems.flatten!.sort!.reverse!
-
-  already_loaded_gems = {}
-
-  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
+  
+  module ::Gem
+    def self.const_missing const
+      require 'rubygems' # punt!
+      return Gem.const_get(const)
     end
-
-    if(!already_loaded_gems[name])
-      already_loaded_gems[name] = true
-      if File.directory? gem + '/lib'
-        $: << 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
+  
+  
 else
  # not needed in 1.9, which by default loads gem_prelude
 end

data/lib/faster_rubygems_lib.rb

@@ -0,0 +1,64 @@
+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/spec/spec.faster_rubygems.rb

@@ -0,0 +1,55 @@
+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')
+    
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faster_rubygems
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -06:00
+date: 2009-12-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,14 +23,17 @@ extra_rdoc_files:
 - README
 files: 
 - README
+- Rakefile
 - VERSION
 - examples/require_fast_start.rb
 - examples/require_rubygems_normal.rb
 - ext/mkrf_conf.rb
 - install.rb
+- lib/faster_rubygems.rb
+- lib/faster_rubygems_lib.rb
 - lib/frubygems.rb
 - lib/ubygemsf.rb
-- lib/faster_rubygems.rb
+- spec/spec.faster_rubygems.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -38,7 +41,7 @@ licenses: []
 post_install_message: |+
   
   
-  installed! require 'frubygems' now
+  installed! use by doing require 'faster_rubygems'
   
 rdoc_options: 
 - --charset=UTF-8
@@ -64,5 +67,6 @@ signing_key:
 specification_version: 3
 summary: faster gem loading
 test_files: 
+- spec/spec.faster_rubygems.rb
 - examples/require_fast_start.rb
 - examples/require_rubygems_normal.rb