jruby · Nov 7, 2014 · Nov 7, 2014
Showing with 39 additions and 0 deletions.

+9 −0 core/src/main/java/org/jruby/RubyComparable.java

+29 −0 core/src/main/java/org/jruby/ext/etc/RubyEtc.java

+1 −0 test/mri/excludes/TestAssignment.rb
diff --git a/core/src/main/java/org/jruby/RubyComparable.java b/core/src/main/java/org/jruby/RubyComparable.java
@@ -35,6 +35,7 @@
 
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
+import org.jruby.common.RubyWarnings;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -144,6 +145,7 @@ private static IRubyObject callCmpMethod(ThreadContext context, IRubyObject recv
 
             return RubyBoolean.newBoolean(runtime, cmpint(context, result, recv, other) == 0);
         } catch (RaiseException e) {
+            cmpFailed(context);
             if (e.getException().kind_of_p(context, runtime.getStandardError()).isTrue()) {
                 // clear error info resulting from failure to compare (JRUBY-3292)
                 runtime.getGlobalVariables().set("$!", savedError);
@@ -155,6 +157,13 @@ private static IRubyObject callCmpMethod(ThreadContext context, IRubyObject recv
         }
     }
 
+    private static void cmpFailed(ThreadContext context) {
+        RubyWarnings warnings = context.runtime.getWarnings();
+
+        warnings.warn("Comparable#== will no more rescue exceptions of #<=> in the next release.");
+        warnings.warn("Return nil in #<=> if the comparison is inappropriate or avoid such comparison.");
+    }
+
     /** cmp_gt
      * 
      */

diff --git a/core/src/main/java/org/jruby/ext/etc/RubyEtc.java b/core/src/main/java/org/jruby/ext/etc/RubyEtc.java
@@ -1,6 +1,10 @@
 package org.jruby.ext.etc;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.jruby.RubyHash;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
 import org.jruby.common.IRubyWarnings.ID;
@@ -20,6 +24,7 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
+import org.jruby.util.SafePropertyAccessor;
 
 @JRubyModule(name="Etc")
 public class RubyEtc {
@@ -435,6 +440,30 @@ public static IRubyObject nprocessors(ThreadContext context, IRubyObject recv) {
         int nprocs = Runtime.getRuntime().availableProcessors();
         return RubyFixnum.newFixnum(context.getRuntime(), nprocs);
     }
+
+    @JRubyMethod(module = true)
+    public static IRubyObject uname(ThreadContext context, IRubyObject self) {
+        Ruby runtime = context.runtime;
+        RubyHash uname = RubyHash.newHash(runtime);
+
+        uname.op_aset(context,
+                runtime.newSymbol("sysname"),
+                runtime.newString(SafePropertyAccessor.getProperty("os.name", "unknown")));
+        try {
+            uname.op_aset(context,
+                    runtime.newSymbol("nodename"),
+                    runtime.newString(InetAddress.getLocalHost().getHostName()));
+        } catch (UnknownHostException uhe) {
+            uname.op_aset(context,
+                    runtime.newSymbol("nodename"),
+                    runtime.newString("unknown"));
+        }
+        uname.put(runtime.newSymbol("release"), runtime.newString("unknown"));
+        uname.put(runtime.newSymbol("version"), runtime.newString(SafePropertyAccessor.getProperty("os.version")));
+        uname.put(runtime.newSymbol("machine"), runtime.newString(SafePropertyAccessor.getProperty("os.arch")));
+
+        return uname;
+    }
 
     private static final AtomicBoolean iteratingPasswd = new AtomicBoolean(false);
 }
diff --git a/test/mri/excludes/TestAssignment.rb b/test/mri/excludes/TestAssignment.rb
@@ -1 +1,2 @@
+exclude :test_assign_private_self, "disagreement about visibility of attrs (MRI #9907)"
 exclude :test_yield, "needs investigation"
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		exclude :test_assign_private_self, "disagreement about visibility of attrs (MRI #9907)"
		exclude :test_yield, "needs investigation"