faster_require 0.7.3 → 0.7.4

data/ChangeLog

@@ -1,3 +1,7 @@
+0.7.4: allow double loading, for rails apps and gems to load it.
+
+0.7.3: work with 1.9 require_relative
+
 0.7.1: Accomodate for non HOME environment variable [what the..]
 
 0.7.0: now it works with autoload finally [and thus hopefully rails]

data/Rakefile

@@ -20,6 +20,7 @@ end
     s.add_development_dependency 'jeweler'
     s.add_development_dependency 'rspec', '>= 2'
     s.add_development_dependency 'sane'
+    s.add_development_dependency 'facets'
     s.add_development_dependency 'ruby-prof'
     # s.add_dependency
   end

data/TODO

@@ -2,4 +2,5 @@ advertise if quiet for a week after 3/10/11
 stringio
 if ruby < 1.9 for autoload stuff
 benchmarks jruby et al
-running rails seems to still have some redundancies in there [?]
+running rails seems to still have some redundancies in there [?]
+"does it slow us down"

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/lib/faster_require.rb

@@ -1,8 +1,18 @@
-require 'rbconfig'
+
+if(defined?($already_using_faster_require))
+  p 'warning: faster_require double load expected?' if $FAST_REQUIRE_DEBUG
+  local_version = File.read(File.dirname(__FILE__) + "/../VERSION")
+  raise 'mismatched faster_require version' unless local_version == FastRequire::VERSION
+else
+$already_using_faster_require = true
+
+# now load it...
+
+require 'rbconfig' # maybe could cache this one, too?
 
 module FastRequire
   $FAST_REQUIRE_DEBUG ||= $DEBUG # can set via $DEBUG, or on its own.
-
+  VERSION = File.read(File.dirname(__FILE__) + "/../VERSION")
   def self.setup
     begin
      @@dir = File.expand_path('~/.ruby_faster_require_cache')
@@ -177,11 +187,12 @@ module FastRequire
                 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)
+                $: << libs_path unless $:.index(libs_path) # might not need this anymore, but it feels more sane...does it slow us down, though?
+                
                 # try some more autoload conivings...so that it won't attempt to autoload if it runs into it later...
                 relative_full_path = known_loc.sub(libs_path, '')[1..-1]
+                $LOADED_FEATURES << relative_full_path unless $LOADED_FEATURES.index(relative_full_path) # add in with .rb, too, for autoload 
             #    $LOADED_FEATURES << relative_full_path.gsub('.rb', '') # don't think you need this one
-                $LOADED_FEATURES << relative_full_path # add in with .rb, too. 
                   
                 # load(known_loc, false) # too slow
                 contents = File.open(known_loc, 'rb') {|f| f.read}
@@ -203,6 +214,7 @@ module FastRequire
       else
         # we don't know the location--let Ruby's original require do the heavy lifting for us here
         old = $LOADED_FEATURES.dup
+        p 'doing old non-known location require ' + lib if $FAST_REQUIRE_DEBUG
         if(original_non_cached_require(lib))
           # debugger might land here the first time you run a script and it doesn't have a require
           # cached yet...
@@ -265,10 +277,6 @@ end
 
 module Kernel
 
-  if(defined?(@already_using_faster_require))
-    raise 'loading twice not allowed...we should never get here!'
-  end
-  @already_using_faster_require = true
   # overwrite old require...
   include FastRequire
   if defined?(gem_original_require)
@@ -298,3 +306,6 @@ module Kernel
     alias :require :require_cached
   end
 end
+
+
+end

data/spec/files/attempt_double_load.rb

@@ -1,4 +1,6 @@
 $FAST_REQUIRE_DEBUG = 1
 a = File.dirname(File.expand_path(__FILE__)) + '/../../lib/faster_require.rb'
+p 'first pass'
 load a
+p 'second pass'
 load a

data/spec/files/attempt_double_load_wrong_version.rb

@@ -0,0 +1,5 @@
+$FAST_REQUIRE_DEBUG = 1
+a = File.dirname(File.expand_path(__FILE__)) + '/../../lib/faster_require.rb'
+load a
+FastRequire::VERSION='fake'
+load a

data/spec/files/require_facets.rb

@@ -0,0 +1,3 @@
+require '../lib/faster_require.rb'
+require 'rubygems'
+require 'facets'

data/spec/files/socket_load.rb

@@ -4,5 +4,8 @@ require '../lib/faster_require.rb'
 raise if FastRequire.already_loaded.to_a.flatten.grep(/files\/b.rb/).length > 0
 require 'socket'
 TCPSocket
+require 'stringio'
+StringIO
 raise 'lacking socket ' + FastRequire.already_loaded.to_a.join(' ') unless FastRequire.already_loaded.to_a.flatten.grep(/socket/).length > 0
+raise 'lacking stringio ' + FastRequire.already_loaded.to_a.join(' ') unless FastRequire.already_loaded.to_a.flatten.grep(/stringio/).length > 0
 p 'success'

data/spec/files/time_just_loading_rubygems.rb

@@ -0,0 +1,2 @@
+require 'rubygems'
+Gem::Dependency

data/spec/spec.fast_require.rb

@@ -1,12 +1,11 @@
-# can set this: $FAST_REQUIRE_DEBUG
-
-if RUBY_VERSION < '1.9'
-  require 'rubygems' # faster_rubygems, perhaps?
-end
+# could also  set this here if desired: $FAST_REQUIRE_DEBUG = true
 
+require 'rubygems' # faster_rubygems, perhaps?
 require 'sane'
 require 'benchmark'
 
+raise 'double faster_require' if defined?($already_using_faster_require) # disallowed, since who knows what version the gem one is...
+
 unless RUBY_PLATFORM =~ /java/
  require_relative '../lib/faster_require'
  cached = '.cached_spec_locs' + RUBY_VERSION
@@ -68,11 +67,15 @@ describe "requires faster!" do
     end
   end
   
+  it "should load rubygems for speed look" do
+    slow = Benchmark.realtime { assert system("#{OS.ruby_bin} files/time_just_loading_rubygems.rb")}
+    fast = Benchmark.realtime { assert system("#{OS.ruby_bin} files/time_just_loading_rubygems.rb")}
+    pps 'just loading rubygems [obviously depends on number of gems installed] at all: fast', fast, 'slow', slow
+  end
+  
   it "should work with large complex gem" do
   	Dir.chdir('files') do
-  		assert(system("#{OS.ruby_bin} large.rb"))
-  		assert(system("#{OS.ruby_bin} large.rb"))
-  		assert(system("#{OS.ruby_bin} large.rb"))
+  		3.times { assert(system("#{OS.ruby_bin} large.rb")) }
   	end
   end
   
@@ -82,7 +85,7 @@ describe "requires faster!" do
   
   it "should load .so files still, and only load them once" do
     # ruby-prof gem
-    2.times { require 'ruby_prof.so'; RubyProf }
+    3.times { require 'ruby_prof.so'; RubyProf }
     assert $LOADED_FEATURES.length == (@old_length + 1)
   end
 
@@ -106,17 +109,13 @@ describe "requires faster!" 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 + '/*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
-    it "could cache the converted file, if that speeds things up"
-  end
-  
+  it "should work with encoded files too" # most are binary, so...low prio
+
   private
   
   def ruby filename
@@ -132,7 +131,7 @@ describe "requires faster!" do
     ruby "files/gem_before.rb"    
   end  
   
- ['gem_after.rb', 'load_various_gems.rb', 'load_various_gems2.rb', 'active_support_no_double_load.rb', 'fast.rb'].each{|filename| 
+ ['require_facets.rb', 'gem_after.rb', 'load_various_gems.rb', 'load_various_gems2.rb', 'active_support_no_double_load.rb', 'fast.rb'].each{|filename| 
     it "should not double load gems #{filename}" do
       3.times {
         a = `#{@ruby} -v files/#{filename} 2>&1`
@@ -144,9 +143,10 @@ describe "requires faster!" do
     end
   }
 
-  it "should throw if you require itself twice" do
+  it "should be ok if you require itself twice" do
     Dir.chdir('files') do
-      assert !system(@ruby + 'attempt_double_load.rb')
+      3.times { assert system(@ruby + 'attempt_double_load.rb') }
+      assert `#{@ruby + 'attempt_double_load.rb'}` =~ /double load expected/
     end
   end
   

data/todo

@@ -2,4 +2,5 @@ advertise if quiet for a week after 3/10/11
 stringio
 if ruby < 1.9 for autoload stuff
 benchmarks jruby et al
-running rails seems to still have some redundancies in there [?]
+running rails seems to still have some redundancies in there [?]
+"does it slow us down"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faster_require
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Roger Pack
@@ -107,7 +107,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ruby-prof
+  name: facets
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -120,6 +120,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ruby-prof
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: A tool designed to speedup library loading in Ruby by caching library locations
 email: rogerdpack@gmail.com
 executables: 
@@ -141,7 +155,9 @@ files:
 - lib/faster_require.rb
 - lib/rubygems_plugin.rb
 - spec/files/a_requires_b.rb
+- spec/files/active_support_no_double_load.rb
 - spec/files/attempt_double_load.rb
+- spec/files/attempt_double_load_wrong_version.rb
 - spec/files/b.rb
 - spec/files/c.rb
 - spec/files/clear.bat
@@ -155,20 +171,21 @@ files:
 - spec/files/load_various_gems.rb
 - spec/files/load_various_gems2.rb
 - spec/files/non_dot_rb.rb
+- spec/files/require_facets.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/files/socket_load.rb
+- spec/files/time_just_loading_rubygems.rb
 - spec/spec.fast_require.rb
 - todo
 - TODO
 - spec/eval_me1.rb
 - spec/eval_me2.rb
 - spec/files/a.rb
-- spec/files/active_support_no_double_load.rb
-- spec/files/socket_load.rb
 - spec/temp/slow.rb
 - spec/temp/yo.rb
 has_rdoc: true
@@ -211,6 +228,7 @@ test_files:
 - spec/files/a.rb
 - spec/files/active_support_no_double_load.rb
 - spec/files/attempt_double_load.rb
+- spec/files/attempt_double_load_wrong_version.rb
 - spec/files/a_requires_b.rb
 - spec/files/b.rb
 - spec/files/c.rb
@@ -225,12 +243,14 @@ test_files:
 - spec/files/load_various_gems2.rb
 - spec/files/non_dot_rb.rb
 - spec/files/requires_itself.rb
+- spec/files/require_facets.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/should_put_modules_in_right_place.rb
 - spec/files/slow.rb
 - spec/files/socket_load.rb
+- spec/files/time_just_loading_rubygems.rb
 - spec/spec.fast_require.rb
 - spec/temp/slow.rb
 - spec/temp/yo.rb