libuv 0.11.3 → 0.11.4

data/lib/libuv/timer.rb

@@ -1,91 +1,91 @@
-module Libuv
-    class Timer < Handle
-        include Assertions
-
-
-        TIMEOUT_ERROR = "timeout must be an Integer".freeze
-        REPEAT_ERROR = "repeat must be an Integer".freeze
-
-
-        # @param loop [::Libuv::Loop] loop this timer will be associated
-        # @param callback [Proc] callback to be called when the timer is triggered
-        def initialize(loop, callback = nil)
-            @loop, @callback = loop, callback
-            
-            timer_ptr = ::Libuv::Ext.create_handle(:uv_timer)
-            error = check_result(::Libuv::Ext.timer_init(loop.handle, timer_ptr))
-            @stopped = true
-
-            super(timer_ptr, error)
-        end
-
-        # Enables the timer. A repeat of 0 means no repeat
-        #
-        # @param timeout [Fixnum] time in milliseconds before the timer callback is triggered the first time
-        # @param repeat [Fixnum] time in milliseconds between repeated callbacks after the first
-        def start(timeout, repeat = 0)
-            return if @closed
-            @stopped = false
-
-            assert_type(Integer, timeout, TIMEOUT_ERROR)
-            assert_type(Integer, repeat, REPEAT_ERROR)
-
-            error = check_result ::Libuv::Ext.timer_start(handle, callback(:on_timer), timeout, repeat)
-            reject(error) if error
-        end
-
-        # Disables the timer.
-        def stop
-            return if @stopped || @closed
-            @stopped = true
-            error = check_result ::Libuv::Ext.timer_stop(handle)
-            reject(error) if error
-        end
-
-        # Resets the current repeat
-        def again
-            return if @closed
-            error = check_result ::Libuv::Ext.timer_again(handle)
-            reject(error) if error
-        end
-
-        # Updates the repeat timeout
-        def repeat=(repeat)
-            return if @closed
-            assert_type(Integer, repeat, REPEAT_ERROR)
-            check_result ::Libuv::Ext.timer_set_repeat(handle, repeat)
-            reject(error) if error
-        end
-
-        # Returns the current repeat timeout
-        def repeat
-            return if @closed
-            ::Libuv::Ext.timer_get_repeat(handle)
-        end
-
-        # Used to update the callback to be triggered by the timer
-        #
-        # @param callback [Proc] the callback to be called by the timer
-        def progress(callback = nil, &blk)
-            @callback = callback || blk
-        end
-
-
-        private
-
-
-        def on_timer(handle, status)
-            e = check_result(status)
-
-            if e
-                reject(e)
-            else
-                begin
-                    @callback.call
-                rescue Exception => e
-                    @loop.log :error, :timer_cb, e
-                end
-            end
-        end
-    end
-end
+module Libuv
+    class Timer < Handle
+        include Assertions
+
+
+        TIMEOUT_ERROR = "timeout must be an Integer".freeze
+        REPEAT_ERROR = "repeat must be an Integer".freeze
+
+
+        # @param loop [::Libuv::Loop] loop this timer will be associated
+        # @param callback [Proc] callback to be called when the timer is triggered
+        def initialize(loop, callback = nil)
+            @loop, @callback = loop, callback
+            
+            timer_ptr = ::Libuv::Ext.create_handle(:uv_timer)
+            error = check_result(::Libuv::Ext.timer_init(loop.handle, timer_ptr))
+            @stopped = true
+
+            super(timer_ptr, error)
+        end
+
+        # Enables the timer. A repeat of 0 means no repeat
+        #
+        # @param timeout [Fixnum] time in milliseconds before the timer callback is triggered the first time
+        # @param repeat [Fixnum] time in milliseconds between repeated callbacks after the first
+        def start(timeout, repeat = 0)
+            return if @closed
+            @stopped = false
+
+            assert_type(Integer, timeout, TIMEOUT_ERROR)
+            assert_type(Integer, repeat, REPEAT_ERROR)
+
+            error = check_result ::Libuv::Ext.timer_start(handle, callback(:on_timer), timeout, repeat)
+            reject(error) if error
+        end
+
+        # Disables the timer.
+        def stop
+            return if @stopped || @closed
+            @stopped = true
+            error = check_result ::Libuv::Ext.timer_stop(handle)
+            reject(error) if error
+        end
+
+        # Resets the current repeat
+        def again
+            return if @closed
+            error = check_result ::Libuv::Ext.timer_again(handle)
+            reject(error) if error
+        end
+
+        # Updates the repeat timeout
+        def repeat=(repeat)
+            return if @closed
+            assert_type(Integer, repeat, REPEAT_ERROR)
+            check_result ::Libuv::Ext.timer_set_repeat(handle, repeat)
+            reject(error) if error
+        end
+
+        # Returns the current repeat timeout
+        def repeat
+            return if @closed
+            ::Libuv::Ext.timer_get_repeat(handle)
+        end
+
+        # Used to update the callback to be triggered by the timer
+        #
+        # @param callback [Proc] the callback to be called by the timer
+        def progress(callback = nil, &blk)
+            @callback = callback || blk
+        end
+
+
+        private
+
+
+        def on_timer(handle, status)
+            e = check_result(status)
+
+            if e
+                reject(e)
+            else
+                begin
+                    @callback.call
+                rescue Exception => e
+                    @loop.log :error, :timer_cb, e
+                end
+            end
+        end
+    end
+end

data/lib/libuv/tty.rb

@@ -1,37 +1,37 @@
-module Libuv
-    class TTY < Handle
-        include Stream
-
-
-        def initialize(loop, fileno, readable)
-            @loop = loop
-
-            tty_ptr = ::Libuv::Ext.create_handle(:uv_tty)
-            error = check_result(::Libuv::Ext.tty_init(loop.handle, tty_ptr, fileno, readable ? 1 : 0))
-            
-            super(tty_ptr, error)
-        end
-
-        def enable_raw_mode
-            return if @closed
-            check_result ::Libuv::Ext.tty_set_mode(handle, 1)
-        end
-
-        def disable_raw_mode
-            return if @closed
-            check_result ::Libuv::Ext.tty_set_mode(handle, 0)
-        end
-
-        def reset_mode
-            ::Libuv::Ext.tty_reset_mode
-        end
-
-        def winsize
-            return [] if @closed
-            width = FFI::MemoryPointer.new(:int)
-            height = FFI::MemoryPointer.new(:int)
-            ::Libuv::Ext.tty_get_winsize(handle, width, height)
-            [width.get_int(0), height.get_int(0)]
-        end
-    end
-end
+module Libuv
+    class TTY < Handle
+        include Stream
+
+
+        def initialize(loop, fileno, readable)
+            @loop = loop
+
+            tty_ptr = ::Libuv::Ext.create_handle(:uv_tty)
+            error = check_result(::Libuv::Ext.tty_init(loop.handle, tty_ptr, fileno, readable ? 1 : 0))
+            
+            super(tty_ptr, error)
+        end
+
+        def enable_raw_mode
+            return if @closed
+            check_result ::Libuv::Ext.tty_set_mode(handle, 1)
+        end
+
+        def disable_raw_mode
+            return if @closed
+            check_result ::Libuv::Ext.tty_set_mode(handle, 0)
+        end
+
+        def reset_mode
+            ::Libuv::Ext.tty_reset_mode
+        end
+
+        def winsize
+            return [] if @closed
+            width = FFI::MemoryPointer.new(:int)
+            height = FFI::MemoryPointer.new(:int)
+            ::Libuv::Ext.tty_get_winsize(handle, width, height)
+            [width.get_int(0), height.get_int(0)]
+        end
+    end
+end

data/lib/libuv/udp.rb

@@ -1,225 +1,225 @@
-module Libuv
-    class UDP < Handle
-        include Net
-
-
-        SEND_DATA_ERROR = "data must be a String".freeze
-        TTL_ARGUMENT_ERROR = "ttl must be an Integer".freeze
-        MULTICAST_ARGUMENT_ERROR = "multicast_address must be a String".freeze
-        INTERFACE_ARGUMENT_ERROR = "interface_address must be a String".freeze
-        HANDLE_CLOSED_ERROR = "unable to send as handle closed".freeze
-
-
-        def initialize(loop)
-            @loop = loop
-
-            udp_ptr = ::Libuv::Ext.create_handle(:uv_udp)
-            error = check_result(::Libuv::Ext.udp_init(loop.handle, udp_ptr))
-
-            super(udp_ptr, error)
-        end
-
-        def bind(ip, port)
-            return if @closed
-            assert_type(String, ip, IP_ARGUMENT_ERROR)
-            assert_type(Integer, port, PORT_ARGUMENT_ERROR)
-
-            sockaddr = create_sockaddr(ip, port)
-            error = check_result ::Libuv::Ext.udp_bind(handle, sockaddr, 0)
-            reject(error) if error
-        end
-
-        def open(fd, binding = true, callback = nil, &blk)
-            return if @closed
-            error = check_result UV.udp_open(handle, fd)
-            reject(error) if error
-        end
-
-        def sockname
-            return [] if @closed
-            sockaddr, len = get_sockaddr_and_len
-            check_result! ::Libuv::Ext.udp_getsockname(handle, sockaddr, len)
-            get_ip_and_port(UV::Sockaddr.new(sockaddr), len.get_int(0))
-        end
-
-        def join(multicast_address, interface_address)
-            return if @closed
-            assert_type(String, multicast_address, MULTICAST_ARGUMENT_ERROR)
-            assert_type(String, interface_address, INTERFACE_ARGUMENT_ERROR)
-
-            error = check_result ::Libuv::Ext.udp_set_membership(handle, multicast_address, interface_address, :uv_join_group)
-            reject(error) if error
-        end
-
-        def leave(multicast_address, interface_address)
-            return if @closed
-            assert_type(String, multicast_address, MULTICAST_ARGUMENT_ERROR)
-            assert_type(String, interface_address, INTERFACE_ARGUMENT_ERROR)
-
-            error = check_result ::Libuv::Ext.udp_set_membership(handle, multicast_address, interface_address, :uv_leave_group)
-            reject(error) if error
-        end
-
-        # Starts reading from the handle
-        # Renamed to match Stream
-        def start_read
-            return if @closed
-            error = check_result ::Libuv::Ext.udp_recv_start(handle, callback(:on_allocate), callback(:on_recv))
-            reject(error) if error
-        end
-
-        # Stops reading from the handle
-        # Renamed to match Stream
-        def stop_read
-            return if @closed
-            error = check_result ::Libuv::Ext.udp_recv_stop(handle)
-            reject(error) if error
-        end
-
-        def send(ip, port, data)
-            # NOTE:: Similar to stream.rb -> write
-            deferred = @loop.defer
-            if !@closed
-                begin
-                    assert_type(String, ip, IP_ARGUMENT_ERROR)
-                    assert_type(Integer, port, PORT_ARGUMENT_ERROR)
-                    assert_type(String, data, SEND_DATA_ERROR)
-
-                    sockaddr = create_sockaddr(ip, port)
-
-                    # local as this variable will be avaliable until the handle is closed
-                    @sent_callbacks ||= []
-
-                    #
-                    # create the curried callback
-                    #
-                    callback = FFI::Function.new(:void, [:pointer, :int]) do |req, status|
-                        ::Libuv::Ext.free(req)
-                        # remove the callback from the array
-                        # assumes sends are done in order
-                        promise = @sent_callbacks.shift[0]
-                        resolve promise, status
-                    end
-
-                    #
-                    # Save the callback and return the promise
-                    #
-                    @sent_callbacks << [deferred, callback]
-                    error = check_result ::Libuv::Ext.udp_send(
-                        send_req,
-                        handle,
-                        buf_init(data),
-                        1,
-                        sockaddr,
-                        callback
-                    )
-                    if error
-                        @sent_callbacks.pop
-                        deferred.reject(error)
-                        reject(error)       # close the handle
-                    end
-                rescue StandardError => e
-                    deferred.reject(e)
-                end
-            else
-                deferred.reject(RuntimeError.new(HANDLE_CLOSED_ERROR))
-            end
-            deferred.promise
-        end
-
-        def enable_multicast_loop
-            return if @closed
-            error = check_result ::Libuv::Ext.udp_set_multicast_loop(handle, 1)
-            reject(error) if error
-        end
-
-        def disable_multicast_loop
-            return if @closed
-            error = check_result ::Libuv::Ext.udp_set_multicast_loop(handle, 0)
-            reject(error) if error
-        end
-
-        def multicast_ttl=(ttl)
-            return if @closed
-            assert_type(Integer, ttl, TTL_ARGUMENT_ERROR)
-            error = check_result ::Libuv::Ext.udp_set_multicast_ttl(handle, ttl)
-            reject(error) if error
-        end
-
-        def enable_broadcast
-            return if @closed
-            error = check_result ::Libuv::Ext.udp_set_broadcast(handle, 1)
-            reject(error) if error
-        end
-
-        def disable_broadcast
-            return if @closed
-            error = check_result ::Libuv::Ext.udp_set_broadcast(handle, 0)
-            reject(error) if error
-        end
-
-        def ttl=(ttl)
-            return if @closed
-            assert_type(Integer, ttl, TTL_ARGUMENT_ERROR)
-            error = check_result ::Libuv::Ext.udp_set_ttl(handle, Integer(ttl))
-            reject(error) if error
-        end
-
-        def progress(callback = nil, &blk)
-            @progress = callback || blk
-        end
-
-
-        private
-
-
-        def send_req
-            ::Libuv::Ext.create_request(:uv_udp_send)
-        end
-
-        def buf_init(data)
-            ::Libuv::Ext.buf_init(FFI::MemoryPointer.from_string(data), data.respond_to?(:bytesize) ? data.bytesize : data.size)
-        end
-
-        def create_sockaddr(ip, port)
-            ips = IPAddr.new(ip)
-            if ips.ipv4?
-                addr = Ext::SockaddrIn.new
-                check_result! ::Libuv::Ext.ip4_addr(ip, port, addr)
-                addr
-            else
-                addr = Ext::SockaddrIn6.new
-                check_result! ::Libuv::Ext.ip6_addr(ip, port, addr)
-                addr
-            end
-        end
-
-
-        def on_allocate(client, suggested_size, buffer)
-            buffer[:len] = suggested_size
-            buffer[:base] = ::Libuv::Ext.malloc(suggested_size)
-        end
-
-        def on_recv(handle, nread, buf, sockaddr, flags)
-            e = check_result(nread)
-            base = buf[:base]
-
-            if e
-                ::Libuv::Ext.free(base)
-                reject(e)
-            else
-                data = base.read_string(nread)
-                ::Libuv::Ext.free(base)
-                unless sockaddr.null?
-                    ip, port = get_ip_and_port(UV::Sockaddr.new(sockaddr))
-                end
-                
-                begin
-                    @progress.call data, ip, port, self
-                rescue Exception => e
-                    @loop.log :error, :udp_progress_cb, e
-                end
-            end
-        end
-    end
+module Libuv
+    class UDP < Handle
+        include Net
+
+
+        SEND_DATA_ERROR = "data must be a String".freeze
+        TTL_ARGUMENT_ERROR = "ttl must be an Integer".freeze
+        MULTICAST_ARGUMENT_ERROR = "multicast_address must be a String".freeze
+        INTERFACE_ARGUMENT_ERROR = "interface_address must be a String".freeze
+        HANDLE_CLOSED_ERROR = "unable to send as handle closed".freeze
+
+
+        def initialize(loop)
+            @loop = loop
+
+            udp_ptr = ::Libuv::Ext.create_handle(:uv_udp)
+            error = check_result(::Libuv::Ext.udp_init(loop.handle, udp_ptr))
+
+            super(udp_ptr, error)
+        end
+
+        def bind(ip, port)
+            return if @closed
+            assert_type(String, ip, IP_ARGUMENT_ERROR)
+            assert_type(Integer, port, PORT_ARGUMENT_ERROR)
+
+            sockaddr = create_sockaddr(ip, port)
+            error = check_result ::Libuv::Ext.udp_bind(handle, sockaddr, 0)
+            reject(error) if error
+        end
+
+        def open(fd, binding = true, callback = nil, &blk)
+            return if @closed
+            error = check_result UV.udp_open(handle, fd)
+            reject(error) if error
+        end
+
+        def sockname
+            return [] if @closed
+            sockaddr, len = get_sockaddr_and_len
+            check_result! ::Libuv::Ext.udp_getsockname(handle, sockaddr, len)
+            get_ip_and_port(UV::Sockaddr.new(sockaddr), len.get_int(0))
+        end
+
+        def join(multicast_address, interface_address)
+            return if @closed
+            assert_type(String, multicast_address, MULTICAST_ARGUMENT_ERROR)
+            assert_type(String, interface_address, INTERFACE_ARGUMENT_ERROR)
+
+            error = check_result ::Libuv::Ext.udp_set_membership(handle, multicast_address, interface_address, :uv_join_group)
+            reject(error) if error
+        end
+
+        def leave(multicast_address, interface_address)
+            return if @closed
+            assert_type(String, multicast_address, MULTICAST_ARGUMENT_ERROR)
+            assert_type(String, interface_address, INTERFACE_ARGUMENT_ERROR)
+
+            error = check_result ::Libuv::Ext.udp_set_membership(handle, multicast_address, interface_address, :uv_leave_group)
+            reject(error) if error
+        end
+
+        # Starts reading from the handle
+        # Renamed to match Stream
+        def start_read
+            return if @closed
+            error = check_result ::Libuv::Ext.udp_recv_start(handle, callback(:on_allocate), callback(:on_recv))
+            reject(error) if error
+        end
+
+        # Stops reading from the handle
+        # Renamed to match Stream
+        def stop_read
+            return if @closed
+            error = check_result ::Libuv::Ext.udp_recv_stop(handle)
+            reject(error) if error
+        end
+
+        def send(ip, port, data)
+            # NOTE:: Similar to stream.rb -> write
+            deferred = @loop.defer
+            if !@closed
+                begin
+                    assert_type(String, ip, IP_ARGUMENT_ERROR)
+                    assert_type(Integer, port, PORT_ARGUMENT_ERROR)
+                    assert_type(String, data, SEND_DATA_ERROR)
+
+                    sockaddr = create_sockaddr(ip, port)
+
+                    # local as this variable will be avaliable until the handle is closed
+                    @sent_callbacks ||= []
+
+                    #
+                    # create the curried callback
+                    #
+                    callback = FFI::Function.new(:void, [:pointer, :int]) do |req, status|
+                        ::Libuv::Ext.free(req)
+                        # remove the callback from the array
+                        # assumes sends are done in order
+                        promise = @sent_callbacks.shift[0]
+                        resolve promise, status
+                    end
+
+                    #
+                    # Save the callback and return the promise
+                    #
+                    @sent_callbacks << [deferred, callback]
+                    error = check_result ::Libuv::Ext.udp_send(
+                        send_req,
+                        handle,
+                        buf_init(data),
+                        1,
+                        sockaddr,
+                        callback
+                    )
+                    if error
+                        @sent_callbacks.pop
+                        deferred.reject(error)
+                        reject(error)       # close the handle
+                    end
+                rescue StandardError => e
+                    deferred.reject(e)
+                end
+            else
+                deferred.reject(RuntimeError.new(HANDLE_CLOSED_ERROR))
+            end
+            deferred.promise
+        end
+
+        def enable_multicast_loop
+            return if @closed
+            error = check_result ::Libuv::Ext.udp_set_multicast_loop(handle, 1)
+            reject(error) if error
+        end
+
+        def disable_multicast_loop
+            return if @closed
+            error = check_result ::Libuv::Ext.udp_set_multicast_loop(handle, 0)
+            reject(error) if error
+        end
+
+        def multicast_ttl=(ttl)
+            return if @closed
+            assert_type(Integer, ttl, TTL_ARGUMENT_ERROR)
+            error = check_result ::Libuv::Ext.udp_set_multicast_ttl(handle, ttl)
+            reject(error) if error
+        end
+
+        def enable_broadcast
+            return if @closed
+            error = check_result ::Libuv::Ext.udp_set_broadcast(handle, 1)
+            reject(error) if error
+        end
+
+        def disable_broadcast
+            return if @closed
+            error = check_result ::Libuv::Ext.udp_set_broadcast(handle, 0)
+            reject(error) if error
+        end
+
+        def ttl=(ttl)
+            return if @closed
+            assert_type(Integer, ttl, TTL_ARGUMENT_ERROR)
+            error = check_result ::Libuv::Ext.udp_set_ttl(handle, Integer(ttl))
+            reject(error) if error
+        end
+
+        def progress(callback = nil, &blk)
+            @progress = callback || blk
+        end
+
+
+        private
+
+
+        def send_req
+            ::Libuv::Ext.create_request(:uv_udp_send)
+        end
+
+        def buf_init(data)
+            ::Libuv::Ext.buf_init(FFI::MemoryPointer.from_string(data), data.respond_to?(:bytesize) ? data.bytesize : data.size)
+        end
+
+        def create_sockaddr(ip, port)
+            ips = IPAddr.new(ip)
+            if ips.ipv4?
+                addr = Ext::SockaddrIn.new
+                check_result! ::Libuv::Ext.ip4_addr(ip, port, addr)
+                addr
+            else
+                addr = Ext::SockaddrIn6.new
+                check_result! ::Libuv::Ext.ip6_addr(ip, port, addr)
+                addr
+            end
+        end
+
+
+        def on_allocate(client, suggested_size, buffer)
+            buffer[:len] = suggested_size
+            buffer[:base] = ::Libuv::Ext.malloc(suggested_size)
+        end
+
+        def on_recv(handle, nread, buf, sockaddr, flags)
+            e = check_result(nread)
+            base = buf[:base]
+
+            if e
+                ::Libuv::Ext.free(base)
+                reject(e)
+            else
+                data = base.read_string(nread)
+                ::Libuv::Ext.free(base)
+                unless sockaddr.null?
+                    ip, port = get_ip_and_port(UV::Sockaddr.new(sockaddr))
+                end
+                
+                begin
+                    @progress.call data, ip, port, self
+                rescue Exception => e
+                    @loop.log :error, :udp_progress_cb, e
+                end
+            end
+        end
+    end
 end