jruby-launcher 1.0.18.pre1-java → 1.0.19-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce4e0d1bf184a5dfccdf421d5ed8da92126a0ae
-  data.tar.gz: 352774f9a895e7d132d4e272d36378f5a76238f2
+  metadata.gz: 4d24b0243283cbcc3c3bcd6426a90954db0d09ac
+  data.tar.gz: 3b0d624082883167c321d028390bec604ffb2543
 SHA512:
-  metadata.gz: 62c9291af4b87cf5c8cc1ec23aa997e47b7dd869f2f562007555f2289fb1bdd0d05414bf016c9d27568bd934b450964e5a443cbe49608f3add866589ffa99c69
-  data.tar.gz: 1b274c919c24f22bab490704a7b96137e9aa5e183e48ddd79f00b9313c09dd6adda1a82560382acc4d59759911cde0d148de30e01cf18ca34beb48f1da7ba1b3
+  metadata.gz: 63267ed5dccbf6cb9d5262e5ee65485c71f222dfcb12fb338bb91f1ce0e885206c7d178ed31a2bee147f477935162083817d873beaa9eece03ddeb13f5b05eb8
+  data.tar.gz: 3750401b00836c9b7094e6a55fe6e399dd77583d7b5c25e106fe88cb7b77d26a598953c7d2e48285aa58436bec267af0825eb1c5f3c0f49eb845672c6215bc3a

data/argparser.cpp

@@ -12,6 +12,7 @@
 #include "argparser.h"
 #include "argnames.h"
 #include "version.h"
+#include "sys/stat.h"
 
 #ifndef WIN32
 #include <sys/types.h>
@@ -362,10 +363,6 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
         }
     }
 
-    // prefer IPv4 to IPv6
-    // see https://github.com/jruby/jruby/issues/775
-    javaOptions.push_back("-Djava.net.preferIPv4Stack=true");
-
     return true;
 }
 
@@ -394,14 +391,31 @@ void ArgParser::prepareOptions() {
     javaOptions.push_back(option);
 
     option = OPT_JFFI_PATH;
+
+    string jniDir;
+#ifdef WIN32
+    string newJniDir = platformDir + "\\lib\\jni";
+    string oldJniDir = platformDir + "\\lib\\native";
+#else
+    string newJniDir = platformDir + "/lib/jni";
+    string oldJniDir = platformDir + "/lib/native";
+#endif
+
+    struct stat jniDirStat;
+    if (stat(newJniDir.c_str(), &jniDirStat) == 0) {
+        jniDir = newJniDir;
+    } else {
+        jniDir = oldJniDir;
+    }
+
 #ifdef WIN32
-    option += (platformDir + "\\lib\\jni;"
-            + platformDir + "\\lib\\jni\\i386-Windows;"
-            + platformDir + "\\lib\\jni\\x86_64-Windows");
+    option += (jniDir + ";"
+            + jniDir + "\\i386-Windows;"
+            + jniDir + "\\x86_64-Windows");
 #else
     struct utsname name;
     if (uname(&name) == 0) {
-        string ffiBase(platformDir + "/lib/jni");
+        string ffiBase(jniDir);
         string ffiPath = ffiBase;
         DIR* dir = opendir(ffiBase.c_str());
         struct dirent* ent;

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.18.pre1"
+  VERSION = "1.0.19"
 end

data/strlcpy.c

@@ -34,6 +34,9 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
 #include <sys/types.h>
 #include <string.h>
 
+#ifdef strlcpy
+#undef strlcpy
+#endif
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
  * will be copied.  Always NUL terminates (unless siz == 0).

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.18.pre1"
+#define JRUBY_LAUNCHER_VERSION "1.0.19"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.18.pre1
+  version: 1.0.19
 platform: java
 authors:
 - Nick Sieger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -49,41 +49,6 @@ files:
 - extconf.rb
 - lib/jruby-launcher.rb
 - lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.0.17-java/extconf.rb
-- pkg/jruby-launcher-1.0.17-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.0.17-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.0.17-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.0.17-java/spec/spec_helper.rb
-- pkg/jruby-launcher-1.0.18.dev-java/extconf.rb
-- pkg/jruby-launcher-1.0.18.dev-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.0.18.dev-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/extconf.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/spec/spec_helper.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/extconf.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/extconf.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/spec/spec_helper.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/extconf.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/extconf.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.17-java/spec/spec_helper.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/spec/spec_helper.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.0.18.dev-java/pkg/jruby-launcher-1.0.18.dev-java/spec/spec_helper.rb
-- pkg/jruby-launcher-1.0.18.dev-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.0.18.dev-java/spec/spec_helper.rb
 - spec/launcher_spec.rb
 - spec/spec_helper.rb
 - resources/jruby.ico
@@ -102,12 +67,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key:
 specification_version: 4
 summary: Native launcher for JRuby

data/pkg/jruby-launcher-1.0.17-java/extconf.rb

@@ -1,7 +0,0 @@
-require 'rbconfig'
-
-mf = File.read('Makefile')
-mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{Config::CONFIG['bindir']}")
-mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(Config::CONFIG['libdir'])}")
-puts mf
-File.open('Makefile', 'wb') {|f| f << mf}

data/pkg/jruby-launcher-1.0.17-java/lib/jruby-launcher.rb

@@ -1,3 +0,0 @@
-module JRubyLauncher
-  VERSION = "1.0.18"
-end

data/pkg/jruby-launcher-1.0.17-java/lib/rubygems/defaults/jruby_native.rb

@@ -1,4 +0,0 @@
-class Gem::ConfigFile
-  PLATFORM_DEFAULTS['install'] = '--no-rdoc --no-ri'
-  PLATFORM_DEFAULTS['update'] = '--no-rdoc --no-ri'
-end

data/pkg/jruby-launcher-1.0.17-java/spec/launcher_spec.rb

@@ -1,258 +0,0 @@
-require File.expand_path('../spec_helper.rb', __FILE__)
-load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
-
-describe "JRuby native launcher" do
-  it "should run org.jruby.Main" do
-    jruby_launcher_args("").last.should == "org/jruby/Main"
-  end
-
-  it "should pass unrecognized arguments to JRuby" do
-    jruby_launcher_args("-J-Dsome.option -v --help")[-3..-1].should == ["org/jruby/Main", "-v", "--help"]
-  end
-
-  it "should print help message" do
-    args = jruby_launcher_args("-Xhelp 2>&1")
-    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
-    args.should include("-X")
-    args = jruby_launcher_args("-X 2>&1")
-    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
-    args.should include("-X")
-  end
-
-  it "should use $JAVACMD when JAVACMD is specified" do
-    with_environment "JAVACMD" => File.join("jato") do
-      if windows?
-        jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
-      else
-        jruby_launcher_args("-v").first.should == File.join("jato")
-      end
-    end
-  end
-
-  it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
-    with_environment "JAVA_HOME" => File.join("some", "java", "home") do
-      if windows?
-        jruby_launcher_args("-v 2>&1").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("-v").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should use -Xjdkhome argument above JAVA_HOME" do
-    with_environment "JAVA_HOME" => File.join("env", "java", "home") do
-      if windows?
-        jruby_launcher_args("-Xjdkhome some/java/home 2>&1").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("-Xjdkhome some/java/home").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should drop the backslashes at the end of JAVA_HOME" do
-    with_environment "JAVA_HOME" => File.join("some", "java", "home\\\\") do
-      if windows?
-        jruby_launcher_args("").join.should =~ %r{some/java/home}
-      else
-        jruby_launcher_args("").first.should == File.join("some", "java", "home", "bin", "java")
-      end
-    end
-  end
-
-  it "should complain about a missing log argument" do
-    jruby_launcher("-Xtrace 2>&1").should =~ /Argument is missing for "-Xtrace"/
-    jruby_launcher("-Xtrace -- 2>&1").should =~ /Argument is missing for "-Xtrace"/
-  end
-
-  it "should complain about a missing jdkhome argument" do
-    jruby_launcher("-Xjdkhome 2>&1").should =~ /Argument is missing/
-    jruby_launcher("-Xjdkhome -- 2>&1").should =~ /Argument is missing/
-  end
-
-  it "should complain about a missing classpath append argument" do
-    jruby_launcher("-Xcp:a 2>&1").should =~ /Argument is missing/
-    jruby_launcher("-Xcp:a -- 2>&1").should =~ /Argument is missing/
-  end
-
-  it "should run nailgun server with --ng-server option" do
-    jruby_launcher_args("--ng-server").last.should == "com/martiansoftware/nailgun/NGServer"
-  end
-
-  it "should run nailgun client with --ng option" do
-    jruby_launcher_args('--ng -e "puts 1"').should == ["org.jruby.util.NailMain", "-e", "puts 1"]
-  end
-
-  it "should handle -J JVM options" do
-    jruby_launcher_args("-J-Darg1=value1 -J-Darg2=value2").should include("-Darg1=value1", "-Darg2=value2")
-  end
-
-  it "should pass -Xprop.erty=value as -J-Djruby.prop.erty=value" do
-    jruby_launcher_args("-Xprop.erty=value").should include("-Djruby.prop.erty=value")
-  end
-
-  it "should pass -Xproperties as --properties" do
-    jruby_launcher_args("-Xproperties").should include("--properties")
-  end
-
-  it "should default to 500m max heap" do
-    jruby_launcher_args("").should include("-Xmx500m")
-  end
-
-  it "should allow max heap to be overridden" do
-    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m")
-  end
-
-  it "should default to 2048k max stack" do
-    jruby_launcher_args("").should include("-Xss2048k")
-  end
-
-  it "should allow max stack to be overridden" do
-    jruby_launcher_args("-J-Xss512k").should include("-Xss512k")
-  end
-
-  it "should add the contents of the CLASSPATH environment variable" do
-    with_environment "CLASSPATH" => "some.jar" do
-      classpath_arg(jruby_launcher_args("")).should =~ /some.jar/
-    end
-  end
-
-  it "should add the classpath elements in proper order" do
-    s = File::PATH_SEPARATOR
-    with_environment "CLASSPATH" => "some-env.jar" do
-      args = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar")
-      classpath_arg(args).should =~ /some.jar.*#{s}some-env.jar#{s}some-other.jar/
-    end
-  end
-
-  it "should use the --server compiler" do
-    jruby_launcher_args("--server").should include("-server")
-  end
-
-  it "should use the --client compiler" do
-    jruby_launcher_args("--client").should include("-client")
-  end
-
-  it "should set the JMX settings when --manage is present" do
-    jruby_launcher_args("--manage").should include("-Dcom.sun.management.jmxremote", "-Djruby.management.enabled=true")
-  end
-
-  it "should set the headless flag when --headless is present" do
-    jruby_launcher_args("--headless").should include("-Djava.awt.headless=true")
-  end
-
-  it "should pass -Xprof when --sample is present" do
-    jruby_launcher_args("--sample").should include("-Xprof")
-  end
-
-  it "should stop argument processing when a -- is seen" do
-    jruby_launcher_args("-- -Xhelp -Xtrace --headless").should include("-Xhelp", "-Xtrace", "--headless")
-  end
-
-  # JRUBY-4151
-  it "should properly handle single quotes" do
-    jruby_launcher_args("-e 'ABC DEF'").should include("ABC DEF")
-  end
-
-  # JRUBY-4581
-  it "should prepend JRUBY_OPTS to the start of the argument list to process" do
-    with_environment "JRUBY_OPTS" => "--server -J-Dsome.key=val -rubygems" do
-      jruby_launcher_args("-e 'ABC DEF'").should include("-server", "-Dsome.key=val", "-rubygems", "-e", "ABC DEF")
-    end
-  end
-
-  # JRUBY-4611
-  it "stops argument processing on first non-option argument" do
-    jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
-  end
-
-  # JRUBY-4608
-  if RbConfig::CONFIG['target_os'] =~ /darwin/i
-    it "includes file.encoding=UTF-8 on Mac if JAVA_ENCODING is not set" do
-      jruby_launcher_args("-e true").should include("-Dfile.encoding=UTF-8")
-      with_environment "JAVA_ENCODING" => "MacRoman" do
-        jruby_launcher_args("-e true").should_not include("-Dfile.encoding=UTF-8")
-      end
-    end
-  end
-
-  it "does not crash on empty args" do
-    jruby_launcher_args("-e ''").should include("-e")
-    jruby_launcher("-Xtrace '' 2>&1").should =~ /-Xtrace/
-    jruby_launcher("-Xjdkhome '' 2>&1").should =~ /-Xjdkhome/
-  end
-
-  # JRUBY-4706
-  it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
-    args = jruby_launcher_args("-e true")
-    args.grep(/Xbootclasspath/).should_not be_empty
-    args = jruby_launcher_args("-Xnobootclasspath -e true")
-    args.grep(/Xbootclasspath/).should be_empty
-  end
-
-  it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
-    with_environment "VERIFY_JRUBY" => "true" do
-      args = jruby_launcher_args("-e true")
-      args.grep(/Xbootclasspath/).should be_empty
-    end
-  end
-
-  # JRUBY-4709
-  it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
-    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
-      if windows?
-        /;$/
-      else
-        /:$/
-      end
-  end
-
-  # JRUBY-6016
-  it "should honor JAVA_MEM" do
-    with_environment "JAVA_MEM" => "-Xmx768m" do
-      jruby_launcher_args("").should include("-Xmx768m")
-    end
-  end
-
-  it "should honor JAVA_STACK" do
-    with_environment "JAVA_STACK" => "-Xss3072k" do
-      jruby_launcher_args("").should include("-Xss3072k")
-    end
-  end
-
-  it "should honor JRUBY_HOME" do
-    with_environment "JRUBY_HOME" => "/tmp" do
-      jruby_launcher_args("").should include("-Djruby.home=/tmp")
-    end
-  end
-
-  context "JRUBY_HOME set and JRUBY_HOME/lib/jruby.jar exists" do
-    let(:jruby_home) do
-      require 'tempfile'
-      t = Tempfile.new("jruby_home")
-      t.path.tap { t.close! }
-    end
-
-    before do
-      FileUtils.mkdir_p(File.join(jruby_home, "lib"))
-      FileUtils.touch(File.join(jruby_home, "lib", "jruby.jar"))
-    end
-    after { FileUtils.rm_rf jruby_home }
-
-    it "should add jruby.jar to the bootclasspath" do
-      with_environment "JRUBY_HOME" => jruby_home do
-        jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
-      end
-    end
-  end
-
-  it "should place user-supplied options after default options" do
-    args = jruby_launcher_args("-J-Djruby.home=/tmp")
-    home_args = args.select {|x| x =~ /^-Djruby\.home/ }
-    home_args.length.should == 2
-    home_args.last.should == "-Djruby.home=/tmp"
-  end
-
-  it "should print the version" do
-    jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
-  end
-end

data/pkg/jruby-launcher-1.0.17-java/spec/spec_helper.rb

@@ -1,81 +0,0 @@
-require 'rspec'
-require 'rbconfig'
-require 'fileutils'
-
-if defined?(JRUBY_VERSION)
-  require 'jruby'
-  JRuby.runtime.instance_config.run_ruby_in_process = false
-end
-
-module JRubyLauncherHelper
-  JRUBY_EXE = ''
-  WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
-
-  def self.check_executable_built
-    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::CONFIG['EXEEXT']
-    unless File.executable?(exe)
-      raise "Error: launcher executable not built; type `make' before continuing."
-    end
-    top = File.dirname(exe)
-    name = File.basename(exe)
-    home = File.join(top, "build/home")
-    FileUtils.mkdir_p(File.join(home, "bin"))
-    FileUtils.cp(exe, File.join(home, "bin"))
-    if JRubyLauncherHelper::WINDOWS
-      FileUtils.cp(exe.sub(/exe/, 'dll'), File.join(home, "bin"))
-    end
-    FileUtils.mkdir_p(File.join(home, "lib"))
-    FileUtils.touch(File.join(home, "lib/jruby.jar"))
-    JRUBY_EXE.concat File.join(home, "bin", name)
-  end
-
-  def jruby_launcher(args)
-    `#{JRUBY_EXE} #{args}`
-  end
-
-  def jruby_launcher_args(args)
-    jruby_launcher("-Xcommand #{args}").split("\n")
-  end
-
-  def last_exit_code
-    $?.exitstatus
-  end
-
-  def windows?
-    WINDOWS
-  end
-
-  def classpath_arg(args)
-    index = args.index("-cp")
-    index.should > 0
-    args[index + 1]
-  end
-
-  def with_environment(pairs = {})
-    prev_env = {}
-    pairs.each_pair do |k,v|
-      prev_env[k] = ENV[k] if ENV.has_key?(k)
-      ENV[k] = v
-    end
-    begin
-      yield
-    ensure
-      pairs.keys.each {|k| ENV.delete(k)}
-      ENV.update(prev_env)
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.before(:all) do
-    JRubyLauncherHelper.check_executable_built
-    # clear environment for better control
-    ENV.delete("JAVA_HOME")
-    ENV.delete("JRUBY_HOME")
-    ENV.delete("JAVA_OPTS")
-    ENV.delete("JRUBY_OPTS")
-    ENV.delete("CLASSPATH")
-    ENV.delete("JAVA_ENCODING")
-  end
-  config.include(JRubyLauncherHelper)
-end