sane 0.23.1 → 0.23.2

data/VERSION

@@ -1 +1 @@
-0.23.1
+0.23.2

data/lib/sane/require_relative.rb

@@ -2,6 +2,8 @@ unless Kernel.respond_to?(:require_relative, true)
   
 module Kernel
   module_function
+  OriginalDir = File.expand_path(Dir.pwd) # try to accomodate for later Directory changes...
+  
   def require_relative(relative_feature)
     c = caller.first
     # could be spec.sane.rb:127
@@ -11,8 +13,15 @@ module Kernel
     if /\A\((.*)\)/ =~ file # eval, etc.
       raise LoadError, "require_relative is called in #{$1}"
     end
+    p 'relative is', relative_feature, File.dirname(file), OriginalDir
     absolute_feature = File.expand_path(File.join(File.dirname(file), relative_feature))
-    require absolute_feature
+    begin
+      require absolute_feature
+    rescue LoadError => e
+      # hacky kludge in case they've changed dirs...
+      require File.expand_path(File.join(OriginalDir,File.dirname(file), relative_feature))
+    end
+    
   end
 end
 

data/spec/extrapolate/subdir2/require_relative2.rb

@@ -0,0 +1 @@
+$was_in_rr_1 = 1

data/spec/extrapolate/temp/recreate.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'backports'
+Dir.chdir File.dirname(__FILE__)
+#subdir2
+#require_relative2.rb
+require_relative '../subdir2/require_relative2'
+raise unless $was_in_rr_1 == 1

data/spec/req_rel_bug/recreate.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require '../lib/sane'
+Dir.chdir File.dirname(__FILE__)
+require_relative '../subdir2/require_relative2'
+raise unless $was_in_rr_1 == 1

data/spec/spec.sane.rb

@@ -163,6 +163,12 @@ describe Sane do
    require_relative 'subdir/go.rb'
   end
   
+  it "should require_relative after changing dirs" do
+    require 'ruby-debug'
+    debugger
+    assert system(OS.ruby_bin + " req_rel_bug/recreate.rb")
+  end
+  
   it "should have a File.home method" do
     assert File.home == File.expand_path('~')
   end

data/spec/subdir2/require_relative2.rb

@@ -0,0 +1,2 @@
+p 'in good file'
+$was_in_rr_1 = 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sane
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 71
   prerelease: false
   segments: 
   - 0
   - 23
-  - 1
-  version: 0.23.1
+  - 2
+  version: 0.23.2
 platform: ruby
 authors: 
 - Roger Pack
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -06:00
+date: 2010-10-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,10 +91,14 @@ files:
 - spec/files/pp_before_hand.rb
 - spec/files/test.rb
 - spec/go2.rb
+- spec/req_rel_bug/recreate.rb
 - spec/spec.sane.rb
 - spec/subdir/go.rb
+- spec/subdir2/require_relative2.rb
 - todo
 - TODO
+- spec/extrapolate/subdir2/require_relative2.rb
+- spec/extrapolate/temp/recreate.rb
 has_rdoc: true
 homepage: http://github.com/rogerdpack/sane_ruby
 licenses: []
@@ -130,9 +134,13 @@ signing_key:
 specification_version: 3
 summary: Helpers for ruby core to make it easier to work with--things that are missing from core but should arguably be there
 test_files: 
+- spec/extrapolate/subdir2/require_relative2.rb
+- spec/extrapolate/temp/recreate.rb
 - spec/files/pp_after.rb
 - spec/files/pp_before_hand.rb
 - spec/files/test.rb
 - spec/go2.rb
+- spec/req_rel_bug/recreate.rb
 - spec/spec.sane.rb
 - spec/subdir/go.rb
+- spec/subdir2/require_relative2.rb