libuv 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 769f10cadb566b542368277dfee691a5aa2af059
-  data.tar.gz: 8114fb75a4da94c6341e6ead1faf5d59182c9245
+  metadata.gz: 8f50ac13e289f22e33239e26cbd273c6559284ab
+  data.tar.gz: 8c342b9f3c447b5f72e92170c29e62d606236c1d
 SHA512:
-  metadata.gz: 33e0394111e14048717934b2cffbc6f37d660117f6bc871eb7bb4da8089c0a303629b28febb6ee762f870039968029f620c35303b68302f1b8e1fc18bdbd2522
-  data.tar.gz: b1d5f5af132c26fdb88d732c188f6b067714512e3466feb63bef970f56374f961810c1a63d8d5e8c9301af28f23e0b70aae7a6bf917e07fd38c0b6e806565216
+  metadata.gz: 9c4b6ec4ac447ca967050fea8487850ac29041a2abb2d3437c4a7ce529be51d522be416c0dc719a25fda640c98b4bdcb67d1b9f6d8c6083155ee302882580821
+  data.tar.gz: 6667e4276f32dea396149d8118eb99d35dc73c62ddd1339ca834ca563cd3adf8c326f39a84f7c69dcb60bc9000c4d79b5bd037da05f256269dad77f37f8a138c

data/README.md

@@ -38,7 +38,7 @@ Check out the [yard documentation](http://rubydoc.info/gems/libuv/Libuv/Loop)
 
 ## Installation
 
-```Shell
+```shell
   gem install libuv
 ```
 
@@ -62,7 +62,7 @@ or
   * if you have a compatible `libuv.(so | dylib | dll)` on the PATH already
 
 
-## What's supported
+## Libuv features supported
 
 * TCP
 * UDP
@@ -72,11 +72,11 @@ or
 * Prepare
 * Check
 * Idle
-* Async
 * Signals
+* Async callbacks
+* Async DNS Resolution
 * Filesystem Events
-* File manipulation
 * Filesystem manipulation
+* File manipulation
 * Errors
 * Work queue (thread pool)
-

data/lib/libuv.rb

@@ -29,6 +29,7 @@ module Libuv
     require 'libuv/idle'        # Called when there are no events to process
     require 'libuv/work'        # Provide work to be completed on another thread (thread pool)
     require 'libuv/udp'         # Communicate over UDP
+    require 'libuv/dns'         # Async DNS lookup
 
     # Streams
     require 'libuv/pipe'        # Communicate over Pipes

data/lib/libuv/dns.rb

@@ -0,0 +1,83 @@
+module Libuv
+    class Dns < Q::DeferredPromise
+        include Resource, Listener, Net
+
+
+        attr_reader :results
+        attr_reader :domain
+        attr_reader :port
+        attr_reader :hint
+
+
+        HINTS = {
+            :IPv4 => ::Libuv::Ext::UvAddrinfo.new,
+            :IPv6 => ::Libuv::Ext::UvAddrinfo.new
+        }
+        HINTS[:IPv4].tap do |hint|
+            hint[:family] = Socket::Constants::AF_INET
+            hint[:socktype] = Socket::Constants::SOCK_STREAM
+            hint[:protocol] = Socket::Constants::IPPROTO_TCP
+        end
+        HINTS[:IPv6].tap do |hint|
+            hint[:family] = Socket::Constants::AF_INET6
+            hint[:socktype] = Socket::Constants::SOCK_STREAM
+            hint[:protocol] = Socket::Constants::IPPROTO_TCP
+        end
+
+
+        # @param loop [::Libuv::Loop] loop this work request will be associated
+        # @param domain [String] the domain name to resolve
+        # @param port [Integer, String] the port we wish to use
+        def initialize(loop, domain, port, hint = :IPv4)
+            super(loop, loop.defer)
+
+            @domain = domain
+            @port = port
+            @hint = hint
+            @complete = false
+            @pointer = ::Libuv::Ext.create_request(:uv_getaddrinfo)
+            @error = nil    # error in callback
+
+            error = check_result ::Libuv::Ext.getaddrinfo(@loop, @pointer, callback(:on_complete), domain, port.to_s, HINTS[hint])
+            if error
+                ::Libuv::Ext.free(@pointer)
+                @complete = true
+                @defer.reject(error)
+            end
+        end
+
+        # Indicates if the lookup has completed yet or not.
+        #
+        # @return [true, false]
+        def completed?
+            return @complete
+        end
+
+
+        private
+
+
+        def on_complete(req, status, addrinfo)
+            @complete = true
+            ::Libuv::Ext.free(req)
+
+            e = check_result(status)
+            if e
+                @defer.reject(e)
+            else
+                begin
+                    current = addrinfo
+                    @results = []
+                    while !current.null?
+                        @results << get_ip_and_port(current[:addr])
+                        current = current[:next]
+                    end
+                    @defer.resolve(@results)
+                rescue Exception => e
+                    @defer.reject(e)
+                end
+                ::Libuv::Ext.freeaddrinfo(addrinfo)
+            end
+        end
+    end
+end

data/lib/libuv/ext/ext.rb

@@ -155,9 +155,9 @@ module Libuv
         attach_function :timer_again, :uv_timer_again, [:uv_timer_t], :int, :blocking => true
         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 :getaddrinfo, :uv_getaddrinfo, [:uv_loop_t, :uv_getaddrinfo_t, :uv_getaddrinfo_cb, :string, :string, :addrinfo], :int, :blocking => true
-        attach_function :freeaddrinfo, :uv_freeaddrinfo, [:addrinfo], :void, :blocking => true
+#:addrinfo
+        attach_function :getaddrinfo, :uv_getaddrinfo, [:uv_loop_t, :uv_getaddrinfo_t, :uv_getaddrinfo_cb, :string, :string, UvAddrinfo.by_ref], :int, :blocking => true
+        attach_function :freeaddrinfo, :uv_freeaddrinfo, [UvAddrinfo.by_ref], :void, :blocking => true
 
         attach_function :spawn, :uv_spawn, [:uv_loop_t, :uv_process_t, :uv_options_t], :int, :blocking => true
         attach_function :process_kill, :uv_process_kill, [:uv_process_t, :int], :int, :blocking => true

data/lib/libuv/ext/platform/darwin_x64.rb

@@ -8,5 +8,16 @@ module Libuv
                     :blksize_t, :st_flags, :uint32, :st_gen, :uint32, :st_lspare,
                     :int32, :st_qspare_0, :int64, :st_qspare_1, :int64
         end
+
+        class UvAddrinfo < FFI::Struct
+            layout  :flags, :int,
+                    :family, :int,
+                    :socktype, :int,
+                    :protocol, :int,
+                    :addrlen, :socklen_t,
+                    :canonname, :string,
+                    :addr, Sockaddr.by_ref,
+                    :next, UvAddrinfo.by_ref
+        end
     end
 end

data/lib/libuv/ext/platform/unix.rb

@@ -13,6 +13,17 @@ module Libuv
                     :st_mtime, :time_t, :st_ctime, :time_t
         end
 
+        class UvAddrinfo < FFI::Struct
+            layout  :flags, :int,
+                    :family, :int,
+                    :socktype, :int,
+                    :protocol, :int,
+                    :addrlen, :socklen_t,
+                    :addr, Sockaddr.by_ref,
+                    :canonname, :string,
+                    :next, UvAddrinfo.by_ref
+        end
+
         attach_function :ntohs, [:ushort], :ushort, :blocking => true
     end
-end
+end

data/lib/libuv/ext/platform/windows.rb

@@ -25,5 +25,16 @@ module Libuv
                     :st_ino, :ino_t, :st_mode, :mode_t, :st_mtime, :time_t, :st_nlink, :nlink_t,
                     :st_rdev, :dev_t, :st_size, :off_t, :st_uid, :uid_t
         end
+
+        class UvAddrinfo < FFI::Struct
+            layout  :flags, :int,
+                    :family, :int,
+                    :socktype, :int,
+                    :protocol, :int,
+                    :addrlen, :size_t,
+                    :canonname, :string,
+                    :addr, Sockaddr.by_ref,
+                    :next, UvAddrinfo.by_ref
+        end
     end
-end
+end

data/lib/libuv/ext/types.rb

@@ -1,3 +1,5 @@
+require 'socket'    # Addrinfo
+
 module FFI::Platform
     def self.linux?
         IS_LINUX
@@ -6,6 +8,23 @@ end
 
 module Libuv
     module Ext
+        class Sockaddr < FFI::Struct
+            layout :sa_len, :uint8,
+                   :sa_family, :sa_family_t,
+                   :sa_data, [:char, 14]
+        end
+
+        class UvAddrinfo < FFI::Struct
+            layout  :flags, :int,
+                    :family, :int,
+                    :socktype, :int,
+                    :protocol, :int,
+                    :addrlen, :socklen_t,
+                    :addr, Sockaddr.by_ref,
+                    :canonname, :string,
+                    :next, :pointer
+        end
+
         require 'libuv/ext/platform/linux.rb' if FFI::Platform.linux?
         require 'libuv/ext/platform/unix.rb' if FFI::Platform.unix?
         require 'libuv/ext/platform/darwin_x64.rb' if FFI::Platform.mac? and FFI::Platform::ARCH == 'x86_64'
@@ -90,13 +109,6 @@ module Libuv
 
         typedef UvBuf.by_ref, :uv_buf_t
 
-
-        class Sockaddr < FFI::Struct
-            layout :sa_len, :uint8,
-                   :sa_family, :sa_family_t,
-                   :sa_data, [:char, 14]
-        end
-
         class InAddr < FFI::Struct
             layout :s_addr, :in_addr_t
         end
@@ -173,7 +185,6 @@ module Libuv
         typedef :pointer, :uv_signal_t
         typedef :pointer, :uv_process_t
         typedef :pointer, :uv_getaddrinfo_cb
-        typedef :pointer, :addrinfo
         typedef :pointer, :uv_work_t
         typedef :pointer, :uv_loop_t
         typedef :pointer, :uv_shutdown_t
@@ -214,7 +225,7 @@ module Libuv
         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_getaddrinfo_cb, [:uv_getaddrinfo_t, :status, :addrinfo],            :void
+        callback :uv_getaddrinfo_cb, [:uv_getaddrinfo_t, :status, UvAddrinfo.by_ref],    :void
         callback :uv_exit_cb,        [:uv_process_t, :int, :int],                        :void
         callback :uv_walk_cb,        [:uv_handle_t, :pointer],                           :void
         callback :uv_work_cb,        [:uv_work_t],                                       :void

data/lib/libuv/loop.rb

@@ -269,6 +269,18 @@ module Libuv
             Work.new(@loop, callback)    # Work is a promise object
         end
 
+        # Lookup a hostname
+        #
+        # @param hostname [String] the domain name to lookup
+        # @param port [Integer, String] the service being connected too
+        # @param callback [Proc] the callback to be called on success
+        # @return [::Libuv::Dns]
+        def lookup(hostname, hint = :IPv4, port = 9, &block)
+            dns = Dns.new(@loop, hostname, port, hint)    # Work is a promise object
+            dns.then block if block_given?
+            dns
+        end
+
         # Get a new FSEvent instance
         # 
         # @param path [String] the path to the file or folder for watching

data/lib/libuv/mixins/net.rb

@@ -6,28 +6,30 @@ module Libuv
 
         IP_ARGUMENT_ERROR = "ip must be a String".freeze                # Arguments specifying an IP address
         PORT_ARGUMENT_ERROR = "port must be an Integer".freeze          # Arguments specifying an IP port
+        INET_ADDRSTRLEN = 16
+        INET6_ADDRSTRLEN = 46
 
 
         private
 
 
         def get_sockaddr_and_len
-            sockaddr = FFI::MemoryPointer.new(UV::Sockaddr)
+            sockaddr = FFI::MemoryPointer.new(::Libuv::Ext::Sockaddr)
             len = FFI::MemoryPointer.new(:int)
-            len.put_int(0, UV::Sockaddr.size)
+            len.put_int(0, ::Libuv::Ext::Sockaddr.size)
             [sockaddr, len]
         end
 
-        def get_ip_and_port(sockaddr, len=nil)
+        def get_ip_and_port(sockaddr, len = nil)
             if sockaddr[:sa_family] == Socket::Constants::AF_INET6
-                len ||= Socket::Constants::INET6_ADDRSTRLEN
-                sockaddr_in6 = UV::SockaddrIn6.new(sockaddr.pointer)
+                len ||= INET6_ADDRSTRLEN
+                sockaddr_in6 = ::Libuv::Ext::SockaddrIn6.new(sockaddr.pointer)
                 ip_ptr = FFI::MemoryPointer.new(:char, len)
                 ::Libuv::Ext.ip6_name(sockaddr_in6, ip_ptr, len)
                 port = ::Libuv::Ext.ntohs(sockaddr_in6[:sin6_port])
             else
-                len ||= Socket::Constants::INET_ADDRSTRLEN
-                sockaddr_in = UV::SockaddrIn.new(sockaddr.pointer)
+                len ||= INET_ADDRSTRLEN
+                sockaddr_in = ::Libuv::Ext::SockaddrIn.new(sockaddr.pointer)
                 ip_ptr = FFI::MemoryPointer.new(:char, len)
                 ::Libuv::Ext.ip4_name(sockaddr_in, ip_ptr, len)
                 port = ::Libuv::Ext.ntohs(sockaddr_in[:sin_port])
@@ -35,4 +37,4 @@ module Libuv
             [ip_ptr.read_string, port]
         end
     end
-end
+end

data/lib/libuv/tcp.rb

@@ -77,14 +77,14 @@ module Libuv
             return [] if @closed
             sockaddr, len = get_sockaddr_and_len
             check_result! ::Libuv::Ext.tcp_getsockname(handle, sockaddr, len)
-            get_ip_and_port(::Libuv::Sockaddr.new(sockaddr), len.get_int(0))
+            get_ip_and_port(::Libuv::Ext::Sockaddr.new(sockaddr), len.get_int(0))
         end
 
         def peername
             return [] if @closed
             sockaddr, len = get_sockaddr_and_len
             check_result! ::Libuv::Ext.tcp_getpeername(handle, sockaddr, len)
-            get_ip_and_port(::Libuv::Sockaddr.new(sockaddr), len.get_int(0))
+            get_ip_and_port(::Libuv::Ext::Sockaddr.new(sockaddr), len.get_int(0))
         end
 
         def enable_nodelay

data/lib/libuv/version.rb

@@ -1,3 +1,3 @@
 module Libuv
-    VERSION = '0.10.3'
+    VERSION = '0.11.0'
 end

data/spec/dns_spec.rb

@@ -0,0 +1,90 @@
+require 'libuv'
+
+
+describe Libuv::Dns do
+	before :each do
+		@log = []
+		@general_failure = []
+
+		@loop = Libuv::Loop.new
+		@timeout = @loop.timer do
+			@loop.stop
+			@general_failure << "test timed out"
+		end
+		@timeout.start(5000)
+
+		@loop.all(@server, @client, @timeout).catch do |reason|
+			@general_failure << reason.inspect
+			p "Failed with: #{reason.message}\n#{reason.backtrace.join("\n")}\n"
+		end
+	end
+	
+	it "should resolve localhost using IP4", :network => true do
+		@loop.run { |logger|
+			logger.progress do |level, errorid, error|
+				begin
+					p "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+				rescue Exception
+					p 'error in logger'
+				end
+			end
+
+			@loop.lookup('localhost').then proc { |addrinfo|
+				@result = addrinfo[0][0]
+				@loop.stop
+			}, proc { |err|
+				@general_failure << err
+				@loop.stop
+			}
+		}
+
+		@general_failure.should == []
+		@result.should == '127.0.0.1'
+	end
+
+	it "should resolve localhost using IP6", :network => true do
+		@loop.run { |logger|
+			logger.progress do |level, errorid, error|
+				begin
+					p "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+				rescue Exception
+					p 'error in logger'
+				end
+			end
+
+			@loop.lookup('localhost', :IPv6).then proc { |addrinfo|
+				@result = addrinfo[0][0]
+				@loop.stop
+			}, proc { |err|
+				@general_failure << err
+				@loop.stop
+			}
+		}
+
+		@general_failure.should == []
+		@result.should == '::1'
+	end
+
+	it "should resolve loop back" do
+		@loop.run { |logger|
+			logger.progress do |level, errorid, error|
+				begin
+					p "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+				rescue Exception
+					p 'error in logger'
+				end
+			end
+
+			@loop.lookup('127.0.0.1').then proc { |addrinfo|
+				@result = addrinfo[0][0]
+				@loop.stop
+			}, proc { |err|
+				@general_failure << err
+				@loop.stop
+			}
+		}
+
+		@general_failure.should == []
+		@result.should == '127.0.0.1'
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libuv
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Bulat Shakirzyanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -103,6 +103,7 @@ files:
 - lib/libuv.rb
 - lib/libuv/async.rb
 - lib/libuv/check.rb
+- lib/libuv/dns.rb
 - lib/libuv/error.rb
 - lib/libuv/ext/ext.rb
 - lib/libuv/ext/platform/darwin_x64.rb
@@ -140,6 +141,7 @@ files:
 - spec/async_spec.rb
 - spec/cpu_spec.rb
 - spec/defer_spec.rb
+- spec/dns_spec.rb
 - spec/filesystem_spec.rb
 - spec/idle_spec.rb
 - spec/pipe_spec.rb
@@ -389,6 +391,7 @@ test_files:
 - spec/async_spec.rb
 - spec/cpu_spec.rb
 - spec/defer_spec.rb
+- spec/dns_spec.rb
 - spec/filesystem_spec.rb
 - spec/idle_spec.rb
 - spec/pipe_spec.rb