jruby · Apr 19, 2015 · Apr 19, 2015 · Apr 20, 2015 · Apr 20, 2015 · Apr 20, 2015
Showing 316 changed files with 2,984 additions and 707 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,7 @@ os:
 env:
   global:
     - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+    - MALLOC_ARENA_MAX=2
   matrix:
     - PHASE='-Ptest'
     - PHASE='-Prake -Dtask=test:jruby'

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # JRuby - an implementation of the Ruby language on the JVM
 
-Master: [![Build Status](https://travis-ci.org/jruby/jruby.png?branch=master)](https://travis-ci.org/jruby/jruby) 
+Master: [![Build Status](https://travis-ci.org/jruby/jruby.png?branch=master)](https://travis-ci.org/jruby/jruby)
 1.7 branch: [![Build Status](https://travis-ci.org/jruby/jruby.png?branch=jruby-1_7)](https://travis-ci.org/jruby/jruby/branches)
 
 ## About
@@ -40,7 +40,7 @@ For [`rbenv`](https://github.com/sstephenson/rbenv) you will need the
 package manager can provide these. Then you can run:
 
 ```
-$ rbenv install rbenv install jruby-9.0.0.0-dev
+$ rbenv install jruby-9.0.0.0-dev
 ```
 
 For [`rvm`](https://rvm.io) you can simply do:
@@ -69,7 +69,7 @@ Stefan Matthias Aust, Anders Bengtsson, Geert Bevin, Ola Bini,
  Daiki Ueno, Matthias Veit, Jason Voegele, Sergey Yevtushenko, Robert Yokota,
    and many gracious contributors from the community.
 
-JRuby uses code generously shared by the creator of the Ruby language, 
+JRuby uses code generously shared by the creator of the Ruby language,
 Yukihiro Matsumoto <matz@netlab.co.jp>.
 
 Project Contact: Thomas E Enebo <tom.enebo@gmail.com>

diff --git a/core/pom.xml b/core/pom.xml
@@ -41,7 +41,7 @@
     <parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
     <jruby.basedir>${basedir}/..</jruby.basedir>
     <rubyspec.dir>${spec.dir}/ruby</rubyspec.dir>
-    <version.ruby.revision>49761</version.ruby.revision>
+    <version.ruby.revision>50293</version.ruby.revision>
     <jruby.test.memory>3G</jruby.test.memory>
     <mspec.dir>${spec.dir}/mspec</mspec.dir>
     <build.date>${maven.build.timestamp}</build.date>

diff --git a/core/src/main/java/org/jruby/util/io/PopenExecutor.java b/core/src/main/java/org/jruby/util/io/PopenExecutor.java
@@ -1183,7 +1183,7 @@ static void execargFixup(ThreadContext context, Ruby runtime, ExecArg eargp) {
             }
             else {
                 envtbl = runtime.getObject().getConstant("ENV");
-                envtbl = TypeConverter.convertToType(envtbl, runtime.getHash(), "to_hash");
+                envtbl = TypeConverter.convertToType(envtbl, runtime.getHash(), "to_hash").dup();
             }
             if (envopts != null) {
                 RubyHash stenv = (RubyHash)envtbl;

diff --git a/core/src/main/java/org/jruby/util/io/SelectExecutor.java b/core/src/main/java/org/jruby/util/io/SelectExecutor.java
@@ -117,7 +117,7 @@ IRubyObject selectInternal(ThreadContext context) throws IOException {
                     pendingReadFDs.add(fptr.fd());
                 }
             }
-            if (pendingReadFDs != null) {		/* no blocking if there's buffered data */
+            if (pendingReadFDs != null || unselectableReadFDs != null) {/* ready to go if there's buffered data or we can't select */
                 timeout = (long) 0;
             }
         }
@@ -130,6 +130,9 @@ IRubyObject selectInternal(ThreadContext context) throws IOException {
                 fptr = write_io.getOpenFileChecked();
                 fdSetWrite(context, fptr.fd(), writeAry.size());
             }
+            if (unselectableWriteFDs != null) {/* ready to go if we can't select */
+                timeout = (long) 0;
+            }
         }
 
         RubyArray exceptAry = null;
@@ -240,8 +243,8 @@ private int maxWriteReadySize() {
     }
 
     private void fdSetRead(ThreadContext context, ChannelFD fd, int maxSize) throws IOException {
-        if (fd.chFile != null || fd.isNativeFile) {
-            // files are not selectable, so we treat them as ready
+        if (fd.chSelect == null) {
+            // channels that are not selectable are treated as always ready, like files
             if (unselectableReadFDs == null) unselectableReadFDs = new ArrayList(1);
             unselectableReadFDs.add(fd);
             return;
@@ -253,8 +256,8 @@ private void fdSetRead(ThreadContext context, ChannelFD fd, int maxSize) throws
     }
 
     private void fdSetWrite(ThreadContext context, ChannelFD fd, int maxSize) throws IOException {
-        if (fd.chFile != null || fd.isNativeFile) {
-            // files are not selectable, so we treat them as ready
+        if (fd.chSelect == null) {
+            // channels that are not selectable are treated as always ready, like files
             if (unselectableWriteFDs == null) unselectableWriteFDs = new ArrayList(1);
             unselectableWriteFDs.add(fd);
             return;

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -24,12 +24,12 @@ def version
    ImportedGem.new( 'jruby-readline', '1.0', false ),
    ImportedGem.new( 'rake', 'rake.version', true ),
    ImportedGem.new( 'rdoc', 'rdoc.version', true ),
-   ImportedGem.new( 'json', 'json.version', true ),
-   ImportedGem.new( 'jar-dependencies', '0.1.12', true ),
    ImportedGem.new( 'minitest', 'minitest.version', true ),
    ImportedGem.new( 'test-unit', 'test-unit.version', true ),
    ImportedGem.new( 'power_assert', 'power_assert.version', true ),
-   ImportedGem.new( 'psych', '2.0.9.2', true )
+   ImportedGem.new( 'psych', '2.0.9.2', true ),
+   ImportedGem.new( 'json', 'json.version', true ),
+   ImportedGem.new( 'jar-dependencies', '0.1.13', true )
   ]
 
 project 'JRuby Lib Setup' do

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>0.1.12</version>
+      <version>0.1.13</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>

diff --git a/lib/ruby/stdlib/jruby/compiler.rb b/lib/ruby/stdlib/jruby/compiler.rb
@@ -162,6 +162,9 @@ def compile_files_with_options(filenames, options = default_options)
           IRWriter.persist(stream, scope)
           string = String.from_java_bytes(bytes.to_byte_array, 'BINARY')
 
+          # bust it up into 32k-1 chunks
+          pieces = string.scan(/.{1,32767}/m)
+
           cls = ClassWriter.new(ClassWriter::COMPUTE_MAXS | ClassWriter::COMPUTE_FRAMES)
           cls.visit(
               Opcodes::V1_7,
@@ -185,7 +188,17 @@ def compile_files_with_options(filenames, options = default_options)
           main.astore(1)
           main.aload(1)
           main.aload(1)
-          main.ldc(string)
+
+          # put String back together
+          main.newobj("java/lang/StringBuilder")
+          main.dup
+          main.invokespecial("java/lang/StringBuilder", "<init>", "()V")
+          pieces.each do |piece|
+            main.ldc(piece)
+            main.invokevirtual("java/lang/StringBuilder", "append", "(Ljava/lang/String;)Ljava/lang/StringBuilder;")
+          end
+          main.invokevirtual("java/lang/Object", "toString", "()Ljava/lang/String;")
+
           main.ldc("ISO-8859-1")
           main.invokevirtual("java/lang/String", "getBytes", "(Ljava/lang/String;)[B")
           main.invokestatic("org/jruby/ir/runtime/IRRuntimeHelpers", "decodeScopeFromBytes", "(Lorg/jruby/Ruby;[B)Lorg/jruby/ir/IRScope;")

diff --git a/lib/ruby/truffle/mri/benchmark.rb b/lib/ruby/truffle/mri/benchmark.rb
@@ -0,0 +1 @@
+require_relative '../../stdlib/benchmark'
diff --git a/maven/jruby/src/it/bouncycastle-with-bc-gem/invoker.properties b/maven/jruby/src/it/bouncycastle-with-bc-gem/invoker.properties
diff --git a/maven/jruby/src/it/bouncycastle-with-bc-gem/pom.xml b/maven/jruby/src/it/bouncycastle-with-bc-gem/pom.xml
diff --git a/...uby/src/it/bouncycastle-with-bc-gem/src/test/java/org/jruby/its/BouncyCastleTestCase.java b/...uby/src/it/bouncycastle-with-bc-gem/src/test/java/org/jruby/its/BouncyCastleTestCase.java
diff --git a/spec/regression/unselectable_channels_should_be_ready_in_select_spec.rb b/spec/regression/unselectable_channels_should_be_ready_in_select_spec.rb
@@ -0,0 +1,12 @@
+describe "An unselectable (for read) channel" do
+  it "is considered ready by IO.select" do
+    bios = java.io.ByteArrayInputStream.new('hello'.to_java_bytes)
+    ch = java.nio.channels.Channels.new_channel(bios)
+    io = ch.to_io
+
+    reads, * = IO.select([io], nil, nil, 1000)
+
+    expect(reads.size).to eq(1)
+    expect(reads[0]).to eq(io)
+  end
+end
diff --git a/spec/ruby/core/module/method_added_spec.rb b/spec/ruby/core/module/method_added_spec.rb
@@ -33,4 +33,18 @@ def test() end
       $methods_added = nil
     end
   end
+
+  it "is not called when a method is undefined in self" do
+    m = Module.new do
+      def method_to_undef
+      end
+
+      def self.method_added(name)
+        fail("method_added called by undef_method")
+      end
+
+      undef_method :method_to_undef
+    end
+    m.should_not have_method(:method_to_undef)
+  end
 end
diff --git a/spec/ruby/library/thread/shared/queue/num_waiting.rb b/spec/ruby/library/thread/shared/queue/num_waiting.rb
@@ -6,7 +6,7 @@
     5.times do |i|
       q.num_waiting.should == i
       t = Thread.new { q.deq }
-      Thread.pass until t.status == 'sleep'
+      Thread.pass until q.num_waiting == i+1
       threads << t
     end
 

diff --git a/spec/truffle/tags/core/array/cycle_tags.txt b/spec/truffle/tags/core/array/cycle_tags.txt
diff --git a/spec/truffle/tags/core/array/frozen_tags.txt b/spec/truffle/tags/core/array/frozen_tags.txt
diff --git a/spec/truffle/tags/core/array/inspect_tags.txt b/spec/truffle/tags/core/array/inspect_tags.txt
diff --git a/spec/truffle/tags/core/array/intersection_tags.txt b/spec/truffle/tags/core/array/intersection_tags.txt
diff --git a/spec/truffle/tags/core/array/join_tags.txt b/spec/truffle/tags/core/array/join_tags.txt
diff --git a/spec/truffle/tags/core/array/new_tags.txt b/spec/truffle/tags/core/array/new_tags.txt
diff --git a/spec/truffle/tags/core/array/sort_by_tags.txt b/spec/truffle/tags/core/array/sort_by_tags.txt
diff --git a/spec/truffle/tags/core/array/to_s_tags.txt b/spec/truffle/tags/core/array/to_s_tags.txt
diff --git a/spec/truffle/tags/core/basicobject/instance_exec_tags.txt b/spec/truffle/tags/core/basicobject/instance_exec_tags.txt
diff --git a/spec/truffle/tags/core/bignum/bit_or_tags.txt b/spec/truffle/tags/core/bignum/bit_or_tags.txt
@@ -1,2 +1 @@
-fails:Bignum#| raises a TypeError when passed a Float
 fails:Bignum#| returns self bitwise OR other when one operand is negative
diff --git a/spec/truffle/tags/core/bignum/modulo_tags.txt b/spec/truffle/tags/core/bignum/modulo_tags.txt
diff --git a/spec/truffle/tags/core/complex/minus_tags.txt b/spec/truffle/tags/core/complex/minus_tags.txt
diff --git a/spec/truffle/tags/core/complex/plus_tags.txt b/spec/truffle/tags/core/complex/plus_tags.txt
diff --git a/spec/truffle/tags/core/enumerable/cycle_tags.txt b/spec/truffle/tags/core/enumerable/cycle_tags.txt
@@ -1,11 +1 @@
 fails:Enumerable#cycle passed no argument or nil loops indefinitely
-fails:Enumerable#cycle passed no argument or nil yields successive elements of the array repeatedly
-fails:Enumerable#cycle passed no argument or nil calls each at most once
-fails:Enumerable#cycle passed no argument or nil yields only when necessary
-fails:Enumerable#cycle passed a number n as an argument returns nil and does nothing for non positive n
-fails:Enumerable#cycle passed a number n as an argument calls each at most once
-fails:Enumerable#cycle passed a number n as an argument yields only when necessary
-fails:Enumerable#cycle passed a number n as an argument tries to convert n to an Integer using #to_int
-fails:Enumerable#cycle passed a number n as an argument raises a TypeError when the passed n can be coerced to Integer
-fails:Enumerable#cycle passed a number n as an argument raises an ArgumentError if more arguments are passed
-fails:Enumerable#cycle passed a number n as an argument gathers whole arrays as elements when each yields multiple
diff --git a/spec/truffle/tags/core/enumerable/drop_while_tags.txt b/spec/truffle/tags/core/enumerable/drop_while_tags.txt
diff --git a/spec/truffle/tags/core/enumerable/each_cons_tags.txt b/spec/truffle/tags/core/enumerable/each_cons_tags.txt
diff --git a/spec/truffle/tags/core/enumerable/include_tags.txt b/spec/truffle/tags/core/enumerable/include_tags.txt
diff --git a/spec/truffle/tags/core/enumerable/member_tags.txt b/spec/truffle/tags/core/enumerable/member_tags.txt
diff --git a/spec/truffle/tags/core/enumerable/take_while_tags.txt b/spec/truffle/tags/core/enumerable/take_while_tags.txt
diff --git a/spec/truffle/tags/core/enumerator/each_with_index_tags.txt b/spec/truffle/tags/core/enumerator/each_with_index_tags.txt
diff --git a/spec/truffle/tags/core/enumerator/generator/each_tags.txt b/spec/truffle/tags/core/enumerator/generator/each_tags.txt
diff --git a/spec/truffle/tags/core/enumerator/generator/initialize_tags.txt b/spec/truffle/tags/core/enumerator/generator/initialize_tags.txt
diff --git a/spec/truffle/tags/core/enumerator/inject_tags.txt b/spec/truffle/tags/core/enumerator/inject_tags.txt
diff --git a/spec/truffle/tags/core/enumerator/lazy/collect_concat_tags.txt b/spec/truffle/tags/core/enumerator/lazy/collect_concat_tags.txt
@@ -1,5 +1,3 @@
 fails:Enumerator::Lazy#collect_concat calls the block with initial values when yield with multiple arguments
-fails:Enumerator::Lazy#collect_concat when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
 fails:Enumerator::Lazy#collect_concat when the returned lazy enumerator is evaluated by Enumerable#first flattens elements when the given block returned an array or responding to .each and .force
-fails:Enumerator::Lazy#collect_concat on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
 fails:Enumerator::Lazy#collect_concat on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first flattens elements when the given block returned an array or responding to .each and .force
diff --git a/spec/truffle/tags/core/enumerator/lazy/collect_tags.txt b/spec/truffle/tags/core/enumerator/lazy/collect_tags.txt
@@ -1,3 +1 @@
 fails:Enumerator::Lazy#collect calls the block with initial values when yield with multiple arguments
-fails:Enumerator::Lazy#collect when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
-fails:Enumerator::Lazy#collect on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
diff --git a/spec/truffle/tags/core/enumerator/lazy/drop_tags.txt b/spec/truffle/tags/core/enumerator/lazy/drop_tags.txt
diff --git a/spec/truffle/tags/core/enumerator/lazy/drop_while_tags.txt b/spec/truffle/tags/core/enumerator/lazy/drop_while_tags.txt
@@ -1,3 +1 @@
 fails:Enumerator::Lazy#drop_while calls the block with initial values when yield with multiple arguments
-fails:Enumerator::Lazy#drop_while when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
-fails:Enumerator::Lazy#drop_while on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
diff --git a/spec/truffle/tags/core/enumerator/lazy/enum_for_tags.txt b/spec/truffle/tags/core/enumerator/lazy/enum_for_tags.txt
@@ -1,4 +1 @@
-fails:Enumerator::Lazy#enum_for requires multiple arguments
-fails:Enumerator::Lazy#enum_for generates a lazy enumerator from the given name
 fails:Enumerator::Lazy#enum_for passes given arguments to wrapped method
-fails:Enumerator::Lazy#enum_for used by some parent's methods though returning Lazy
diff --git a/spec/truffle/tags/core/enumerator/lazy/find_all_tags.txt b/spec/truffle/tags/core/enumerator/lazy/find_all_tags.txt
@@ -1,3 +1 @@
 fails:Enumerator::Lazy#find_all calls the block with a gathered array when yield with multiple arguments
-fails:Enumerator::Lazy#find_all when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
-fails:Enumerator::Lazy#find_all on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
diff --git a/spec/truffle/tags/core/enumerator/lazy/flat_map_tags.txt b/spec/truffle/tags/core/enumerator/lazy/flat_map_tags.txt
@@ -1,5 +1,3 @@
 fails:Enumerator::Lazy#flat_map calls the block with initial values when yield with multiple arguments
-fails:Enumerator::Lazy#flat_map when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
 fails:Enumerator::Lazy#flat_map when the returned lazy enumerator is evaluated by Enumerable#first flattens elements when the given block returned an array or responding to .each and .force
-fails:Enumerator::Lazy#flat_map on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
 fails:Enumerator::Lazy#flat_map on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first flattens elements when the given block returned an array or responding to .each and .force
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Bignum#\| raises a TypeError when passed a Float
		fails:Bignum#\| returns self bitwise OR other when one operand is negative