kgio 2.7.3 → 2.7.4

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.7.3.GIT
+DEF_VER=v2.7.4.GIT
 
 LF='
 '

data/ext/kgio/read_write.c

@@ -20,11 +20,8 @@ static inline void kgio_autopush_write(VALUE io) { }
 
 #else
 static const int peek_flags = MSG_PEEK;
-#  include <netinet/tcp.h>
-#  if defined(TCP_NOPUSH)
 static inline void kgio_autopush_read(VALUE io) { kgio_autopush_recv(io); }
 static inline void kgio_autopush_write(VALUE io) { kgio_autopush_send(io); }
-#  endif
 #endif
 
 NORETURN(static void raise_empty_bt(VALUE, const char *));

data/test/lib_read_write.rb

@@ -9,10 +9,8 @@ module LibReadWriteTest
   RANDOM_BLOB = File.open("/dev/urandom") { |fp| fp.read(10 * 1024 * 1024) }
 
   def teardown
-    assert_nothing_raised do
-      @rd.close if defined?(@rd) && ! @rd.closed?
-      @wr.close if defined?(@wr) && ! @wr.closed?
-    end
+    @rd.close if defined?(@rd) && ! @rd.closed?
+    @wr.close if defined?(@wr) && ! @wr.closed?
   end
 
   def test_write_empty
@@ -59,6 +57,7 @@ module LibReadWriteTest
     a = "." * 0x1000
     b = a.dup
     @wr.syswrite("a")
+    IO.select([@rd]) # this seems needed on FreeBSD 9.0
     assert_equal "a", @rd.kgio_tryread(0x1000, b)
     assert_equal "a", b
     assert_equal "." * 0x1000, a
@@ -68,6 +67,7 @@ module LibReadWriteTest
     a = "." * 0x1000
     b = a.dup
     @wr.syswrite("a")
+    IO.select([@rd]) # this seems needed on FreeBSD 9.0
     assert_equal "a", @rd.kgio_tryread(0x1000, a)
     assert_equal "a", a
     assert_equal "." * 0x1000, b
@@ -90,6 +90,7 @@ module LibReadWriteTest
 
   def test_tryread_eof
     @wr.close
+    IO.select([@rd]) # this seems needed on FreeBSD 9.0
     assert_nil @rd.kgio_tryread(5)
   end
 
@@ -159,6 +160,7 @@ module LibReadWriteTest
 
   def test_trywrite_conv
     assert_equal nil, @wr.kgio_trywrite(10)
+    IO.select([@rd]) # this seems needed on FreeBSD 9.0
     assert_equal "10", @rd.kgio_tryread(2)
   end
 
@@ -184,6 +186,7 @@ module LibReadWriteTest
 
   def test_tryread_short
     assert_equal nil, @wr.kgio_trywrite("hi")
+    IO.select([@rd]) # this seems needed on FreeBSD 9.0
     assert_equal "h", @rd.kgio_tryread(1)
     assert_equal "i", @rd.kgio_tryread(1)
   end
@@ -221,6 +224,7 @@ module LibReadWriteTest
   def test_tryread_extra_buf_eof_clears_buffer
     tmp = "hello world"
     @wr.close
+    IO.select([@rd]) # this seems needed on FreeBSD 9.0
     assert_nil @rd.kgio_tryread(2, tmp)
     assert_equal "", tmp
   end
@@ -264,10 +268,8 @@ module LibReadWriteTest
     foo = nil
     t0 = Time.now
     thr = Thread.new { sleep 1; @wr.write "HELLO" }
-    assert_nothing_raised do
-      foo = @rd.kgio_read(5)
-      elapsed = Time.now - t0
-    end
+    foo = @rd.kgio_read(5)
+    elapsed = Time.now - t0
     assert elapsed >= 1.0, "elapsed: #{elapsed}"
     assert_equal "HELLO", foo
     thr.join
@@ -285,11 +287,10 @@ module LibReadWriteTest
     elapsed = 0
     foo = nil
     t0 = Time.now
-    thr = Thread.new { sleep 1; @rd.readpartial(nr) }
-    assert_nothing_raised do
-      foo = @wr.kgio_write("HELLO")
-      elapsed = Time.now - t0
-    end
+    thr = Thread.new { sleep 1; @rd.read(nr) }
+    foo = @wr.kgio_write("HELLO")
+    elapsed = Time.now - t0
+
     assert_nil foo
     if @wr.stat.pipe?
       assert elapsed >= 1.0, "elapsed: #{elapsed}"

data/test/test_accept_class.rb

@@ -12,12 +12,12 @@ class TestAcceptClass < Test::Unit::TestCase
   end
 
   def teardown
-    assert_nothing_raised { Kgio.accept_class = nil }
+    Kgio.accept_class = nil
     assert_equal Kgio::Socket, Kgio.accept_class
   end
 
   def test_tcp_socket
-    assert_nothing_raised { Kgio.accept_class = Kgio::TCPSocket }
+    Kgio.accept_class = Kgio::TCPSocket
     assert_equal Kgio::TCPSocket, Kgio.accept_class
   end
 
@@ -31,21 +31,21 @@ class TestAcceptClass < Test::Unit::TestCase
     @srv = Kgio::TCPServer.new(@host, 0)
     @port = @srv.addr[1]
 
-    assert_nothing_raised { Kgio.accept_class = Kgio::TCPSocket }
+    Kgio.accept_class = Kgio::TCPSocket
     client = TCPSocket.new(@host, @port)
     assert_instance_of Kgio::TCPSocket, @srv.kgio_accept
     client = TCPSocket.new(@host, @port)
     IO.select([@srv])
     assert_instance_of Kgio::TCPSocket, @srv.kgio_tryaccept
 
-    assert_nothing_raised { Kgio.accept_class = nil }
+    Kgio.accept_class = nil
     client = TCPSocket.new(@host, @port)
     assert_instance_of Kgio::Socket, @srv.kgio_accept
     client = TCPSocket.new(@host, @port)
     IO.select([@srv])
     assert_instance_of Kgio::Socket, @srv.kgio_tryaccept
 
-    assert_nothing_raised { Kgio.accept_class = Kgio::UNIXSocket }
+    Kgio.accept_class = Kgio::UNIXSocket
     client = TCPSocket.new(@host, @port)
     assert_instance_of Kgio::UNIXSocket, @srv.kgio_accept
     client = TCPSocket.new(@host, @port)

data/test/test_autopush.rb

@@ -18,12 +18,10 @@ class TestAutopush < Test::Unit::TestCase
 
     @host = ENV["TEST_HOST"] || '127.0.0.1'
     @srv = Kgio::TCPServer.new(@host, 0)
-    assert_nothing_raised {
+    RUBY_PLATFORM =~ /linux/ and
       @srv.setsockopt(Socket::IPPROTO_TCP, TCP_CORK, 1)
-    } if RUBY_PLATFORM =~ /linux/
-    assert_nothing_raised {
+    RUBY_PLATFORM =~ /freebsd/ and
       @srv.setsockopt(Socket::IPPROTO_TCP, TCP_NOPUSH, 1)
-    } if RUBY_PLATFORM =~ /freebsd/
     @port = @srv.addr[1]
   end
 
@@ -35,7 +33,7 @@ class TestAutopush < Test::Unit::TestCase
     assert ! s.kgio_autopush?
     s.kgio_autopush = true
     assert s.kgio_autopush?
-    assert_nothing_raised { s.kgio_write 'asdf' }
+    s.kgio_write 'asdf'
     assert_equal :wait_readable, s.kgio_tryread(1)
     assert s.kgio_autopush?
     val = s.getsockopt(Socket::IPPROTO_TCP, opt).unpack('i')[0]
@@ -64,12 +62,10 @@ class TestAutopush < Test::Unit::TestCase
       lines = io.readlines
       assert lines.grep(/TCP_CORK/).empty?, lines.inspect
     else
-      assert_nothing_raised do
-        @wr = @srv.kgio_accept
-        t0 = Time.now
-        @wr.kgio_write "HI\n"
-        rc = @wr.kgio_tryread 666
-      end
+      @wr = @srv.kgio_accept
+      t0 = Time.now
+      @wr.kgio_write "HI\n"
+      rc = @wr.kgio_tryread 666
     end
     assert_equal "HI\n", @rd.kgio_read(3)
     diff = Time.now - t0
@@ -151,8 +147,8 @@ class TestAutopush < Test::Unit::TestCase
       lines = io.readlines
       assert_equal 2, lines.grep(/TCP_CORK/).size, lines.inspect
     end
-    assert_nothing_raised { @wr.close }
-    assert_nothing_raised { @rd.close }
+    @wr.close
+    @rd.close
 
     @wr = Kgio::TCPSocket.new(@host, @port)
     if defined?(Strace)

data/test/test_connect_fd_leak.rb

@@ -9,11 +9,9 @@ class TestConnectFDLeak < Test::Unit::TestCase
     nr = 0
     path = "/non/existent/path"
     assert(! File.exist?(path), "#{path} should not exist")
-    assert_nothing_raised do
-      begin
-        sock = Kgio::UNIXSocket.new(path)
-      rescue Errno::ENOENT
-      end while (nr += 1) < 10000
-    end
+    begin
+      sock = Kgio::UNIXSocket.new(path)
+    rescue Errno::ENOENT
+    end while (nr += 1) < 10000
   end
 end

data/test/test_poll.rb

@@ -122,9 +122,7 @@ class TestPoll < Test::Unit::TestCase
       exit!(0)
     end
 
-    assert_nothing_raised do
-      empty += 1 until Kgio.poll(set.dup, 100)
-    end
+    empty += 1 until Kgio.poll(set.dup, 100)
     _, status = Process.waitpid2(pid)
     assert status.success?, status.inspect
     assert usr1 > 0, "usr1: #{usr1}"

data/test/test_singleton_read_write.rb

@@ -6,7 +6,7 @@ class TestSingletonReadWrite < Test::Unit::TestCase
 
   def test_unix_socketpair
     a, b = UNIXSocket.pair
-    assert_nothing_raised { Kgio.trywrite(a, "HELLO") }
+    Kgio.trywrite(a, "HELLO")
     buf = ""
     assert_equal "HELLO", Kgio.tryread(b, 5, buf)
     assert_equal "HELLO", buf

data/test/test_tcp_connect.rb

@@ -78,6 +78,7 @@ class TestKgioTcpConnect < Test::Unit::TestCase
   def test_wait_writable_set
     sock = SubSocket.new(@addr)
     assert_equal "waited", sock.foo if RUBY_PLATFORM =~ /linux/
+    IO.select(nil, [sock]) if RUBY_PLATFORM !~ /linux/
     assert_equal nil, sock.kgio_write("HELLO")
   end
 end

data/test/test_tryopen.rb

@@ -15,7 +15,7 @@ class TestTryopen < Test::Unit::TestCase
     assert_equal File.read(__FILE__), tmp.read
     assert_equal __FILE__, tmp.path
     assert_equal __FILE__, tmp.to_path
-    assert_nothing_raised { tmp.close }
+    tmp.close
   end
 
   def test_tryopen_ENOENT
@@ -26,11 +26,11 @@ class TestTryopen < Test::Unit::TestCase
     assert_equal :ENOENT, tmp
   end
 
-  def test_tryopen_EPERM
+  def test_tryopen_EACCES
     tmp = Tempfile.new "tryopen"
     File.chmod 0000, tmp.path
     tmp = Kgio::File.tryopen(tmp.path)
-    assert_equal :EACCES, tmp
+    assert_equal(:EACCES, tmp)
   end
 
   def test_tryopen_readwrite

metadata

@@ -1,34 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kgio
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 2.7.4
   prerelease: 
-  segments: 
-  - 2
-  - 7
-  - 3
-  version: 2.7.3
 platform: ruby
-authors: 
+authors:
 - kgio hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-15 00:00:00 Z
+date: 2012-03-24 00:00:00.000000000 Z
 dependencies: []
+description: ! 'kgio provides non-blocking I/O methods for Ruby without raising
 
-description: |-
-  kgio provides non-blocking I/O methods for Ruby without raising
   exceptions on EAGAIN and EINPROGRESS.  It is intended for use with the
+
   Unicorn and Rainbows! Rack servers, but may be used by other
-  applications (that run on Unix-like platforms).
+
+  applications (that run on Unix-like platforms).'
 email: kgio@librelist.org
 executables: []
-
-extensions: 
+extensions:
 - ext/kgio/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
 - TODO
@@ -46,7 +40,7 @@ extra_rdoc_files:
 - ext/kgio/read_write.c
 - ext/kgio/wait.c
 - ext/kgio/tryopen.c
-files: 
+files:
 - .document
 - .gitignore
 - .manifest
@@ -114,41 +108,33 @@ files:
 - test/test_unix_server_read_client_write.rb
 homepage: http://bogomips.org/kgio/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -t
 - kgio - kinder, gentler I/O for Ruby
 - -W
 - http://bogomips.org/kgio.git/tree/%s
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rainbows
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: kinder, gentler I/O for Ruby
-test_files: 
+test_files:
 - test/test_poll.rb
 - test/test_peek.rb
 - test/test_default_wait.rb