jruby-launcher 1.1.0-java → 1.1.1-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Makefile +7 -1
- data/argparser.cpp +7 -0
- data/argparser.h +1 -0
- data/lib/jruby-launcher.rb +1 -1
- data/version.h +1 -1
- metadata +3 -28
- data/pkg/jruby-launcher-1.0.15-java/extconf.rb +0 -7
- data/pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb +0 -3
- data/pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb +0 -4
- data/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/extconf.rb +0 -7
- data/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb +0 -3
- data/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb +0 -4
- data/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb +0 -258
- data/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb +0 -81
- data/pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb +0 -258
- data/pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb +0 -81
- data/pkg/jruby-launcher-1.1.0-java/extconf.rb +0 -7
- data/pkg/jruby-launcher-1.1.0-java/lib/jruby-launcher.rb +0 -3
- data/pkg/jruby-launcher-1.1.0-java/lib/rubygems/defaults/jruby_native.rb +0 -4
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/extconf.rb +0 -7
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb +0 -3
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb +0 -4
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/extconf.rb +0 -7
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb +0 -3
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb +0 -4
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb +0 -258
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb +0 -81
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb +0 -258
- data/pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb +0 -81
- data/pkg/jruby-launcher-1.1.0-java/spec/launcher_spec.rb +0 -258
- data/pkg/jruby-launcher-1.1.0-java/spec/spec_helper.rb +0 -81
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7ca7c71a454055eb2d826de3a0550cab015f95a0
|
4
|
+
data.tar.gz: 46872ced0c106f6f14da7323cb4be9f9d018db85
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: aa3ba6ea4a0db72bd319d072b9043b6f56fe281eb1ca24d08c46a7d052670e6f85dc08c1fa898248fea232c1307900e0c60346e7c5121968e9c09f368a0e43f8
|
7
|
+
data.tar.gz: 505b81b8cbe662dd68ed7a9cf9fb97f6a93009866c43188d2db91ee3069a25fb21d849cc4b4e59f38adb7d8facff22974607ef8fad4fa81026f42b8703454136
|
data/Makefile
CHANGED
@@ -2,6 +2,7 @@
|
|
2
2
|
PREFIX = notspecified
|
3
3
|
BINDIR = $(PREFIX)/bin
|
4
4
|
INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
|
5
|
+
INSTALLDIR9000 = $(PREFIX)/lib/ruby/stdlib/rubygems/defaults
|
5
6
|
OLDINSTALLDIR = $(PREFIX)/lib/ruby/site_ruby/1.8/rubygems/defaults
|
6
7
|
|
7
8
|
ifeq (true,$(shell test -x $(BINDIR)/jruby && echo true))
|
@@ -41,7 +42,12 @@ install:
|
|
41
42
|
@if [ x$(PREFIX) = xnotspecified ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
|
42
43
|
@if [ ! -w $(INSTALLDIR) ]; then \
|
43
44
|
if [ ! -w $(OLDINSTALLDIR) ]; then \
|
44
|
-
|
45
|
+
if [ ! -w $(INSTALLDIR9000) ]; then \
|
46
|
+
echo "Neither '$(INSTALLDIR9000)' nor '$(INSTALLDIR)' nor '$(OLDINSTALLDIR)' exist and are writable"; exit 1; \
|
47
|
+
else \
|
48
|
+
echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000)"; \
|
49
|
+
cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000); \
|
50
|
+
fi; \
|
45
51
|
else \
|
46
52
|
echo "cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR)"; \
|
47
53
|
cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR); \
|
data/argparser.cpp
CHANGED
@@ -7,6 +7,7 @@
|
|
7
7
|
#include <climits>
|
8
8
|
#include <memory>
|
9
9
|
#include <string>
|
10
|
+
#include <algorithm>
|
10
11
|
#include <unistd.h>
|
11
12
|
#include "utilsfuncs.h"
|
12
13
|
#include "argparser.h"
|
@@ -360,6 +361,8 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
|
|
360
361
|
return false;
|
361
362
|
} else if (strcmp(it->c_str(), "-Xproperties") == 0) {
|
362
363
|
progArgs.push_back(std::string("--properties"));
|
364
|
+
} else if (endsWith(*it, "?") || endsWith(*it, "...")) {
|
365
|
+
progArgs.push_back(*it);
|
363
366
|
} else if (it->compare(0, 2, "-X", 2) == 0 && islower(it->c_str()[2])) {
|
364
367
|
// Any other /-X([a-z].*)/ get turned into a -Djruby.\1 property
|
365
368
|
std::string propPart = it->substr(2);
|
@@ -658,3 +661,7 @@ void ArgParser::addOptionsToCommandLine(list<string> & commandLine) {
|
|
658
661
|
commandLine.insert(commandLine.end(), bootclass);
|
659
662
|
commandLine.insert(commandLine.end(), progArgs.begin(), progArgs.end());
|
660
663
|
}
|
664
|
+
|
665
|
+
bool ArgParser::endsWith(const std::string &string, const std::string &end) {
|
666
|
+
return std::equal(string.begin() + string.size() - end.size(), string.end(), end.begin());
|
667
|
+
}
|
data/argparser.h
CHANGED
@@ -51,6 +51,7 @@ protected:
|
|
51
51
|
void addToBootClassPath(const char *path, bool onlyIfExists = false);
|
52
52
|
void addJarsToClassPathFrom(const char *dir);
|
53
53
|
void addOptionsToCommandLine(std::list<std::string> & commandLine);
|
54
|
+
bool endsWith(const std::string &string, const std::string &end);
|
54
55
|
|
55
56
|
protected:
|
56
57
|
bool separateProcess;
|
data/lib/jruby-launcher.rb
CHANGED
data/version.h
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jruby-launcher
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.1
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Nick Sieger
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-
|
12
|
+
date: 2014-11-20 00:00:00.000000000 Z
|
13
13
|
dependencies: []
|
14
14
|
description: Builds and installs a native launcher for JRuby on your system
|
15
15
|
email:
|
@@ -39,31 +39,6 @@ files:
|
|
39
39
|
- lib/rubygems/defaults/jruby_native.rb
|
40
40
|
- nbexecloader.h
|
41
41
|
- ng.c
|
42
|
-
- pkg/jruby-launcher-1.0.15-java/extconf.rb
|
43
|
-
- pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb
|
44
|
-
- pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb
|
45
|
-
- pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/extconf.rb
|
46
|
-
- pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb
|
47
|
-
- pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb
|
48
|
-
- pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb
|
49
|
-
- pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb
|
50
|
-
- pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb
|
51
|
-
- pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb
|
52
|
-
- pkg/jruby-launcher-1.1.0-java/extconf.rb
|
53
|
-
- pkg/jruby-launcher-1.1.0-java/lib/jruby-launcher.rb
|
54
|
-
- pkg/jruby-launcher-1.1.0-java/lib/rubygems/defaults/jruby_native.rb
|
55
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/extconf.rb
|
56
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb
|
57
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb
|
58
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/extconf.rb
|
59
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/lib/jruby-launcher.rb
|
60
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/lib/rubygems/defaults/jruby_native.rb
|
61
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb
|
62
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb
|
63
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/spec/launcher_spec.rb
|
64
|
-
- pkg/jruby-launcher-1.1.0-java/pkg/jruby-launcher-1.0.15-java/spec/spec_helper.rb
|
65
|
-
- pkg/jruby-launcher-1.1.0-java/spec/launcher_spec.rb
|
66
|
-
- pkg/jruby-launcher-1.1.0-java/spec/spec_helper.rb
|
67
42
|
- platformlauncher.cpp
|
68
43
|
- platformlauncher.h
|
69
44
|
- rb_w32_cmdvector.h
|
@@ -97,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
97
72
|
version: '0'
|
98
73
|
requirements: []
|
99
74
|
rubyforge_project: jruby-extras
|
100
|
-
rubygems_version: 2.
|
75
|
+
rubygems_version: 2.4.3
|
101
76
|
signing_key:
|
102
77
|
specification_version: 4
|
103
78
|
summary: Native launcher for JRuby
|
@@ -1,258 +0,0 @@
|
|
1
|
-
require File.expand_path('../spec_helper.rb', __FILE__)
|
2
|
-
load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
|
3
|
-
|
4
|
-
describe "JRuby native launcher" do
|
5
|
-
it "should run org.jruby.Main" do
|
6
|
-
jruby_launcher_args("").last.should == "org/jruby/Main"
|
7
|
-
end
|
8
|
-
|
9
|
-
it "should pass unrecognized arguments to JRuby" do
|
10
|
-
jruby_launcher_args("-J-Dsome.option -v --help")[-3..-1].should == ["org/jruby/Main", "-v", "--help"]
|
11
|
-
end
|
12
|
-
|
13
|
-
it "should print help message" do
|
14
|
-
args = jruby_launcher_args("-Xhelp 2>&1")
|
15
|
-
args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
|
16
|
-
args.should include("-X")
|
17
|
-
args = jruby_launcher_args("-X 2>&1")
|
18
|
-
args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
|
19
|
-
args.should include("-X")
|
20
|
-
end
|
21
|
-
|
22
|
-
it "should use $JAVACMD when JAVACMD is specified" do
|
23
|
-
with_environment "JAVACMD" => File.join("jato") do
|
24
|
-
if windows?
|
25
|
-
jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
|
26
|
-
else
|
27
|
-
jruby_launcher_args("-v").first.should == File.join("jato")
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
|
33
|
-
with_environment "JAVA_HOME" => File.join("some", "java", "home") do
|
34
|
-
if windows?
|
35
|
-
jruby_launcher_args("-v 2>&1").join.should =~ %r{some/java/home}
|
36
|
-
else
|
37
|
-
jruby_launcher_args("-v").first.should == File.join("some", "java", "home", "bin", "java")
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
it "should use -Xjdkhome argument above JAVA_HOME" do
|
43
|
-
with_environment "JAVA_HOME" => File.join("env", "java", "home") do
|
44
|
-
if windows?
|
45
|
-
jruby_launcher_args("-Xjdkhome some/java/home 2>&1").join.should =~ %r{some/java/home}
|
46
|
-
else
|
47
|
-
jruby_launcher_args("-Xjdkhome some/java/home").first.should == File.join("some", "java", "home", "bin", "java")
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
|
-
it "should drop the backslashes at the end of JAVA_HOME" do
|
53
|
-
with_environment "JAVA_HOME" => File.join("some", "java", "home\\\\") do
|
54
|
-
if windows?
|
55
|
-
jruby_launcher_args("").join.should =~ %r{some/java/home}
|
56
|
-
else
|
57
|
-
jruby_launcher_args("").first.should == File.join("some", "java", "home", "bin", "java")
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
61
|
-
|
62
|
-
it "should complain about a missing log argument" do
|
63
|
-
jruby_launcher("-Xtrace 2>&1").should =~ /Argument is missing for "-Xtrace"/
|
64
|
-
jruby_launcher("-Xtrace -- 2>&1").should =~ /Argument is missing for "-Xtrace"/
|
65
|
-
end
|
66
|
-
|
67
|
-
it "should complain about a missing jdkhome argument" do
|
68
|
-
jruby_launcher("-Xjdkhome 2>&1").should =~ /Argument is missing/
|
69
|
-
jruby_launcher("-Xjdkhome -- 2>&1").should =~ /Argument is missing/
|
70
|
-
end
|
71
|
-
|
72
|
-
it "should complain about a missing classpath append argument" do
|
73
|
-
jruby_launcher("-Xcp:a 2>&1").should =~ /Argument is missing/
|
74
|
-
jruby_launcher("-Xcp:a -- 2>&1").should =~ /Argument is missing/
|
75
|
-
end
|
76
|
-
|
77
|
-
it "should run nailgun server with --ng-server option" do
|
78
|
-
jruby_launcher_args("--ng-server").last.should == "com/martiansoftware/nailgun/NGServer"
|
79
|
-
end
|
80
|
-
|
81
|
-
it "should run nailgun client with --ng option" do
|
82
|
-
jruby_launcher_args('--ng -e "puts 1"').should == ["org.jruby.util.NailMain", "-e", "puts 1"]
|
83
|
-
end
|
84
|
-
|
85
|
-
it "should handle -J JVM options" do
|
86
|
-
jruby_launcher_args("-J-Darg1=value1 -J-Darg2=value2").should include("-Darg1=value1", "-Darg2=value2")
|
87
|
-
end
|
88
|
-
|
89
|
-
it "should pass -Xprop.erty=value as -J-Djruby.prop.erty=value" do
|
90
|
-
jruby_launcher_args("-Xprop.erty=value").should include("-Djruby.prop.erty=value")
|
91
|
-
end
|
92
|
-
|
93
|
-
it "should pass -Xproperties as --properties" do
|
94
|
-
jruby_launcher_args("-Xproperties").should include("--properties")
|
95
|
-
end
|
96
|
-
|
97
|
-
it "should default to 500m max heap" do
|
98
|
-
jruby_launcher_args("").should include("-Xmx500m", "-Djruby.memory.max=500m")
|
99
|
-
end
|
100
|
-
|
101
|
-
it "should allow max heap to be overridden" do
|
102
|
-
jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
|
103
|
-
end
|
104
|
-
|
105
|
-
it "should default to 2048k max stack" do
|
106
|
-
jruby_launcher_args("").should include("-Xss2048k", "-Djruby.stack.max=2048k")
|
107
|
-
end
|
108
|
-
|
109
|
-
it "should allow max stack to be overridden" do
|
110
|
-
jruby_launcher_args("-J-Xss512k").should include("-Xss512k", "-Djruby.stack.max=512k")
|
111
|
-
end
|
112
|
-
|
113
|
-
it "should add the contents of the CLASSPATH environment variable" do
|
114
|
-
with_environment "CLASSPATH" => "some.jar" do
|
115
|
-
classpath_arg(jruby_launcher_args("")).should =~ /some.jar/
|
116
|
-
end
|
117
|
-
end
|
118
|
-
|
119
|
-
it "should add the classpath elements in proper order" do
|
120
|
-
s = File::PATH_SEPARATOR
|
121
|
-
with_environment "CLASSPATH" => "some-env.jar" do
|
122
|
-
args = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar")
|
123
|
-
classpath_arg(args).should =~ /some.jar.*#{s}some-env.jar#{s}some-other.jar/
|
124
|
-
end
|
125
|
-
end
|
126
|
-
|
127
|
-
it "should use the --server compiler" do
|
128
|
-
jruby_launcher_args("--server").should include("-server")
|
129
|
-
end
|
130
|
-
|
131
|
-
it "should use the --client compiler" do
|
132
|
-
jruby_launcher_args("--client").should include("-client")
|
133
|
-
end
|
134
|
-
|
135
|
-
it "should set the JMX settings when --manage is present" do
|
136
|
-
jruby_launcher_args("--manage").should include("-Dcom.sun.management.jmxremote", "-Djruby.management.enabled=true")
|
137
|
-
end
|
138
|
-
|
139
|
-
it "should set the headless flag when --headless is present" do
|
140
|
-
jruby_launcher_args("--headless").should include("-Djava.awt.headless=true")
|
141
|
-
end
|
142
|
-
|
143
|
-
it "should pass -Xprof when --sample is present" do
|
144
|
-
jruby_launcher_args("--sample").should include("-Xprof")
|
145
|
-
end
|
146
|
-
|
147
|
-
it "should stop argument processing when a -- is seen" do
|
148
|
-
jruby_launcher_args("-- -Xhelp -Xtrace --headless").should include("-Xhelp", "-Xtrace", "--headless")
|
149
|
-
end
|
150
|
-
|
151
|
-
# JRUBY-4151
|
152
|
-
it "should properly handle single quotes" do
|
153
|
-
jruby_launcher_args("-e 'ABC DEF'").should include("ABC DEF")
|
154
|
-
end
|
155
|
-
|
156
|
-
# JRUBY-4581
|
157
|
-
it "should prepend JRUBY_OPTS to the start of the argument list to process" do
|
158
|
-
with_environment "JRUBY_OPTS" => "--server -J-Dsome.key=val -rubygems" do
|
159
|
-
jruby_launcher_args("-e 'ABC DEF'").should include("-server", "-Dsome.key=val", "-rubygems", "-e", "ABC DEF")
|
160
|
-
end
|
161
|
-
end
|
162
|
-
|
163
|
-
# JRUBY-4611
|
164
|
-
it "stops argument processing on first non-option argument" do
|
165
|
-
jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
|
166
|
-
end
|
167
|
-
|
168
|
-
# JRUBY-4608
|
169
|
-
if RbConfig::CONFIG['target_os'] =~ /darwin/i
|
170
|
-
it "includes file.encoding=UTF-8 on Mac if JAVA_ENCODING is not set" do
|
171
|
-
jruby_launcher_args("-e true").should include("-Dfile.encoding=UTF-8")
|
172
|
-
with_environment "JAVA_ENCODING" => "MacRoman" do
|
173
|
-
jruby_launcher_args("-e true").should_not include("-Dfile.encoding=UTF-8")
|
174
|
-
end
|
175
|
-
end
|
176
|
-
end
|
177
|
-
|
178
|
-
it "does not crash on empty args" do
|
179
|
-
jruby_launcher_args("-e ''").should include("-e")
|
180
|
-
jruby_launcher("-Xtrace '' 2>&1").should =~ /-Xtrace/
|
181
|
-
jruby_launcher("-Xjdkhome '' 2>&1").should =~ /-Xjdkhome/
|
182
|
-
end
|
183
|
-
|
184
|
-
# JRUBY-4706
|
185
|
-
it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
|
186
|
-
args = jruby_launcher_args("-e true")
|
187
|
-
args.grep(/Xbootclasspath/).should_not be_empty
|
188
|
-
args = jruby_launcher_args("-Xnobootclasspath -e true")
|
189
|
-
args.grep(/Xbootclasspath/).should be_empty
|
190
|
-
end
|
191
|
-
|
192
|
-
it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
|
193
|
-
with_environment "VERIFY_JRUBY" => "true" do
|
194
|
-
args = jruby_launcher_args("-e true")
|
195
|
-
args.grep(/Xbootclasspath/).should be_empty
|
196
|
-
end
|
197
|
-
end
|
198
|
-
|
199
|
-
# JRUBY-4709
|
200
|
-
it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
|
201
|
-
classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
|
202
|
-
if windows?
|
203
|
-
/;$/
|
204
|
-
else
|
205
|
-
/:$/
|
206
|
-
end
|
207
|
-
end
|
208
|
-
|
209
|
-
# JRUBY-6016
|
210
|
-
it "should honor JAVA_MEM" do
|
211
|
-
with_environment "JAVA_MEM" => "-Xmx768m" do
|
212
|
-
jruby_launcher_args("").should include("-Xmx768m", "-Djruby.memory.max=768m")
|
213
|
-
end
|
214
|
-
end
|
215
|
-
|
216
|
-
it "should honor JAVA_STACK" do
|
217
|
-
with_environment "JAVA_STACK" => "-Xss3072k" do
|
218
|
-
jruby_launcher_args("").should include("-Xss3072k", "-Djruby.stack.max=3072k")
|
219
|
-
end
|
220
|
-
end
|
221
|
-
|
222
|
-
it "should honor JRUBY_HOME" do
|
223
|
-
with_environment "JRUBY_HOME" => "/tmp" do
|
224
|
-
jruby_launcher_args("").should include("-Djruby.home=/tmp")
|
225
|
-
end
|
226
|
-
end
|
227
|
-
|
228
|
-
context "JRUBY_HOME set and JRUBY_HOME/lib/jruby.jar exists" do
|
229
|
-
let(:jruby_home) do
|
230
|
-
require 'tempfile'
|
231
|
-
t = Tempfile.new("jruby_home")
|
232
|
-
t.path.tap { t.close! }
|
233
|
-
end
|
234
|
-
|
235
|
-
before do
|
236
|
-
FileUtils.mkdir_p(File.join(jruby_home, "lib"))
|
237
|
-
FileUtils.touch(File.join(jruby_home, "lib", "jruby.jar"))
|
238
|
-
end
|
239
|
-
after { FileUtils.rm_rf jruby_home }
|
240
|
-
|
241
|
-
it "should add jruby.jar to the bootclasspath" do
|
242
|
-
with_environment "JRUBY_HOME" => jruby_home do
|
243
|
-
jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
|
244
|
-
end
|
245
|
-
end
|
246
|
-
end
|
247
|
-
|
248
|
-
it "should place user-supplied options after default options" do
|
249
|
-
args = jruby_launcher_args("-J-Djruby.home=/tmp")
|
250
|
-
home_args = args.select {|x| x =~ /^-Djruby\.home/ }
|
251
|
-
home_args.length.should == 2
|
252
|
-
home_args.last.should == "-Djruby.home=/tmp"
|
253
|
-
end
|
254
|
-
|
255
|
-
it "should print the version" do
|
256
|
-
jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
|
257
|
-
end
|
258
|
-
end
|
@@ -1,81 +0,0 @@
|
|
1
|
-
require 'rspec'
|
2
|
-
require 'rbconfig'
|
3
|
-
require 'fileutils'
|
4
|
-
|
5
|
-
if defined?(JRUBY_VERSION)
|
6
|
-
require 'jruby'
|
7
|
-
JRuby.runtime.instance_config.run_ruby_in_process = false
|
8
|
-
end
|
9
|
-
|
10
|
-
module JRubyLauncherHelper
|
11
|
-
JRUBY_EXE = ''
|
12
|
-
WINDOWS = RbConfig::CONFIG['target_os'] =~ /mswin/
|
13
|
-
|
14
|
-
def self.check_executable_built
|
15
|
-
exe = File.expand_path("../../jruby", __FILE__) + RbConfig::CONFIG['EXEEXT']
|
16
|
-
unless File.executable?(exe)
|
17
|
-
raise "Error: launcher executable not built; type `make' before continuing."
|
18
|
-
end
|
19
|
-
top = File.dirname(exe)
|
20
|
-
name = File.basename(exe)
|
21
|
-
home = File.join(top, "build/home")
|
22
|
-
FileUtils.mkdir_p(File.join(home, "bin"))
|
23
|
-
FileUtils.cp(exe, File.join(home, "bin"))
|
24
|
-
if JRubyLauncherHelper::WINDOWS
|
25
|
-
FileUtils.cp(exe.sub(/exe/, 'dll'), File.join(home, "bin"))
|
26
|
-
end
|
27
|
-
FileUtils.mkdir_p(File.join(home, "lib"))
|
28
|
-
FileUtils.touch(File.join(home, "lib/jruby.jar"))
|
29
|
-
JRUBY_EXE.concat File.join(home, "bin", name)
|
30
|
-
end
|
31
|
-
|
32
|
-
def jruby_launcher(args)
|
33
|
-
`#{JRUBY_EXE} #{args}`
|
34
|
-
end
|
35
|
-
|
36
|
-
def jruby_launcher_args(args)
|
37
|
-
jruby_launcher("-Xcommand #{args}").split("\n")
|
38
|
-
end
|
39
|
-
|
40
|
-
def last_exit_code
|
41
|
-
$?.exitstatus
|
42
|
-
end
|
43
|
-
|
44
|
-
def windows?
|
45
|
-
WINDOWS
|
46
|
-
end
|
47
|
-
|
48
|
-
def classpath_arg(args)
|
49
|
-
index = args.index("-cp")
|
50
|
-
index.should > 0
|
51
|
-
args[index + 1]
|
52
|
-
end
|
53
|
-
|
54
|
-
def with_environment(pairs = {})
|
55
|
-
prev_env = {}
|
56
|
-
pairs.each_pair do |k,v|
|
57
|
-
prev_env[k] = ENV[k] if ENV.has_key?(k)
|
58
|
-
ENV[k] = v
|
59
|
-
end
|
60
|
-
begin
|
61
|
-
yield
|
62
|
-
ensure
|
63
|
-
pairs.keys.each {|k| ENV.delete(k)}
|
64
|
-
ENV.update(prev_env)
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
RSpec.configure do |config|
|
70
|
-
config.before(:all) do
|
71
|
-
JRubyLauncherHelper.check_executable_built
|
72
|
-
# clear environment for better control
|
73
|
-
ENV.delete("JAVA_HOME")
|
74
|
-
ENV.delete("JRUBY_HOME")
|
75
|
-
ENV.delete("JAVA_OPTS")
|
76
|
-
ENV.delete("JRUBY_OPTS")
|
77
|
-
ENV.delete("CLASSPATH")
|
78
|
-
ENV.delete("JAVA_ENCODING")
|
79
|
-
end
|
80
|
-
config.include(JRubyLauncherHelper)
|
81
|
-
end
|