faster_require 0.5.2 → 0.6.0

data/Rakefile

@@ -1,12 +1,15 @@
-  require 'faster_rubygems' if RUBY_VERSION < "1.9'"
+  require 'rubygems' if RUBY_VERSION < "1.9'"
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "faster_require"
-    s.summary = "A tool designed to speedup library loading in Ruby by caching library locations"
+    s.summary = "Speed library loading in Ruby"
+    s.description = "A tool designed to speedup library loading in Ruby by caching library locations"
     s.email = "rogerdpack@gmail.com"
     s.homepage = "http://github.com/rdp/faster_require"
     s.authors = ["Roger Pack"]
-    s.add_development_dependency 'rspec'
+    s.add_development_dependency 'redparse'
+    s.add_development_dependency 'jeweler'
+    s.add_development_dependency 'rspec', '>= 2'
     s.add_development_dependency 'sane'
     s.add_development_dependency 'ruby-prof'
     # s.add_dependency

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/benchmark/benchmark.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require '../lib/faster_require'
+require 'stringio'
+require 'redparse'
+require 'ruby_parser'
+RedParse
+RubyParser

data/benchmark/benchmark_slow.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'stringio'
+require 'redparse'
+require 'ruby_parser'
+RedParse
+RubyParser

data/lib/faster_require.rb

@@ -1,13 +1,15 @@
+require 'rbconfig'
+
 module FastRequire
   $FAST_REQUIRE_DEBUG ||= $DEBUG # can set it via $DEBUG, or by itself
 
   def self.setup
     @@dir = File.expand_path('~/.ruby_faster_require_cache')
-
     Dir.mkdir @@dir unless File.directory?(@@dir)
-    @@loc = @@dir + '/' + RUBY_VERSION + '-' + RUBY_PLATFORM + '-' +
-    sanitize(File.expand_path($0).gsub(/[\/:]/, '_')) +
-    sanitize(Dir.pwd)
+    
+    parts = [File.basename($0), RUBY_VERSION, RUBY_PLATFORM, File.basename(Dir.pwd), Dir.pwd, File.dirname($0), File.expand_path(File.dirname($0))].map{|part| sanitize(part)}
+    loc_name = (parts.map{|part| part[0..5]} + parts).join('-')[0..75] # try to be unique, but short...
+    @@loc = @@dir + '/' + loc_name
   end
 
   def self.sanitize filename
@@ -17,7 +19,7 @@ module FastRequire
   FastRequire.setup
 
   def self.load filename
-    @@require_locs = Marshal.restore( File.open(filename, 'rb') {|f| f.read})
+    @@require_locs = Marshal.restore( File.open(filename, 'rb') {|f| f.read}) rescue {} 
   end
 
   if File.exist?(@@loc)
@@ -40,12 +42,12 @@ module FastRequire
 
     if add_dot_rb
       tests << partial_name + '.rb'
-      tests << partial_name + '.so'
+      tests << partial_name + '.' + RbConfig::CONFIG['DLEXT']
     end
 
     tests.each{|b|
-      # assume that .rb.rb is...valid...
-      if File.file?(b) && ((b[-3..-1] == '.rb') || (b[-3..-1] == '.so'))
+      # assume that .rb.rb is...valid...?
+      if File.file?(b) && ((b[-3..-1] == '.rb') || (b[-3..-1] == '.' + RbConfig::CONFIG['DLEXT']))
         return File.expand_path(b)
       end
     }
@@ -53,15 +55,15 @@ module FastRequire
     for dir in $:
       if File.file?(b = (dir + '/' + partial_name))
         # make sure we require a file that has the right suffix...
-        if (b[-3..-1] == '.rb')  || (b[-3..-1] == '.so')
+        if (b[-3..-1] == '.rb')  || (b[-3..-1] == '.' + RbConfig::CONFIG['DLEXT'])
           return File.expand_path(b)
         end
 
       end
     end
 
-    if add_dot_rb && (partial_name[-3..-1] != '.rb') && (partial_name[-3..-1] != '.so')
-      guess_discover(partial_name + '.rb') || guess_discover(partial_name + '.so')
+    if add_dot_rb && (partial_name[-3..-1] != '.rb') && (partial_name[-3..-1] != '.' + RbConfig::CONFIG['DLEXT'])
+      guess_discover(partial_name + '.rb') || guess_discover(partial_name + '.')
     else
       nil
     end
@@ -87,7 +89,6 @@ module FastRequire
   @@require_locs[$0] = File.expand_path($0) # so when we run into it on a require, we will skip it...
   @@already_loaded[File.expand_path($0)] = true
 
-
   # XXXX within a very long depth to require fast_require,
   # require 'a' => 'b' => 'c' => 'd' & fast_require
   #             then
@@ -124,19 +125,43 @@ module FastRequire
     @@require_locs.clear
     setup
   end
-
+#   require 'ruby-debug'
   def require_cached lib
-    lib = lib.to_s unless lib.is_a?(String) # might not be zactly 1.9 compat...
+    lib = lib.to_s # might not be zactly 1.9 compat... to_path ??
+   # p 'doing require ' + lib
     if known_loc = @@require_locs[lib]
-      return false if @@already_loaded[known_loc]
+      if @@already_loaded[known_loc]
+        p 'already loaded ' + known_loc if $FAST_REQUIRE_DEBUG
+        return false 
+      end
       @@already_loaded[known_loc] = true
-      if known_loc =~ /.so$/
+      if known_loc =~ /\.#{RbConfig::CONFIG['DLEXT']}$/
         puts 'doing original_non_cached_require on .so full path ' + known_loc if $FAST_REQUIRE_DEBUG
-        original_non_cached_require known_loc # not much we can do there...too bad...
+        original_non_cached_require known_loc # not much we can do there...too bad...well at least we pass it a full path though :P
       else
-        puts 'doing eval on ' + lib + '=>' + known_loc if $FAST_REQUIRE_DEBUG
-        $LOADED_FEATURES << known_loc # *must*
-        return eval(File.open(known_loc, 'rb') {|f| f.read}, TOPLEVEL_BINDING, known_loc) || true # note the b here--this means it's reading .rb files as binary, which *typically* works--if it breaks re-save the offending file in binary mode, or file an issue on the tracker...
+        unless $LOADED_FEATURES.include? known_loc
+          if known_loc =~ /rubygems.rb$/
+            puts 'requiring rubygems ' + known_loc if $FAST_REQUIRE_DEBUG
+            original_non_cached_require(known_loc) # normal require so rubygems doesn't freak out when it finds itself already in $LOADED_FEATURES :P
+          else
+            if $FAST_REQUIRE_DEBUG
+              puts 'doing cached loc eval on ' + lib + '=>' + known_loc 
+            end
+            $LOADED_FEATURES << known_loc
+            # fakely add the load path, too, so that autoload for the same file will work <sigh> [rspec2]
+            no_suffix_full_path = known_loc.gsub(/\.[^.]+$/, '')
+            no_suffix_lib = lib.gsub(/\.[^.]+$/, '')
+            libs_path = no_suffix_full_path.gsub(no_suffix_lib, '')
+            libs_path = File.expand_path(libs_path) # strip off trailing '/'
+            $: << libs_path unless $:.index(libs_path)
+            # load(known_loc, false) # too slow
+            eval(File.open(known_loc, 'rb') {|f| f.read}, TOPLEVEL_BINDING, known_loc) # note the rb here--this means it's reading .rb files as binary, which *typically* works...maybe unnecessary?
+            # --if it breaks re-save the offending file in binary mode, or file an issue on the tracker...
+            return true
+          end
+        else
+          puts 'ignoring already loaded? ' + known_loc if $FAST_REQUIRE_DEBUG
+        end
       end
     else
       # we don't know the location--let Ruby's original require do the heavy lifting for us here
@@ -171,7 +196,7 @@ module FastRequire
         # calc location, expand, map back
         where_found = FastRequire.guess_discover(lib, true)
         if where_found
-          puts 'inferred ghost loc:' + lib + '=>' + where_found if $FAST_REQUIRE_DEBUG
+          puts 'inferred lib loc:' + lib + '=>' + where_found if $FAST_REQUIRE_DEBUG
           @@require_locs[lib] = where_found
           # unfortunately if it's our first pass
           # and we are in the middle of a "real" require
@@ -202,7 +227,7 @@ module Kernel
 
   if(defined?(@already_using_faster_require))
     raise 'twice not allowed...'
-    # *shouldn't* get here...unless I'm wrong...
+    # *shouldn't* ever get here...unless I'm wrong...
   else
     @already_using_faster_require = true
     include FastRequire

data/spec/files/attempt_double_load.rb

@@ -1,4 +1,4 @@
 $FAST_REQUIRE_DEBUG = 1
-a = File.dirname(File.expand_path(__FILE__)) + '/../../lib/fast_require.rb'
+a = File.dirname(File.expand_path(__FILE__)) + '/../../lib/faster_require.rb'
 load a
 load a

data/spec/files/clear.bat

@@ -0,0 +1 @@
+rm -rf %HOMEPATH%/.ruby_faster_require_cache

data/spec/files/fast.rb

@@ -1,4 +1,5 @@
-require 'rubygems'
 require File.dirname(__FILE__) + "/../../lib/faster_require.rb"
-require 'spec/autorun'
-a = Spec
+require 'rubygems'
+require 'rspec'
+a = RSpec
+p 'success'

data/spec/files/fast2.rb

@@ -0,0 +1,6 @@
+# different rubygems orders
+require 'rubygems'
+require File.dirname(__FILE__) + "/../../lib/faster_require.rb"
+require 'rspec'
+a = RSpec
+p 'success'

data/spec/files/gem_after.rb

@@ -1,3 +1,4 @@
+$: << '.'
 require '../lib/faster_require.rb'
 require 'rubygems'
 Gem::Specification

data/spec/files/gem_before.rb

@@ -1,3 +1,4 @@
+$: << '.'
 require 'rubygems'
 Gem::Specification
 

data/spec/files/require_non_dot_rb_fails.rb

@@ -1,6 +1,7 @@
+$: << '.'
 $:.unshift 'bin'
 require File.dirname(File.expand_path(__FILE__)) + '/../../lib/faster_require.rb'
 require 'non_dot_rb.rb' # succeed
-require 'non_dot_rb' # fails (well, returns false), we think it succeeds, but it in the wrong place, so when we run the second time, it loads the wrong file
+raise if require 'non_dot_rb' # fails (well, returns false), we think it succeeds, but it in the wrong place, so when we run the second time, it loads the wrong file
 
 # unless my gem is working right

data/spec/files/should_put_modules_in_right_place.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require File.dirname(__FILE__) + "/../../lib/faster_require.rb"
+require 'rspec'
+a = RSpec
+raise 'bad' if FastRequire.constants.grep(/spec/i).length > 0

data/spec/files/slow.rb

@@ -1,3 +1,3 @@
 require 'rubygems'
-require 'spec/autorun'
-a = Spec
+require 'rspec'
+a = RSpec

data/spec/spec.fast_require.rb

@@ -1,28 +1,32 @@
-# $FAST_REQUIRE_DEBUG
+# can set this: $FAST_REQUIRE_DEBUG
+
 if RUBY_VERSION < '1.9'
-  require 'faster_rubygems'
+  require 'rubygems' # faster_rubygems, perhaps?
 end
+
 require 'sane'
 require 'benchmark'
 
-
 unless RUBY_PLATFORM =~ /java/
-require_relative '../lib/faster_require'
-cached = '.cached_spec_locs' + RUBY_VERSION
-# use it for our own local test specs
-FastRequire.load cached if File.exist? cached
-require 'spec/autorun'
-FastRequire.save cached
+ require_relative '../lib/faster_require'
+ cached = '.cached_spec_locs' + RUBY_VERSION
+ # use it for our own local test specs
+ begin
+   require 'spec/autorun'
+ rescue LoadError
+  # rspec 2
+  require 'rspec'
+ end
+ FastRequire.load cached if File.exist? cached
+ FastRequire.save cached
 else
   
 require 'spec/autorun'
-
-require_relative '../lib/faster_require'
+ require_relative '../lib/faster_require'
   
 end
 
-
-describe "faster requires" do
+describe "requires faster" do
 
   before do
     FastRequire.clear_all!
@@ -73,12 +77,14 @@ describe "faster requires" do
   		assert(system("#{OS.ruby_bin} large.rb"))
   	end
   end
+  
+  it "could cache file contents, too, in theory...oh my"
 
   it "should not re-save the cache file if it hasn't changed [?]"
   
-  it "should require .so files still, and only load them once" do
+  it "should load .so files still, and only load them once" do
     # ruby-prof gem
-    2.times { require 'ruby_prof'; RubyProf } # .so
+    2.times { require 'ruby_prof.so'; RubyProf }
     assert $LOADED_FEATURES.length == (@old_length + 1)
   end
 
@@ -102,9 +108,11 @@ describe "faster requires" do
    	  assert system("ruby -I../../lib e.rb")
    	  assert system("ruby -C.. -I../lib files/e.rb")
    end
+ # require 'ruby-debug'
+#  debugger
    assert Dir[FastRequire.dir + '/*'].length == 3    
-   assert Dir[FastRequire.dir + '/*spec_files_d*'].length == 1 # use full path
-   assert Dir[FastRequire.dir + '/*spec_files_e*'].length == 2 # different dirs
+   assert Dir[FastRequire.dir + '/*d.rb*'].length == 1 # use full path
+   assert Dir[FastRequire.dir + '/*e.rb*'].length == 2 # different Dir.pwd's
   end
     
   context "should work with ascii files well" do # most are binary, so...low prio
@@ -114,7 +122,8 @@ describe "faster requires" do
   private
   
   def ruby filename
-    3.times { assert system(@ruby  + " " + filename) }    
+    command = @ruby + " " + filename
+    3.times { raise command unless system(command) }    
   end
   
   it "should override rubygems' require if rubygems is loaded after the fact...maybe by hooking to Gem::const_defined or something" do
@@ -157,7 +166,20 @@ describe "faster requires" do
   
   it "should disallow a file requiring itself" do
     ruby 'files/requires_itself.rb'
-    ruby 'files/requires_itself.rb'    
   end
   
+  it "should put modules in the right place" do
+    Dir.chdir('files') do
+      ruby 'should_put_modules_in_right_place.rb'
+    end
+  end
+
+  it "should" do
+    Dir.chdir('files') do
+      ruby 'fast2.rb'
+    end
+  end
+
+
+
 end

data/spec/temp/slow.rb

@@ -0,0 +1,9 @@
+slow = true
+file_name = File.expand_path('./yo.rb')
+File.open(file_name, 'w') do |f| f.write '33333'; end
+
+if !slow
+  1000.times { eval File.read(file_name) } # ascii mode
+else
+  1000.times { load file_name } # ascii mode
+end

data/spec/temp/yo.rb

@@ -0,0 +1,10 @@
+33333
+33333
+33333
+33333
+33333
+33333
+33333
+33333
+33333
+33333

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faster_require
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  hash: 7
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Roger Pack
@@ -9,40 +15,80 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -07:00
+date: 2011-02-25 00:00:00 -07:00
 default_executable: faster_require
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: redparse
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sane
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  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"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ruby-prof
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: 
+  type: :development
+  version_requirements: *id005
+description: A tool designed to speedup library loading in Ruby by caching library locations
 email: rogerdpack@gmail.com
 executables: 
 - faster_require
@@ -54,6 +100,8 @@ files:
 - README
 - Rakefile
 - VERSION
+- benchmark/benchmark.rb
+- benchmark/benchmark_slow.rb
 - bin/faster_require
 - lib/faster_require.rb
 - lib/rubygems_plugin.rb
@@ -61,9 +109,11 @@ files:
 - spec/files/attempt_double_load.rb
 - spec/files/b.rb
 - spec/files/c.rb
+- spec/files/clear.bat
 - spec/files/d.rb
 - spec/files/e.rb
 - spec/files/fast.rb
+- spec/files/fast2.rb
 - spec/files/gem_after.rb
 - spec/files/gem_before.rb
 - spec/files/large.rb
@@ -72,51 +122,66 @@ files:
 - spec/files/require_non_dot_rb_fails.rb
 - spec/files/require_twice_in_dir_pwd.rb
 - spec/files/requires_itself.rb
+- spec/files/should_put_modules_in_right_place.rb
 - spec/files/slow.rb
 - spec/spec.fast_require.rb
+- spec/files/a.rb
+- spec/temp/slow.rb
+- spec/temp/yo.rb
 has_rdoc: true
 homepage: http://github.com/rdp/faster_require
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+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: A tool designed to speedup library loading in Ruby by caching library locations
+summary: Speed library loading in Ruby
 test_files: 
-- spec/files/attempt_double_load.rb
+- spec/files/a.rb
 - spec/files/a_requires_b.rb
+- spec/files/attempt_double_load.rb
 - spec/files/b.rb
 - spec/files/c.rb
 - spec/files/d.rb
 - spec/files/e.rb
 - spec/files/fast.rb
+- spec/files/fast2.rb
 - spec/files/gem_after.rb
 - spec/files/gem_before.rb
 - spec/files/large.rb
 - spec/files/non_dot_rb.rb
-- spec/files/requires_itself.rb
 - spec/files/require_full_path.rb
 - spec/files/require_non_dot_rb_fails.rb
 - spec/files/require_twice_in_dir_pwd.rb
+- spec/files/requires_itself.rb
+- spec/files/should_put_modules_in_right_place.rb
 - spec/files/slow.rb
 - spec/spec.fast_require.rb
+- spec/temp/slow.rb
+- spec/temp/yo.rb