jruby · Jul 29, 2015 · Jul 29, 2015
diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -44,6 +44,7 @@
 import org.jruby.util.NormalizedFile;
 import org.jruby.util.SafePropertyAccessor;
 import org.jruby.util.URLResource;
+import org.jruby.util.UriLikePathHelper;
 import org.jruby.util.cli.ArgumentProcessor;
 import org.jruby.util.cli.Options;
 import org.jruby.util.cli.OutputStrings;
@@ -65,6 +66,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -77,6 +79,7 @@
  * embedding.
  */
 public class RubyInstanceConfig {
+
     public RubyInstanceConfig() {
         currentDirectory = Ruby.isSecurityRestricted() ? "/" : JRubyFile.getFileProperty("user.dir");
 
@@ -670,7 +673,7 @@ private void setupEnvironment(String jrubyHome) {
         if (!new File(jrubyHome).exists() && !environment.containsKey("RUBY")) {
             // the assumption that if JRubyHome is not a regular file that jruby
             // got launched in an embedded fashion
-            environment.put("RUBY", ClasspathLauncher.jrubyCommand(defaultClassLoader()) );
+            environment.put("RUBY", ClasspathLauncher.jrubyCommand(defaultClassLoader()));
         }
     }
 
@@ -686,6 +689,19 @@ public void setLoader(ClassLoader loader) {
         this.loader = loader;
     }
 
+    private final List<String> extraLoadPaths = new LinkedList<>();
+    public List<String> getExtraLoadPaths() {
+        return extraLoadPaths;
+    }
+    private final List<String> extraGemPath = new LinkedList<>();
+    public void addLoader(ClassLoader loader) {
+        UriLikePathHelper helper = new UriLikePathHelper(loader);
+        String uri = helper.getUriLikePath();
+        if (uri != null) extraLoadPaths.add(uri);
+        uri = helper.getUriLikePath();
+        if (uri != null) extraGemPath.add(uri);
+    }
+
     public String[] getArgv() {
         return argv;
     }

diff --git a/core/src/main/java/org/jruby/javasupport/JavaEmbedUtils.java b/core/src/main/java/org/jruby/javasupport/JavaEmbedUtils.java
@@ -203,15 +203,6 @@ public IRubyObject run() {
         }
     }
 
-    public static void addLoadPath(Ruby runtime, ClassLoader cl) {
-        runtime.getLoadService().addPaths(new UriLikePathHelper(cl).getUriLikePath());
-    }
-
-    public static void addGemPath(Ruby runtime, ClassLoader cl) {
-        String uri = new UriLikePathHelper(cl).getUriLikePath();
-        runtime.evalScriptlet("Gem::Specification.add_dir '" + uri + "' unless Gem::Specification.dirs.member?( '" + uri + "' )" );
-    }
-
     /**
      * Dispose of the runtime you initialized.
      *

diff --git a/core/src/main/java/org/jruby/runtime/load/LoadService.java b/core/src/main/java/org/jruby/runtime/load/LoadService.java
@@ -251,6 +251,7 @@ public void init(List prependDirectories) {
             }
 
         } catch(SecurityException ignore) {}
+        addPaths(runtime.getInstanceConfig().getExtraLoadPaths());
     }
 
     /**

diff --git a/core/src/main/java/org/jruby/util/UriLikePathHelper.java b/core/src/main/java/org/jruby/util/UriLikePathHelper.java
@@ -43,19 +43,19 @@ public URL getResource(String ref) {
         }
         return url;
     }
-    
+
     public String getUriLikePath() {
         return createUri("/.jrubydir");
     }
 
-    public String getUriLikePath(String ref) {
-        return createUri(ref);
+    public String getUriLikeGemPath() {
+        return createUri("/specifications/.jrubydir");
     }
-    
+
     String createUri(String ref) {
         URL url = getResource( ref );
         if ( url == null ) {
-            throw new RuntimeException( "reference " + ref + " not found on classloader " + classLoader );
+            return null;
         }
         return "uri:" + url.toString().replaceFirst( ref + "$", "" );
     }

diff --git a/core/src/test/java/org/jruby/javasupport/JavaEmbedUtilsTest.java b/core/src/test/java/org/jruby/javasupport/JavaEmbedUtilsTest.java
@@ -46,9 +46,11 @@ public static void restClassLoader() {
     @Test
     public void testAddClassloaderToLoadPathOnTCCL() throws Exception {
         Thread.currentThread().setContextClassLoader( cl );
-        Ruby runtime = JavaEmbedUtils.initialize(EMPTY);
+        RubyInstanceConfig config = new RubyInstanceConfig();
+        config.setLoader(RubyInstanceConfig.class.getClassLoader());
         URL url = new File("src/test/resources/java_embed_utils").toURI().toURL();
-        JavaEmbedUtils.addLoadPath(runtime, new URLClassLoader(new URL[] { url }));
+        config.addLoader(new URLClassLoader(new URL[]{url}));
+        Ruby runtime = JavaEmbedUtils.initialize(EMPTY, config);
         String result = runtime.evalScriptlet("require 'test_me'; $result").toString();
         assertEquals(result, "uri:" + url);
     }
@@ -57,9 +59,9 @@ public void testAddClassloaderToLoadPathOnTCCL() throws Exception {
     public void testAddClassloaderToLoadPathOnNoneTCCL() throws Exception {
         RubyInstanceConfig config = new RubyInstanceConfig();
         config.setLoader(RubyInstanceConfig.class.getClassLoader());
-        Ruby runtime = JavaEmbedUtils.initialize(EMPTY, config);
         URL url = new File("src/test/resources/java_embed_utils").toURI().toURL();
-        JavaEmbedUtils.addLoadPath(runtime, new URLClassLoader(new URL[] { url }));
+        config.addLoader(new URLClassLoader(new URL[]{url}));
+        Ruby runtime = JavaEmbedUtils.initialize(EMPTY, config);
         String result = runtime.evalScriptlet("require 'test_me';$result").toString();
         assertEquals(result, "uri:" + url);
     }

diff --git a/lib/ruby/stdlib/rubygems/defaults/jruby.rb b/lib/ruby/stdlib/rubygems/defaults/jruby.rb
@@ -107,7 +107,11 @@ def dirs= dirs
     end
 
     def spec_directories_from_classpath
-      stuff = [ 'uri:classloader://specifications' ] + JRuby::Util.classloader_resources("specifications")
+      stuff = [ 'uri:classloader://specifications' ]
+      JRuby.runtime.instance_config.extra_gem_paths.each do |path|
+        stuff += File.join(path, 'specifications')
+      end
+      stuff += JRuby::Util.classloader_resources('specifications')
       # some classloader return directory info. use only the "protocols"
       # which jruby understands
       stuff.select { |s| File.directory?( s ) }
-Original file line number
+Diff line change
@@ @@ -251,6 +251,7 @@ public void init(List prependDirectories) { @@
                 }
             } catch(SecurityException ignore) {}
+            addPaths(runtime.getInstanceConfig().getExtraLoadPaths());
         }
         /**