directory_watcher 0.1.1 → 0.1.2

data/lib/directory_watcher.rb

@@ -164,8 +164,6 @@ class DirectoryWatcher
   #
   Event = Struct.new :type, :path
 
-  FileInfo = Struct.new :mtime, :size, :stable   # :nodoc:
-
   #
   # call-seq:
   #    DirectoryWatcher.new( directory, options )
@@ -206,6 +204,7 @@ class DirectoryWatcher
 
     @files = (opts[:pre_load] ? scan_files : Hash.new)
     @events = []
+    @thread = nil
   end
 
   #
@@ -371,17 +370,17 @@ class DirectoryWatcher
   #    scan_files
   #
   # Using the configured glob pattern, scan the directory for all files and
-  # return a hash with the filenames as keys and +FileInfo+ objects as the
-  # values. The +FileInfo+ objects contain the mtime and size of the file.
+  # return a hash with the filenames as keys and +File::Stat+ objects as the
+  # values. The +File::Stat+ objects contain the mtime and size of the file.
   #
   def scan_files
     files = {}
     @glob.each do |glob|
       Dir.glob(glob).each do |fn|
         begin
-          if Kernel.test(?f, fn)
-            files[fn] = FileInfo.new(File.mtime(fn), File.size(fn))
-          end
+          stat = File.stat fn
+          next unless stat.file?
+          files[fn] = stat
         rescue SystemCallError; end
       end
     end
@@ -403,15 +402,14 @@ class DirectoryWatcher
       start = Time.now.to_f
 
       files = scan_files
-      keys = [files.keys, @files.keys]
-      common = keys.first & keys.last
+      keys = [files.keys, @files.keys]  # current files, previous files
 
       find_added(files, *keys)
-      find_modified(files, common)
+      find_modified(files, *keys)
       find_removed(*keys)
 
       notify_observers
-      @files = files
+      @files = files    # store the current file list for the next iteration
 
       nap_time = @interval - (Time.now.to_f - start)
       sleep nap_time if nap_time > 0
@@ -424,9 +422,7 @@ class DirectoryWatcher
   #
   # Taking the list of current files, _cur_, and the list of files found
   # previously, _prev_, figure out which files have been added and generate
-  # a new file added event for each. The events are returned as an array
-  # from this method. If no files have been added, the returned array is
-  # empty.
+  # a new file added event for each.
   #
   def find_added( files, cur, prev )
     added = cur - prev
@@ -443,9 +439,7 @@ class DirectoryWatcher
   #
   # Taking the list of current files, _cur_, and the list of files found
   # previously, _prev_, figure out which files have been removed and
-  # generate a new file removed event for each. The events are returned as
-  # an array from this method. If no files have been removed, the returned
-  # array is empty.
+  # generate a new file removed event for each.
   #
   def find_removed( cur, prev )
     removed = prev - cur
@@ -455,33 +449,32 @@ class DirectoryWatcher
 
   #
   # call-seq:
-  #    find_modified( files, common )
+  #    find_modified( files, cur, prev )
   #
-  # Taking the list of _common_ files (those that exist in the current file
-  # list and in the previous file list) determine if any have been modified.
-  # Generate a new file modified event for each modified file. Also, by
-  # looking at the stable count in the _files_ hash, figure out if any files
-  # have become stable since being added or modified. Generate a new stable
-  # event for each stabilized file. The events are returned as an array from
-  # this method. If there are no events, the array is empty.
+  # Taking the list of current files, _cur_, and the list of files found
+  # previously, _prev_, find those that are common between them and determine
+  # if any have been modified. Generate a new file modified event for each
+  # modified file. Also, by looking at the stable count in the _files_ hash,
+  # figure out if any files have become stable since being added or modified.
+  # Generate a new stable event for each stabilized file.
   #
-  def find_modified( files, common )
-    common.each do |key|
-      cur, prev = files[key], @files[key]
+  def find_modified( files, cur, prev )
+    (cur & prev).each do |key|
+      cur_stat, prev_stat = files[key], @files[key]
 
       # if the modification time or the file size differs from the last
       # time it was seen, then create a :modified event
-      if cur.mtime != prev.mtime or cur.size != prev.size
+      if (cur_stat <=> prev_stat) != 0 or cur_stat.size != prev_stat.size
         @events << Event.new(:modified, key)
-        cur.stable = @stable
+        cur_stat.stable = @stable
 
       # otherwise, if the count is not nil see if we need to create a
       # :stable event
-      elsif !prev.stable.nil?
-        cur.stable = prev.stable - 1
-        if cur.stable == 0
+      elsif !prev_stat.stable.nil?
+        cur_stat.stable = prev_stat.stable - 1
+        if cur_stat.stable == 0
           @events << Event.new(:stable, key)
-          cur.stable = nil
+          cur_stat.stable = nil
         end
       end
     end
@@ -507,4 +500,10 @@ class DirectoryWatcher
 
 end  # class DirectoryWatcher
 
+# :stopdoc:
+# We need to add a 'stable' attribute to the File::Stat object
+class File::Stat
+  attr_accessor :stable
+end
+
 # EOF

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: directory_watcher
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-11-10 00:00:00 -07:00
+  version: 0.1.2
+date: 2006-11-26 00:00:00 -07:00
 summary: A class for watching files within a directory and generating events when those files change
 require_paths: 
 - lib