libuv 0.10.0 → 0.10.2

data/.gitignore

@@ -1,17 +1,17 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-html
-pkg
-doc
-tmp
-rerun.txt
-Gemfile.lock
-.bundle
-.idea
-*.rbc
-.yardoc
-bin
-Gemfile-custom
-ext/*
+*.sw?
+.DS_Store
+coverage
+rdoc
+html
+pkg
+doc
+tmp
+rerun.txt
+Gemfile.lock
+.bundle
+.idea
+*.rbc
+.yardoc
+bin
+Gemfile-custom
+ext/*

data/.gitmodules

@@ -1,3 +1,3 @@
-[submodule "ext/libuv"]
-	path = ext/libuv
-	url = https://github.com/joyent/libuv.git
+[submodule "ext/libuv"]
+	path = ext/libuv
+	url = https://github.com/joyent/libuv.git

data/.rspec

@@ -1 +1 @@
---format progress
+--format progress

data/.travis.yml

@@ -1,16 +1,16 @@
-language: ruby
-rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - rbx-20mode
-  - jruby-19mode
-  - jruby-20mode
-branches:
-  only:
-    - master
-before_install:
-  - sudo apt-get install subversion
-  - git submodule update --init --recursive
-  - echo "yes" | gem uninstall ffi -a
-before_script:
-  - rake compile
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - rbx-20mode
+  - jruby-19mode
+  - jruby-20mode
+branches:
+  only:
+    - master
+before_install:
+  - sudo apt-get install subversion
+  - git submodule update --init --recursive
+  - echo "yes" | gem uninstall ffi -a
+before_script:
+  - rake compile

data/Gemfile

@@ -1,2 +1,2 @@
-source "https://rubygems.org"
-gemspec
+source "https://rubygems.org"
+gemspec

data/LICENSE

@@ -1,24 +1,24 @@
-Copyright (c) 2004-2013 Cotag Media
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-===
-
-This license applies to all parts of uvrb (Ruby FFI bindings for libuv only)
+Copyright (c) 2004-2013 Cotag Media
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===
+
+This license applies to all parts of uvrb (Ruby FFI bindings for libuv only)
 Libuv itself [is using Node license](https://github.com/joyent/libuv/blob/master/LICENSE)

data/README.md

@@ -1,73 +1,82 @@
-# Libuv FFI bindings for Ruby
-
-[![Build Status](https://travis-ci.org/cotag/libuv.png?branch=master)](https://travis-ci.org/cotag/libuv)
-
-[Libuv](https://github.com/joyent/libuv) is a cross platform asynchronous IO implementation that powers NodeJS. It supports sockets, both UDP and TCP, filesystem watch, TTY, Pipes and other asynchronous primitives like timer, check, prepare and idle.
-
-The Libuv gem contains Libuv and a Ruby wrapper that implements [pipelined promises](http://en.wikipedia.org/wiki/Futures_and_promises#Promise_pipelining) for asynchronous flow control
-
-## Usage
-
-Create a new libuv loop or use a default one
-
-```ruby
-  require 'libuv'
-
-  loop = Libuv::Loop.default
-  # or
-  # loop = Libuv::Loop.new
-
-  loop.run do
-    timer = loop.timer do |error|
-      p error if error
-      puts "50 seconds passed"
-      timer.close
-      loop.stop
-    end
-    timer.start(50000)
-  end
-```
-
-Check out the [yard documentation](http://rubydoc.info/gems/libuv/Libuv/Loop)
-
-
-## Installation
-
-```Shell
-  gem install libuv
-```
-
-or
-
-```shell
-  git clone https://github.com/cotag/libuv.git
-  cd libuv
-  bundle install
-  rake compile
-```
-
-### Prerequisites
-
-* The installation requires __subversion__ to be installed on your system and available on the PATH
-* Windows users will require a copy of Visual Studio 2010 or later. [Visual Studio Express](http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products) works fine.
-
-or
-
-if you have a compatible `libuv.(so | dylib | dll)` on the PATH already, setting the environmental variable `USE_GLOBAL_LIBUV` will prevent compiling the packaged version.
-
-
-## What's supported
-
-* TCP
-* UDP
-* TTY
-* Pipe
-* Timer
-* Prepare
-* Check
-* Idle
-* Async
-* Filesystem Events
-* Errors
-* Work queue (thread pool)
-
+# Libuv FFI bindings for Ruby
+
+[![Build Status](https://travis-ci.org/cotag/libuv.png?branch=master)](https://travis-ci.org/cotag/libuv)
+
+[Libuv](https://github.com/joyent/libuv) is a cross platform asynchronous IO implementation that powers NodeJS. It supports sockets, both UDP and TCP, filesystem watch, TTY, Pipes and other asynchronous primitives like timer, check, prepare and idle.
+
+The Libuv gem contains Libuv and a Ruby wrapper that implements [pipelined promises](http://en.wikipedia.org/wiki/Futures_and_promises#Promise_pipelining) for asynchronous flow control
+
+## Usage
+
+Create a new libuv loop or use a default one
+
+```ruby
+  require 'libuv'
+
+  loop = Libuv::Loop.default
+  # or
+  # loop = Libuv::Loop.new
+
+  loop.run do
+    timer = loop.timer do
+      puts "5 seconds passed"
+      timer.close
+      loop.stop
+    end
+    timer.catch do |error|
+      puts "error with timer: #{error}"
+    end
+    timer.finally do
+      puts "timer handle was closed"
+    end
+    timer.start(5000)
+  end
+```
+
+Check out the [yard documentation](http://rubydoc.info/gems/libuv/Libuv/Loop)
+
+
+## Installation
+
+```Shell
+  gem install libuv
+```
+
+or
+
+```shell
+  git clone https://github.com/cotag/libuv.git
+  cd libuv
+  bundle install
+  rake compile
+```
+
+### Prerequisites
+
+* The installation requires __subversion__ to be installed on your system and available on the PATH
+* Windows users will require a copy of Visual Studio 2010 or later. [Visual Studio Express](http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products) works fine.
+
+or
+
+* setting the environmental variable `USE_GLOBAL_LIBUV` will prevent compiling the packaged version.
+  * if you have a compatible `libuv.(so | dylib | dll)` on the PATH already
+
+
+## What's supported
+
+* TCP
+* UDP
+* TTY
+* Pipe
+* Timer
+* Prepare
+* Check
+* Idle
+* Async
+* Signals
+* Filesystem Events
+* File manipulation
+* Filesystem manipulation
+* Errors
+* Work queue (thread pool)
+

data/Rakefile

@@ -1,31 +1,31 @@
-require 'rubygems'
-require 'rspec/core/rake_task'  # testing framework
-require 'yard'                  # yard documentation
-require 'ffi'                   # loads the extension
-require 'rake/clean'            # for the :clobber rake task
-require 'libuv/ext/tasks'       # platform specific rake tasks used by compile
-
-
-
-# By default we don't run network tests
-task :default => :limited_spec
-RSpec::Core::RakeTask.new(:limited_spec) do |t|
-    # Exclude network tests and tests that won't run on java (real io)
-    t.rspec_opts = "--tag ~network --tag ~real_io" 
-end
-RSpec::Core::RakeTask.new(:spec)
-
-
-desc "Run all tests"
-task :test => [:spec]
-
-
-YARD::Rake::YardocTask.new do |t|
-    t.files   = ['lib/**/*.rb', '-', 'ext/README.md', 'README.md']
-end
-
-
-desc "Compile libuv from submodule"
-task :compile => ["ext/libuv.#{FFI::Platform::LIBSUFFIX}"]
-
-CLOBBER.include("ext/libuv.#{FFI::Platform::LIBSUFFIX}")
+require 'rubygems'
+require 'rspec/core/rake_task'  # testing framework
+require 'yard'                  # yard documentation
+require 'ffi'                   # loads the extension
+require 'rake/clean'            # for the :clobber rake task
+require 'libuv/ext/tasks'       # platform specific rake tasks used by compile
+
+
+
+# By default we don't run network tests
+task :default => :limited_spec
+RSpec::Core::RakeTask.new(:limited_spec) do |t|
+    # Exclude network tests
+    t.rspec_opts = "--tag ~network" 
+end
+RSpec::Core::RakeTask.new(:spec)
+
+
+desc "Run all tests"
+task :test => [:spec]
+
+
+YARD::Rake::YardocTask.new do |t|
+    t.files   = ['lib/**/*.rb', '-', 'ext/README.md', 'README.md']
+end
+
+
+desc "Compile libuv from submodule"
+task :compile => ["ext/libuv.#{FFI::Platform::LIBSUFFIX}"]
+
+CLOBBER.include("ext/libuv.#{FFI::Platform::LIBSUFFIX}")

data/lib/libuv.rb

@@ -1,34 +1,53 @@
-require 'forwardable'
-require 'ffi'
-
-module Libuv
-    require 'libuv/ext/ext'     # The libuv ffi ext
-    require 'libuv/q'           # The promise library
-
-    autoload :Assertions, 'libuv/assertions'    # Common code to check arguments
-    autoload :Resource, 'libuv/resource'        # Common code to check for errors
-    autoload :Listener, 'libuv/listener'        # Common callback code
-
-    autoload :Error, 'libuv/error'              # List of errors (matching those in uv.h)
-    autoload :Net, 'libuv/net'                  # Common functions for tcp and udp
-
-    autoload :Handle, 'libuv/handle'            # Libuv handle base class
-    
-    autoload :Loop, 'libuv/loop'                # The libuv reactor or event loop
-    autoload :Timer, 'libuv/timer'              # High resolution timer
-    autoload :Check, 'libuv/check'              # Called before processing events on the loop
-    autoload :Prepare, 'libuv/prepare'          # Called at the end of a loop cycle
-    autoload :Idle, 'libuv/idle'                # Called when there are no events to process
-    autoload :Async, 'libuv/async'              # Provide a threadsafe way to signal the event loop (uses promises)
-    autoload :SimpleAsync, 'libuv/simple_async' # Same as above using a simple callback
-    autoload :Work, 'libuv/work'                # Provide work to be completed on another thread (thread pool)
-
-    # Streams
-    autoload :Stream, 'libuv/stream'
-    autoload :TCP, 'libuv/tcp'                  # Communicate over TCP
-    autoload :Pipe, 'libuv/pipe'                # Communicate over Pipes
-    autoload :TTY, 'libuv/tty'                  # Terminal output
-
-    autoload :UDP, 'libuv/udp'                  # Communicate over UDP
-    autoload :FSEvent, 'libuv/fs_event'         # Notifies of changes to files and folders as they occur
-end
+require 'forwardable'
+require 'ffi'
+
+module Libuv
+    require 'libuv/ext/ext'     # The libuv ffi ext
+    require 'libuv/error'       # List of errors (matching those in uv.h)
+    require 'libuv/q'           # The promise library
+
+    require 'libuv/mixins/assertions'  # Common code to check arguments
+    require 'libuv/mixins/fs_checks'   # Common code to check file system results
+    require 'libuv/mixins/resource'    # Common code to check for errors
+    require 'libuv/mixins/listener'    # Common callback code
+    require 'libuv/mixins/stream'      # For all libuv streams (tcp, pipes, tty)
+    require 'libuv/mixins/net'         # Common functions for tcp and udp
+
+    # -- The classes required for a loop instance --
+    require 'libuv/handle'      # Base class for most libuv functionality
+    require 'libuv/async'       # Provide a threadsafe way to signal the event loop
+    require 'libuv/timer'       # High resolution timer
+    require 'libuv/loop'        # The libuv reactor or event loop
+    # --
+
+    require 'libuv/filesystem'  # Async directory manipulation
+    require 'libuv/fs_event'    # Notifies of changes to files and folders as they occur
+    require 'libuv/prepare'     # Called at the end of a loop cycle
+    require 'libuv/signal'      # Used to handle OS signals
+    require 'libuv/check'       # Called before processing events on the loop
+    require 'libuv/file'        # Async file reading and writing
+    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
+
+    # Streams
+    require 'libuv/pipe'        # Communicate over Pipes
+    require 'libuv/tcp'         # Communicate over TCP
+    require 'libuv/tty'         # Terminal output
+
+
+    # Returns the number of CPU cores on the host platform
+    # 
+    # @return [Fixnum, nil] representing the number of CPU cores or nil if failed
+    def self.cpu_count
+        cpu_info = FFI::MemoryPointer.new(:pointer)
+        cpu_count = FFI::MemoryPointer.new(:int)
+        if ::Libuv::Ext.cpu_info(cpu_info, cpu_count) >= 0
+            count = cpu_count.read_int
+            ::Libuv::Ext.free_cpu_info(cpu_info.read_pointer, count)
+            return count
+        else
+            return nil
+        end
+    end
+end

data/lib/libuv/async.rb

@@ -1,33 +1,47 @@
-module Libuv
-    class Async < Handle
-
-
-        def initialize(loop)
-            @loop = loop
-            async_ptr = ::Libuv::Ext.create_handle(:uv_async)
-            error = check_result(::Libuv::Ext.async_init(loop.handle, async_ptr, callback(:on_async)))
-
-            super(async_ptr, error)
-        end
-
-        def call
-            return if @closed
-            error = check_result ::Libuv::Ext.async_send(handle)
-            reject(error) if error
-        end
-
-
-        private
-
-
-        def on_async(handle, status)
-            e = check_result(status)
-
-            if e
-                reject(e)
-            else
-                defer.notify(self)   # notify of a call
-            end
-        end
-    end
-end
+module Libuv
+    class Async < Handle
+
+
+        # @param loop [::Libuv::Loop] loop this async callback will be associated
+        def initialize(loop, callback = nil, &blk)
+            @loop = loop
+            @callback = callback || blk
+            async_ptr = ::Libuv::Ext.create_handle(:uv_async)
+            error = check_result(::Libuv::Ext.async_init(loop.handle, async_ptr, callback(:on_async)))
+
+            super(async_ptr, error)
+        end
+
+        # Triggers a notify event, calling everything in the notify chain
+        def call
+            return if @closed
+            error = check_result ::Libuv::Ext.async_send(handle)
+            reject(error) if error
+        end
+
+        # Used to update the callback that will be triggered when async is called
+        #
+        # @param callback [Proc] the callback to be called on loop prepare
+        def progress(callback = nil, &blk)
+            @callback = callback || blk
+        end
+
+
+        private
+
+
+        def on_async(handle, status)
+            e = check_result(status)
+
+            if e
+                reject(e)
+            else
+                begin
+                    @callback.call
+                rescue Exception => e
+                    @loop.log :error, :async_cb, e
+                end
+            end
+        end
+    end
+end