jruby · Aug 10, 2015 · Aug 10, 2015 · Aug 10, 2015 · Aug 10, 2015 · Aug 10, 2015
diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -36,14 +36,17 @@
 import org.jruby.runtime.backtrace.TraceType;
 import org.jruby.runtime.load.LoadService;
 import org.jruby.runtime.profile.builtin.ProfileOutput;
+import org.jruby.util.ClassLoaderGetResourses;
 import org.jruby.util.ClasspathLauncher;
 import org.jruby.util.FileResource;
+import org.jruby.util.GetResources;
 import org.jruby.util.InputStreamMarkCursor;
 import org.jruby.util.JRubyFile;
 import org.jruby.util.KCode;
 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 +68,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 +81,7 @@
  * embedding.
  */
 public class RubyInstanceConfig {
+
     public RubyInstanceConfig() {
         currentDirectory = Ruby.isSecurityRestricted() ? "/" : JRubyFile.getFileProperty("user.dir");
 
@@ -670,7 +675,7 @@ private void setupEnvironment(String jrubyHome) {
         if (RubyFile.PROTOCOL_PATTERN.matcher(jrubyHome).matches() && !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 +691,52 @@ 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> extraGemPaths = new LinkedList<>();
+    public List<String> getExtraGemPaths() {
+        return extraGemPaths;
+    }
+
+    /**
+     * adds a given ClassLoader to jruby. i.e. adds the root of
+     * the classloader to the LOAD_PATH so embedded ruby scripts
+     * can be found. dito for embedded gems.
+     *
+     * since classloaders do not provide directory information (some
+     * do and some do not) the source of the classloader needs to have
+     * a '.jrubydir' in each with the list of files and directories of the
+     * same directory. (see jruby-stdlib.jar or jruby-complete.jar inside
+     * META-INF/jruby.home for examples).
+     *
+     * these files can be generated by <code>jruby -S generate_dir_info {path/to/ruby/files}</code>
+     *
+     * @param loader
+     */
+    public void addLoader(ClassLoader loader) {
+        addLoader(new ClassLoaderGetResourses(loader));
+    }
+
+    /**
+     * adds a given "bundle" to jruby. an OSGi bundle and a classloader
+     * both have common set of method but do not share a common interface.
+     * for adding a bundle or classloader to jruby is done via the base URL of
+     * the classloader/bundle. all we need is the 'getResource'/'getResources'
+     * method to do so.
+     * @param bundle
+     */
+    public void addLoader(GetResources bundle) {
+        // loader can be a ClassLoader or an Bundle from OSGi
+        UriLikePathHelper helper = new UriLikePathHelper(bundle);
+        String uri = helper.getUriLikePath();
+        if (uri != null) extraLoadPaths.add(uri);
+        uri = helper.getUriLikeGemPath();
+        if (uri != null) extraGemPaths.add(uri);
+    }
+
     public String[] getArgv() {
         return argv;
     }

diff --git a/core/src/main/java/org/jruby/embed/IsolatedScriptingContainer.java b/core/src/main/java/org/jruby/embed/IsolatedScriptingContainer.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.LinkedList;
 
+import org.jruby.util.ClassLoaderGetResourses;
 import org.jruby.util.UriLikePathHelper;
 
 /**
@@ -57,7 +58,7 @@ public IsolatedScriptingContainer( LocalContextScope scope,
         setLoadPaths(loadPaths);
 
         // set the right jruby home
-        UriLikePathHelper uriPath = new UriLikePathHelper(getClassLoader());
+        UriLikePathHelper uriPath = new UriLikePathHelper(new ClassLoaderGetResourses(getClassLoader()));
         URL url = uriPath.getResource("/.jrubydir");
         if (url != null){
             setCurrentDirectory( URI_CLASSLOADER );

diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
@@ -1904,14 +1904,24 @@ public boolean getClassloaderDelegate() {
         return getProvider().getRubyInstanceConfig().isClassloaderDelegate();
     }
 
+    /**
+     * add the given classloader to the LOAD_PATH and GEM_PATH
+     * @param classloader
+     */
+    public void addClassLoader(ClassLoader classLoader) {
+        getProvider().getRubyInstanceConfig().addLoader(classLoader);
+    }
+
     /**
      * add the given classloader to the LOAD_PATH
      * @param classloader
      */
+    @Deprecated
     public void addLoadPath(ClassLoader classloader) {
         addLoadPath(createUri(classloader, "/.jrubydir"));
     }
 
+    @Deprecated
     protected void addLoadPath(String uri) {
         runScriptlet( "$LOAD_PATH << '" + uri + "' unless $LOAD_PATH.member?( '" + uri + "' )" );
     }
@@ -1920,6 +1930,7 @@ protected void addLoadPath(String uri) {
      * add the given classloader to the GEM_PATH
      * @param classloader
      */
+    @Deprecated
     public void addGemPath(ClassLoader classloader) {
         addGemPath(createUri(classloader, "/specifications/.jrubydir"));
     }

diff --git a/core/src/main/java/org/jruby/embed/osgi/OSGiIsolatedScriptingContainer.java b/core/src/main/java/org/jruby/embed/osgi/OSGiIsolatedScriptingContainer.java
@@ -1,11 +1,14 @@
 package org.jruby.embed.osgi;
 
+import java.io.IOException;
 import java.net.URL;
+import java.util.Enumeration;
 
 import org.jruby.embed.IsolatedScriptingContainer;
 import org.jruby.embed.LocalContextScope;
 import org.jruby.embed.LocalVariableBehavior;
 
+import org.jruby.util.GetResources;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -62,8 +65,9 @@ private Bundle toBundle(String symbolicName) {
         return bundle;
     }
 
+    @Deprecated
     private String createUri(Bundle cl, String ref) {
-        URL url = cl.getResource( ref );
+        URL url = cl.getResource(ref);
         if ( url == null && ref.startsWith( "/" ) ) {
             url = cl.getResource( ref.substring( 1 ) );
         }
@@ -76,6 +80,7 @@ private String createUri(Bundle cl, String ref) {
      * add the classloader from the given bundle to the LOAD_PATH
      * @param bundle
      */
+    @Deprecated
     public void addBundleToLoadPath(Bundle bundle) {
         addLoadPath(createUri(bundle, "/.jrubydir"));
     }
@@ -86,25 +91,64 @@ public void addBundleToLoadPath(Bundle bundle) {
      * 
      * @param symbolicName
      */
+    @Deprecated
     public void addBundleToLoadPath(String symbolicName) {
         addBundleToLoadPath(toBundle(symbolicName));
     }
 
+    /**
+     * add the classloader from the given bundle to the LOAD_PATH and the GEM_PATH
+     * using the bundle symbolic name
+     * @param symbolicName
+     */
+    public void addBundle(String symbolicName) {
+        addBundle(toBundle(symbolicName));
+    }
+
+    /**
+     * add the classloader from the given bundle to the LOAD_PATH and the GEM_PATH
+     * @param bundle
+     */
+    public void addBundle(Bundle bundle) {
+        getProvider().getRubyInstanceConfig().addLoader(new BundleGetResources(bundle));
+    }
+
     /**
      * add the classloader from the given bundle to the GEM_PATH
      * @param bundle
      */
+    @Deprecated
     public void addBundleToGemPath(Bundle bundle) {
         addGemPath(createUri(bundle, "/specifications/.jrubydir"));
     }
- 
+
     /**
      * add the classloader from the given bundle to the GEM_PATH
      * using the bundle symbolic name
      * 
      * @param symbolicName
      */
+    @Deprecated
     public void addBundleToGemPath(String symbolicName) {
         addBundleToGemPath(toBundle(symbolicName));
     }
+
+    static class BundleGetResources implements GetResources {
+
+        private final Bundle bundle;
+
+        BundleGetResources(Bundle bundle) {
+            this.bundle = bundle;
+        }
+
+        @Override
+        public URL getResource(String path) {
+            return bundle.getResource(path);
+        }
+
+        @Override
+        public Enumeration<URL> getResources(String path) throws IOException {
+            return bundle.getResources(path);
+        }
+    }
 }
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/ClassLoaderGetResourses.java b/core/src/main/java/org/jruby/util/ClassLoaderGetResourses.java
@@ -0,0 +1,24 @@
+package org.jruby.util;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+
+public class ClassLoaderGetResourses implements GetResources {
+
+    private final ClassLoader loader;
+
+    public ClassLoaderGetResourses(ClassLoader loader) {
+        this.loader = loader;
+    }
+
+    @Override
+    public URL getResource(String path) {
+        return loader.getResource(path);
+    }
+
+    @Override
+    public Enumeration<URL> getResources(String path) throws IOException {
+        return loader.getResources(path);
+    }
+}
diff --git a/core/src/main/java/org/jruby/util/GetResources.java b/core/src/main/java/org/jruby/util/GetResources.java
@@ -0,0 +1,15 @@
+package org.jruby.util;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+
+/**
+ * Created by cmeier on 7/30/15.
+ */
+public interface GetResources {
+
+    URL getResource(String path);// throws IOException;
+
+    Enumeration<URL> getResources(String path) throws IOException;
+}
diff --git a/core/src/main/java/org/jruby/util/UriLikePathHelper.java b/core/src/main/java/org/jruby/util/UriLikePathHelper.java
@@ -30,32 +30,36 @@
 
 public class UriLikePathHelper {
 
-    private final ClassLoader classLoader;
+    private final GetResources loader;
 
-    public UriLikePathHelper(ClassLoader classLoader) {
-        this.classLoader = classLoader;
+    public UriLikePathHelper(GetResources loader) {
+        this.loader = loader;
     }
-    
+
     public URL getResource(String ref) {
-        URL url = classLoader.getResource( ref );
+        URL url = get( ref );
         if ( url == null && ref.startsWith( "/" ) ) {
-            url = classLoader.getResource( ref.substring( 1 ) );
+            url = get( ref.substring( 1 ) );
         }
         return url;
     }
-
+
+    private URL get(String ref) {
+        return loader.getResource(ref);
+    }
+
     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) {
+
+    private 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/main/ruby/jruby/commands.rb b/core/src/main/ruby/jruby/commands.rb
@@ -13,7 +13,7 @@ class << self
         end
       end
 
-      def generate_dir_info( dir, is_root = true )
+      def generate_dir_info( dir = ARGV[0], is_root = true )
         return if dir != nil && !File.directory?( dir )
         File.open( dir + '/.jrubydir', 'w' ) do |f|
           f.puts ".." unless is_root

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);
     }
-Original file line number
+Diff line change
@@ @@ -251,6 +251,7 @@ public void init(List prependDirectories) { @@
                 }
             } catch(SecurityException ignore) {}
+            addPaths(runtime.getInstanceConfig().getExtraLoadPaths());
         }
         /**