uvrb 0.1.4 → 0.2.0

data/lib/uv.rb

@@ -81,7 +81,7 @@ module UV
   attach_function :shutdown, :uv_shutdown, [:uv_shutdown_t, :uv_stream_t, :uv_shutdown_cb], :int, :blocking => true
 
   attach_function :tcp_init, :uv_tcp_init, [:uv_loop_t, :uv_tcp_t], :int, :blocking => true
-  #attach_function :tcp_open, :uv_tcp_open, [:uv_tcp_t, :uv_os_sock_t], :int
+  attach_function :tcp_open, :uv_tcp_open, [:uv_tcp_t, :uv_os_sock_t], :int, :blocking => true
   attach_function :tcp_nodelay, :uv_tcp_nodelay, [:uv_tcp_t, :int], :int, :blocking => true
   attach_function :tcp_keepalive, :uv_tcp_keepalive, [:uv_tcp_t, :int, :uint], :int, :blocking => true
   attach_function :tcp_simultaneous_accepts, :uv_tcp_simultaneous_accepts, [:uv_tcp_t, :int], :int, :blocking => true
@@ -93,6 +93,7 @@ module UV
   attach_function :tcp_connect6, :uv_tcp_connect6, [:uv_connect_t, :uv_tcp_t, :sockaddr_in6, :uv_connect_cb], :int, :blocking => true
 
   attach_function :udp_init, :uv_udp_init, [:uv_loop_t, :uv_udp_t], :int, :blocking => true
+  attach_function :udp_open, :uv_udp_open, [:uv_udp_t, :uv_os_sock_t], :int, :blocking => true
   attach_function :udp_bind, :uv_udp_bind, [:uv_udp_t, :sockaddr_in, :uint], :int, :blocking => true
   attach_function :udp_bind6, :uv_udp_bind6, [:uv_udp_t, :sockaddr_in6, :uint], :int, :blocking => true
   attach_function :udp_getsockname, :uv_udp_getsockname, [:uv_udp_t, :pointer, :pointer], :int, :blocking => true
@@ -141,6 +142,10 @@ module UV
   attach_function :timer_set_repeat, :uv_timer_set_repeat, [:uv_timer_t, :int64_t], :void, :blocking => true
   attach_function :timer_get_repeat, :uv_timer_get_repeat, [:uv_timer_t], :int64_t, :blocking => true
 
+  attach_function :signal_init, :uv_signal_init, [:uv_loop_t, :uv_signal_t], :int, :blocking => true
+  attach_function :signal_start, :uv_signal_start, [:uv_signal_t, :uv_signal_cb, :int], :int, :blocking => true
+  attach_function :signal_stop, :uv_signal_stop, [:uv_signal_t], :int, :blocking => true
+
   #attach_function :ares_init_options, :uv_ares_init_options, [:uv_loop_t, :ares_channel, :ares_options, :int], :int
   #attach_function :ares_destroy, :uv_ares_destroy, [:uv_loop_t, :ares_channel], :void
 
@@ -239,9 +244,6 @@ module UV
   attach_function :handle_size, :uv_handle_size, [:uv_handle_type], :size_t, :blocking => true
   attach_function :req_size, :uv_req_size, [:uv_req_type], :size_t, :blocking => true
 
-  # This function is attached differently in windows - see ./types/windows.rb
-  attach_function :ntohs, [:ushort], :ushort, :blocking => true unless FFI::Platform.windows?
-
 
   def self.create_handle(type)
     LIBC.malloc(UV.handle_size(type))
@@ -268,6 +270,7 @@ module UV
   autoload :Idle, 'uv/idle'
   autoload :Async, 'uv/async'
   autoload :Work, 'uv/work'
+  autoload :Signal, 'uv/signal'
   autoload :Filesystem, 'uv/filesystem'
   autoload :File, 'uv/file'
   autoload :FSEvent, 'uv/fs_event'

data/lib/uv/assertions.rb

@@ -26,5 +26,12 @@ module UV
         raise ArgumentError, msg, caller
       end
     end
+
+    def assert_signal(signo, msg = nil)
+      if not ::Signal.list.values.include?(signo)
+        msg ||= "undefined signal number: #{signo}"
+        raise ArgumentError, msg, caller
+      end
+    end
   end
 end

data/lib/uv/handle.rb

@@ -2,8 +2,16 @@ module UV
   module Handle
     include Assertions, Resource, Listener
 
+    class << self
+      def close(handle)
+        proc { UV.close(handle, UV.method(:free)) }
+      end
+    end
+
     def initialize(loop, pointer)
       @loop, @pointer = loop, pointer
+
+      ObjectSpace.define_finalizer(self, Handle.close(@pointer))
     end
 
     # Public: Increment internal ref counter for the handle on the loop. Useful for
@@ -27,7 +35,11 @@ module UV
     end
 
     def close(&block)
-      if not block.nil?
+      return if @pointer.nil?
+
+      ObjectSpace.undefine_finalizer(self)
+
+      if block
         assert_block(block)
         assert_arity(0, block)
 
@@ -61,8 +73,10 @@ module UV
     def on_close(pointer)
       UV.free(pointer)
       clear_callbacks
-      
+
       @close_block.call unless @close_block.nil?
+
+      @pointer = nil
     end
   end
 end

data/lib/uv/idle.rb

@@ -20,6 +20,7 @@ module UV
     end
 
     private
+
     def on_idle(handle, status)
       @idle_block.call(check_result(status))
     end

data/lib/uv/listener.rb

@@ -2,25 +2,27 @@ require 'set'
 
 module UV
   module Listener
-    private
-    def callbacks
-      @callbacks ||= Set.new
+    @@callbacks = Hash.new { |hash, object_id| hash[object_id] = Hash.new }
+
+    class << self
+      def define_callback(object_id, name, callback)
+        @@callbacks[object_id][name] ||= callback
+      end
+
+      def undefine_callbacks(object_id)
+        @@callbacks.delete(object_id)
+        nil
+      end
     end
 
+    private
+
     def callback(name)
-      const_name = "#{name.upcase}_#{object_id}"
-      unless self.class.const_defined?(const_name)
-        callbacks << const_name
-        self.class.const_set(const_name, method(name))
-      end
-      self.class.const_get(const_name)
+      Listener.define_callback(object_id, name, method(name))
     end
 
     def clear_callbacks
-      callbacks.each do |name|
-        self.class.send(:remove_const, name)
-      end
-      callbacks.clear
+      Listener.undefine_callbacks(object_id)
     end
   end
 end

data/lib/uv/loop.rb

@@ -105,6 +105,10 @@ module UV
       run(:UV_RUN_ONCE)
     end
 
+    def stop
+      check_result! UV.stop(@pointer)
+    end
+
     # Public: forces loop time update, useful for getting more granular times
     # 
     # Returns nothing
@@ -280,6 +284,16 @@ module UV
       fs_event
     end
 
+    # Public: Get a new Signal handle
+    # 
+    # Returns UV::Signal
+    def signal
+      signal_ptr = UV.create_handle(:uv_signal)
+
+      check_result! UV.signal_init(@pointer, signal_ptr)
+      Signal.new(self, signal_ptr)
+    end
+
     # Internal: Get a hold of internal loop pointer instance
     # 
     # Returns FFI::Pointer

data/lib/uv/resource.rb

@@ -1,7 +1,7 @@
 module UV
   module Resource
     def check_result(rc)
-      @loop.lookup_error(rc) unless rc.nil? || rc >= 0 
+      @loop.lookup_error(rc) if rc && rc < 0 
     end
 
     def check_result!(rc)

data/lib/uv/signal.rb

@@ -0,0 +1,29 @@
+module UV
+  class Signal
+    include Assertions, Handle
+
+    def start(signum, &block)
+      assert_signal(signum)
+      assert_block(block)
+      assert_arity(1, block)
+
+      @signal_block = block
+
+      check_result! UV.signal_start(handle, callback(:on_signal), signum)
+
+      self
+    end
+
+    def stop
+      check_result! UV.signal_stop(handle)
+
+      self
+    end
+
+    private
+
+    def on_signal(handle, status)
+      @signal_block.call(check_result(status))
+    end
+  end
+end

data/lib/uv/tcp.rb

@@ -4,6 +4,12 @@ module UV
   class TCP
     include Stream, Net
 
+    def open(fd)
+      check_result! UV.tcp_open(handle, fd)
+
+      self
+    end
+
     def bind(ip, port)
       assert_type(String, ip, "ip must be a String")
       assert_type(Integer, port, "port must be an Integer")

data/lib/uv/types.rb

@@ -181,6 +181,7 @@ module UV
   typedef :pointer, :uv_write_t
   typedef :pointer, :uv_connect_t
   typedef :pointer, :uv_udp_send_t
+  typedef :pointer, :uv_signal_t
   typedef :int,     :uv_file
   typedef :pointer, :ares_channel
   typedef :pointer, :ares_options
@@ -213,6 +214,7 @@ module UV
   callback :uv_prepare_cb,     [:uv_prepare_t, :status],                           :void
   callback :uv_check_cb,       [:uv_check_t, :status],                             :void
   callback :uv_idle_cb,        [:uv_idle_t, :status],                              :void
+  callback :uv_signal_cb,      [:uv_signal_t, :status],                            :void
   callback :uv_getaddrinfo_cb, [:uv_getaddrinfo_t, :status, :addrinfo],            :void
   callback :uv_exit_cb,        [:uv_process_t, :int, :int],                        :void
   callback :uv_walk_cb,        [:uv_handle_t, :pointer],                           :void

data/lib/uv/types/unix.rb

@@ -1,4 +1,6 @@
 module UV
+  typedef :int, :uv_os_sock_t
+
   class UvBuf < FFI::Struct
     layout :base, :pointer, :len, :size_t
   end
@@ -9,4 +11,6 @@ module UV
     :st_blksize, :blksize_t, :st_blocks, :blkcnt_t, :st_atime, :time_t,
     :st_mtime, :time_t, :st_ctime, :time_t
   end
+
+  attach_function :ntohs, [:ushort], :ushort, :blocking => true
 end

data/lib/uv/types/windows.rb

@@ -2,6 +2,8 @@ module UV
   typedef :uint32_t, :in_addr_t
   typedef :uint16, :in_port_t
   typedef :int, :mode_t
+  # http://stackoverflow.com/questions/1953639/is-it-safe-to-cast-socket-to-int-under-win64
+  typedef :int, :uv_os_sock_t
 
   module WS2
     extend FFI::Library

data/lib/uv/udp.rb

@@ -2,6 +2,12 @@ module UV
   class UDP
     include Handle, Net
 
+    def open(fd)
+      check_result! UV.udp_open(handle, fd)
+
+      self
+    end
+
     def bind(ip, port, ipv6_only = false)
       assert_type(String, ip, "ip must be a String")
       assert_type(Integer, port, "port must be an Integer")

data/lib/uv/version.rb

@@ -1,3 +1,3 @@
 module UV
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/spec/uv/loop_spec.rb

@@ -32,6 +32,14 @@ describe UV::Loop do
     end
   end
 
+  describe "#stop" do
+    it "calls UV.stop" do
+      UV.should_receive(:stop).with(loop_pointer)
+
+      subject.stop
+    end
+  end
+
   describe "#update_time" do
     it "calls UV.update_time" do
       UV.should_receive(:update_time).with(loop_pointer)

data/spec/uv/signal_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe UV::Signal do
+  let(:handle_name) { :signal }
+  let(:loop) { double() }
+  let(:pointer) { double() }
+  subject { UV::Signal.new(loop, pointer) }
+
+  it_behaves_like 'a handle'
+
+  describe "#start" do
+    let(:signo) { 2 }
+
+    it "requires a block" do
+      expect { subject.start(signo) }.to raise_error(ArgumentError)
+    end
+
+    it "calls UV.signal_start" do
+      UV.should_receive(:signal_start).with(pointer, subject.method(:on_signal), signo)
+
+      subject.start(signo) { |e| }
+    end
+  end
+
+  describe "#stop" do
+    it "calls UV.signal_stop" do
+      UV.should_receive(:signal_stop).with(pointer)
+
+      subject.stop
+    end
+  end
+end

data/spec/uv/tcp_spec.rb

@@ -9,6 +9,16 @@ describe UV::TCP do
   it_behaves_like 'a handle'
   it_behaves_like 'a stream'
 
+  describe "#open" do
+    let(:fd) { 4 }
+
+    it "calls UV.tcp_open" do
+      UV.should_receive(:tcp_open).with(pointer, fd)
+
+      subject.open(fd)
+    end
+  end
+
   describe "#bind" do
     let(:ip_addr) { double() }
     let(:port) { 0 }

data/spec/uv/udp_spec.rb

@@ -8,6 +8,16 @@ describe UV::UDP do
 
   it_behaves_like 'a handle'
 
+  describe "#open" do
+    let(:fd) { 4 }
+
+    it "calls UV.udp_open" do
+      UV.should_receive(:udp_open).with(pointer, fd)
+
+      subject.open(fd)
+    end
+  end
+
   describe "#bind" do
     let(:ip_addr) { double() }
     let(:port) { 0 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uvrb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -160,6 +160,7 @@ files:
 - lib/uv/pipe.rb
 - lib/uv/prepare.rb
 - lib/uv/resource.rb
+- lib/uv/signal.rb
 - lib/uv/stream.rb
 - lib/uv/tasks.rb
 - lib/uv/tasks/mac.rb
@@ -189,6 +190,7 @@ files:
 - spec/uv/loop_spec.rb
 - spec/uv/pipe_spec.rb
 - spec/uv/prepare_spec.rb
+- spec/uv/signal_spec.rb
 - spec/uv/tcp_spec.rb
 - spec/uv/timer_spec.rb
 - spec/uv/tty_spec.rb
@@ -199,34 +201,37 @@ files:
 - ext/libuv/AUTHORS
 - ext/libuv/ChangeLog
 - ext/libuv/LICENSE
-- ext/libuv/Makefile
+- ext/libuv/Makefile.am
+- ext/libuv/Makefile.mingw
 - ext/libuv/README.md
-- ext/libuv/build.mk
+- ext/libuv/android-configure
+- ext/libuv/autogen.sh
 - ext/libuv/checksparse.sh
 - ext/libuv/common.gypi
-- ext/libuv/config-mingw.mk
-- ext/libuv/config-unix.mk
+- ext/libuv/configure.ac
 - ext/libuv/gyp_uv
-- ext/libuv/include/uv-private/ngx-queue.h
-- ext/libuv/include/uv-private/stdint-msvc2008.h
-- ext/libuv/include/uv-private/tree.h
-- ext/libuv/include/uv-private/uv-bsd.h
-- ext/libuv/include/uv-private/uv-darwin.h
-- ext/libuv/include/uv-private/uv-linux.h
-- ext/libuv/include/uv-private/uv-sunos.h
-- ext/libuv/include/uv-private/uv-unix.h
-- ext/libuv/include/uv-private/uv-win.h
+- ext/libuv/include/pthread-fixes.h
+- ext/libuv/include/stdint-msvc2008.h
+- ext/libuv/include/tree.h
+- ext/libuv/include/uv-bsd.h
+- ext/libuv/include/uv-darwin.h
+- ext/libuv/include/uv-errno.h
+- ext/libuv/include/uv-linux.h
+- ext/libuv/include/uv-sunos.h
+- ext/libuv/include/uv-unix.h
+- ext/libuv/include/uv-win.h
 - ext/libuv/include/uv.h
+- ext/libuv/m4/.gitignore
+- ext/libuv/m4/dtrace.m4
 - ext/libuv/src/fs-poll.c
 - ext/libuv/src/inet.c
+- ext/libuv/src/queue.h
 - ext/libuv/src/unix/aix.c
 - ext/libuv/src/unix/async.c
 - ext/libuv/src/unix/core.c
-- ext/libuv/src/unix/cygwin.c
 - ext/libuv/src/unix/darwin-proctitle.c
 - ext/libuv/src/unix/darwin.c
 - ext/libuv/src/unix/dl.c
-- ext/libuv/src/unix/error.c
 - ext/libuv/src/unix/freebsd.c
 - ext/libuv/src/unix/fs.c
 - ext/libuv/src/unix/fsevents.c
@@ -245,6 +250,7 @@ files:
 - ext/libuv/src/unix/poll.c
 - ext/libuv/src/unix/process.c
 - ext/libuv/src/unix/proctitle.c
+- ext/libuv/src/unix/pthread-fixes.c
 - ext/libuv/src/unix/signal.c
 - ext/libuv/src/unix/stream.c
 - ext/libuv/src/unix/sunos.c
@@ -322,6 +328,7 @@ files:
 - ext/libuv/test/runner.h
 - ext/libuv/test/task.h
 - ext/libuv/test/test-active.c
+- ext/libuv/test/test-async-null-cb.c
 - ext/libuv/test/test-async.c
 - ext/libuv/test/test-barrier.c
 - ext/libuv/test/test-callback-order.c
@@ -344,6 +351,7 @@ files:
 - ext/libuv/test/test-getsockname.c
 - ext/libuv/test/test-hrtime.c
 - ext/libuv/test/test-idle.c
+- ext/libuv/test/test-ip6-addr.c
 - ext/libuv/test/test-ipc-send-recv.c
 - ext/libuv/test/test-ipc.c
 - ext/libuv/test/test-list.h
@@ -424,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1737719522335393934
+      hash: 3415186922912615671
 requirements:
 - libuv
 rubyforge_project: 
@@ -451,6 +459,7 @@ test_files:
 - spec/uv/loop_spec.rb
 - spec/uv/pipe_spec.rb
 - spec/uv/prepare_spec.rb
+- spec/uv/signal_spec.rb
 - spec/uv/tcp_spec.rb
 - spec/uv/timer_spec.rb
 - spec/uv/tty_spec.rb