Merge remote-tracking branch 'origin/master' into jruby

Author: headius

.gitignore

@@ -3,6 +3,8 @@
 /_yardoc/
 /coverage/
 /doc/
+/lib/
+/logs/
 /pkg/
 /spec/reports/
 /tmp/

Rakefile

@@ -15,15 +15,15 @@ if RUBY_ENGINE == 'jruby'
 else
   require 'rake/extensiontask'
   extask = Rake::ExtensionTask.new(name) do |x|
-    x.lib_dir << "/#{RUBY_VERSION}/#{x.platform}"
+    x.lib_dir.sub!(%r[(?=/|\z)], "/#{RUBY_VERSION}/#{x.platform}")
   end
 end
 
 Rake::TestTask.new(:test) do |t|
   if RUBY_ENGINE == "jruby"
     t.libs += ["ext/java/lib", "lib"]
   else
-    t.libs << extask.lib_dir
+    t.libs = ["lib/#{RUBY_VERSION}/#{extask.platform}"]
   end
   t.libs << "test/lib"
   t.ruby_opts << "-rhelper"

ext/io/wait/wait.c

@@ -77,6 +77,8 @@ wait_for_single_fd(rb_io_t *fptr, int events, struct timeval *tv)
  *
  * Returns number of bytes that can be read without blocking.
  * Returns zero if no information available.
+ *
+ * You must require 'io/wait' to use this method.
  */
 
 static VALUE
@@ -119,9 +121,12 @@ io_wait_event(VALUE io, int event, VALUE timeout)
 
 /*
  * call-seq:
- *   io.ready? -> true or false
+ *   io.ready? -> truthy or falsy
+ *
+ * Returns a truthy value if input available without blocking, or a
+ * falsy value.
  *
- * Returns +true+ if input available without blocking, or +false+.
+ * You must require 'io/wait' to use this method.
  */
 
 static VALUE
@@ -148,12 +153,14 @@ io_ready_p(VALUE io)
 
 /*
  * call-seq:
- *   io.wait_readable          -> true or false
- *   io.wait_readable(timeout) -> true or false
+ *   io.wait_readable          -> truthy or falsy
+ *   io.wait_readable(timeout) -> truthy or falsy
+ *
+ * Waits until IO is readable and returns a truthy value, or a falsy
+ * value when times out.  Returns a truthy value immediately when
+ * buffered data is available.
  *
- * Waits until IO is readable and returns +true+, or
- * +false+ when times out.
- * Returns +true+ immediately when buffered data is available.
+ * You must require 'io/wait' to use this method.
  */
 
 static VALUE
@@ -188,11 +195,13 @@ io_wait_readable(int argc, VALUE *argv, VALUE io)
 
 /*
  * call-seq:
- *   io.wait_writable          -> true or false
- *   io.wait_writable(timeout) -> true or false
+ *   io.wait_writable          -> truthy or falsy
+ *   io.wait_writable(timeout) -> truthy or falsy
  *
- * Waits until IO is writable and returns +true+ or
- * +false+ when times out.
+ * Waits until IO is writable and returns a truthy value or a falsy
+ * value when times out.
+ *
+ * You must require 'io/wait' to use this method.
  */
 static VALUE
 io_wait_writable(int argc, VALUE *argv, VALUE io)
@@ -223,11 +232,13 @@ io_wait_writable(int argc, VALUE *argv, VALUE io)
 #ifdef HAVE_RB_IO_WAIT
 /*
  * call-seq:
- *   io.wait_priority          -> true or false
- *   io.wait_priority(timeout) -> true or false
+ *   io.wait_priority          -> truthy or falsy
+ *   io.wait_priority(timeout) -> truthy or falsy
+ *
+ * Waits until IO is priority and returns a truthy value or a falsy
+ * value when times out.
  *
- * Waits until IO is priority and returns +true+ or
- * +false+ when times out.
+ * You must require 'io/wait' to use this method.
  */
 static VALUE
 io_wait_priority(int argc, VALUE *argv, VALUE io)
@@ -282,19 +293,21 @@ wait_mode_sym(VALUE mode)
 
 /*
  * call-seq:
- *   io.wait(events, timeout) -> event mask or false.
- *   io.wait(timeout = nil, mode = :read) -> event mask or false.
+ *   io.wait(events, timeout) -> truthy or falsy
+ *   io.wait(timeout = nil, mode = :read) -> truthy or falsy.
  *
  * Waits until the IO becomes ready for the specified events and returns the
- * subset of events that become ready, or +false+ when times out.
+ * subset of events that become ready, or a falsy value when times out.
  *
  * The events can be a bit mask of +IO::READABLE+, +IO::WRITABLE+ or
  * +IO::PRIORITY+.
  *
- * Returns +true+ immediately when buffered data is available.
+ * Returns a truthy value immediately when buffered data is available.
  *
  * Optional parameter +mode+ is one of +:read+, +:write+, or
  * +:read_write+.
+ *
+ * You must require 'io/wait' to use this method.
  */
 
 static VALUE

test/io/wait/test_io_wait_uncommon.rb

@@ -13,8 +13,8 @@ def test_tty_wait
   end
 
   def test_fifo_wait
-    skip 'no mkfifo' unless File.respond_to?(:mkfifo) && IO.const_defined?(:NONBLOCK)
-    skip 'known bogus error in JRuby 9.3.0.0 and earlier' if RUBY_ENGINE == 'jruby' && JRUBY_VERSION < '9.3.1.0'
+    omit 'no mkfifo' unless File.respond_to?(:mkfifo) && IO.const_defined?(:NONBLOCK)
+    omit 'known bogus error in JRuby 9.3.0.0 and earlier' if RUBY_ENGINE == 'jruby' && JRUBY_VERSION < '9.3.1.0'
 
     require 'tmpdir'
     Dir.mktmpdir('rubytest-fifo') do |dir|

test/lib/core_assertions.rb

@@ -107,7 +107,7 @@ def syntax_check(code, fname, line)
 
       def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: false, **opt)
         # TODO: consider choosing some appropriate limit for MJIT and stop skipping this once it does not randomly fail
-        pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::JIT) && RubyVM::JIT.enabled?
+        pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
 
         require_relative 'memory_status'
         raise Test::Unit::PendedError, "unsupported platform" unless defined?(Memory::Status)

test/lib/helper.rb

@@ -1,8 +1,4 @@
 require "test/unit"
 require_relative "core_assertions"
 
-class Test::Unit::TestCase
-  alias skip pend
-end
-
 Test::Unit::TestCase.include Test::Unit::CoreAssertions