filewatcher 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18429964b2631c8f50fc42b2a919d3dd859608cd
-  data.tar.gz: e1206dff831c1bb8d2495cc4110b21971c2e6c33
+  metadata.gz: 931616017d17d3dbca73187c1b6fe31887975115
+  data.tar.gz: 24cec3cbfe8256a906a0067d628438d2bc4176d8
 SHA512:
-  metadata.gz: 38c927c846a8844443afb7cb0b403ede8eac5205f3d6833a4220d1e5e6bece967e33602adcdba5b44b922e12bf3300e5043acfb35922067d7cce486de50ddd77
-  data.tar.gz: 6d732bb3d0cfae8f6c57f5477077ccbc9a3b43b631ec58336f8b5953186233b9cdf8bec08fe136e857d747d6f08b1e9a45b7b9ac799e76c3119c1f4f67e0bda1
+  metadata.gz: eddb01f13c12345438352bb1450f22078462d1b392baacdd0796ddf40a82f80aab5164fc2be36d0c15493cf257164de2f41a2b4a46cfe84400b67c4a1438d6d4
+  data.tar.gz: efeff47ff4fb01fc3e9af4e9f7a0af47fc33d59fa6b67a19d077055438c43c4839428bc4f8ca8de42d74e44093df2f092532a36e27f5e6efa05b91283a25f91c

data/README.rdoc

@@ -96,6 +96,9 @@ To detect if a file is updated or deleted:
     if(event == :deleted)
       puts "Deleted " + filename
     end
+    if(event == :new)
+      puts "New file " + filename
+    end
   end
 
 = TODO

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/filewatcher.rb

@@ -4,40 +4,26 @@
 class FileWatcher
 
   def self.VERSION
-    return "0.2.1"
+    return "0.3.0"
   end
 
-  def initialize(filenames,print_filelist=false)
-    if(filenames.kind_of?String)
-      filenames = [filenames]
-    end
-
-    filenames = expand_directories(filenames)
-
-    if(print_filelist)
-      if(print_filelist.kind_of?String)
-        puts print_filelist
-      else
-        puts "Watching:"
-      end
-      filenames.each do |filename|
-        puts filename
-      end
-    end
-
+  def initialize(unexpanded_filenames, print_filelist=false)
+    @unexpanded_filenames = unexpanded_filenames
     @last_mtimes = { }
-    filenames.each do |filename|
+    @filenames = expand_directories(@unexpanded_filenames)
+
+    puts "Watching:" if print_filelist
+    @filenames.each do |filename|
       raise "File does not exist" unless File.exist?(filename)
       @last_mtimes[filename] = File.stat(filename).mtime
+      puts filename if print_filelist
     end
-    @filenames = filenames
-    @deleted_files = []
   end
 
   def watch(sleep=1, &on_update)
     loop do
       begin
-        Kernel.sleep sleep until file_updated?
+        Kernel.sleep sleep until filesystem_updated?
       rescue SystemExit,Interrupt
         Kernel.exit
       end
@@ -45,33 +31,45 @@ class FileWatcher
     end
   end
 
-  def file_updated?
-    @filenames.each do |filename|
-
-      if(not(@deleted_files.include?(filename)))
+  def filesystem_updated?
+    filenames = expand_directories(@unexpanded_filenames)
 
-        if(not(File.exist?(filename)))
-          @deleted_files << filename
-          @updated_file = filename
-          @event = :delete
-          return true
-        end
-        mtime = File.stat(filename).mtime
+    if(filenames.size > @filenames.size)
+      filename = (filenames - @filenames).first
+      @filenames << filename
+      @last_mtimes[filename] = File.stat(filename).mtime
+      @updated_file = filename
+      @event = :new
+      return true
+    end
 
-        updated = @last_mtimes[filename] < mtime
-        @last_mtimes[filename] = mtime
-        if(updated)
-          @updated_file = filename
-          @event = :changed
-          return true
-        end
+    if(filenames.size < @filenames.size)
+      filename = (@filenames - filenames).first
+      @filenames.delete(filename)
+      @last_mtimes.delete(filename)
+      @updated_file = filename
+      @event = :delete
+      return true
+    end
 
+    @filenames.each do |filename|
+      mtime = File.stat(filename).mtime
+      updated = @last_mtimes[filename] < mtime
+      @last_mtimes[filename] = mtime
+      if(updated)
+        @updated_file = filename
+        @event = :changed
+        return true
       end
     end
+
     return false
   end
 
   def expand_directories(filenames)
+    if(filenames.kind_of?String)
+      filenames = [filenames]
+    end
     files = []
     filenames.each do |filename|
       if(File.directory?(filename))

data/test/test_filewatcher.rb

@@ -5,22 +5,12 @@ class TestFilewatcher < Test::Unit::TestCase
 
   should "should detect directories and extract filenames" do
 
-    puts " "
-
     FileWatcher.new(["test/"],"Watching files. Ctrl-C to abort.").watch(0.1) do |filename, event|
-      puts "updated: " + filename.to_s + " event:" + event.to_s
-    end
-
-    FileWatcher.new(["./test/", "Rakefile", "lib"]).watch(0.1) do |filename|
-      puts "updated: " + filename
+      puts "updated: '#{filename.to_s} event:'#{event.to_s}'"
     end
 
   end
 
-  should "return version number" do
-    assert FileWatcher.VERSION.size > 2
-  end
-
 #   should "should detect changes in files" do
 
 #     @pid = fork do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Thomas Flemming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simple filewatcher.