jruby-launcher 1.0.14-java → 1.0.15-java

data/argparser.cpp

@@ -4,6 +4,7 @@
 
 #include <cstring>
 #include <cstdlib>
+#include <climits>
 #include <memory>
 #include <string>
 #include <unistd.h>
@@ -193,8 +194,10 @@ bool ArgParser::initPlatformDir() {
     if (!found) {               // try via PATH search
         logMsg("initPlatformDir: trying to find executable on PATH");
         std::string location = findOnPath(platformDir.c_str());
-        strncpy(path, location.c_str(), PATH_MAX);
-        found = true;
+        if (location.size() > 0) {
+            strncpy(path, location.c_str(), PATH_MAX);
+            found = true;
+        }
     }
 
     // Check if bin/jruby file exists; this logs a message if not found

data/inc/Makefile-conf.mk

@@ -32,7 +32,7 @@ OBJECTFILES = ${OBJECTDIR}/argparser.o		\
 
 ifdef JAVA_HOME
 JAVA_INCLUDE = $(subst \,/,${JAVA_HOME})/include
-INCLUDES = -I${JAVA_INCLUDE}
+INCLUDES = "-I${JAVA_INCLUDE}"
 endif
 
 ifdef MINGW
@@ -40,7 +40,7 @@ OBJECTFILES += ${OBJECTDIR}/utilsfuncswin.o	\
 	       ${OBJECTDIR}/platformlauncher.o	\
 	       ${OBJECTDIR}/jvmlauncher.o	\
 	       ${OBJECTDIR}/jruby.o
-INCLUDES += -I${JAVA_INCLUDE}/win32
+INCLUDES += "-I${JAVA_INCLUDE}/win32"
 else
 OBJECTFILES += ${OBJECTDIR}/unixlauncher.o
 endif
@@ -51,10 +51,10 @@ CXXFLAGS = $(CFLAGS)
 
 # Compiler Flags
 ifeq (mingw,$(CONF))
-CFLAGS += -m32 -mno-cygwin -s
+CFLAGS += -m32 -s
 endif
 ifeq (mingw64,$(CONF))
-CFLAGS += -m64 -mno-cygwin -s
+CFLAGS += -m64 -s
 endif
 
 # Resources

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.14"
+  VERSION = "1.0.15"
 end

data/pkg/{jruby-launcher-1.0.13-java → jruby-launcher-1.0.15-java}/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.13"
+  VERSION = "1.0.15"
 end

data/pkg/{jruby-launcher-1.0.13-java → jruby-launcher-1.0.15-java}/spec/launcher_spec.rb

@@ -49,6 +49,16 @@ describe "JRuby native launcher" do
     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"/
@@ -102,16 +112,15 @@ describe "JRuby native launcher" do
 
   it "should add the contents of the CLASSPATH environment variable" do
     with_environment "CLASSPATH" => "some.jar" do
-      classpath_arg = jruby_launcher_args("").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=.*some.jar/
+      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
-      classpath_arg = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=some.jar.*#{s}some-env.jar#{s}some-other.jar/
+      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
 
@@ -157,7 +166,7 @@ describe "JRuby native launcher" do
   end
 
   # JRUBY-4608
-  if Config::CONFIG['target_os'] =~ /darwin/i
+  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
@@ -189,7 +198,7 @@ describe "JRuby native launcher" do
 
   # JRUBY-4709
   it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
-    jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.should =~
+    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
       if windows?
         /;$/
       else

data/pkg/{jruby-launcher-1.0.12-java → jruby-launcher-1.0.15-java}/spec/spec_helper.rb

@@ -9,10 +9,10 @@ end
 
 module JRubyLauncherHelper
   JRUBY_EXE = ''
-  WINDOWS = Config::CONFIG['target_os'] =~ /mswin/
+  WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
 
   def self.check_executable_built
-    exe = File.expand_path("../../jruby", __FILE__) + Config::CONFIG['EXEEXT']
+    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::CONFIG['EXEEXT']
     unless File.executable?(exe)
       raise "Error: launcher executable not built; type `make' before continuing."
     end
@@ -45,6 +45,12 @@ module JRubyLauncherHelper
     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|

data/platformlauncher.cpp

@@ -54,8 +54,8 @@ extern "C" int nailgunClientMain(int argc, char *argv[], char *env[]);
 PlatformLauncher::PlatformLauncher()
     : ArgParser()
     , suppressConsole(false)
-    , separateProcess(false)
 {
+    separateProcess = false;
 }
 
 PlatformLauncher::PlatformLauncher(const PlatformLauncher& orig)
@@ -218,8 +218,9 @@ bool PlatformLauncher::checkJDKHome() {
 
     if (jdkhome.empty()) {
         logMsg("-Xjdkhome is not set, checking for %%JAVA_HOME%%...");
-        char *javaHome = getenv("JAVA_HOME");
-        if (javaHome) {
+        char *origJavaHome = getenv("JAVA_HOME");
+        if (origJavaHome) {
+            const char *javaHome = trimTrailingBackslashes(origJavaHome).c_str();
             logMsg("%%JAVA_HOME%% is set: %s", javaHome);
             if (!jvmLauncher.initialize(javaHome)) {
                 logMsg("ERROR: Cannot locate java installation, specified by JAVA_HOME: %s", javaHome);

data/spec/launcher_spec.rb

@@ -49,6 +49,16 @@ describe "JRuby native launcher" do
     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"/
@@ -156,7 +166,7 @@ describe "JRuby native launcher" do
   end
 
   # JRUBY-4608
-  if Config::CONFIG['target_os'] =~ /darwin/i
+  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

data/spec/spec_helper.rb

@@ -9,10 +9,10 @@ end
 
 module JRubyLauncherHelper
   JRUBY_EXE = ''
-  WINDOWS = Config::CONFIG['target_os'] =~ /mswin/
+  WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
 
   def self.check_executable_built
-    exe = File.expand_path("../../jruby", __FILE__) + Config::CONFIG['EXEEXT']
+    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::CONFIG['EXEEXT']
     unless File.executable?(exe)
       raise "Error: launcher executable not built; type `make' before continuing."
     end

data/unixlauncher.cpp

@@ -52,7 +52,9 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
         if (!jdkhome.empty()) {
             java = jdkhome + "/bin/java";
         } else if (getenv("JAVA_HOME") != NULL) {
-            java = string(getenv("JAVA_HOME")) + "/bin/java";
+            string java_home = string(getenv("JAVA_HOME"));
+            java_home = trimTrailingBackslashes(java_home);
+            java = java_home + "/bin/java";
         } else {
             java = findOnPath("java");
         }

data/utilsfuncs.cpp

@@ -144,7 +144,7 @@ string findOnPath(const char* name) {
 
 	start = sep + 1;
     }
-    return NULL;
+    return "";
 }
 
 const char* getSysError(char *str, int strSize) {
@@ -269,3 +269,11 @@ void printListToConsole(list<string> values) {
         std::cout << *it << std::endl;
     }
 }
+
+string trimTrailingBackslashes(string orig) {
+    while (orig.size() > 0 &&
+        orig.at(orig.size() - 1) == '\\') {
+        orig.erase(orig.size() - 1);
+    }
+    return orig;
+}

data/utilsfuncs.h

@@ -59,6 +59,7 @@ void addToArgList(std::list<std::string> & args, int argc, char ** argv);
 std::string findOnPath(const char* name);
 bool checkDirectory(const char* path);
 void printListToConsole(std::list<std::string> l);
+std::string trimTrailingBackslashes(std::string orig);
 
 #ifndef WIN32
 #define FILE_SEP '/'

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.14"
+#define JRUBY_LAUNCHER_VERSION "1.0.15"
 
 #endif // ! _VERSION_H_

metadata

@@ -2,7 +2,7 @@
 name: jruby-launcher
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.14
+  version: 1.0.15
 platform: java
 authors:
 - Nick Sieger
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -76,48 +76,18 @@ files:
 - !binary |-
   bGliL3J1YnlnZW1zL2RlZmF1bHRzL2pydWJ5X25hdGl2ZS5yYg==
 - !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL2V4dGNvbmYucmI=
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL2V4dGNvbmYucmI=
 - !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL2xpYi9qcnVieS1sYXVu
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL2xpYi9qcnVieS1sYXVu
   Y2hlci5yYg==
 - !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL2xpYi9ydWJ5Z2Vtcy9k
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL2xpYi9ydWJ5Z2Vtcy9k
   ZWZhdWx0cy9qcnVieV9uYXRpdmUucmI=
 - !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL3NwZWMvbGF1bmNoZXJf
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL3NwZWMvbGF1bmNoZXJf
   c3BlYy5yYg==
 - !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL3NwZWMvc3BlY19oZWxw
-  ZXIucmI=
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL2V4dGNvbmYucmI=
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL2xpYi9qcnVieS1sYXVu
-  Y2hlci5yYg==
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL2xpYi9ydWJ5Z2Vtcy9k
-  ZWZhdWx0cy9qcnVieV9uYXRpdmUucmI=
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
-  Y2hlci0xLjAuMTItamF2YS9leHRjb25mLnJi
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
-  Y2hlci0xLjAuMTItamF2YS9saWIvanJ1YnktbGF1bmNoZXIucmI=
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
-  Y2hlci0xLjAuMTItamF2YS9saWIvcnVieWdlbXMvZGVmYXVsdHMvanJ1Ynlf
-  bmF0aXZlLnJi
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
-  Y2hlci0xLjAuMTItamF2YS9zcGVjL2xhdW5jaGVyX3NwZWMucmI=
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
-  Y2hlci0xLjAuMTItamF2YS9zcGVjL3NwZWNfaGVscGVyLnJi
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3NwZWMvbGF1bmNoZXJf
-  c3BlYy5yYg==
-- !binary |-
-  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3NwZWMvc3BlY19oZWxw
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xNS1qYXZhL3NwZWMvc3BlY19oZWxw
   ZXIucmI=
 - !binary |-
   c3BlYy9sYXVuY2hlcl9zcGVjLnJi
@@ -154,4 +124,3 @@ signing_key:
 specification_version: 3
 summary: Native launcher for JRuby
 test_files: []
-...

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

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

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

@@ -1,223 +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 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", "-Djruby.memory.max=500m")
-  end
-
-  it "should allow max heap to be overridden" do
-    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
-  end
-
-  it "should default to 2048k max stack" do
-    jruby_launcher_args("").should include("-Xss2048k", "-Djruby.stack.max=2048k")
-  end
-
-  it "should allow max stack to be overridden" do
-    jruby_launcher_args("-J-Xss512k").should include("-Xss512k", "-Djruby.stack.max=512k")
-  end
-
-  it "should add the contents of the CLASSPATH environment variable" do
-    with_environment "CLASSPATH" => "some.jar" do
-      classpath_arg = jruby_launcher_args("").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=.*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
-      classpath_arg = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=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 Config::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
-    jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.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", "-Djruby.memory.max=768m")
-    end
-  end
-
-  it "should honor JAVA_STACK" do
-    with_environment "JAVA_STACK" => "-Xss3072k" do
-      jruby_launcher_args("").should include("-Xss3072k", "-Djruby.stack.max=3072k")
-    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.13-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.13-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.13-java/pkg/jruby-launcher-1.0.12-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.13-java/pkg/jruby-launcher-1.0.12-java/lib/jruby-launcher.rb

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

data/pkg/jruby-launcher-1.0.13-java/pkg/jruby-launcher-1.0.12-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.13-java/pkg/jruby-launcher-1.0.12-java/spec/launcher_spec.rb

@@ -1,223 +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 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", "-Djruby.memory.max=500m")
-  end
-
-  it "should allow max heap to be overridden" do
-    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
-  end
-
-  it "should default to 2048k max stack" do
-    jruby_launcher_args("").should include("-Xss2048k", "-Djruby.stack.max=2048k")
-  end
-
-  it "should allow max stack to be overridden" do
-    jruby_launcher_args("-J-Xss512k").should include("-Xss512k", "-Djruby.stack.max=512k")
-  end
-
-  it "should add the contents of the CLASSPATH environment variable" do
-    with_environment "CLASSPATH" => "some.jar" do
-      classpath_arg = jruby_launcher_args("").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=.*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
-      classpath_arg = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=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 Config::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
-    jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.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", "-Djruby.memory.max=768m")
-    end
-  end
-
-  it "should honor JAVA_STACK" do
-    with_environment "JAVA_STACK" => "-Xss3072k" do
-      jruby_launcher_args("").should include("-Xss3072k", "-Djruby.stack.max=3072k")
-    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.13-java/pkg/jruby-launcher-1.0.12-java/spec/spec_helper.rb

@@ -1,75 +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 = Config::CONFIG['target_os'] =~ /mswin/
-
-  def self.check_executable_built
-    exe = File.expand_path("../../jruby", __FILE__) + Config::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 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

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

@@ -1,75 +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 = Config::CONFIG['target_os'] =~ /mswin/
-
-  def self.check_executable_built
-    exe = File.expand_path("../../jruby", __FILE__) + Config::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 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