jruby · Mar 31, 2015 · Mar 31, 2015 · Mar 31, 2015 · Mar 31, 2015 · Mar 31, 2015
diff --git a/core/src/main/java/org/jruby/RubyDir.java b/core/src/main/java/org/jruby/RubyDir.java
@@ -154,9 +154,8 @@ public IRubyObject initialize19(ThreadContext context, IRubyObject arg) {
     private static List<ByteList> dirGlobs(ThreadContext context, String cwd, IRubyObject[] args, int flags) {
         List<ByteList> dirs = new ArrayList<ByteList>();
 
-        POSIX posix = context.runtime.getPosix();
         for (int i = 0; i < args.length; i++) {
-            dirs.addAll(Dir.push_glob(posix, cwd, globArgumentAsByteList(context, args[i]), flags));
+            dirs.addAll(Dir.push_glob(context.runtime, cwd, globArgumentAsByteList(context, args[i]), flags));
         }
 
         return dirs;
@@ -195,7 +194,7 @@ public static IRubyObject aref(ThreadContext context, IRubyObject recv, IRubyObj
         Ruby runtime = context.runtime;
         List<ByteList> dirs;
         if (args.length == 1) {
-            dirs = Dir.push_glob(runtime.getPosix(), getCWD(runtime), globArgumentAsByteList(context, args[0]), 0);
+            dirs = Dir.push_glob(runtime, getCWD(runtime), globArgumentAsByteList(context, args[0]), 0);
         } else {
             dirs = dirGlobs(context, getCWD(runtime), args, 0);
         }
@@ -221,7 +220,7 @@ public static IRubyObject glob(ThreadContext context, IRubyObject recv, IRubyObj
         List<ByteList> dirs;
         IRubyObject tmp = args[0].checkArrayType();
         if (tmp.isNil()) {
-            dirs = Dir.push_glob(runtime.getPosix(), runtime.getCurrentDirectory(), globArgumentAsByteList(context, args[0]), flags);
+            dirs = Dir.push_glob(runtime, runtime.getCurrentDirectory(), globArgumentAsByteList(context, args[0]), flags);
         } else {
             dirs = dirGlobs(context, getCWD(runtime), ((RubyArray) tmp).toJavaArray(), flags);
         }

diff --git a/core/src/main/java/org/jruby/RubyFileStat.java b/core/src/main/java/org/jruby/RubyFileStat.java
@@ -134,7 +134,7 @@ private void setup(String filename, boolean lstat) {
             filename += "/";
         }
 
-        file = JRubyFile.createResource(runtime.getPosix(), runtime.getCurrentDirectory(), filename);
+        file = JRubyFile.createResource(runtime, filename);
         stat = lstat ? file.lstat() : file.stat();
 
         if (stat == null) throw runtime.newErrnoFromInt(file.errno(), filename);

diff --git a/core/src/main/java/org/jruby/RubyFileTest.java b/core/src/main/java/org/jruby/RubyFileTest.java
@@ -466,7 +466,7 @@ private static RubyFileStat getRubyFileStat(ThreadContext context, IRubyObject f
         RubyFileStat stat = null;
         if (!(filename instanceof RubyFile)) {
             RubyString path = get_path(context, filename);
-            FileResource file = JRubyFile.createResource(runtime.getPosix(), runtime.getCurrentDirectory(), path.getUnicodeValue());
+            FileResource file = JRubyFile.createResource(runtime, path.getUnicodeValue());
             if (file.exists()) {
                 stat = runtime.newFileStat(file.absolutePath(), false);
             }

diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -514,7 +514,7 @@ protected RubyIO reopenIO(ThreadContext context, RubyIO nfile) {
     }
 
     private void checkReopenCloexecDup2(Ruby runtime, OpenFile orig, ChannelFD oldfd, ChannelFD newfd) {
-        OpenFile.cloexecDup2(new PosixShim(runtime.getPosix()), oldfd, newfd);
+        OpenFile.cloexecDup2(new PosixShim(runtime), oldfd, newfd);
     }
 
     // rb_io_binmode
@@ -1239,7 +1239,7 @@ private static ChannelFD cloexecOpen(Ruby runtime, Sysopen data)
 //        #elif defined O_NOINHERIT
 //            flags |= O_NOINHERIT;
 //        #endif
-        PosixShim shim = new PosixShim(runtime.getPosix());
+        PosixShim shim = new PosixShim(runtime);
         ret = shim.open(runtime.getCurrentDirectory(), data.fname, ModeFlags.createModeFlags(data.oflags), data.perm);
         if (ret == null) {
             data.errno = shim.errno;
@@ -3967,7 +3967,7 @@ public static IRubyObject pipe19(ThreadContext context, IRubyObject klass, IRuby
                 }
         }
 
-        PosixShim posix = new PosixShim(runtime.getPosix());
+        PosixShim posix = new PosixShim(runtime);
         Channel[] fds = posix.pipe();
         if (fds == null)
             throw runtime.newErrnoFromErrno(posix.errno, "opening pipe");

diff --git a/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java b/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
@@ -15,7 +15,6 @@
 import org.jruby.ast.executable.Script;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.LoadService.SuffixType;
-import org.jruby.util.ClasspathResource;
 import org.jruby.util.FileResource;
 import org.jruby.util.JRubyFile;
 import org.jruby.util.URLResource;
@@ -133,6 +132,7 @@ private FoundLibrary findResourceLibrary(String baseName, String suffix) {
           return findFileResource(baseName, suffix);
         }
 
+        // search the $LOAD_PATH
         try {
             for (IRubyObject loadPathEntry : loadService.loadPath.toJavaArray()) {
                 FoundLibrary library = findFileResourceWithLoadPath(baseName, suffix, getPath(loadPathEntry));
@@ -142,7 +142,19 @@ private FoundLibrary findResourceLibrary(String baseName, String suffix) {
             t.printStackTrace();
         }
 
-        return null;
+        // inside a classloader the path "." is the place where to find the jruby kernel
+        if (!runtime.getCurrentDirectory().startsWith(URLResource.URI_CLASSLOADER)) {
+
+            // ruby does not load a relative path unless the current working directory is in $LOAD_PATH
+            FoundLibrary library = findFileResourceWithLoadPath(baseName, suffix, ".");
+
+            // we did not find the file on the $LOAD_PATH but in current directory so we need to treat it
+            // as not found (the classloader search below will find it otherwise)
+            if (library != null) return null;
+        }
+
+        // load the jruby kernel and all resource added to $CLASSPATH
+        return findFileResourceWithLoadPath(baseName, suffix, URLResource.URI_CLASSLOADER);
     }
 
     // FIXME: to_path should not be called n times it should only be once and that means a cache which would
@@ -263,12 +275,7 @@ private void loadClass(Ruby runtime, InputStream is, boolean wrap) {
         private void loadJar(Ruby runtime, boolean wrap) {
             try {
                 URL url;
-                if (location.startsWith(ClasspathResource.CLASSPATH)){
-                    // get URL directly from the classloader with its StreamHandler set
-                    // by the classloader itself
-                    url = ClasspathResource.getResourceURL(location);
-                }
-                else if (location.startsWith(URLResource.URI)){
+                if (location.startsWith(URLResource.URI)){
                     url = null;
                     runtime.getJRubyClassLoader().addURLNoIndex(URLResource.getResourceURL(runtime, location));
                 }

diff --git a/core/src/main/java/org/jruby/util/ClasspathResource.java b/core/src/main/java/org/jruby/util/ClasspathResource.java