add bundler monkey patch

fixes jruby/jruby#3850

integration/runnable_w_bundler_test/pom.xml

@@ -0,0 +1,91 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jruby.warbler</groupId>
+    <artifactId>integration-tests</artifactId>
+    <version>1.0</version>
+  </parent>
+
+  <artifactId>runnable_w_bundler_test</artifactId>
+  <packaging>jar</packaging>
+
+  <name>runnable_w_bundler_test</name>
+
+  <properties>
+    <test-file>test-file.tmp</test-file>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.5</version>
+        <executions>
+          <execution>
+            <id>auto-clean</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <configuration>
+              <excludeDefaultDirectories>true</excludeDefaultDirectories>
+              <filesets>
+                <fileset>
+                  <directory>${project.build.directory}</directory>
+                  <includes>
+                    <include>${test-file}</include>
+                  </includes>
+                </fileset>
+              </filesets>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>jruby-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>warble</id>
+            <phase>pre-integration-test</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-rake-task</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <executable>java</executable>
+          <workingDirectory>${project.build.directory}</workingDirectory>
+          <arguments>
+            <argument>-jar</argument>
+            <argument>test.jar</argument>
+            <argument>-S</argument>
+            <argument>run.rb</argument>
+            <argument>${project.build.directory}/${test-file}</argument>
+          </arguments>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <testFilename>${project.build.directory}/${test-file}</testFilename>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

integration/runnable_w_bundler_test/src/main/ruby/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'json', '1.8.3'
+
+#gem 'warbler', :group => 'development'

integration/runnable_w_bundler_test/src/main/ruby/bin/run.rb

@@ -0,0 +1,18 @@
+require 'bundler/setup'
+
+path = File.join(Gem.loaded_specs['json'].full_gem_path, 'lib')
+File.open(ARGV[2], 'w') do |f|
+  f.puts("hello world")
+  f.puts path
+  f.puts $LOAD_PATH
+end
+
+unless $LOAD_PATH.member? path
+  raise "wrong load path, expected #{path} to be in #{$LOAD_PATH}"
+end
+
+$LOAD_PATH.each do |p|
+  unless p =~ /^uri:classloader:/
+    raise "expected path #{p} to start with uri:classloader:"
+  end
+end

integration/runnable_w_bundler_test/src/main/ruby/config/warble.rb

@@ -0,0 +1,7 @@
+Warbler::Config.new do |config|
+  config.features = %w(executable)
+  config.autodeploy_dir = "../../../target"
+  config.jar_name = "test"
+
+  config.includes = FileList["Gemfile*"] + FileList["bin/*rb"]
+end

integration/runnable_w_bundler_test/src/test/java/org/jruby/warbler/RunnableWarTestIT.java

@@ -0,0 +1,22 @@
+package org.jruby.warbler;
+
+import java.net.*;
+import java.io.*;
+import org.junit.Assert;
+import org.junit.Test;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+
+/**
+ * Unit test for simple runnable war.
+ */
+public class RunnableWarTestIT
+{
+    @Test
+    public void testApp() throws Exception
+    {
+        String testFilename = System.getProperty("testFilename");
+        File f = new File(testFilename);
+        Assert.assertTrue(testFilename + "should exist", f.exists());
+    }
+}

lib/warbler/templates/bundler.erb

@@ -2,3 +2,18 @@ ENV['BUNDLE_WITHOUT'] = '<%= config.bundle_without.join(':') %>'
 <% if config.bundler[:frozen] -%>
 ENV['BUNDLE_FROZEN'] = '1'
 <% end -%>
+
+module Bundler
+  module Patch
+    def clean_load_path
+      # nothing to be done for embedded JRuby
+    end
+  end
+  module SharedHelpers
+    def included(bundler)
+      bundler.send :include, Patch
+    end
+  end
+end
+
+require 'bundler/shared_helpers'