Added a spawn option to run JVM out of process

jkutner · jkutner · commit 5d8ae9aa2200 · 2015-09-09T12:25:01.000-05:00
diff --git a/bintest/mjruby.rb b/bintest/mjruby.rb
@@ -23,6 +23,11 @@
       assert_true status.success?, "Process did not exit cleanly"
       assert_include output, "Hello World"
 
+      output, status = Open3.capture2(
+        "#{BIN_PATH} --spawn --dev -rwebrick -J-Dsome.prop=foobar -J-Xmx256m -e \"puts 'Hello World'\"")
+      assert_true status.success?, "Process did not exit cleanly"
+      assert_include output, "Hello World"
+
       output, error, status = Open3.capture3(
         "#{BIN_PATH} -rwebrick -e 'puts WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd)'")
       assert_true status.success?, "Process did not exit cleanly"
@@ -45,6 +50,11 @@
         "#{BIN_PATH} -J-ea -e \"puts 'Hello World'\"")
       assert_true status.success?, "Process did not exit cleanly"
       assert_include output, "Hello World"
+
+      output, status = Open3.capture2(
+        "#{BIN_PATH} -S gem install bundler")
+      assert_true status.success?, "Process did not exit cleanly"
+      assert_include output, "1 gem installed"
     end
   end
 end
diff --git a/mrblib/jruby_opts_parser.rb b/mrblib/jruby_opts_parser.rb
@@ -26,6 +26,10 @@ def valid?
     @valid
   end
 
+  def spawn?
+    @spawn == true
+  end
+
   def java_mem
     @java_mem || '-Xmx500m'
   end
@@ -109,6 +113,8 @@ def parse(opts)
         @java_opts << "-Djruby.compile.invokedynamic=false"
       elsif opt == "--sample"
         @java_opts << "-Xprof"
+      elsif opt == "--spawn"
+        @spawn = true
       elsif opt == "--1.8"
        puts "warning: --1.8 ignored"
       elsif opt == "--1.9"
diff --git a/mrblib/jruby_support.rb b/mrblib/jruby_support.rb
@@ -69,9 +69,9 @@ def resolve_jruby_classpath
         jruby_already_added = true
       end
     end
-    # FIXME this doesn't work on windows. org/jruby/Main isn't found.
-    # cp_ary << File.join(jruby_home, "lib", "jruby-truffle.jar")
     raise "No JRuby JAR found in lib directory!" if cp_ary.empty?
+    # FIXME this doesn't work on windows. org/jruby/Main isn't found.
+    #cp_ary << File.join(jruby_home, "lib", "jruby-truffle.jar")
     cp_ary.join(JavaSupport.cp_delim)
   end
 
diff --git a/mrblib/mjruby.rb b/mrblib/mjruby.rb
@@ -30,5 +30,9 @@ def __main__(argv)
       "-Djruby.shell=#{JRubySupport::SYSTEM_SHELL}"]
 
   debug "java #{all_java_opts} #{java_class} #{cli_opts.ruby_opts}"
-  JavaSupport.exec_java(java_class, all_java_opts, cli_opts.ruby_opts)
+  if cli_opts.spawn?
+    JavaSupport.system_java(all_java_opts, java_class, cli_opts.ruby_opts)
+  else
+    JavaSupport.exec_java(java_class, all_java_opts, cli_opts.ruby_opts)
+  end
 end
