guard 0.2.0 → 0.2.1

data/lib/guard.rb

@@ -55,7 +55,7 @@ module Guard
     end
     
     def locate_guard(name)
-      `gem open guard-#{name} --latest --command echo`
+      `gem open guard-#{name} --latest --command echo`.chomp
     rescue
       UI.error "Could not find 'guard-#{name}' gem path."
     end

data/lib/guard/listeners/darwin.rb

@@ -25,8 +25,8 @@ module Guard
     
     def self.usable?
       require 'rb-fsevent'
-      if !defined?(FSEvent::VERSION) || Gem::Version.new(FSEvent::VERSION) < Gem::Version.new('0.3.2')
-        UI.info "Please update rb-fsevent (>= 0.3.2)"
+      if !defined?(FSEvent::VERSION) || Gem::Version.new(FSEvent::VERSION) < Gem::Version.new('0.3.3')
+        UI.info "Please update rb-fsevent (>= 0.3.3)"
         false
       else
         true

data/lib/guard/listeners/linux.rb

@@ -3,6 +3,8 @@ module Guard
     attr_reader :inotify, :files, :latency, :callback
 
     def initialize
+      super
+
       @inotify = INotify::Notifier.new
       @files   = []
       @latency = 0.5
@@ -10,7 +12,7 @@ module Guard
 
     def on_change(&callback)
       @callback = callback
-      inotify.watch(Dir.pwd, :recursive, :attrib, :modify, :create) do |event|
+      inotify.watch(Dir.pwd, :recursive, :modify, :create, :delete, :move) do |event|
         unless event.name == "" # Event on root directory
           @files << event.absolute_name
         end
@@ -20,12 +22,12 @@ module Guard
 
     def start
       @stop = false
-      watch_change
+      watch_change unless @watch_change
     end
 
     def stop
       @stop = true
-      inotify.stop
+      sleep latency
     end
 
     def self.usable?
@@ -44,18 +46,24 @@ module Guard
   private
 
     def watch_change
+      @watch_change = true
       while !@stop
         if Config::CONFIG['build'] =~ /java/ || IO.select([inotify.to_io], [], [], latency)
+          break if @stop
+
           inotify.process
+          update_last_event
 
           unless files.empty?
             files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
             callback.call(files)
             files.clear
           end
-          sleep latency
+
+          sleep latency unless @stop
         end
       end
+      @watch_change = false
     end
 
   end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2010-10-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency