jruby-launcher 1.0.8-java → 1.0.9-java

data/Rakefile

@@ -1,4 +1,4 @@
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'date'
 
 begin
@@ -43,7 +43,7 @@ task :gemspec => './lib/jruby-launcher.rb' do
 end
 
 task :package => :gemspec do
-  Rake::GemPackageTask.new(@gemspec) do |pkg|
+  Gem::PackageTask.new(@gemspec) do |pkg|
   end
   Rake::Task['gem'].invoke
 end

data/argparser.cpp

@@ -230,6 +230,16 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
         noBootClassPath = true;
     }
 
+    const char *java_mem = getenv("JAVA_MEM");
+    if (java_mem != NULL) {
+        javaOptions.push_back(java_mem);
+    }
+
+    const char *java_stack = getenv("JAVA_STACK");
+    if (java_stack != NULL) {
+        javaOptions.push_back(java_stack);
+    }
+
     addToArgList(args, argc, argv);
 
     logMsg("Parsing arguments:");

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/ng.c

@@ -576,7 +576,7 @@ int nailgunClientMain(int argc, char *argv[], char *env[]) {
 
   if (connect(nailgunsocket, (struct sockaddr *)&server_addr,
     sizeof(struct sockaddr)) == -1) {
-    perror("connect");
+    perror("connect to Nailgun server");
     cleanUpAndExit(NAILGUN_CONNECT_FAILED);
   }
 

data/spec/launcher_spec.rb

@@ -196,6 +196,19 @@ describe "JRuby native launcher" do
       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 print the version" do
     jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version [0-9.]+/
   end

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.8"
+#define JRUBY_LAUNCHER_VERSION "1.0.9"
 
 #endif // ! _VERSION_H_

metadata

@@ -2,7 +2,7 @@
 name: jruby-launcher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.8
+  version: 1.0.9
 platform: java
 authors: 
   - Nick Sieger
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -05:00
-default_executable: 
+date: 2011-10-25 00:00:00 Z
 dependencies: []
 
 description: Builds and installs a native launcher for JRuby on your system
@@ -59,7 +58,6 @@ files:
   - spec/spec_helper.rb
   - resources/jruby.ico
   - resources/jruby.rc
-has_rdoc: true
 homepage: http://jruby.org
 licenses: []
 
@@ -83,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Native launcher for JRuby