jruby · Apr 26, 2015 · Apr 28, 2015 · Apr 28, 2015 · Apr 28, 2015 · Apr 29, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -41,6 +41,7 @@ env:
     - PHASE='-Ptruffle-specs-language'
     - PHASE='-Ptruffle-specs-core'
     - PHASE='-Ptruffle-specs-library'
+    - PHASE='-Ptruffle-mri-tests'
 
 matrix:
   include:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9.0.0.0.pre2
+9.0.0.0-SNAPSHOT
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.0.0.0.pre2</version>
+    <version>9.0.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>

diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -283,8 +283,6 @@ public void run() {
         }
 
         try {
-            doSetContextClassLoader(runtime);
-
             if (in == null) {
                 // no script to run, return success
                 return new Status();
@@ -454,18 +452,6 @@ private boolean checkStreamSyntax(Ruby runtime, InputStream in, String filename)
         }
     }
 
-    private void doSetContextClassLoader(Ruby runtime) {
-        // set thread context JRuby classloader here, for the main thread
-        try {
-            Thread.currentThread().setContextClassLoader(runtime.getJRubyClassLoader());
-        } catch (SecurityException se) {
-            // can't set TC classloader
-            if (runtime.getInstanceConfig().isVerbose()) {
-                config.getError().println("WARNING: Security restrictions disallowed setting context classloader for main thread.");
-            }
-        }
-    }
-
     private void doProcessArguments(InputStream in) {
         config.processArguments(config.parseShebangOptions(in));
     }

diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -2985,18 +2985,25 @@ public RubyBoolean const_defined_p19(ThreadContext context, IRubyObject[] args)
         String symbol = fullName;
         boolean inherit = args.length == 1 || (!args[1].isNil() && args[1].isTrue());
 
+        int sep = symbol.indexOf("::");
         // symbol form does not allow ::
-        if (args[0] instanceof RubySymbol && symbol.indexOf("::") != -1) {
+        if (args[0] instanceof RubySymbol && sep != -1) {
             throw runtime.newNameError("wrong constant name", symbol);
         }
 
         RubyModule mod = this;
 
-        if (symbol.startsWith("::")) mod = runtime.getObject();
+        if (sep == 0) { // ::Foo::Bar
+            mod = runtime.getObject();
+            symbol = symbol.substring(2);
+        }
+
+        // Bare ::
+        if (symbol.length() == 0) throw context.runtime.newNameError("wrong constant name ::", fullName);
 
-        int sep;
         while((sep = symbol.indexOf("::")) != -1) {
             String segment = symbol.substring(0, sep);
+            if (segment.length() == 0) throw context.runtime.newNameError("wrong constant name " + fullName, symbol);
             symbol = symbol.substring(sep + 2);
             IRubyObject obj = mod.getConstantNoConstMissing(validateConstant(segment, args[0]), inherit, inherit);
             if(obj instanceof RubyModule) {
@@ -3040,6 +3047,9 @@ public IRubyObject const_get_2_0(ThreadContext context, IRubyObject[] args) {
             symbol = symbol.substring(2);
         }
 
+        // Bare ::
+        if (symbol.length() == 0) throw context.runtime.newNameError("wrong constant name ::", fullName);
+
         while ((sep = symbol.indexOf("::")) != -1) {
             String segment = symbol.substring(0, sep);
             symbol = symbol.substring(sep + 2);
@@ -3107,15 +3117,16 @@ private boolean hasConstantInHierarchy(final String name) {
     @JRubyMethod(name = "const_missing", required = 1)
     public IRubyObject const_missing(ThreadContext context, IRubyObject rubyName, Block block) {
         Ruby runtime = context.runtime;
-        String name;
+        String shortName = rubyName.asJavaString();
+        String longName;
 
         if (this != runtime.getObject()) {
-            name = getName() + "::" + rubyName.asJavaString();
+            longName = getName() + "::" + shortName;
         } else {
-            name = rubyName.asJavaString();
+            longName = shortName;
         }
 
-        throw runtime.newNameErrorObject("uninitialized constant " + name, runtime.newSymbol(name));
+        throw runtime.newNameErrorObject("uninitialized constant " + longName, runtime.newSymbol(shortName));
     }
 
     public RubyArray constants(ThreadContext context) {

diff --git a/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java b/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
@@ -718,7 +718,7 @@ private void logScriptResolutionFailure(String path) {
     public static void checkGraalVersion() {
         if (Options.TRUFFLE_RUNTIME_VERSION_CHECK.load()) {
             final String graalVersion = System.getProperty("graal.version", "unknown");
-            final String expectedGraalVersion = "0.7-dev";
+            final String expectedGraalVersion = "0.7";
 
             if (graalVersion.equals("unknown")) {
                 return;

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.0.0.0.pre2</version>
+    <version>9.0.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
   <name>JRuby Lib Setup</name>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>9.0.0.0.pre2</version>
+      <version>9.0.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/lib/ruby/shared/ffi/platform/ppc64le-linux/types.conf b/lib/ruby/shared/ffi/platform/ppc64le-linux/types.conf
diff --git a/lib/ruby/truffle/mri/logger.rb b/lib/ruby/truffle/mri/logger.rb
@@ -0,0 +1 @@
+require_relative '../../stdlib/logger'
diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9.0.0.0.pre2</version>
+    <version>9.0.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-complete</artifactId>
   <packaging>bundle</packaging>

diff --git a/maven/jruby-dist/pom.xml b/maven/jruby-dist/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9.0.0.0.pre2</version>
+    <version>9.0.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-dist</artifactId>
   <packaging>pom</packaging>

diff --git a/maven/jruby-jars/pom.xml b/maven/jruby-jars/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9.0.0.0.pre2</version>
+    <version>9.0.0.0-SNAPSHOT</version>
   </parent>
   <groupId>rubygems</groupId>
   <artifactId>jruby-jars</artifactId>
@@ -43,7 +43,6 @@ freezing to) a specific jruby-complete jar version.</description>
     <url>http://github.com/jruby/jruby/tree/master/gem/jruby-jars</url>
   </scm>
   <properties>
-    <jruby.home>${basedir}/../..</jruby.home>
     <tesla.dump.readonly>true</tesla.dump.readonly>
     <gem.home>${jruby_home}/lib/ruby/gems/shared</gem.home>
     <jruby.plugins.version>1.0.7</jruby.plugins.version>
@@ -73,7 +72,7 @@ freezing to) a specific jruby-complete jar version.</description>
       </extension>
     </extensions>
     <directory>${basedir}/pkg</directory>
-    <finalName>${project.artifactId}-9.0.0.0.pre2</finalName>
+    <finalName>${project.artifactId}-9.0.0.0.SNAPSHOT</finalName>
     <plugins>
       <plugin>
         <groupId>de.saumya.mojo</groupId>
@@ -120,7 +119,7 @@ freezing to) a specific jruby-complete jar version.</description>
         <artifactId>maven-invoker-plugin</artifactId>
         <configuration>
           <properties>
-            <ruby.version>9.0.0.0.pre2</ruby.version>
+            <ruby.version>9.0.0.0.SNAPSHOT</ruby.version>
             <gem.home>${project.build.directory}/rubygems</gem.home>
             <gem.path>${project.build.directory}/rubygems</gem.path>
           </properties>

diff --git a/maven/jruby/pom.xml b/maven/jruby/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9.0.0.0.pre2</version>
+    <version>9.0.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby</artifactId>
   <name>JRuby Main Maven Artifact</name>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.0.0.0.pre2</version>
+    <version>9.0.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-artifacts</artifactId>
   <packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.jruby</groupId>
   <artifactId>jruby-parent</artifactId>
-  <version>9.0.0.0.pre2</version>
+  <version>9.0.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JRuby</name>
   <description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>

diff --git a/spec/java_integration/reify/become_java_spec.rb b/spec/java_integration/reify/become_java_spec.rb
@@ -112,8 +112,10 @@ def blah_with_args(arg_one,arg_two)
     class JRUBY5564; end
     a_class = JRUBY5564.become_java!(false)
 
-    # load the java class from the classloader
-    cl = java.lang.Thread.current_thread.getContextClassLoader
+    # load the java class from the jruby-classloader
+    # this diverts from the original issue 5564 since
+    # JRuby can run without any context_class_loader involved
+    cl = JRuby.runtime.jruby_class_loader
     cl.load_class(a_class.get_name).should == a_class
   end
 

diff --git a/spec/truffle/tags/core/bignum/equal_value_tags.txt b/spec/truffle/tags/core/bignum/equal_value_tags.txt
diff --git a/spec/truffle/tags/library/logger/device/close_tags.txt b/spec/truffle/tags/library/logger/device/close_tags.txt
@@ -0,0 +1 @@
+fails:Logger::LogDevice#close closes the LogDevice's stream
diff --git a/spec/truffle/tags/library/logger/device/new_tags.txt b/spec/truffle/tags/library/logger/device/new_tags.txt
@@ -0,0 +1 @@
+fails:Logger::LogDevice#new creates a File if the IO object does not exist
diff --git a/spec/truffle/tags/library/logger/device/write_tags.txt b/spec/truffle/tags/library/logger/device/write_tags.txt
@@ -0,0 +1,2 @@
+fails:Logger::LogDevice#write can create a file and writes empty message
+fails:Logger::LogDevice#write fails if the device is already closed
diff --git a/spec/truffle/tags/library/logger/logger/new_tags.txt b/spec/truffle/tags/library/logger/logger/new_tags.txt
@@ -0,0 +1,2 @@
+fails:Logger#new creates a new logger object
+fails:Logger#new receivs a maximum logfile size as third argument
diff --git a/spec/truffle/tags/library/stringscanner/element_reference_tags.txt b/spec/truffle/tags/library/stringscanner/element_reference_tags.txt
@@ -0,0 +1,2 @@
+fails:StringScanner#[] raises a IndexError when there's no named capture
+fails:StringScanner#[] returns named capture
diff --git a/spec/truffle/tags/library/stringscanner/getch_tags.txt b/spec/truffle/tags/library/stringscanner/getch_tags.txt
@@ -0,0 +1 @@
+fails:StringScanner#getch is multi-byte character sensitive
diff --git a/spec/truffle/tags/library/stringscanner/matched_tags.txt b/spec/truffle/tags/library/stringscanner/matched_tags.txt
@@ -0,0 +1 @@
+fails:StringScanner#matched taints the returned String if the input was tainted
diff --git a/spec/truffle/tags/library/stringscanner/peek_tags.txt b/spec/truffle/tags/library/stringscanner/peek_tags.txt
@@ -0,0 +1 @@
+fails:StringScanner#peek raises a RangeError when the passed argument is a Bignum
diff --git a/spec/truffle/tags/library/stringscanner/peep_tags.txt b/spec/truffle/tags/library/stringscanner/peep_tags.txt
@@ -0,0 +1 @@
+fails:StringScanner#peep raises a RangeError when the passed argument is a Bignum
diff --git a/spec/truffle/tags/library/stringscanner/post_match_tags.txt b/spec/truffle/tags/library/stringscanner/post_match_tags.txt
@@ -0,0 +1 @@
+fails:StringScanner#post_match taints the returned String if the input was tainted
diff --git a/spec/truffle/tags/library/stringscanner/scan_tags.txt b/spec/truffle/tags/library/stringscanner/scan_tags.txt
@@ -0,0 +1 @@
+fails:StringScanner#scan treats ^ as matching from the beginning of the current position
diff --git a/spec/truffle/tags/library/stringscanner/scan_until_tags.txt b/spec/truffle/tags/library/stringscanner/scan_until_tags.txt
@@ -0,0 +1 @@
+fails:StringScanner#scan_until can match anchors properly
diff --git a/spec/truffle/truffle.mspec b/spec/truffle/truffle.mspec
@@ -90,6 +90,7 @@ class MSpecScript
     "spec/ruby/library/erb",
     "spec/ruby/library/getoptlong",
     "spec/ruby/library/matrix",
+    "spec/ruby/library/logger",
     "spec/ruby/library/observer",
     "spec/ruby/library/open3",
     "spec/ruby/library/openstruct",
@@ -100,7 +101,7 @@ class MSpecScript
     "spec/ruby/library/shellwords",
     "spec/ruby/library/singleton",
     "spec/ruby/library/stringio",
-    "spec/ruby/library/strscan",
+    "spec/ruby/library/stringscanner",
     "spec/ruby/library/tempfile",
     "spec/ruby/library/thread",
     "spec/ruby/library/time",
@@ -117,15 +118,13 @@ class MSpecScript
     "^spec/ruby/library/expect",
     "^spec/ruby/library/fiber",
     "^spec/ruby/library/ipaddr",
-    "^spec/ruby/library/logger",
     "^spec/ruby/library/mathn",
     "^spec/ruby/library/net",
     "^spec/ruby/library/openssl",
     "^spec/ruby/library/readline",
     "^spec/ruby/library/resolv",
     "^spec/ruby/library/rexml",
     "^spec/ruby/library/securerandom",
-    "^spec/ruby/library/stringscanner",
     "^spec/ruby/library/syslog",
     "^spec/ruby/library/timeout",
     "^spec/ruby/library/weakref",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:Logger::LogDevice#close closes the LogDevice's stream
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:Logger::LogDevice#new creates a File if the IO object does not exist
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fails:Logger::LogDevice#write can create a file and writes empty message
		fails:Logger::LogDevice#write fails if the device is already closed
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fails:Logger#new creates a new logger object
		fails:Logger#new receivs a maximum logfile size as third argument
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fails:StringScanner#[] raises a IndexError when there's no named capture
		fails:StringScanner#[] returns named capture
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:StringScanner#getch is multi-byte character sensitive
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:StringScanner#matched taints the returned String if the input was tainted
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:StringScanner#peek raises a RangeError when the passed argument is a Bignum
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:StringScanner#peep raises a RangeError when the passed argument is a Bignum
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:StringScanner#post_match taints the returned String if the input was tainted