Fixed require_relative. Fixes #2976. Fixes #3163.

rubinius · Dec 3, 2014 · 6dfb925 · 6dfb925
1 parent 8827765
commit 6dfb925
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/kernel/common/code_loader.rb b/kernel/common/code_loader.rb
@@ -137,10 +137,14 @@ def require
     # check to make sure it's not called inside of an eval.
     def self.require_relative(name, scope)
       script = scope.current_script
-      if script && script.data_path.nil?
-        raise LoadError.new "cannot infer basepath from #{script.file_path}"
-      elsif script
-        require File.expand_path(name, File.dirname(File.realdirpath(script.data_path)))
+      if script
+        if script.data_path
+          path = File.dirname(File.realdirpath(script.data_path))
+        else
+          path = Dir.pwd
+        end
+
+        require File.expand_path(name, path)
       else
         raise LoadError.new "Something is wrong in trying to get relative path"
       end