listen 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.3.2 - 4 Mars, 2012
+## 0.3.3 - March 6, 2012
+
+### Improvements
+
+- Improve pause/unpause. ([@thibaudgg][])
+
+## 0.3.2 - March 4, 2012
 
 ### New features
 

data/README.md

@@ -101,8 +101,9 @@ Listener can also easily be paused/unpaused:
 ``` ruby
 listener = Listen.to('dir/path/to/listen')
 listener.start   # enter the run loop
-listener.pause   # stop the run loop and enter the wait loop
-listener.unpause # re-enter the run loop
+listener.pause   # stop listening changes
+listener.paused? => true
+listener.unpause
 listener.stop
 ```
 
@@ -127,6 +128,7 @@ When the OS-specific adapter doesn't work the Listen gem automatically falls bac
 Here some things to try to avoiding this fallback:
 
 * [Update your Dropbox client](http://www.dropbox.com/downloading) (if used).
+* Increase latency. (Please [open an issue](https://github.com/guard/listen/issues/new) if you think that default is too low.)
 * Move or rename the listened folder.
 * Update/reboot your OS.
 

data/lib/listen/adapter.rb

@@ -2,7 +2,7 @@ require 'rbconfig'
 
 module Listen
   class Adapter
-    attr_accessor :latency
+    attr_accessor :latency, :paused
 
     # The default delay between checking for changes.
     DEFAULT_LATENCY = 0.1
@@ -58,6 +58,7 @@ module Listen
       @callback  = callback
       @latency ||= DEFAULT_LATENCY
       @latency   = options[:latency] if options[:latency]
+      @paused    = false
     end
 
     # Start the adapter.

data/lib/listen/adapters/darwin.rb

@@ -46,6 +46,8 @@ module Listen
       def init_worker
         @worker = FSEvent.new
         @worker.watch(@directory, :latency => @latency) do |changed_dirs|
+          next if @paused
+
           changed_dirs.map! { |path| path.sub /\/$/, '' }
           @callback.call(changed_dirs, {})
         end

data/lib/listen/adapters/linux.rb

@@ -57,6 +57,8 @@ module Listen
       def init_worker
         @worker = INotify::Notifier.new
         @worker.watch(@directory, *EVENTS.map(&:to_sym)) do |event|
+          next if @paused
+          
           unless event.name == "" # Event on root directory
             @changed_dirs << File.dirname(event.absolute_name)
           end
@@ -68,6 +70,7 @@ module Listen
       def poll_changed_dirs
         until @stop
           sleep(@latency)
+
           next if @changed_dirs.empty?
           changed_dirs = @changed_dirs.to_a
           @changed_dirs.clear

data/lib/listen/adapters/polling.rb

@@ -37,6 +37,8 @@ module Listen
       #
       def poll
         until @stop
+          sleep 0.1 && next if @paused
+
           start = Time.now.to_f
           @callback.call([@directory], :recursive => true)
           nap_time = @latency - (Time.now.to_f - start)

data/lib/listen/adapters/windows.rb

@@ -50,6 +50,8 @@ module Listen
       def init_worker
         @worker = FChange::Notifier.new
         @worker.watch(@directory, :all_events, :recursive) do |event|
+          next if @paused
+          
           @changed_dirs << File.expand_path(event.watcher.path)
         end
       end

data/lib/listen/listener.rb

@@ -9,7 +9,7 @@ require 'listen/adapters/windows'
 
 module Listen
   class Listener
-    attr_accessor :directory, :ignored_paths, :file_filters, :sha1_checksums, :paths, :paused
+    attr_accessor :directory, :ignored_paths, :file_filters, :sha1_checksums, :paths, :adapter, :paused
 
     # Default paths that gets ignored by the listener
     DEFAULT_IGNORED_PATHS = %w[.bundle .git .DS_Store log tmp vendor]
@@ -55,35 +55,28 @@ module Listen
     # Stop the adapter.
     #
     def stop
-      if @paused
-        @paused = false
-      else
-        @adapter.stop
-      end
+      @adapter.stop
     end
 
-    # Stop the adapter and wait
+    # Pause the adapter
     #
     def pause
-      @paused = true
-      @adapter.stop
-      sleep 0.1 while @paused
+      @adapter.paused = true
     end
 
-    # UnPause and re-initialize @paths and start the adapter
+    # Re-initialize @paths and unpause the adapter
     #
     def unpause
-      @paused = false
       init_paths
-      @adapter.start
+      @adapter.paused = false
     end
-    
-    # Is this listener paused
+
+    # Is adapter paused
     #
-    # @return [Boolean] listener paused status
+    # @return [Boolean] adapter paused status
     #
     def paused?
-      @paused == true
+      !@adapter.nil? && @adapter.paused == true
     end
 
     # Add ignored path to the listener.

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000 Z
+date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70305954323260 !ruby/object:Gem::Requirement
+  requirement: &70344951028040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70305954323260
+  version_requirements: *70344951028040
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &70305954322620 !ruby/object:Gem::Requirement
+  requirement: &70344951027580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.8
   type: :runtime
   prerelease: false
-  version_requirements: *70305954322620
+  version_requirements: *70344951027580
 - !ruby/object:Gem::Dependency
   name: rb-fchange
-  requirement: &70305954322080 !ruby/object:Gem::Requirement
+  requirement: &70344951027120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70305954322080
+  version_requirements: *70344951027120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70305954321620 !ruby/object:Gem::Requirement
+  requirement: &70344951026740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305954321620
+  version_requirements: *70344951026740
 description: The Listen gem listens to file modifications and notifies you about the
   changes. Works everywhere!
 email: