rb-inotify 0.8.5 → 0.8.6

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/lib/rb-inotify.rb

@@ -13,5 +13,5 @@ module INotify
   # An array containing the version number of rb-inotify.
   # The numbers in the array are the major, minor, and patch versions,
   # respectively.
-  VERSION = [0, 8, 5]
+  VERSION = [0, 8, 6]
 end

data/lib/rb-inotify/notifier.rb

@@ -40,6 +40,12 @@ module INotify
     # @return [Fixnum]
     attr_reader :fd
 
+    # @return [Boolean] Whether or not this Ruby implementation supports
+    #   wrapping the native file descriptor in a Ruby IO wrapper.
+    def self.supports_ruby_io?
+      RUBY_PLATFORM !~ /java/
+    end
+
     # Creates a new {Notifier}.
     #
     # @return [Notifier]
@@ -76,7 +82,9 @@ module INotify
     # @return [IO] An IO object wrapping the file descriptor
     # @raise [NotImplementedError] if this is being called in JRuby
     def to_io
-      raise NotImplementedError.new("INotify::Notifier#to_io is not supported under JRuby") if RUBY_PLATFORM =~ /java/
+      unless self.class.supports_ruby_io?
+        raise NotImplementedError.new("INotify::Notifier#to_io is not supported under JRuby")
+      end
       @io ||= IO.new(@fd)
     end
 
@@ -190,7 +198,11 @@ module INotify
       return watch(path, *((flags - [:recursive]) | rec_flags)) do |event|
         callback.call(event) if flags.include?(:all_events) || !(flags & event.flags).empty?
         next if (rec_flags & event.flags).empty? || !event.flags.include?(:isdir)
-        watch(event.absolute_name, *flags, &callback)
+        begin
+          watch(event.absolute_name, *flags, &callback)
+        rescue Errno::ENOENT
+          # If the file has been deleted since the glob was run, we don't want to error out.
+        end
       end
     end
 
@@ -220,11 +232,25 @@ module INotify
       read_events.each {|event| event.callback!}
     end
 
+    # Close the notifier.
+    #
+    # @raise [SystemCallError] if closing the underlying file descriptor fails.
+    def close
+      return if Native.close(@fd) == 0
+
+      raise SystemCallError.new("Failed to properly close inotify socket" +
+       case FFI.errno
+       when Errno::EBADF::Errno; ": invalid or closed file descriptior"
+       when Errno::EIO::Errno; ": an I/O error occured"
+       end,
+       FFI.errno)
+    end
+
+    private
+
     # Blocks until there are one or more filesystem events
     # that this notifier has watchers registered for.
     # Once there are events, returns their {Event} objects.
-    #
-    # @private
     def read_events
       size = 64 * Native::Event.size
       tries = 1
@@ -252,21 +278,11 @@ module INotify
       events
     end
 
-    def close
-      return if Native.close(@fd) == 0
-
-      raise SystemCallError.new("Failed to properly close inotify socket" +
-       case FFI.errno
-       when Errno::EBADF::Errno; ": invalid or closed file descriptior"
-       when Errno::EIO::Errno; ": an I/O error occured"
-       end,
-       FFI.errno)
-    end
-
-    private
-
     # Same as IO#readpartial, or as close as we need.
     def readpartial(size)
+      # Use Ruby's readpartial if possible, to avoid blocking other threads.
+      return to_io.readpartial(size) if self.class.supports_ruby_io?
+
       tries = 0
       begin
         tries += 1

data/rb-inotify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rb-inotify}
-  s.version = "0.8.5"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Weizenbaum"]
-  s.date = %q{2011-06-02}
+  s.date = %q{2011-08-02}
   s.description = %q{A Ruby wrapper for Linux's inotify, using FFI}
   s.email = %q{nex342@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rb-inotify
 version: !ruby/object:Gem::Version 
-  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -07:00
+date: 2011-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 5
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 4
@@ -85,7 +82,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -94,7 +90,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"