uvrb 0.1.0 → 0.1.1

data/lib/uv/assertions.rb

@@ -6,19 +6,25 @@ module UV
 
     def assert_arity(expected, proc, msg = nil)
       actual = proc.arity
-      arg  = expected == 1 ? "argument" : "arguments"
-      msg  ||= "block must accept #{expected} #{arg}, but accepts #{actual}"
-      raise ArgumentError, msg, caller if expected != actual
+      if expected != actual
+        arg  = expected == 1 ? "argument" : "arguments"
+        msg  ||= "block must accept #{expected} #{arg}, but accepts #{actual}"
+        raise ArgumentError, msg, caller
+      end
     end
 
     def assert_type(type, actual, msg = nil)
-      msg ||= "value #{actual.inspect} is not a valid #{type}"
-      raise ArgumentError, msg, caller unless actual.kind_of?(type)
+      if not actual.kind_of?(type)
+        msg ||= "value #{actual.inspect} is not a valid #{type}"
+        raise ArgumentError, msg, caller
+      end
     end
 
     def assert_boolean(actual, msg = nil)
-      msg ||= "value #{actual.inspect} is not a valid Boolean"
-      raise ArgumentError, msg, caller unless actual.kind_of?(TrueClass) || actual.kind_of?(FalseClass)
+      if not (actual.kind_of?(TrueClass) || actual.kind_of?(FalseClass))
+        msg ||= "value #{actual.inspect} is not a valid Boolean"
+        raise ArgumentError, msg, caller
+      end
     end
   end
 end

data/lib/uv/handle.rb

@@ -27,10 +27,12 @@ module UV
     end
 
     def close(&block)
-      assert_block(block)
-      assert_arity(0, block)
+      if not block.nil?
+        assert_block(block)
+        assert_arity(0, block)
 
-      @close_block = block
+        @close_block = block
+      end
 
       UV.close(@pointer, callback(:on_close))
 
@@ -59,7 +61,8 @@ module UV
     def on_close(pointer)
       UV.free(pointer)
       clear_callbacks
-      @close_block.call
+      
+      @close_block.call unless @close_block.nil?
     end
   end
 end

data/lib/uv/loop.rb

@@ -34,6 +34,7 @@ module UV
     # Returns nothing
     def initialize(pointer) # :notnew:
       @pointer = pointer
+      @loop = self
     end
 
     # Public: Run the actual event loop. This method will block for the duration of event loop
@@ -93,69 +94,15 @@ module UV
     # Raises UV::Error::EXDEV
     # Raises UV::Error::ENOTEMPTY
     # Raises UV::Error::ENOSPC
-    def run
-      check_result! UV.run(@pointer)
+    def run(run_type = :UV_RUN_DEFAULT)
+      check_result! UV.run(@pointer, run_type)
     end
 
-    # Public: Runs outstanding events once, yields control back
+    # Public: (Deprecated - use loop.run with a run_type specified) Runs outstanding events once, yields control back
     # 
-    # Returns nothing.
-    #
-    # Raises UV::Error::UNKNOWN
-    # Raises UV::Error::EOF
-    # Raises UV::Error::EADDRINFO
-    # Raises UV::Error::EACCES
-    # Raises UV::Error::EAGAIN
-    # Raises UV::Error::EADDRINUSE
-    # Raises UV::Error::EADDRNOTAVAIL
-    # Raises UV::Error::EAFNOSUPPORT
-    # Raises UV::Error::EALREADY
-    # Raises UV::Error::EBADF
-    # Raises UV::Error::EBUSY
-    # Raises UV::Error::ECONNABORTED
-    # Raises UV::Error::ECONNREFUSED
-    # Raises UV::Error::ECONNRESET
-    # Raises UV::Error::EDESTADDRREQ
-    # Raises UV::Error::EFAULT
-    # Raises UV::Error::EHOSTUNREACH
-    # Raises UV::Error::EINTR
-    # Raises UV::Error::EINVAL
-    # Raises UV::Error::EISCONN
-    # Raises UV::Error::EMFILE
-    # Raises UV::Error::EMSGSIZE
-    # Raises UV::Error::ENETDOWN
-    # Raises UV::Error::ENETUNREACH
-    # Raises UV::Error::ENFILE
-    # Raises UV::Error::ENOBUFS
-    # Raises UV::Error::ENOMEM
-    # Raises UV::Error::ENOTDIR
-    # Raises UV::Error::EISDIR
-    # Raises UV::Error::ENONET
-    # Raises UV::Error::ENOTCONN
-    # Raises UV::Error::ENOTSOCK
-    # Raises UV::Error::ENOTSUP
-    # Raises UV::Error::ENOENT
-    # Raises UV::Error::ENOSYS
-    # Raises UV::Error::EPIPE
-    # Raises UV::Error::EPROTO
-    # Raises UV::Error::EPROTONOSUPPORT
-    # Raises UV::Error::EPROTOTYPE
-    # Raises UV::Error::ETIMEDOUT
-    # Raises UV::Error::ECHARSE
-    # Raises UV::Error::EAIFAMNOSUPPORT
-    # Raises UV::Error::EAISERVICE
-    # Raises UV::Error::EAISOCKTYPE
-    # Raises UV::Error::ESHUTDOWN
-    # Raises UV::Error::EEXIST
-    # Raises UV::Error::ESRCH
-    # Raises UV::Error::ENAMETOOLONG
-    # Raises UV::Error::EPERM
-    # Raises UV::Error::ELOOP
-    # Raises UV::Error::EXDEV
-    # Raises UV::Error::ENOTEMPTY
-    # Raises UV::Error::ENOSPC
+    # Returns nothing
     def run_once
-      check_result! UV.run_once(@pointer)
+      run(:UV_RUN_ONCE)
     end
 
     # Public: forces loop time update, useful for getting more granular times
@@ -175,8 +122,7 @@ module UV
     # Internal: Get last error from the loop
     # 
     # Returns one of UV::Error or nil
-    def last_error
-      err  = UV.last_error(@pointer)
+    def lookup_error(err)
       name = UV.err_name(err)
       msg  = UV.strerror(err)
 
@@ -295,6 +241,24 @@ module UV
       async
     end
 
+    # Public: Do some work in the libuv thread pool
+    #
+    # Returns UV::Work
+    #
+    # Raises ArgumentError if block is not given and if the block or optional callback are expecting any arguments
+    def work(callback = nil, op = nil, &block)
+      block = block || op
+      assert_block(block)
+      assert_arity(0, block)
+
+      if not callback.nil?
+        assert_block(callback)
+        assert_arity(0, callback)
+      end
+
+      work = Work.new(self, block, callback)
+    end
+
     # Public: Get a new Filesystem instance
     # 
     # Returns UV::Filesystem

data/lib/uv/pipe.rb

@@ -13,6 +13,7 @@ module UV
     def bind(name)
       assert_type(String, name, "name must be a String")
 
+      name = windows_path name if FFI::Platform.windows?
       check_result! UV.pipe_bind(handle, name)
 
       self
@@ -25,6 +26,7 @@ module UV
 
       @connect_block = block
 
+      name = windows_path name if FFI::Platform.windows?
       UV.pipe_connect(UV.create_request(:uv_connect), handle, name, callback(:on_connect))
 
       self
@@ -43,5 +45,13 @@ module UV
       UV.free(req)
       @connect_block.call(check_result(status))
     end
+
+    def windows_path(name)
+      # test for \\\\.\\pipe
+      if not name =~ /(\/|\\){2}\.(\/|\\)pipe/i
+        name = ::File.join("\\\\.\\pipe", name)
+      end
+      name.gsub("/", "\\")
+    end
   end
 end

data/lib/uv/resource.rb

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

data/lib/uv/tasks.rb

@@ -19,9 +19,9 @@ end
 CLEAN.include('ext/libuv/build/gyp')
 
 if FFI::Platform.windows?
-  require 'uv/tasks/win'
+  require File.join File.expand_path("../", __FILE__), 'tasks/win'
 elsif FFI::Platform.mac?
-  require 'uv/tasks/mac'
+  require File.join File.expand_path("../", __FILE__), 'tasks/mac'
 else # UNIX
-  require 'uv/tasks/unix'
+  require File.join File.expand_path("../", __FILE__), 'tasks/unix'
 end

data/lib/uv/tasks/mac.rb

@@ -5,13 +5,13 @@ file 'ext/libuv/uv.xcodeproj' => 'ext/libuv/build/gyp' do
   abort "Don't know how to build on #{FFI::Platform::ARCH} (yet)" unless target_arch
 
   Dir.chdir("ext/libuv") do |path|
-    system "./gyp_uv -f xcode -Dtarget_arch=#{target_arch}"
+    system "./gyp_uv -f xcode -Dtarget_arch=#{target_arch} -Dlibrary=shared_library -Dcomponent=shared_library"
   end
 end
 
 file "ext/libuv/build/Release/libuv.#{FFI::Platform::LIBSUFFIX}" => 'ext/libuv/uv.xcodeproj' do
   Dir.chdir("ext/libuv") do |path|
-    system 'xcodebuild -project uv.xcodeproj -configuration Release -target All'
+    system 'xcodebuild -project uv.xcodeproj -configuration Release -target libuv'
   end
 end
 

data/lib/uv/tasks/unix.rb

@@ -5,7 +5,7 @@ file 'ext/libuv/out' => 'ext/libuv/build/gyp' do
   abort "Don't know how to build on #{FFI::Platform::ARCH} (yet)" unless target_arch
 
   Dir.chdir("ext/libuv") do |path|
-    system "./gyp_uv -f make -Dtarget_arch=#{target_arch}"
+    system "./gyp_uv -f make -Dtarget_arch=#{target_arch} -Dlibrary=shared_library -Dcomponent=shared_library"
   end
 end
 

data/lib/uv/tasks/win.rb

@@ -1,2 +1,11 @@
-abort "can't build on windows using this rake task (yet)"
-configure_command = 'vcbuild.bat'
+file "ext/libuv/Release/libuv.#{FFI::Platform::LIBSUFFIX}" do
+  Dir.chdir("ext/libuv") do |path|
+    system 'vcbuild.bat', 'shared', 'release'
+  end
+end
+
+file "ext/libuv.#{FFI::Platform::LIBSUFFIX}" => "ext/libuv/Release/libuv.#{FFI::Platform::LIBSUFFIX}" do
+  FileUtils.mv("ext/libuv/Release/libuv.#{FFI::Platform::LIBSUFFIX}", "ext/libuv.#{FFI::Platform::LIBSUFFIX}")
+end
+
+CLOBBER.include("ext/libuv/Release/libuv.#{FFI::Platform::LIBSUFFIX}")

data/lib/uv/timer.rb

@@ -1,6 +1,6 @@
 module UV
   class Timer
-    include Handle
+    include Assertions, Handle
 
     def start(timeout, repeat, &block)
       assert_block(block)

data/lib/uv/types.rb

@@ -12,31 +12,35 @@ module UV
 
   enum :uv_handle_type, [
     :uv_unknown_handle, 0,
-    :uv_async,
+    :uv_async, # start UV_HANDLE_TYPE_MAP
     :uv_check,
     :uv_fs_event,
+    :uv_fs_poll,
+    :uv_handle,
     :uv_idle,
     :uv_pipe,
     :uv_poll,
     :uv_prepare,
     :uv_process,
+    :uv_stream,
     :uv_tcp,
     :uv_timer,
     :uv_tty,
     :uv_udp,
-    :uv_ares_task,
+    :uv_signal, # end UV_HANDLE_TYPE_MAP
     :uv_file,
     :uv_handle_type_max
   ]
   enum :uv_req_type, [
     :uv_unknown_req, 0,
+    :uv_req,         # start UV_REQ_TYPE_MAP
     :uv_connect,
     :uv_write,
     :uv_shutdown,
     :uv_udp_send,
     :uv_fs,
     :uv_work,
-    :uv_getaddrinfo,
+    :uv_getaddrinfo, # end UV_REQ_TYPE_MAP
     :uv_req_type_private,
     :uv_req_type_max
   ]
@@ -44,65 +48,6 @@ module UV
     :uv_leave_group, 0,
     :uv_join_group
   ]
-  enum :uv_err_code, [
-    :UNKNOWN, -1,
-    :OK, 0,
-    :EOF, 1,
-    :EADDRINFO, 2,
-    :EACCES, 3,
-    :EAGAIN, 4,
-    :EADDRINUSE, 5,
-    :EADDRNOTAVAIL, 6,
-    :EAFNOSUPPORT, 7,
-    :EALREADY, 8,
-    :EBADF, 9,
-    :EBUSY, 10,
-    :ECONNABORTED, 11,
-    :ECONNREFUSED, 12,
-    :ECONNRESET, 13,
-    :EDESTADDRREQ, 14,
-    :EFAULT, 15,
-    :EHOSTUNREACH, 16,
-    :EINTR, 17,
-    :EINVAL, 18,
-    :EISCONN, 19,
-    :EMFILE, 20,
-    :EMSGSIZE, 21,
-    :ENETDOWN, 22,
-    :ENETUNREACH, 23,
-    :ENFILE, 24,
-    :ENOBUFS, 25,
-    :ENOMEM, 26,
-    :ENOTDIR, 27,
-    :EISDIR, 28,
-    :ENONET, 29,
-    :ENOTCONN, 31,
-    :ENOTSOCK, 32,
-    :ENOTSUP, 33,
-    :ENOENT, 34,
-    :ENOSYS, 35,
-    :EPIPE, 36,
-    :EPROTO, 37,
-    :EPROTONOSUPPORT, 38,
-    :EPROTOTYPE, 39,
-    :ETIMEDOUT, 40,
-    :ECHARSET, 41,
-    :EAIFAMNOSUPPORT, 42,
-    :EAISERVICE, 44,
-    :EAISOCKTYPE, 45,
-    :ESHUTDOWN, 46,
-    :EEXIST, 47,
-    :ESRCH, 48,
-    :ENAMETOOLONG, 49,
-    :EPERM, 50,
-    :ELOOP, 51,
-    :EXDEV, 52,
-    :ENOTEMPTY, 53,
-    :ENOSPC, 54,
-    :EIO, 55,
-    :EROFS, 56,
-    :UV_MAX_ERRORS
-  ]
   enum :uv_fs_type, [
     :UV_FS_UNKNOWN, -1,
     :UV_FS_CUSTOM,
@@ -136,16 +81,15 @@ module UV
     :UV_RENAME, 1,
     :UV_CHANGE, 2
   ]
+  enum :uv_run_mode, [
+    :UV_RUN_DEFAULT, 0,
+    :UV_RUN_ONCE,
+    :UV_RUN_NOWAIT
+  ]
 
   typedef UvBuf.by_value, :uv_buf_t
   typedef UvFSStat.by_value, :uv_fs_stat_t
 
-  class UvErr < FFI::Struct
-    layout :code, :uv_err_code,
-           :sys_errno_, :int
-  end
-
-  typedef UvErr.by_value, :uv_err_t
 
   class Sockaddr < FFI::Struct
     layout :sa_len, :uint8,
@@ -187,8 +131,36 @@ module UV
 
   typedef SockaddrIn6.by_value, :sockaddr_in6
 
+
+  class UvTimespec < FFI::Struct
+    layout  :tv_sec,  :long,
+            :tv_nsec, :long
+  end
+
+  class UvStat < FFI::Struct
+    layout  :st_dev,      :uint64,
+            :st_mode,     :uint64,
+            :st_nlink,    :uint64,
+            :st_uid,      :uint64,
+            :st_gid,      :uint64,
+            :st_rdev,     :uint64,
+            :st_ino,      :uint64,
+            :st_size,     :uint64,
+            :st_blksize,  :uint64,
+            :st_blocks,   :uint64,
+            :st_flags,    :uint64,
+            :st_gen,      :uint64,
+            :st_atim,     UvTimespec,
+            :st_mtim,     UvTimespec,
+            :st_ctim,     UvTimespec,
+            :st_birthtim, UvTimespec
+  end
+
+  typedef UvStat.by_value, :uv_stat_t
+
   typedef :pointer, :uv_handle_t
   typedef :pointer, :uv_fs_event_t
+  typedef :pointer, :uv_fs_poll_t
   typedef :pointer, :uv_stream_t
   typedef :pointer, :uv_tcp_t
   typedef :pointer, :uv_udp_t
@@ -222,7 +194,10 @@ module UV
   typedef :pointer, :uv_rwlock_t
   typedef :pointer, :uv_once_t
   typedef :pointer, :uv_thread_t
+  typedef :pointer, :uv_poll_t
+  typedef :pointer, :uv_stat_t
   typedef :int,     :status
+  typedef :int,     :events
 
   callback :uv_alloc_cb,       [:uv_handle_t, :size_t],                            :uv_buf_t
   callback :uv_read_cb,        [:uv_stream_t, :ssize_t, :uv_buf_t],                :void
@@ -232,6 +207,7 @@ module UV
   callback :uv_shutdown_cb,    [:uv_shutdown_t, :status],                          :void
   callback :uv_connection_cb,  [:uv_stream_t, :status],                            :void
   callback :uv_close_cb,       [:uv_handle_t],                                     :void
+  callback :uv_poll_cb,        [:uv_poll_t, :status, :events],                     :void
   callback :uv_timer_cb,       [:uv_timer_t, :status],                             :void
   callback :uv_async_cb,       [:uv_async_t, :status],                             :void
   callback :uv_prepare_cb,     [:uv_prepare_t, :status],                           :void
@@ -239,11 +215,14 @@ module UV
   callback :uv_idle_cb,        [:uv_idle_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
   callback :uv_fs_cb,          [:uv_fs_t],                                         :void
   callback :uv_work_cb,        [:uv_work_t],                                       :void
   callback :uv_after_work_cb,  [:uv_work_t],                                       :void
   callback :uv_fs_event_cb,    [:uv_fs_event_t, :string, :int, :int],              :void
+  callback :uv_fs_poll_cb,     [:uv_fs_poll_t, :status, :uv_stat_t, :uv_stat_t],   :void
+  #callback :uv_signal_cb,      []
   callback :uv_udp_send_cb,    [:uv_udp_send_t, :int],                             :void
-  callback :uv_udp_recv_cb,    [:uv_udp_t, :ssize_t, :uv_buf_t, :pointer, :uint],  :void
+  callback :uv_udp_recv_cb,    [:uv_udp_t, :ssize_t, :uv_buf_t, Sockaddr, :uint],  :void
   callback :uv_cb,             [],                                                 :void
 end