jruby · Apr 17, 2015 · Apr 22, 2015 · Apr 22, 2015 · Apr 22, 2015 · Apr 22, 2015
diff --git a/core/pom.rb b/core/pom.rb
@@ -41,18 +41,18 @@
   jar 'org.ow2.asm:asm-util:${asm.version}'
 
   jar 'com.github.jnr:jnr-netdb:1.1.4'
-  jar 'com.github.jnr:jnr-enxio:0.8-SNAPSHOT'
+  jar 'com.github.jnr:jnr-enxio:0.8'
   jar 'com.github.jnr:jnr-x86asm:1.0.2'
-  jar 'com.github.jnr:jnr-unixsocket:0.7-SNAPSHOT'
-  jar 'com.github.jnr:jnr-posix:3.0.11-SNAPSHOT'
+  jar 'com.github.jnr:jnr-unixsocket:0.7'
+  jar 'com.github.jnr:jnr-posix:3.0.11'
   jar 'com.github.jnr:jnr-constants:0.8.6'
   jar 'com.github.jnr:jnr-ffi:2.0.2'
   jar 'com.github.jnr:jffi:${jffi.version}'
   jar 'com.github.jnr:jffi:${jffi.version}:native'
 
-  jar 'org.jruby.joni:joni:2.1.6-SNAPSHOT'
-  jar 'org.jruby.extras:bytelist:1.0.13-SNAPSHOT'
-  jar 'org.jruby.jcodings:jcodings:1.0.13-SNAPSHOT'
+  jar 'org.jruby.joni:joni:2.1.6'
+  jar 'org.jruby.extras:bytelist:1.0.13'
+  jar 'org.jruby.jcodings:jcodings:1.0.13'
   jar 'org.jruby:dirgra:0.2'
 
   jar 'com.headius:invokebinder:1.5'

diff --git a/core/pom.xml b/core/pom.xml
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-enxio</artifactId>
-      <version>0.8-SNAPSHOT</version>
+      <version>0.8</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -100,12 +100,12 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
-      <version>0.7-SNAPSHOT</version>
+      <version>0.7</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.0.11-SNAPSHOT</version>
+      <version>3.0.11</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -131,17 +131,17 @@
     <dependency>
       <groupId>org.jruby.joni</groupId>
       <artifactId>joni</artifactId>
-      <version>2.1.6-SNAPSHOT</version>
+      <version>2.1.6</version>
     </dependency>
     <dependency>
       <groupId>org.jruby.extras</groupId>
       <artifactId>bytelist</artifactId>
-      <version>1.0.13-SNAPSHOT</version>
+      <version>1.0.13</version>
     </dependency>
     <dependency>
       <groupId>org.jruby.jcodings</groupId>
       <artifactId>jcodings</artifactId>
-      <version>1.0.13-SNAPSHOT</version>
+      <version>1.0.13</version>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -39,6 +39,7 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby;
 
+import org.jcodings.specific.UTF8Encoding;
 import org.jruby.ast.ArrayNode;
 import org.jruby.ast.BlockNode;
 import org.jruby.ast.CallNode;
@@ -2731,26 +2732,26 @@ private Node parseFileFromMainAndGetAST(InputStream in, String file, DynamicScop
      private Node parseFileAndGetAST(InputStream in, String file, DynamicScope scope, int lineNumber, boolean isFromMain) {
          ParserConfiguration parserConfig =
                  new ParserConfiguration(this, lineNumber, false, true, config);
-         setupSourceEncoding(parserConfig);
+         setupSourceEncoding(parserConfig, UTF8Encoding.INSTANCE);
          return parser.parse(file, in, scope, parserConfig);
      }
 
     public Node parseInline(InputStream in, String file, DynamicScope scope) {
         addEvalParseToStats();
         ParserConfiguration parserConfig =
                 new ParserConfiguration(this, 0, false, true, false, config);
-        setupSourceEncoding(parserConfig);
+        setupSourceEncoding(parserConfig, getEncodingService().getLocaleEncoding());
         return parser.parse(file, in, scope, parserConfig);
     }
 
-    private void setupSourceEncoding(ParserConfiguration parserConfig) {
+    private void setupSourceEncoding(ParserConfiguration parserConfig, Encoding defaultEncoding) {
         if (config.getSourceEncoding() != null) {
             if (config.isVerbose()) {
                 config.getError().println("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
             }
             parserConfig.setDefaultEncoding(getEncodingService().getEncodingFromString(config.getSourceEncoding()));
         } else {
-            parserConfig.setDefaultEncoding(getEncodingService().getLocaleEncoding());
+            parserConfig.setDefaultEncoding(defaultEncoding);
         }
     }
 

diff --git a/core/src/main/java/org/jruby/java/invokers/StaticMethodInvoker.java b/core/src/main/java/org/jruby/java/invokers/StaticMethodInvoker.java
@@ -21,6 +21,10 @@ public StaticMethodInvoker(RubyClass host, Method method) {
         super(host, method);
     }
 
+    public StaticMethodInvoker(RubyModule host, Method method) {
+        super(host, method);
+    }
+
     @Override
     public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args) {
         JavaMethod method = (JavaMethod) findCallable(self, name, args, args.length);

diff --git a/core/src/main/java/org/jruby/java/proxies/JavaInterfaceTemplate.java b/core/src/main/java/org/jruby/java/proxies/JavaInterfaceTemplate.java
@@ -37,6 +37,8 @@ public static RubyModule createJavaInterfaceTemplateModule(ThreadContext context
         singleton.addReadAttribute(context, "java_class");
         singleton.defineAnnotatedMethods(JavaInterfaceTemplate.class);
 
+        JavaInterfaceTemplate.defineAnnotatedMethods(Java.JavaProxyClassMethods.class);
+
         return JavaInterfaceTemplate;
     }
 

diff --git a/core/src/main/java/org/jruby/javasupport/Java.java b/core/src/main/java/org/jruby/javasupport/Java.java
@@ -677,10 +677,10 @@ public static IRubyObject java_alias(ThreadContext context, IRubyObject clazz, I
 
     private static IRubyObject getRubyMethod(ThreadContext context, IRubyObject clazz, String name, Class... argTypesClasses) {
         final Ruby runtime = context.runtime;
-        if ( ! ( clazz instanceof RubyClass ) ) {
+        if ( ! ( clazz instanceof RubyModule ) ) {
             throw runtime.newTypeError(clazz, runtime.getModule());
         }
-        final RubyClass proxyClass = (RubyClass) clazz;
+        final RubyModule proxyClass = (RubyModule) clazz;
 
         final Method method = getMethodFromClass(context, clazz, name, argTypesClasses);
         final String prettyName = name + CodegenUtils.prettyParams(argTypesClasses);

diff --git a/core/src/main/java/org/jruby/javasupport/binding/ClassInitializer.java b/core/src/main/java/org/jruby/javasupport/binding/ClassInitializer.java
@@ -28,8 +28,6 @@ public RubyModule initialize(RubyModule proxy) {
 
         final State state = new State(runtime, superclass);
 
-        super.initializeBase(proxy);
-
         proxyClass.setReifiedClass(javaClass);
 
         runtime.getJavaSupport().getUnfinishedProxyClassCache().get(javaClass).set(proxyClass);

diff --git a/core/src/main/java/org/jruby/javasupport/binding/Initializer.java b/core/src/main/java/org/jruby/javasupport/binding/Initializer.java
@@ -381,28 +381,6 @@ private static void setJavaClassFor(final Class<?> javaClass, final RubyModule p
 
     public abstract RubyModule initialize(RubyModule proxy);
 
-    public void initializeBase(RubyModule proxy) {
-        proxy.addMethod("__jsend!", new org.jruby.internal.runtime.methods.JavaMethod.JavaMethodNBlock(proxy, PUBLIC) {
-            @Override
-            public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) {
-                String callName = args[0].asJavaString();
-
-                DynamicMethod method = self.getMetaClass().searchMethod(callName);
-                int v = method.getArity().getValue();
-
-                IRubyObject[] newArgs = new IRubyObject[args.length - 1];
-                System.arraycopy(args, 1, newArgs, 0, newArgs.length);
-
-                if(v < 0 || v == (newArgs.length)) {
-                    return Helpers.invoke(context, self, callName, newArgs, Block.NULL_BLOCK);
-                } else {
-                    RubyClass superClass = self.getMetaClass().getSuperClass();
-                    return Helpers.invokeAs(context, superClass, self, callName, newArgs, Block.NULL_BLOCK);
-                }
-            }
-        });
-    }
-
     public static class State {
 
         final Map<String, AssignedName> staticNames;

diff --git a/core/src/main/java/org/jruby/javasupport/binding/InterfaceInitializer.java b/core/src/main/java/org/jruby/javasupport/binding/InterfaceInitializer.java
@@ -23,8 +23,6 @@ public InterfaceInitializer(Ruby runtime, Class<?> javaClass) {
     public RubyModule initialize(RubyModule proxy) {
         final State state = new State(runtime, null);
 
-        super.initializeBase(proxy);
-
         runtime.getJavaSupport().getUnfinishedProxyClassCache().get(javaClass).set(proxy);
 
         Field[] fields = JavaClass.getDeclaredFields(javaClass);

diff --git a/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyClass.java b/core/src/main/java/org/jruby/javasupport/proxy/JavaProxyClass.java
@@ -568,7 +568,6 @@ public static RubyObject get(IRubyObject self, IRubyObject obj) {
         EXCLUDE_METHODS.add("java_class");
         EXCLUDE_METHODS.add("java_object");
         EXCLUDE_METHODS.add("__jcreate!");
-        EXCLUDE_METHODS.add("__jsend!");
     }
 
     @JRubyMethod(meta = true)

diff --git a/core/src/main/java/org/jruby/lexer/GetsLexerSource.java b/core/src/main/java/org/jruby/lexer/GetsLexerSource.java
@@ -18,17 +18,25 @@ public class GetsLexerSource extends LexerSource {
     private IRubyObject io;
     private Encoding encoding;
     private int offset;
-    
-    public GetsLexerSource(String sourceName, int line, IRubyObject io, RubyArray scriptLines) {
-        // FIXME: Does this source needs SCRIPT_LINES support?
+
+    // Main-line Parsing constructor
+    public GetsLexerSource(String sourceName, int line, IRubyObject io, RubyArray scriptLines, Encoding encoding) {
         super(sourceName, line, scriptLines);
-        
+
         this.io = io;
-        encoding = frobnicateEncoding();
+        this.encoding = encoding;
+    }
+
+    // FIXME (enebo 21-Apr-15): ripper probably has same problem as main-line parser so this constructor
+    // may need to be a mix of frobbing the encoding of an incoming object plus defaultEncoding if not.
+    // But main-line parser should not be asking IO for encoding.
+    // Ripper constructor
+    public GetsLexerSource(String sourceName, int line, IRubyObject io, RubyArray scriptLines) {
+        this(sourceName, line, io, scriptLines, frobnicateEncoding(io));
     }
 
     // FIXME: Should be a hard failure likely if no encoding is possible
-    public final Encoding frobnicateEncoding() {
+    public static final Encoding frobnicateEncoding(IRubyObject io) {
         // Non-ripper IO will not have encoding so we will just use default external
         if (!io.respondsTo("encoding")) return io.getRuntime().getDefaultExternalEncoding();
 

diff --git a/core/src/main/java/org/jruby/parser/Parser.java b/core/src/main/java/org/jruby/parser/Parser.java
@@ -83,7 +83,7 @@ public Node parse(String file, ByteList content, DynamicScope blockScope,
     public Node parse(String file, byte[] content, DynamicScope blockScope,
             ParserConfiguration configuration) {
         RubyArray list = getLines(configuration, runtime, file);
-        ByteList in = new ByteList(content, runtime.getDefaultExternalEncoding());
+        ByteList in = new ByteList(content, configuration.getDefaultEncoding());
         LexerSource lexerSource = new ByteListLexerSource(file, configuration.getLineNumber(), in,  list);
         return parse(file, lexerSource, blockScope, configuration);
     }
@@ -96,7 +96,7 @@ public Node parse(String file, InputStream content, DynamicScope blockScope,
         } else {
             RubyArray list = getLines(configuration, runtime, file);
             RubyIO io = RubyIO.newIO(runtime, Channels.newChannel(content));
-            LexerSource lexerSource = new GetsLexerSource(file, configuration.getLineNumber(), io, list);
+            LexerSource lexerSource = new GetsLexerSource(file, configuration.getLineNumber(), io, list, configuration.getDefaultEncoding());
             return parse(file, lexerSource, blockScope, configuration);
         }
     }

diff --git a/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java b/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
@@ -137,6 +137,12 @@ public Entry findEncodingOrAliasEntry(byte[] bytes) {
 
     // rb_locale_charmap...mostly
     public Encoding getLocaleEncoding() {
+        final Encoding consoleEncoding = getConsoleEncoding();
+
+        if (consoleEncoding != null) {
+            return consoleEncoding;
+        }
+
         Entry entry = findEncodingOrAliasEntry(new ByteList(Charset.defaultCharset().name().getBytes()));
         return entry == null ? ASCIIEncoding.INSTANCE : entry.getEncoding();
     }

diff --git a/pom.rb b/pom.rb
@@ -178,7 +178,7 @@
   [
     'rake', 'exec', 'truffle-specs-language', 'truffle-specs-core',
     'truffle-specs-library', 'truffle-specs-language-report',
-    'truffle-specs-core-report', 'truffle-specs-library-report', 'truffle-test-pe'
+    'truffle-specs-core-report', 'truffle-specs-library-report', 'truffle-test-pe', 'truffle-mri-tests'
   ].each do |name|
     profile name do
 

diff --git a/pom.xml b/pom.xml
@@ -606,6 +606,15 @@
         <module>test</module>
       </modules>
     </profile>
+    <profile>
+      <id>truffle-mri-tests</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+      </build>
+      <modules>
+        <module>test</module>
+      </modules>
+    </profile>
     <profile>
       <id>bootstrap</id>
       <modules>

diff --git a/spec/java_integration/interfaces/static_methods_spec.rb b/spec/java_integration/interfaces/static_methods_spec.rb
@@ -25,5 +25,13 @@
     it "binds those methods on the proxy module" do
       expect(Java::Java8Interface.message).to eq("hello")
     end
+
+    it "exposes those methods via java_send" do
+      expect(Java::Java8Interface.java_send(:message)).to eq("hello")
+    end
+
+    it "exposes those methods via java_method" do
+      expect(Java::Java8Interface.java_method(:message).call).to eq("hello")
+    end
   end
 end
diff --git a/spec/truffle/tags/core/array/hash_tags.txt b/spec/truffle/tags/core/array/hash_tags.txt
diff --git a/spec/truffle/tags/core/array/initialize_tags.txt b/spec/truffle/tags/core/array/initialize_tags.txt
diff --git a/spec/truffle/tags/core/array/sort_tags.txt b/spec/truffle/tags/core/array/sort_tags.txt
diff --git a/spec/truffle/tags/core/fixnum/bit_xor_tags.txt b/spec/truffle/tags/core/fixnum/bit_xor_tags.txt
@@ -0,0 +1 @@
+fails:Fixnum#^ raises a TypeError and does not call #to_int when defined on an object
diff --git a/spec/truffle/tags/core/kernel/at_exit_tags.txt b/spec/truffle/tags/core/kernel/at_exit_tags.txt
@@ -1,4 +1,3 @@
-fails:Kernel.at_exit allows calling exit inside at_exit handler
 slow:Kernel.at_exit runs after all other code
 slow:Kernel.at_exit runs in reverse order of registration
 slow:Kernel.at_exit allows calling exit inside at_exit handler

diff --git a/spec/truffle/tags/core/kernel/loop_tags.txt b/spec/truffle/tags/core/kernel/loop_tags.txt
diff --git a/spec/truffle/tags/core/proc/yield_tags.txt b/spec/truffle/tags/core/proc/yield_tags.txt
diff --git a/test/mri/excludes_truffle/TestClass.rb b/test/mri/excludes_truffle/TestClass.rb
@@ -13,3 +13,9 @@
 exclude :test_redefine_private_class, "needs investigation"
 exclude :test_singleton_class, "needs investigation"
 exclude :test_uninitialized, "needs investigation"
+exclude :test_cannot_reinitialize_class_with_initialize_copy,  "needs investigation"
+exclude :test_cloned_class, "needs investigation"
+exclude :test_constant_access_from_method_in_cloned_module, "needs investigation"
+exclude :test_singleton_class_message, "needs investigation"
+exclude :test_singleton_class_of_frozen_object,  "needs investigation"
+exclude :test_singleton_class_p, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestDelegateClass.rb b/test/mri/excludes_truffle/TestDelegateClass.rb
@@ -9,3 +9,5 @@
 exclude :test_systemcallerror_eq, "needs investigation"
 exclude :test_unset_delegate_class, "needs investigation"
 exclude :test_unset_simple_delegator, "needs investigation"
+exclude :test_dir_in_delegator_class, "needs investigation"
+exclude :test_dir_in_simple_delegator, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestFixnum.rb b/test/mri/excludes_truffle/TestFixnum.rb
@@ -2,3 +2,5 @@
 exclude :test_pow2, "needs investigation"
 exclude :test_power_of_0, "needs investigation"
 exclude :test_remainder, "needs investigation"
+exclude :test_xor_with_nonintegral_numeric, "needs investigation"
+exclude :test_xor_with_rational, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestMarshal.rb b/test/mri/excludes_truffle/TestMarshal.rb
@@ -41,3 +41,38 @@
 exclude :test_time_ivar, "needs investigation"
 exclude :test_time_subclass, "needs investigation"
 exclude :test_true, "needs investigation"
+exclude :test_change_class_name , "needs investigation"
+exclude :test_change_struct , "needs investigation"
+exclude :test_class , "needs investigation"
+exclude :test_class_ivar , "needs investigation"
+exclude :test_class_nonascii , "needs investigation"
+exclude :test_context_switch , "needs investigation"
+exclude :test_continuation , "needs investigation"
+exclude :test_dump_buffer , "needs investigation"
+exclude :test_hash_default , "needs investigation"
+exclude :test_inconsistent_struct , "needs investigation"
+exclude :test_marshal_cloned_class , "needs investigation"
+exclude :test_marshal_complex , "needs investigation"
+exclude :test_marshal_dump , "needs investigation"
+exclude :test_marshal_dump_excess_encoding , "needs investigation"
+exclude :test_marshal_dump_extra_iv , "needs investigation"
+exclude :test_marshal_dump_ivar , "needs investigation"
+exclude :test_marshal_dump_struct_ivar , "needs investigation"
+exclude :test_marshal_encoding_encoding , "needs investigation"
+exclude :test_marshal_flonum_reference , "needs investigation"
+exclude :test_marshal_load_ivar , "needs investigation"
+exclude :test_marshal_load_should_not_taint_classes , "needs investigation"
+exclude :test_marshal_private_class , "needs investigation"
+exclude :test_marshal_rational , "needs investigation"
+exclude :test_marshal_regexp_encoding , "needs investigation"
+exclude :test_marshal_respond_to_arity , "needs investigation"
+exclude :test_marshal_string_encoding , "needs investigation"
+exclude :test_modify_array_during_dump , "needs investigation"
+exclude :test_module_ivar , "needs investigation"
+exclude :test_pipe , "needs investigation"
+exclude :test_regexp2 , "needs investigation"
+exclude :test_struct_invalid_members , "needs investigation"
+exclude :test_taint , "needs investigation"
+exclude :test_taint_each_object , "needs investigation"
+exclude :test_too_long_string , "needs investigation"
+exclude :test_userdef_encoding , "needs investigation"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:Fixnum#^ raises a TypeError and does not call #to_int when defined on an object