jruby · Apr 20, 2015 · Apr 20, 2015 · Apr 20, 2015 · Apr 20, 2015 · Apr 20, 2015
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/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/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/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.skip b/maven/jruby/src/it/bouncycastle-with-bc-gem/pom.xml.skip
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/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/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/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/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
diff --git a/spec/truffle/tags/core/enumerator/lazy/grep_tags.txt b/spec/truffle/tags/core/enumerator/lazy/grep_tags.txt
@@ -1,6 +1 @@
-fails:Enumerator::Lazy#grep requires an argument
 fails:Enumerator::Lazy#grep calls the block with a gathered array when yield with multiple arguments
-fails:Enumerator::Lazy#grep when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times when not given a block
-fails:Enumerator::Lazy#grep when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times when given a block
-fails:Enumerator::Lazy#grep on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times when not given a block
-fails:Enumerator::Lazy#grep on a nested Lazy when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times when given a block
diff --git a/spec/truffle/tags/core/enumerator/lazy/initialize_tags.txt b/spec/truffle/tags/core/enumerator/lazy/initialize_tags.txt
diff --git a/spec/truffle/tags/core/enumerator/lazy/map_tags.txt b/spec/truffle/tags/core/enumerator/lazy/map_tags.txt
@@ -1,3 +1 @@
 fails:Enumerator::Lazy#map calls the block with initial values when yield with multiple arguments
-fails:Enumerator::Lazy#map when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
-fails:Enumerator::Lazy#map 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/reject_tags.txt b/spec/truffle/tags/core/enumerator/lazy/reject_tags.txt
@@ -1,3 +1 @@
 fails:Enumerator::Lazy#reject calls the block with a gathered array when yield with multiple arguments
-fails:Enumerator::Lazy#reject when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
-fails:Enumerator::Lazy#reject 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/select_tags.txt b/spec/truffle/tags/core/enumerator/lazy/select_tags.txt
@@ -1,3 +1 @@
 fails:Enumerator::Lazy#select calls the block with a gathered array when yield with multiple arguments
-fails:Enumerator::Lazy#select when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
-fails:Enumerator::Lazy#select 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/to_enum_tags.txt b/spec/truffle/tags/core/enumerator/lazy/to_enum_tags.txt
@@ -1,4 +1 @@
-fails:Enumerator::Lazy#to_enum requires multiple arguments
-fails:Enumerator::Lazy#to_enum generates a lazy enumerator from the given name
 fails:Enumerator::Lazy#to_enum passes given arguments to wrapped method
-fails:Enumerator::Lazy#to_enum used by some parent's methods though returning Lazy
diff --git a/spec/truffle/tags/core/enumerator/lazy/zip_tags.txt b/spec/truffle/tags/core/enumerator/lazy/zip_tags.txt
@@ -1,3 +1 @@
 fails:Enumerator::Lazy#zip calls the block with a gathered array when yield with multiple arguments
-fails:Enumerator::Lazy#zip when the returned lazy enumerator is evaluated by Enumerable#first stops after specified times
-fails:Enumerator::Lazy#zip 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/next_values_tags.txt b/spec/truffle/tags/core/enumerator/next_values_tags.txt
@@ -1,2 +1 @@
-fails:Enumerator#next_values returns an empty array if yield is called without arguments
 fails:Enumerator#next_values returns an array with only nil if yield is called with nil
diff --git a/spec/truffle/tags/core/enumerator/peek_values_tags.txt b/spec/truffle/tags/core/enumerator/peek_values_tags.txt
@@ -1,2 +1 @@
-fails:Enumerator#peek_values returns an empty array if yield is called without arguments
 fails:Enumerator#peek_values returns an array with only nil if yield is called with nil
diff --git a/spec/truffle/tags/core/enumerator/yielder/append_tags.txt b/spec/truffle/tags/core/enumerator/yielder/append_tags.txt
diff --git a/spec/truffle/tags/core/exception/backtrace_tags.txt b/spec/truffle/tags/core/exception/backtrace_tags.txt
@@ -1,2 +1 @@
-fails:Exception#backtrace returns nil if no backtrace was set
 fails:Exception#backtrace when redefined does not affect the behaviour of Exception#message
diff --git a/spec/truffle/tags/core/exception/exception_tags.txt b/spec/truffle/tags/core/exception/exception_tags.txt
@@ -1,8 +1 @@
-fails:Exception.exception creates a new instance of Exception
-fails:Exception.exception sets the message of the Exception when passes a message
 fails:Exception.exception returns 'Exception' for message when no message given
-fails:Exception.exception returns the exception when it has a custom constructor
-fails:Exception#exception returns self when passed no argument
-fails:Exception#exception returns self when passed self as an argument
-fails:Exception#exception returns an exception of the same class as self with the message given as argument
-fails:Exception#exception returns an exception of the same class as self with the message given as argument, but without reinitializing
diff --git a/spec/truffle/tags/core/exception/name_error_tags.txt b/spec/truffle/tags/core/exception/name_error_tags.txt
diff --git a/spec/truffle/tags/core/exception/no_method_error_tags.txt b/spec/truffle/tags/core/exception/no_method_error_tags.txt
@@ -1,3 +1,2 @@
-fails:NoMethodError.new allows passing method args
 fails:NoMethodError#args returns an empty array if the caller method had no arguments
 fails:NoMethodError#args returns an array with the same elements as passed to the method
diff --git a/spec/truffle/tags/core/file/absolute_path_tags.txt b/spec/truffle/tags/core/file/absolute_path_tags.txt
diff --git a/spec/truffle/tags/core/file/dirname_tags.txt b/spec/truffle/tags/core/file/dirname_tags.txt
@@ -1,7 +1,4 @@
 fails:File.dirname returns all the components of filename except the last one
-fails:File.dirname returns all the components of filename except the last one (edge cases on all platforms)
-fails:File.dirname returns all the components of filename except the last one (edge cases on non-windows)
-fails:File.dirname accepts an object that has a #to_path method
 fails(windows):File.dirname returns all the components of filename except the last one (edge cases on windows)
 fails(windows):File.dirname returns the return all the components of filename except the last one (Windows format)
 fails(windows):File.dirname returns the return all the components of filename except the last one (windows unc)

diff --git a/spec/truffle/tags/core/file/expand_path_tags.txt b/spec/truffle/tags/core/file/expand_path_tags.txt
@@ -1,19 +1,6 @@
-fails:File.expand_path converts a pathname to an absolute pathname
-fails:File.expand_path converts a pathname to an absolute pathname, using ~ (home) as base
-fails:File.expand_path expand_path for commoms unix path  give a full path
 fails:File.expand_path does not replace multiple '/' at the beginning of the path
 fails:File.expand_path raises an ArgumentError if the path is not valid
 fails:File.expand_path expands ~ENV['USER'] to the user's home directory
-fails:File.expand_path expands ../foo with ~/dir as base dir to /path/to/user/home/foo
-fails:File.expand_path accepts objects that have a #to_path method
-fails:File.expand_path returns a String in the same encoding as the argument
-fails:File.expand_path expands a path when the default external encoding is ASCII-8BIT
-fails:File.expand_path expands a path with multi-byte characters
-fails:File.expand_path raises an Encoding::CompatibilityError if the external encoding is not compatible
-fails:File.expand_path does not modify a HOME string argument
-fails:File.expand_path when HOME is not set raises an ArgumentError when passed '~' if HOME is nil
-fails:File.expand_path when HOME is not set raises an ArgumentError when passed '~/' if HOME is nil
-fails:File.expand_path when HOME is not set raises an ArgumentError when passed '~' if HOME == ''
 fails(windows):File.expand_path expands C:/./dir to C:/dir
 windows:File.expand_path converts a pathname to an absolute pathname, Ruby-Talk:18512
 windows:File.expand_path converts a pathname to an absolute pathname, using a complete path

diff --git a/spec/truffle/tags/core/file/join_tags.txt b/spec/truffle/tags/core/file/join_tags.txt
@@ -1,13 +1 @@
-fails:File.join changes only boundaries separators
-fails:File.join respects the given separator if only one part has a boundary separator
-fails:File.join prefers the separator of the right part if both parts have separators
-fails:File.join does not treat \ as a separator on non-Windows
-fails:File.join handles leading parts edge cases
-fails:File.join handles trailing parts edge cases
-fails:File.join handles middle parts edge cases
-fails:File.join raises an ArgumentError if passed a recursive array
-fails:File.join raises a TypeError exception when args are nil
-fails:File.join calls #to_str
-fails:File.join doesn't mutate the object when calling #to_str
-fails:File.join calls #to_path
 fails(windows):File.join respects given separator if only one part has a boundary separator
diff --git a/spec/truffle/tags/core/filetest/file_tags.txt b/spec/truffle/tags/core/filetest/file_tags.txt
diff --git a/spec/truffle/tags/core/filetest/owned_tags.txt b/spec/truffle/tags/core/filetest/owned_tags.txt
diff --git a/spec/truffle/tags/core/filetest/pipe_tags.txt b/spec/truffle/tags/core/filetest/pipe_tags.txt
diff --git a/spec/truffle/tags/core/filetest/setgid_tags.txt b/spec/truffle/tags/core/filetest/setgid_tags.txt
diff --git a/spec/truffle/tags/core/filetest/setuid_tags.txt b/spec/truffle/tags/core/filetest/setuid_tags.txt
diff --git a/spec/truffle/tags/core/filetest/socket_tags.txt b/spec/truffle/tags/core/filetest/socket_tags.txt
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
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Enumerator#next_values returns an empty array if yield is called without arguments
		fails:Enumerator#next_values returns an array with only nil if yield is called with nil
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Enumerator#peek_values returns an empty array if yield is called without arguments
		fails:Enumerator#peek_values returns an array with only nil if yield is called with nil
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Exception#backtrace returns nil if no backtrace was set
		fails:Exception#backtrace when redefined does not affect the behaviour of Exception#message