rb-inotify 0.1.0 → 0.2.0

data/.gitignore

@@ -1,2 +1,3 @@
 /.yardoc
 /doc
+/pkg

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/rb-inotify/event.rb

@@ -3,14 +3,12 @@ module INotify
   # Each {Watcher} can fire many events,
   # which are passed to that watcher's callback.
   class Event
-    # An integer specifying that this event is related to some other event,
-    # which will have the same cookie.
-    #
-    # Currently, this is only used for files that are moved within the same directory.
-    # Both the `:moved_from` and the `:moved_to` events will have the same cookie.
+    # A list of other events that are related to this one.
+    # Currently, this is only used for files that are moved within the same directory:
+    # the `:moved_from` and the `:moved_to` events will be related.
     #
-    # @return [Fixnum]
-    attr_reader :cookie
+    # @return [Array<Event>]
+    attr_reader :related
 
     # The name of the file that the event occurred on.
     # This is only set for events that occur on files in directories;
@@ -24,6 +22,16 @@ module INotify
     # @return [Notifier]
     attr_reader :notifier
 
+    # An integer specifying that this event is related to some other event,
+    # which will have the same cookie.
+    #
+    # Currently, this is only used for files that are moved within the same directory.
+    # Both the `:moved_from` and the `:moved_to` events will have the same cookie.
+    #
+    # @private
+    # @return [Fixnum]
+    attr_reader :cookie
+
     # The {Watcher#id id} of the {Watcher} that fired this event.
     #
     # @private
@@ -80,6 +88,7 @@ module INotify
     def initialize(data, notifier)
       ptr = FFI::MemoryPointer.from_string(data)
       @native = Native::Event.new(ptr)
+      @related = []
       @cookie = @native[:cookie]
       @name = data[@native.size, @native[:len]].gsub(/\0+$/, '')
       @notifier = notifier

data/lib/rb-inotify/notifier.rb

@@ -152,7 +152,15 @@ module INotify
     #
     # @see #process
     def run
-      loop {process}
+      @stop = false
+      process until @stop || closed?
+    end
+
+    # Stop watching for filesystem events.
+    # That is, if we're in a \{#run} loop,
+    # exit out as soon as we finish handling the events.
+    def stop
+      @stop = true
     end
 
     # Blocks until there are one or more filesystem events
@@ -186,9 +194,14 @@ module INotify
       end
 
       events = []
+      cookies = {}
       while ev = Event.consume(data, self)
         events << ev
+        next if ev.cookie == 0
+        cookies[ev.cookie] ||= []
+        cookies[ev.cookie] << ev
       end
+      cookies.each {|c, evs| evs.each {|ev| ev.related.replace(evs - [ev]).freeze}}
       events
     end
   end

data/rb-inotify.gemspec

@@ -0,0 +1,51 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rb-inotify}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nathan Weizenbaum"]
+  s.date = %q{2009-11-29}
+  s.description = %q{A Ruby wrapper for Linux's inotify, using FFI}
+  s.email = %q{nex342@gmail.com}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     ".yardopts",
+     "MIT-LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "lib/rb-inotify.rb",
+     "lib/rb-inotify/event.rb",
+     "lib/rb-inotify/native.rb",
+     "lib/rb-inotify/native/flags.rb",
+     "lib/rb-inotify/notifier.rb",
+     "lib/rb-inotify/watcher.rb",
+     "rb-inotify.gemspec"
+  ]
+  s.homepage = %q{http://github.com/nex3/rb-notify}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A Ruby wrapper for Linux's inotify, using FFI}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<yard>, [">= 0"])
+    else
+      s.add_dependency(%q<yard>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<yard>, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rb-inotify
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -43,6 +43,7 @@ files:
 - lib/rb-inotify/native/flags.rb
 - lib/rb-inotify/notifier.rb
 - lib/rb-inotify/watcher.rb
+- rb-inotify.gemspec
 has_rdoc: true
 homepage: http://github.com/nex3/rb-notify
 licenses: []