jruby-launcher 1.1.8-java → 1.1.9-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +2 -2
  3. data/argparser.cpp +5 -4
  4. data/inc/Makefile-conf.mk +0 -3
  5. data/lib/jruby-launcher.rb +1 -1
  6. data/pkg/jruby-launcher-1.1.7-java/lib/jruby-launcher.rb +1 -1
  7. data/pkg/jruby-launcher-1.1.8-java/extconf.rb +5 -0
  8. data/pkg/jruby-launcher-1.1.8-java/lib/jruby-launcher.rb +3 -0
  9. data/pkg/jruby-launcher-1.1.8-java/lib/rubygems/defaults/jruby_native.rb +4 -0
  10. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/extconf.rb +5 -0
  11. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/lib/jruby-launcher.rb +3 -0
  12. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/lib/rubygems/defaults/jruby_native.rb +4 -0
  13. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/extconf.rb +5 -0
  14. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/lib/jruby-launcher.rb +3 -0
  15. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/lib/rubygems/defaults/jruby_native.rb +4 -0
  16. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/spec/launcher_spec.rb +258 -0
  17. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/spec/spec_helper.rb +81 -0
  18. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/spec/launcher_spec.rb +258 -0
  19. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/spec/spec_helper.rb +81 -0
  20. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5.pre-java/extconf.rb +5 -0
  21. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5.pre-java/lib/jruby-launcher.rb +3 -0
  22. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5.pre-java/lib/rubygems/defaults/jruby_native.rb +4 -0
  23. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5.pre-java/spec/launcher_spec.rb +258 -0
  24. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5.pre-java/spec/spec_helper.rb +81 -0
  25. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/extconf.rb +5 -0
  26. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/lib/jruby-launcher.rb +3 -0
  27. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/lib/rubygems/defaults/jruby_native.rb +4 -0
  28. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/extconf.rb +5 -0
  29. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/lib/jruby-launcher.rb +3 -0
  30. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/lib/rubygems/defaults/jruby_native.rb +4 -0
  31. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/extconf.rb +5 -0
  32. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/lib/jruby-launcher.rb +3 -0
  33. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/lib/rubygems/defaults/jruby_native.rb +4 -0
  34. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/spec/launcher_spec.rb +258 -0
  35. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/spec/spec_helper.rb +81 -0
  36. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/spec/launcher_spec.rb +258 -0
  37. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5-java/spec/spec_helper.rb +81 -0
  38. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5.pre-java/extconf.rb +5 -0
  39. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5.pre-java/lib/jruby-launcher.rb +3 -0
  40. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5.pre-java/lib/rubygems/defaults/jruby_native.rb +4 -0
  41. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5.pre-java/spec/launcher_spec.rb +258 -0
  42. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/pkg/jruby-launcher-1.1.5.pre-java/spec/spec_helper.rb +81 -0
  43. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/spec/launcher_spec.rb +258 -0
  44. data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.7-java/spec/spec_helper.rb +81 -0
  45. data/pkg/jruby-launcher-1.1.8-java/spec/launcher_spec.rb +258 -0
  46. data/pkg/jruby-launcher-1.1.8-java/spec/spec_helper.rb +81 -0
  47. data/version.h +1 -1
  48. metadata +42 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3b92c78b910d37eb7a2f3b4eca4830aba9aac07cf92570302583c000ba635e43
4
- data.tar.gz: 71d61c84774f723eebd76d6716eb569033b7f6fa761153393fd1977a270235a8
3
+ metadata.gz: 4a24cd17a7e856fa27004cd2ecae5be7f6fe133bec57528e9cfcdd287293eb76
4
+ data.tar.gz: 7a5c616e66f9423f27ea5ed477c5500960527e84fcccb0c12fe53056959c581b
5
5
  SHA512:
6
- metadata.gz: 6a2b1d4ad8b440e5acd0abdd524575632172fdf5b4855b3466de0a6adb1967180cd9d01f6430c9d7cb4783067421e3f9ca692301b6963fc79ed09a665f9c17d9
7
- data.tar.gz: c9aabf3d1ef886445c98718da014f1dcb9fdb9b920483a310fd01b5d36eae4128dd825c18d72482dc1682b389b42c53ea82a744463a70673a1be0b31a738fa23
6
+ metadata.gz: fc086ec3f19e35e4c70d0a8176230785cefc796032ce32f85dfc6c84e723c721e924fe6fd345a3682164e66430e6eb10f569c55342d124a1f6fd0a6dc22b5ba8
7
+ data.tar.gz: 07e802263388bb7395b879beef5883189775296c07b4ab81b0a9191a560d797207ebafadb870316a261ef11f9d4b97179a7f2203f1d7089d7e7463d3f16deb54
data/Makefile CHANGED
@@ -28,10 +28,10 @@ jruby.res: resources/jruby.rc
28
28
  windres $^ -O coff -o $@
29
29
 
30
30
  jruby.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
31
- g++ $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS) -static
31
+ $(CXX) $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS) -static
32
32
 
33
33
  jrubyw.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
34
- g++ $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS) -static
34
+ $(CXX) $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS) -static
35
35
 
36
36
  install:
37
37
  @if [ ! -f ./jruby ]; then echo "Please run 'make' first."; exit 1; fi
@@ -60,7 +60,7 @@ const char *ArgParser::OPT_JRUBY_HOME = "-Djruby.home=";
60
60
  const char *ArgParser::OPT_JRUBY_COMMAND_NAME = "-Dsun.java.command=";
61
61
 
62
62
  const char *ArgParser::OPT_CMDLINE_CLASS_PATH = "-cp";
63
- const char *ArgParser::OPT_CMDLINE_MODULE_PATH = "--module-path";
63
+ const char *ArgParser::OPT_CMDLINE_MODULE_PATH = "--module-path=";
64
64
  const char *ArgParser::OPT_CLASS_PATH = "-Djava.class.path=";
65
65
  const char *ArgParser::OPT_BOOT_CLASS_PATH = "-Xbootclasspath/a:";
66
66
 
@@ -135,7 +135,7 @@ bool ArgParser::initPlatformDir() {
135
135
 
136
136
  if (getenv("JRUBY_HOME") != NULL) {
137
137
  logMsg("initPlatformDir: using JRUBY_HOME environment variable");
138
- char sep[2] = { FILE_SEP, NULL };
138
+ char sep[2] = { FILE_SEP, '\0' };
139
139
  strncpy(path, getenv("JRUBY_HOME"), PATH_MAX - 11);
140
140
  strncpy(path + strlen(path), sep, 1);
141
141
  strncpy(path + strlen(path), "bin", 3);
@@ -487,8 +487,9 @@ void ArgParser::prepareOptions() {
487
487
 
488
488
  if (useModulePath) {
489
489
  // When modules are present, use module path
490
- javaOptions.push_back(OPT_CMDLINE_MODULE_PATH);
491
- javaOptions.push_back(classPath);
490
+ option = OPT_CMDLINE_MODULE_PATH;
491
+ option += classPath;
492
+ javaOptions.push_back(option);
492
493
  } else if (separateProcess) {
493
494
  // When launching a separate process, use '-cp' which expands embedded wildcards
494
495
  javaOptions.push_back(OPT_CMDLINE_CLASS_PATH);
@@ -3,9 +3,6 @@ MKDIR=mkdir
3
3
  CP=cp
4
4
  CCADMIN=CCadmin
5
5
  RANLIB=ranlib
6
- CC=gcc
7
- CCC=g++
8
- CXX=g++
9
6
 
10
7
  # Windows (mingw)?
11
8
  ifneq (,$(findstring mingw, $(CONF)))
@@ -1,3 +1,3 @@
1
1
  module JRubyLauncher
2
- VERSION = "1.1.8"
2
+ VERSION = "1.1.9"
3
3
  end
@@ -1,3 +1,3 @@
1
1
  module JRubyLauncher
2
- VERSION = "1.1.8"
2
+ VERSION = "1.1.9"
3
3
  end
@@ -0,0 +1,5 @@
1
+ mf = File.read('Makefile')
2
+ mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{RbConfig::CONFIG['bindir']}")
3
+ mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(RbConfig::CONFIG['libdir'])}")
4
+ puts mf
5
+ File.open('Makefile', 'wb') {|f| f << mf}
@@ -0,0 +1,3 @@
1
+ module JRubyLauncher
2
+ VERSION = "1.1.9"
3
+ end
@@ -0,0 +1,4 @@
1
+ class Gem::ConfigFile
2
+ PLATFORM_DEFAULTS['install'] = '--no-rdoc --no-ri'
3
+ PLATFORM_DEFAULTS['update'] = '--no-rdoc --no-ri'
4
+ end
@@ -0,0 +1,5 @@
1
+ mf = File.read('Makefile')
2
+ mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{RbConfig::CONFIG['bindir']}")
3
+ mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(RbConfig::CONFIG['libdir'])}")
4
+ puts mf
5
+ File.open('Makefile', 'wb') {|f| f << mf}
@@ -0,0 +1,3 @@
1
+ module JRubyLauncher
2
+ VERSION = "1.1.6.pre"
3
+ end
@@ -0,0 +1,4 @@
1
+ class Gem::ConfigFile
2
+ PLATFORM_DEFAULTS['install'] = '--no-rdoc --no-ri'
3
+ PLATFORM_DEFAULTS['update'] = '--no-rdoc --no-ri'
4
+ end
@@ -0,0 +1,5 @@
1
+ mf = File.read('Makefile')
2
+ mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{RbConfig::CONFIG['bindir']}")
3
+ mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(RbConfig::CONFIG['libdir'])}")
4
+ puts mf
5
+ File.open('Makefile', 'wb') {|f| f << mf}
@@ -0,0 +1,4 @@
1
+ class Gem::ConfigFile
2
+ PLATFORM_DEFAULTS['install'] = '--no-rdoc --no-ri'
3
+ PLATFORM_DEFAULTS['update'] = '--no-rdoc --no-ri'
4
+ end
@@ -0,0 +1,258 @@
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.select {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
16
+ args.should include("-X")
17
+ args = jruby_launcher_args("-X 2>&1")
18
+ args.detect {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
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 allow max heap to be overridden" do
98
+ jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m")
99
+ end
100
+
101
+ it "should default to 2048k max stack" do
102
+ jruby_launcher_args("").should include("-Xss2048k")
103
+ end
104
+
105
+ it "should allow max stack to be overridden" do
106
+ jruby_launcher_args("-J-Xss512k").should include("-Xss512k")
107
+ end
108
+
109
+ it "should add the contents of the CLASSPATH environment variable" do
110
+ with_environment "CLASSPATH" => "some.jar" do
111
+ classpath_arg(jruby_launcher_args("")).should =~ /some.jar/
112
+ end
113
+ end
114
+
115
+ it "should add the classpath elements in proper order" do
116
+ s = File::PATH_SEPARATOR
117
+ with_environment "CLASSPATH" => "some-env.jar" do
118
+ args = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar")
119
+ classpath_arg(args).should =~ /some.jar.*#{s}some-env.jar#{s}some-other.jar/
120
+ end
121
+ end
122
+
123
+ it "should use the --server compiler" do
124
+ jruby_launcher_args("--server").should include("-server")
125
+ end
126
+
127
+ it "should use the --client compiler" do
128
+ jruby_launcher_args("--client").should include("-client")
129
+ end
130
+
131
+ it "should set the JMX settings when --manage is present" do
132
+ jruby_launcher_args("--manage").should include("-Dcom.sun.management.jmxremote", "-Djruby.management.enabled=true")
133
+ end
134
+
135
+ it "should set the headless flag when --headless is present" do
136
+ jruby_launcher_args("--headless").should include("-Djava.awt.headless=true")
137
+ end
138
+
139
+ it "should pass -Xprof when --sample is present" do
140
+ jruby_launcher_args("--sample").should include("-Xprof")
141
+ end
142
+
143
+ it "should stop argument processing when a -- is seen" do
144
+ jruby_launcher_args("-- -Xhelp -Xtrace --headless").should include("-Xhelp", "-Xtrace", "--headless")
145
+ end
146
+
147
+ # JRUBY-4151
148
+ it "should properly handle single quotes" do
149
+ jruby_launcher_args("-e 'ABC DEF'").should include("ABC DEF")
150
+ end
151
+
152
+ # JRUBY-4581
153
+ it "should prepend JRUBY_OPTS to the start of the argument list to process" do
154
+ with_environment "JRUBY_OPTS" => "--server -J-Dsome.key=val -rubygems" do
155
+ jruby_launcher_args("-e 'ABC DEF'").should include("-server", "-Dsome.key=val", "-rubygems", "-e", "ABC DEF")
156
+ end
157
+ end
158
+
159
+ # JRUBY-4611
160
+ it "stops argument processing on first non-option argument" do
161
+ jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
162
+ end
163
+
164
+ # JRUBY-4608
165
+ if RbConfig::CONFIG['target_os'] =~ /darwin/i
166
+ it "includes file.encoding=UTF-8 on Mac if JAVA_ENCODING is not set" do
167
+ jruby_launcher_args("-e true").should include("-Dfile.encoding=UTF-8")
168
+ with_environment "JAVA_ENCODING" => "MacRoman" do
169
+ jruby_launcher_args("-e true").should_not include("-Dfile.encoding=UTF-8")
170
+ end
171
+ end
172
+ end
173
+
174
+ it "does not crash on empty args" do
175
+ jruby_launcher_args("-e ''").should include("-e")
176
+ jruby_launcher("-Xtrace '' 2>&1").should =~ /-Xtrace/
177
+ jruby_launcher("-Xjdkhome '' 2>&1").should =~ /-Xjdkhome/
178
+ end
179
+
180
+ # JRUBY-4706
181
+ it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
182
+ args = jruby_launcher_args("-e true")
183
+ args.grep(/Xbootclasspath/).should_not be_empty
184
+ args = jruby_launcher_args("-Xnobootclasspath -e true")
185
+ args.grep(/Xbootclasspath/).should be_empty
186
+ end
187
+
188
+ it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
189
+ with_environment "VERIFY_JRUBY" => "true" do
190
+ args = jruby_launcher_args("-e true")
191
+ args.grep(/Xbootclasspath/).should be_empty
192
+ end
193
+ end
194
+
195
+ # JRUBY-4709
196
+ it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
197
+ classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
198
+ if windows?
199
+ /;$/
200
+ else
201
+ /:$/
202
+ end
203
+ end
204
+
205
+ # JRUBY-6016
206
+ it "should honor JAVA_MEM" do
207
+ with_environment "JAVA_MEM" => "-Xmx768m" do
208
+ jruby_launcher_args("").should include("-Xmx768m")
209
+ end
210
+ end
211
+
212
+ it "should honor JAVA_STACK" do
213
+ with_environment "JAVA_STACK" => "-Xss3072k" do
214
+ jruby_launcher_args("").should include("-Xss3072k")
215
+ end
216
+ end
217
+
218
+ it "should honor JRUBY_HOME" do
219
+ with_environment "JRUBY_HOME" => "/tmp" do
220
+ jruby_launcher_args("").should include("-Djruby.home=/tmp")
221
+ end
222
+ end
223
+
224
+ context "JRUBY_HOME set and JRUBY_HOME/lib/jruby.jar exists" do
225
+ let(:jruby_home) do
226
+ require 'tempfile'
227
+ t = Tempfile.new("jruby_home")
228
+ t.path.tap { t.close! }
229
+ end
230
+
231
+ before do
232
+ FileUtils.mkdir_p(File.join(jruby_home, "lib"))
233
+ FileUtils.touch(File.join(jruby_home, "lib", "jruby.jar"))
234
+ end
235
+ after { FileUtils.rm_rf jruby_home }
236
+
237
+ it "should add jruby.jar to the bootclasspath" do
238
+ with_environment "JRUBY_HOME" => jruby_home do
239
+ jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
240
+ end
241
+ end
242
+ end
243
+
244
+ it "should place user-supplied options after default options" do
245
+ args = jruby_launcher_args("-J-Djruby.home=/tmp")
246
+ home_args = args.select {|x| x =~ /^-Djruby\.home/ }
247
+ home_args.length.should == 2
248
+ home_args.last.should == "-Djruby.home=/tmp"
249
+ end
250
+
251
+ it "should print the version" do
252
+ jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
253
+ end
254
+
255
+ it "should not crash on format-strings" do
256
+ jruby_launcher_args("-e %s%s%s%s%s 2>&1").should include('-e', '%s%s%s%s%s')
257
+ end
258
+ end
@@ -0,0 +1,81 @@
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