jruby · Aug 1, 2015 · Aug 4, 2015 · Aug 5, 2015 · Aug 5, 2015 · Aug 5, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,8 @@ sudo: false
 #    - $HOME/.m2
 
 before_script:
+  - export MAVEN_SKIP_RC=true
+  - export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=192m"
   - unset GEM_PATH GEM_HOME IRBRC JRUBY_OPTS
   - "export PATH=`pwd`/bin:$PATH"
   - echo $HOME

diff --git a/BSDL b/BSDL
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/COPYING b/COPYING
@@ -3,17 +3,18 @@ under a tri EPL/GPL/LGPL license. You can use it, redistribute it
 and/or modify it under the terms of the:
 
   Eclipse Public License version 1.0
+    OR
   GNU General Public License version 2
+    OR
   GNU Lesser General Public License version 2.1
 
-build_lib/bytelist.jar (http://github.com/jruby/bytelist),
-build_lib/yydebug.jar (http://svn.codehaus.org/jruby/trunk/jay/yydebug)
+bytelist (http://github.com/jruby/bytelist),
+yydebug (http://svn.codehaus.org/jruby/trunk/jay/yydebug)
 are released under the same copyright/license.
 
 Some additional libraries distributed with JRuby are not covered by
 JRuby's licence. Most of these libraries and their licenses are listed 
-below. Also see LICENSE.RUBY for most files found in lib/ruby/1.8,
-lib/ruby/1.9, and lib/ruby/site_ruby/1.8/rubygems*.
+below. Also see LICENSE.RUBY for most files found in lib/ruby/stdlib.
 
  bench/rails/public/javascripts/* are distributed under the MIT
  license, and have the following copyrights:
@@ -36,75 +37,30 @@ lib/ruby/1.9, and lib/ruby/site_ruby/1.8/rubygems*.
 
    Copyright (c) 2003, 2004 Jim Weirich
 
- build_lib/*asm*jar (http://asm.objectweb.org) are distributed under the BSD license.
+ asm (http://asm.objectweb.org) is distributed under the BSD license.
 
- build_lib/apt-mirror-api.jar, build_lib/bnd-0.0.249.jar,
- build_lib/commons-logging-1.1.1.jar, build_lib/joda-time-1.6.2.jar,
- BSF and ant are distributed under the Apache Software License,
- Version 1.1 (license file inside the jars).
-
- build_lib/jcodings.jar (http://github.com/jruby/jcodings) and
- build_lib/joni.jar (http://github.com/jruby/joni) are distributed
+ jcodings (http://github.com/jruby/jcodings) and
+ joni (http://github.com/jruby/joni) are distributed
  under the MIT license.
 
- build_lib/jnr-constants.jar (http://github.com/jnr/jnr-constants),
- build_lib/jarjar-1.0rc8.jar (http://code.google.com/p/jarjar),
- build_lib/joda-time-1.6.2.jar (http://joda-time.sourceforge.net),
- build_lib/jffi*jar (https://github.com/jnr/jffi),
- build_lib/jnr-ffi.jar (https://github.com/jnr/jnr-jffi),
- build_lib/jnr-netdb.jar (http://github.com/jnr/jnr-netdb),
- build_lib/dynalang-0.3.jar (http://dynalang.sourceforge.net),
- build_lib/nailgun-0.7.1.jar and tool/nailgun/ng.exe
- (http://martiansoftware.com/nailgun) are distributed under the
+ ant (http://ant.apache.org/),
+ jnr-constants (http://github.com/jnr/jnr-constants),
+ joda-time (http://joda-time.sourceforge.net),
+ jffi (https://github.com/jnr/jffi),
+ jnr-ffi (https://github.com/jnr/jnr-jffi),
+ jnr-enxio (https://github.com/jnr/jnr-enxio),
+ jnr-unixsocket (https://github.com/jnr/jnr-unixsocket),
+ jnr-netdb (http://github.com/jnr/jnr-netdb), and
+ nailgun (http://martiansoftware.com/nailgun) are distributed under the
  Apache License version 2.0.
 
- build_lib/emma*jar (http://emma.sourceforge.net) and
- build_lib/junit.jar (http://www.junit.org) are distributed under the
- Common Public License v1.0.
-
- build_lib/jline-* (http://jline.sourceforge.net) is distributed
- under the following license:
-
-   Redistribution and use in source and binary forms, with or
-   without modification, are permitted provided that the following
-   conditions are met:
-
-   Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer
-   in the documentation and/or other materials provided with
-   the distribution.
-
-   Neither the name of JLine nor the names of its contributors
-   may be used to endorse or promote products derived from this
-   software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-   EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-   OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-   AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-   OF THE POSSIBILITY OF SUCH DAMAGE.
-
- build_lib/jsr292-mock.jar (http://code.google.com/p/jvm-language-runtime)
+ jsr292-mock (http://code.google.com/p/jvm-language-runtime)
  distributed under the LGPL license. It is only used as a compile-time mock
  for Java 7-only features.
 
  Bouncycastle is released under the MIT license, and is Copyright (c)
  2000 - 2006 The Legion Of The Bouncy Castle.
 
- The "yecht" library is Copyright (c) 2009-2011 Ola Bini, and released
- under the MIT license.
-
  The Rubinius API implementation in truffle/src/main/ruby/core/rubinius/api
  is copyright (c) 2011, Evan Phoenix, and released under the 3-clause BSD license.
 

diff --git a/LICENSE.RUBY b/LICENSE.RUBY
@@ -2,8 +2,8 @@ JRuby distributes some ruby modules which are distributed under Ruby
 license:
 
 Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see the file GPL), or the conditions below:
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the
@@ -47,9 +47,9 @@ You can redistribute it and/or modify it under either the terms of the GPL
      For the list of those files and their copying conditions, see the
      file LEGAL.
 
-  5. The scripts and library files supplied as input to or produced as 
+  5. The scripts and library files supplied as input to or produced as
      output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
+     copyright of the software, but belong to whomever generated them,
      and may be sold commercially, and may be aggregated with this
      software.
 

diff --git a/core/src/main/java/org/jruby/RubyBasicObject.java b/core/src/main/java/org/jruby/RubyBasicObject.java
@@ -56,6 +56,7 @@
 import org.jruby.runtime.Visibility;
 
 import static org.jruby.anno.FrameField.*;
+import static org.jruby.runtime.Helpers.invokeChecked;
 import static org.jruby.runtime.Visibility.*;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.Arity;
@@ -73,6 +74,7 @@
 import org.jruby.util.unsafe.UnsafeHolder;
 
 import static org.jruby.runtime.Helpers.invokedynamic;
+import static org.jruby.runtime.invokedynamic.MethodNames.HASH;
 import static org.jruby.runtime.invokedynamic.MethodNames.OP_EQUAL;
 import static org.jruby.runtime.invokedynamic.MethodNames.OP_CMP;
 import static org.jruby.runtime.invokedynamic.MethodNames.EQL;
@@ -2822,6 +2824,46 @@ public RubyArray instance_variables19(ThreadContext context) {
         return array;
     }
 
+    /**
+     * This method is just a wrapper around the Ruby "==" method,
+     * provided so that RubyObjects can be used as keys in the Java
+     * HashMap object underlying RubyHash.
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) return true;
+
+        if (other instanceof IRubyObject) {
+            IRubyObject equals = invokeChecked(getRuntime().getCurrentContext(), this, "==", (IRubyObject)other);
+            if (equals == null) return false;
+            return equals.isTrue();
+        }
+
+        return false;
+    }
+
+    /**
+     * Override the Object#hashCode method to make sure that the Ruby
+     * hash is actually used as the hashcode for Ruby objects. If the
+     * Ruby "hash" method doesn't return a number, the Object#hashCode
+     * implementation will be used instead.
+     */
+    @Override
+    public int hashCode() {
+        IRubyObject hashValue = invokeChecked(getRuntime().getCurrentContext(), this, "hash");
+        if (hashValue == null) return super.hashCode();
+        if (hashValue instanceof RubyFixnum) return (int) RubyNumeric.fix2long(hashValue);
+        return nonFixnumHashCode(hashValue);
+    }
+
+    protected static int nonFixnumHashCode(IRubyObject hashValue) {
+        RubyInteger integer = hashValue.convertToInteger();
+        if (integer instanceof RubyBignum) {
+            return integer.getBigIntegerValue().intValue();
+        }
+        return (int) integer.getLongValue();
+    }
+
     /**
      * Checks if the name parameter represents a legal instance variable name, and otherwise throws a Ruby NameError
      */

diff --git a/core/src/main/java/org/jruby/RubyClass.java b/core/src/main/java/org/jruby/RubyClass.java
@@ -622,16 +622,25 @@ public IRubyObject finvoke(ThreadContext context, IRubyObject self, String name)
      * MRI: rb_check_funcall
      */
     public IRubyObject finvokeChecked(ThreadContext context, IRubyObject self, String name) {
+        return finvokeChecked(context, self, name, IRubyObject.NULL_ARRAY);
+    }
+
+    /**
+     * Safely attempt to invoke the given method name on self, using respond_to? and method_missing as appropriate.
+     *
+     * MRI: rb_check_funcall
+     */
+    public IRubyObject finvokeChecked(ThreadContext context, IRubyObject self, String name, IRubyObject... args) {
         RubyClass klass = self.getMetaClass();
         DynamicMethod me;
         if (!checkFuncallRespondTo(context, self.getMetaClass(), self, name))
             return null;
 
         me = searchMethod(name);
         if (!checkFuncallCallable(context, me, CallType.FUNCTIONAL, self)) {
-            return checkFuncallMissing(context, klass, self, name);
+            return checkFuncallMissing(context, klass, self, name, args);
         }
-        return me.call(context, self, klass, name);
+        return me.call(context, self, klass, name, args);
     }
 
     // MRI: check_funcall_exec
@@ -689,6 +698,7 @@ public static boolean rbMethodCallStatus(ThreadContext context, DynamicMethod me
         return method != null && !method.isUndefined() && method.isCallableFrom(self, callType);
     }
 
+    // MRI: check_funcall_missing
     private static IRubyObject checkFuncallMissing(ThreadContext context, RubyClass klass, IRubyObject self, String method, IRubyObject... args) {
         Ruby runtime = context.runtime;
         if (klass.isMethodBuiltin("method_missing")) {

diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -634,7 +634,7 @@ public static IRubyObject dirname(ThreadContext context, IRubyObject recv, IRuby
         return runtime.newString(dirname(context, jfilename)).infectBy(filename);
     }
 
-    private static Pattern PROTOCOL_PATTERN = Pattern.compile("^(uri|jar|file|classpath):([^:]*:)?//?.*");
+    static Pattern PROTOCOL_PATTERN = Pattern.compile("^(uri|jar|file|classpath):([^:]*:)?//?.*");
     public static String dirname(ThreadContext context, String jfilename) {
         String name = jfilename.replace('\\', '/');
         int minPathLength = 1;