jruby-launcher 1.0.12-java → 1.0.13-java

data/argparser.cpp

@@ -6,6 +6,7 @@
 #include <cstdlib>
 #include <memory>
 #include <string>
+#include <unistd.h>
 #include "utilsfuncs.h"
 #include "argparser.h"
 #include "argnames.h"
@@ -29,7 +30,6 @@ Options:\n\
   -Xversion             print launcher's version\n\
 \nJvm Management:\n\
   -Xjdkhome <path>      set path to JDK\n\
-  -Xfork-java           run java in separate process\n\
   -J<jvm_option>        pass <jvm_option> to JVM\n\
 \nClasspath Management:\n\
   -Xcp   <classpath>    set the classpath\n\
@@ -42,7 +42,9 @@ Options:\n\
   -Xprop.erty[=value]   equivalent to -J-Djruby.<prop.erty>[=value]\n\
   -Xproperties          list supported properties (omit \"jruby.\" with -X)\n"
 #ifdef WIN32
-"  -Xconsole <mode>      jrubyw console attach mode (new|attach|suppress)\n"
+"\
+  -Xfork-java           run java in separate process\n\
+  -Xconsole <mode>      jrubyw console attach mode (new|attach|suppress)\n"
 #endif
 "\n"
 ;
@@ -114,21 +116,42 @@ void ArgParser::addEnvVarToOptions(std::list<std::string> & optionsList, const c
 #include <mach-o/dyld.h>
 #endif
 
+#ifndef PATH_MAX
+#define PATH_MAX  MAX_PATH
+#endif
+
 bool ArgParser::initPlatformDir() {
-#ifdef WIN32
-    char path[MAX_PATH] = "";
-    getCurrentModulePath(path, MAX_PATH);
-#else
-    char path[PATH_MAX] = "";
     bool found = false;
+    char path[PATH_MAX] = "";
+
+    if (getenv("JRUBY_HOME") != NULL) {
+        logMsg("initPlatformDir: using JRUBY_HOME environment variable");
+        char sep[2] = { FILE_SEP, NULL };
+        strncpy(path, getenv("JRUBY_HOME"), PATH_MAX - 11);
+        strncpy(path + strlen(path), sep, 1);
+        strncpy(path + strlen(path), "bin", 3);
+        strncpy(path + strlen(path), sep, 1);
+        strncpy(path + strlen(path), "jruby", 5);
+        found = true;
+    }
 
-    // first try via linux /proc/self/exe
-    logMsg("initPlatformDir: trying /proc/self/exe");
-    found = readlink("/proc/self/exe", path, PATH_MAX) != -1;
+#ifdef WIN32
+
+    if (!found) {
+        getCurrentModulePath(path, PATH_MAX);
+    }
+
+#else // !WIN32
+
+    if (!found) {
+        // first try via linux /proc/self/exe
+        logMsg("initPlatformDir: trying /proc/self/exe");
+        found = readlink("/proc/self/exe", path, PATH_MAX) != -1;
+    }
 
 #ifdef __MACH__
     uint32_t sz = PATH_MAX;
-    if (_NSGetExecutablePath(path, &sz) == 0) { // OSX-specific
+    if (!found && _NSGetExecutablePath(path, &sz) == 0) { // OSX-specific
         logMsg("initPlatformDir: using _NSGetExecutablePath");
         string tmpPath(path);
         realpath(tmpPath.c_str(), path);
@@ -138,7 +161,7 @@ bool ArgParser::initPlatformDir() {
 
 #ifdef __SUNOS__
     const char* execname = getexecname();
-    if (execname) {
+    if (!found && execname) {
         logMsg("initPlatformDir: using getexecname");
         char * dst = path;
         if (execname[0] != '/') {
@@ -164,6 +187,7 @@ bool ArgParser::initPlatformDir() {
         strncpy(path + strlen(path), platformDir.c_str(), platformDir.length());
         found = true;
     }
+#endif // WIN32
 
     if (!found) {               // try via PATH search
         logMsg("initPlatformDir: trying to find executable on PATH");
@@ -172,21 +196,8 @@ bool ArgParser::initPlatformDir() {
         found = true;
     }
 
-    if (!found) {               // try via JRUBY_HOME
-        if (getenv("JRUBY_HOME") != NULL) {
-            logMsg("initPlatformDir: trying JRUBY_HOME environment variable");
-            strncpy(path, getenv("JRUBY_HOME"), PATH_MAX - 11);
-            strncpy(path + strlen(path), "/bin/jruby", 10);
-            found = true;
-        }
-    }
-
-    if (!fileExists(path)) {
-        printToConsole("Could not figure out a proper location for JRuby.\n"
-                       "Try `jruby -Xtrace trace.log ...` and view trace.log for details.");
-        return false;
-    }
-#endif
+    // Check if bin/jruby file exists; this logs a message if not found
+    fileExists(path);
 
     logMsg("Module: %s", path);
     char *bslash = strrchr(path, FILE_SEP);

data/lib/jruby-launcher.rb

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

data/ng.c

@@ -314,7 +314,7 @@ void processnailgunstream() {
             break;
       case CHUNKTYPE_EXIT:   processExit(buf, len);
             break;
-      default:  fprintf(stderr, "Unexpected chunk type %d ('%c')\n", chunkType, chunkType);
+      default:  fprintf(stdout, "Unexpected chunk type %d ('%c')\n", chunkType, chunkType);
           cleanUpAndExit(NAILGUN_UNEXPECTED_CHUNKTYPE);
     }
   /*}*/
@@ -451,24 +451,24 @@ int isNailgunClientName(char *s) {
  */
 void usage(int exitcode) {
 
-  fprintf(stderr, "Usage: ng class [--nailgun-options] [args]\n");
-  fprintf(stderr, "          (to execute a class)\n");
-  fprintf(stderr, "   or: ng alias [--nailgun-options] [args]\n");
-  fprintf(stderr, "          (to execute an aliased class)\n");
-  fprintf(stderr, "   or: alias [--nailgun-options] [args]\n");
-  fprintf(stderr, "          (to execute an aliased class, where \"alias\"\n");
-  fprintf(stderr, "           is both the alias for the class and a symbolic\n");
-  fprintf(stderr, "           link to the ng client)\n\n");
-
-  fprintf(stderr, "where options include:\n");
-  fprintf(stderr, "   --nailgun-D<name>=<value>   set/override a client environment variable\n");
-  fprintf(stderr, "   --nailgun-version           print product version and exit\n");
-  fprintf(stderr, "   --nailgun-showversion       print product version and continue\n");
-  fprintf(stderr, "   --nailgun-server            to specify the address of the nailgun server\n");
-  fprintf(stderr, "                               (default is localhost)\n");
-  fprintf(stderr, "   --nailgun-port              to specify the port of the nailgun server\n");
-  fprintf(stderr, "                               (default is 2113)\n");
-  fprintf(stderr, "   --nailgun-help              print this message and exit\n");
+  fprintf(stdout, "Usage: ng class [--nailgun-options] [args]\n");
+  fprintf(stdout, "          (to execute a class)\n");
+  fprintf(stdout, "   or: ng alias [--nailgun-options] [args]\n");
+  fprintf(stdout, "          (to execute an aliased class)\n");
+  fprintf(stdout, "   or: alias [--nailgun-options] [args]\n");
+  fprintf(stdout, "          (to execute an aliased class, where \"alias\"\n");
+  fprintf(stdout, "           is both the alias for the class and a symbolic\n");
+  fprintf(stdout, "           link to the ng client)\n\n");
+
+  fprintf(stdout, "where options include:\n");
+  fprintf(stdout, "   --nailgun-D<name>=<value>   set/override a client environment variable\n");
+  fprintf(stdout, "   --nailgun-version           print product version and exit\n");
+  fprintf(stdout, "   --nailgun-showversion       print product version and continue\n");
+  fprintf(stdout, "   --nailgun-server            to specify the address of the nailgun server\n");
+  fprintf(stdout, "                               (default is localhost)\n");
+  fprintf(stdout, "   --nailgun-port              to specify the port of the nailgun server\n");
+  fprintf(stdout, "                               (default is 2113)\n");
+  fprintf(stdout, "   --nailgun-help              print this message and exit\n");
 
   cleanUpAndExit(exitcode);
 }
@@ -557,7 +557,7 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
   hostinfo = gethostbyname(nailgun_server);
 
   if (hostinfo == NULL) {
-    fprintf(stderr, "Unknown host: %s\n", nailgun_server);
+    fprintf(stdout, "Unknown host: %s\n", nailgun_server);
     cleanUpAndExit(NAILGUN_CONNECT_FAILED);
   }
 

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

@@ -0,0 +1,7 @@
+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.12-java/lib/jruby-launcher.rb

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

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

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

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

@@ -0,0 +1,223 @@
+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.12-java/spec/spec_helper.rb

@@ -0,0 +1,75 @@
+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/platformlauncher.cpp

@@ -98,7 +98,7 @@ bool PlatformLauncher::start(char* argv[], int argc, DWORD *retCode, const char*
         progArgs.push_front("org.jruby.util.NailMain");
         char ** nailArgv = convertToArgvArray(progArgs);
         if (printCommandLine) {
-            printArgvToConsole(nailArgv);
+            printListToConsole(progArgs);
             return true;
         }
 
@@ -210,7 +210,7 @@ bool PlatformLauncher::checkJDKHome() {
                 return false;
             }
         } else {
-            fprintf(stderr, "%s\n", errMsg.c_str());
+            fprintf(stdout, "%s\n", errMsg.c_str());
             return false;
         }
     }
@@ -233,7 +233,7 @@ bool PlatformLauncher::checkJDKHome() {
                         return false;
                     }
                 } else {
-                    fprintf(stderr, "%s\n", errMsg.c_str());
+                    fprintf(stdout, "%s\n", errMsg.c_str());
                     return false;
                 }
             } else {

data/spec/launcher_spec.rb

@@ -210,6 +210,32 @@ describe "JRuby native launcher" do
     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/ }

data/unixlauncher.cpp

@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <unistd.h>
 #include "unixlauncher.h"
 #include "utilsfuncs.h"
 

data/utilsfuncs.cpp

@@ -51,6 +51,7 @@
 #include <algorithm>
 #include <iterator>
 #include <iostream>
+#include <unistd.h>
 #include "utilsfuncs.h"
 #include "argnames.h"
 
@@ -202,7 +203,7 @@ void logV(bool appendSysError, bool showMsgBox, const char *format, va_list args
             ::MessageBox(NULL, msg, "JRuby Error", MB_OK | MB_ICONSTOP);
         }
 #endif
-        fprintf(stderr, "%s\n", msg);
+        fprintf(stdout, "%s\n", msg);
     }
 }
 
@@ -242,7 +243,7 @@ bool checkLoggingArg(int argc, char *argv[], bool delFile) {
 }
 
 bool printToConsole(const char *msg) {
-    fprintf(stderr, "%s", msg);
+    fprintf(stdout, "%s", msg);
     return false;
 }
 

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.12"
+#define JRUBY_LAUNCHER_VERSION "1.0.13"
 
 #endif // ! _VERSION_H_

metadata

@@ -2,7 +2,7 @@
 name: jruby-launcher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.12
+  version: 1.0.13
 platform: java
 authors: 
   - Nick Sieger
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 Z
+date: 2012-04-18 00:00:00 Z
 dependencies: []
 
 description: Builds and installs a native launcher for JRuby on your system
@@ -54,6 +54,11 @@ files:
   - extconf.rb
   - lib/jruby-launcher.rb
   - lib/rubygems/defaults/jruby_native.rb
+  - pkg/jruby-launcher-1.0.12-java/extconf.rb
+  - pkg/jruby-launcher-1.0.12-java/lib/jruby-launcher.rb
+  - pkg/jruby-launcher-1.0.12-java/lib/rubygems/defaults/jruby_native.rb
+  - pkg/jruby-launcher-1.0.12-java/spec/launcher_spec.rb
+  - pkg/jruby-launcher-1.0.12-java/spec/spec_helper.rb
   - spec/launcher_spec.rb
   - spec/spec_helper.rb
   - resources/jruby.ico
@@ -81,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.8.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Native launcher for JRuby