listen 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -1,167 +1,173 @@
-## 0.5.1 - Septemper 18, 2012
-
-### Bug fixes
-
-- [#61] Fix a synchronisation bug that caused constant fallback to polling. (fixed by [@Maher4Ever][])
-
-## 0.5.0 - Septemper 1, 2012
-
-### New features
-
-- Add a dependency manager to handle platform-specific gems. So there is no need anymore to install
-  extra gems which will never be used on the user system. ([@Maher4Ever][])
-- Add a manual reporting mode to the adapters. ([@Maher4Ever][])
-
-### Improvements
-
-- [#28] Enhance the speed of detecting changes on Windows by using the [WDM][] library. ([@Maher4Ever][])
-
-## 0.4.7 - June 27, 2012
-
-### Bug fixes
-
-- Increase latency to 0.25, to avoid useless polling fallback. (fixed by [@thibaudgg][])
-- Change watched inotify events, to avoid duplication callback. (fixed by [@thibaudgg][])
-- [#41](https://github.com/guard/listen/issues/41) Use lstat instead of stat when calculating mtime. (fixed by [@ebroder][])
-
-## 0.4.6 - June 20, 2012
-
-### Bug fix
-
-- [#39](https://github.com/guard/listen/issues/39) Fix digest race condition. (fixed by [@dkubb][])
-
-## 0.4.5 - June 13, 2012
-
-### Bug fix
-
-- [#39](https://github.com/guard/listen/issues/39) Rescue Errno::ENOENT when path inserted doesn't exist. (reported by [@textgoeshere][], fixed by [@thibaudgg][] and [@rymai][])
-
-## 0.4.4 - June 8, 2012
-
-### Bug fixes
-
-- ~~[#39](https://github.com/guard/listen/issues/39) Non-existing path insertion bug. (reported by [@textgoeshere][], fixed by [@thibaudgg][])~~
-- Fix relative path for directories containing special characters. (reported by [@napcs][], fixed by [@netzpirat][])
-
-## 0.4.3 - June 6, 2012
-
-### Bug fixes
-
-- [#24](https://github.com/guard/listen/issues/24) Fail gracefully when the inotify limit is not enough for Listen to function. (reported by [@daemonza][], fixed by [@Maher4Ever][])
-- [#32](https://github.com/guard/listen/issues/32) Fix a crash when trying to calculate the checksum of unreadable files. (reported by [@nex3][], fixed by [@Maher4Ever][])
-
-### Improvements
-
-- Add `#relative_paths` method to listeners. ([@Maher4Ever][])
-- Add `#started?` query-method to adapters. ([@Maher4Ever][])
-- Dynamically detect the mtime precision used on a system. ([@Maher4Ever][] with help from [@nex3][])
-
-## 0.4.2 - May 1, 2012
-
-### Bug fixes
-
-- [#21](https://github.com/guard/listen/issues/21) Issues when listening to changes in relative paths. (reported by [@akerbos][], fixed by [@Maher4Ever][])
-- [#27](https://github.com/guard/listen/issues/27) Wrong reports for files modifications. (reported by [@cobychapple][], fixed by [@Maher4Ever][])
-- Fix segmentation fault when profiling on Windows. ([@Maher4Ever][])
-- Fix redundant watchers on Windows. ([@Maher4Ever][])
-
-### Improvements
-
-- [#17](https://github.com/guard/listen/issues/17) Use regexp-patterns with the `ignore` method instead of supplying paths. (reported by [@fny][], added by [@Maher4Ever][])
-- Speed improvement when listening to changes in directories with ignored paths. ([@Maher4Ever][])
-- Added `.rbx` and `.svn` to ignored directories. ([@Maher4Ever][])
-
-## 0.4.1 - April 15, 2012
-
-### Bug fix
-
-- [#18](https://github.com/guard/listen/issues/18) Listener crashes when removing directories with nested paths. (reported by [@daemonza][], fixed by [@Maher4Ever][])
-
-## 0.4.0 - April 9, 2012
-
-### New features
-
-- Add `wait_for_callback` method to all adapters. ([@Maher4Ever][])
-- Add `Listen::MultiListener` class to listen to multiple directories at once. ([@Maher4Ever][])
-- Allow passing multiple directories to the `Listen.to` method. ([@Maher4Ever][])
-- Add `blocking` option to `Listen#start` which can be used to disable blocking the current thread upon starting. ([@Maher4Ever][])
-- Use absolute-paths in callbacks by default instead of relative-paths. ([@Maher4Ever][])
-- Add `relative_paths` option to `Listen::Listener` to retain the old functionality. ([@Maher4Ever][])
-
-### Improvements
-
-- Encapsulate thread spawning in the linux-adapter. ([@Maher4Ever][])
-- Encapsulate thread spawning in the darwin-adapter. ([@Maher4Ever][] with [@scottdavis][] help)
-- Encapsulate thread spawning in the windows-adapter. ([@Maher4Ever][])
-- Fix linux-adapter bug where Listen would report file-modification events on the parent-directory. ([@Maher4Ever][])
-
-### Change
-
-- Remove `wait_until_listening` as adapters doesn't need to run inside threads anymore ([@Maher4Ever][])
-
-## 0.3.3 - March 6, 2012
-
-### Improvement
-
-- Improve pause/unpause. ([@thibaudgg][])
-
-## 0.3.2 - March 4, 2012
-
-### New feature
-
-- Add pause/unpause listener's methods. ([@thibaudgg][])
-
-## 0.3.1 - February 22, 2012
-
-### Bug fix
-
-- [#9](https://github.com/guard/listen/issues/9) Ignore doesn't seem to work. (reported by [@markiz][], fixed by [@thibaudgg][])
-
-## 0.3.0 - February 21, 2012
-
-### New features
-
-- Add automatic fallback to polling if system adapter doesn't work (like a DropBox folder). ([@thibaudgg][])
-- Add latency and force_polling options. ([@Maher4Ever][])
-
-## 0.2.0 - February 13, 2012
-
-### New features
-
-- Add checksum comparaison support for detecting consecutive file modifications made during the same second. ([@thibaudgg][])
-- Add rb-fchange support. ([@thibaudgg][])
-- Add rb-inotify support. ([@thibaudgg][] with [@Maher4Ever][] help)
-- Add rb-fsevent support. ([@thibaudgg][])
-- Add non-recursive diff with multiple directories support. ([@thibaudgg][])
-- Ignore .DS_Store by default. ([@thibaudgg][])
-
-## 0.1.0 - January 28, 2012
-
-- First version with only a polling adapter and basic features set (ignore & filter). ([@thibaudgg][])
-
-<!--- The following link definition list is generated by PimpMyChangelog --->
-[#9]: https://github.com/guard/listen/issues/9
-[#17]: https://github.com/guard/listen/issues/17
-[#18]: https://github.com/guard/listen/issues/18
-[#21]: https://github.com/guard/listen/issues/21
-[#24]: https://github.com/guard/listen/issues/24
-[#27]: https://github.com/guard/listen/issues/27
-[#28]: https://github.com/guard/listen/issues/28
-[#32]: https://github.com/guard/listen/issues/32
-[#39]: https://github.com/guard/listen/issues/39
-[@Maher4Ever]: https://github.com/Maher4Ever
-[@dkubb]: https://github.com/dkubb
-[@ebroder]: https://github.com/ebroder
-[@akerbos]: https://github.com/akerbos
-[@cobychapple]: https://github.com/cobychapple
-[@daemonza]: https://github.com/daemonza
-[@fny]: https://github.com/fny
-[@markiz]: https://github.com/markiz
-[@napcs]: https://github.com/napcs
-[@netzpirat]: https://github.com/netzpirat
-[@nex3]: https://github.com/nex3
-[@rymai]: https://github.com/rymai
-[@scottdavis]: https://github.com/scottdavis
-[@textgoeshere]: https://github.com/textgoeshere
-[@thibaudgg]: https://github.com/thibaudgg
-[WDM]: https://github.com/Maher4Ever/wdm
+## 0.5.2 - Septemper 23, 2012
+
+### Bug fix
+
+- [#62] Fix double change callback with polling adapter. (fixed by [@thibaudgg][])
+
+## 0.5.1 - Septemper 18, 2012
+
+### Bug fix
+
+- [#61] Fix a synchronisation bug that caused constant fallback to polling. (fixed by [@Maher4Ever][])
+
+## 0.5.0 - Septemper 1, 2012
+
+### New features
+
+- Add a dependency manager to handle platform-specific gems. So there is no need anymore to install
+  extra gems which will never be used on the user system. ([@Maher4Ever][])
+- Add a manual reporting mode to the adapters. ([@Maher4Ever][])
+
+### Improvements
+
+- [#28] Enhance the speed of detecting changes on Windows by using the [WDM][] library. ([@Maher4Ever][])
+
+## 0.4.7 - June 27, 2012
+
+### Bug fixes
+
+- Increase latency to 0.25, to avoid useless polling fallback. (fixed by [@thibaudgg][])
+- Change watched inotify events, to avoid duplication callback. (fixed by [@thibaudgg][])
+- [#41](https://github.com/guard/listen/issues/41) Use lstat instead of stat when calculating mtime. (fixed by [@ebroder][])
+
+## 0.4.6 - June 20, 2012
+
+### Bug fix
+
+- [#39](https://github.com/guard/listen/issues/39) Fix digest race condition. (fixed by [@dkubb][])
+
+## 0.4.5 - June 13, 2012
+
+### Bug fix
+
+- [#39](https://github.com/guard/listen/issues/39) Rescue Errno::ENOENT when path inserted doesn't exist. (reported by [@textgoeshere][], fixed by [@thibaudgg][] and [@rymai][])
+
+## 0.4.4 - June 8, 2012
+
+### Bug fixes
+
+- ~~[#39](https://github.com/guard/listen/issues/39) Non-existing path insertion bug. (reported by [@textgoeshere][], fixed by [@thibaudgg][])~~
+- Fix relative path for directories containing special characters. (reported by [@napcs][], fixed by [@netzpirat][])
+
+## 0.4.3 - June 6, 2012
+
+### Bug fixes
+
+- [#24](https://github.com/guard/listen/issues/24) Fail gracefully when the inotify limit is not enough for Listen to function. (reported by [@daemonza][], fixed by [@Maher4Ever][])
+- [#32](https://github.com/guard/listen/issues/32) Fix a crash when trying to calculate the checksum of unreadable files. (reported by [@nex3][], fixed by [@Maher4Ever][])
+
+### Improvements
+
+- Add `#relative_paths` method to listeners. ([@Maher4Ever][])
+- Add `#started?` query-method to adapters. ([@Maher4Ever][])
+- Dynamically detect the mtime precision used on a system. ([@Maher4Ever][] with help from [@nex3][])
+
+## 0.4.2 - May 1, 2012
+
+### Bug fixes
+
+- [#21](https://github.com/guard/listen/issues/21) Issues when listening to changes in relative paths. (reported by [@akerbos][], fixed by [@Maher4Ever][])
+- [#27](https://github.com/guard/listen/issues/27) Wrong reports for files modifications. (reported by [@cobychapple][], fixed by [@Maher4Ever][])
+- Fix segmentation fault when profiling on Windows. ([@Maher4Ever][])
+- Fix redundant watchers on Windows. ([@Maher4Ever][])
+
+### Improvements
+
+- [#17](https://github.com/guard/listen/issues/17) Use regexp-patterns with the `ignore` method instead of supplying paths. (reported by [@fny][], added by [@Maher4Ever][])
+- Speed improvement when listening to changes in directories with ignored paths. ([@Maher4Ever][])
+- Added `.rbx` and `.svn` to ignored directories. ([@Maher4Ever][])
+
+## 0.4.1 - April 15, 2012
+
+### Bug fix
+
+- [#18](https://github.com/guard/listen/issues/18) Listener crashes when removing directories with nested paths. (reported by [@daemonza][], fixed by [@Maher4Ever][])
+
+## 0.4.0 - April 9, 2012
+
+### New features
+
+- Add `wait_for_callback` method to all adapters. ([@Maher4Ever][])
+- Add `Listen::MultiListener` class to listen to multiple directories at once. ([@Maher4Ever][])
+- Allow passing multiple directories to the `Listen.to` method. ([@Maher4Ever][])
+- Add `blocking` option to `Listen#start` which can be used to disable blocking the current thread upon starting. ([@Maher4Ever][])
+- Use absolute-paths in callbacks by default instead of relative-paths. ([@Maher4Ever][])
+- Add `relative_paths` option to `Listen::Listener` to retain the old functionality. ([@Maher4Ever][])
+
+### Improvements
+
+- Encapsulate thread spawning in the linux-adapter. ([@Maher4Ever][])
+- Encapsulate thread spawning in the darwin-adapter. ([@Maher4Ever][] with [@scottdavis][] help)
+- Encapsulate thread spawning in the windows-adapter. ([@Maher4Ever][])
+- Fix linux-adapter bug where Listen would report file-modification events on the parent-directory. ([@Maher4Ever][])
+
+### Change
+
+- Remove `wait_until_listening` as adapters doesn't need to run inside threads anymore ([@Maher4Ever][])
+
+## 0.3.3 - March 6, 2012
+
+### Improvement
+
+- Improve pause/unpause. ([@thibaudgg][])
+
+## 0.3.2 - March 4, 2012
+
+### New feature
+
+- Add pause/unpause listener's methods. ([@thibaudgg][])
+
+## 0.3.1 - February 22, 2012
+
+### Bug fix
+
+- [#9](https://github.com/guard/listen/issues/9) Ignore doesn't seem to work. (reported by [@markiz][], fixed by [@thibaudgg][])
+
+## 0.3.0 - February 21, 2012
+
+### New features
+
+- Add automatic fallback to polling if system adapter doesn't work (like a DropBox folder). ([@thibaudgg][])
+- Add latency and force_polling options. ([@Maher4Ever][])
+
+## 0.2.0 - February 13, 2012
+
+### New features
+
+- Add checksum comparaison support for detecting consecutive file modifications made during the same second. ([@thibaudgg][])
+- Add rb-fchange support. ([@thibaudgg][])
+- Add rb-inotify support. ([@thibaudgg][] with [@Maher4Ever][] help)
+- Add rb-fsevent support. ([@thibaudgg][])
+- Add non-recursive diff with multiple directories support. ([@thibaudgg][])
+- Ignore .DS_Store by default. ([@thibaudgg][])
+
+## 0.1.0 - January 28, 2012
+
+- First version with only a polling adapter and basic features set (ignore & filter). ([@thibaudgg][])
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#9]: https://github.com/guard/listen/issues/9
+[#17]: https://github.com/guard/listen/issues/17
+[#18]: https://github.com/guard/listen/issues/18
+[#21]: https://github.com/guard/listen/issues/21
+[#24]: https://github.com/guard/listen/issues/24
+[#27]: https://github.com/guard/listen/issues/27
+[#28]: https://github.com/guard/listen/issues/28
+[#32]: https://github.com/guard/listen/issues/32
+[#39]: https://github.com/guard/listen/issues/39
+[@Maher4Ever]: https://github.com/Maher4Ever
+[@dkubb]: https://github.com/dkubb
+[@ebroder]: https://github.com/ebroder
+[@akerbos]: https://github.com/akerbos
+[@cobychapple]: https://github.com/cobychapple
+[@daemonza]: https://github.com/daemonza
+[@fny]: https://github.com/fny
+[@markiz]: https://github.com/markiz
+[@napcs]: https://github.com/napcs
+[@netzpirat]: https://github.com/netzpirat
+[@nex3]: https://github.com/nex3
+[@rymai]: https://github.com/rymai
+[@scottdavis]: https://github.com/scottdavis
+[@textgoeshere]: https://github.com/textgoeshere
+[@thibaudgg]: https://github.com/thibaudgg
+[WDM]: https://github.com/Maher4Ever/wdm

data/LICENSE

@@ -1,20 +1,20 @@
-Copyright (c) 2012 Thibaud Guillaume-Gentil
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2012 Thibaud Guillaume-Gentil
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/listen/adapters/polling.rb

@@ -50,7 +50,7 @@ module Listen
       #
       def poll
         until @stop
-          sleep(0.1) && next if @paused
+          next if @paused
 
           start = Time.now.to_f
           @callback.call(@directories.dup, :recursive => true)

data/lib/listen/directory_record.rb

@@ -1,318 +1,344 @@
-require 'set'
-require 'find'
-require 'digest/sha1'
-
-module Listen
-
-  # The directory record stores information about
-  # a directory and keeps track of changes to
-  # the structure of its childs.
-  #
-  class DirectoryRecord
-    attr_reader :directory, :paths, :sha1_checksums
-
-    DEFAULT_IGNORED_DIRECTORIES = %w[.rbx .bundle .git .svn log tmp vendor]
-
-    DEFAULT_IGNORED_EXTENSIONS  = %w[.DS_Store]
-
-    # Defines the used precision based on the type of mtime returned by the
-    # system (whether its in milliseconds or just seconds)
-    #
-    HIGH_PRECISION_SUPPORTED = File.mtime(__FILE__).to_f.to_s[-2..-1] != '.0'
-
-    # Data structure used to save meta data about a path
-    #
-    MetaData = Struct.new(:type, :mtime)
-
-    # Class methods
-    #
-    class << self
-
-      # Creates the ignoring patterns from the default ignored
-      # directories and extensions. It memoizes the generated patterns
-      # to avoid unnecessary computation.
-      #
-      def generate_default_ignoring_patterns
-        @@default_ignoring_patterns ||= Array.new.tap do |default_patterns|
-          # Add directories
-          ignored_directories = DEFAULT_IGNORED_DIRECTORIES.map { |d| Regexp.escape(d) }
-          default_patterns << %r{^(?:#{ignored_directories.join('|')})/}
-
-          # Add extensions
-          ignored_extensions = DEFAULT_IGNORED_EXTENSIONS.map { |e| Regexp.escape(e) }
-          default_patterns << %r{(?:#{ignored_extensions.join('|')})$}
-        end
-      end
-    end
-
-    # Initializes a directory record.
-    #
-    # @option [String] directory the directory to keep track of
-    #
-    def initialize(directory)
-      raise ArgumentError, "The path '#{directory}' is not a directory!" unless File.directory?(directory)
-
-      @directory          = directory
-      @ignoring_patterns  = Set.new
-      @filtering_patterns = Set.new
-      @sha1_checksums     = Hash.new
-
-      @ignoring_patterns.merge(DirectoryRecord.generate_default_ignoring_patterns)
-    end
-
-    # Returns the ignoring patterns in the record
-    #
-    # @return [Array<Regexp>] the ignoring patterns
-    #
-    def ignoring_patterns
-      @ignoring_patterns.to_a
-    end
-
-    # Returns the filtering patterns used in the record to know
-    # which paths should be stored.
-    #
-    # @return [Array<Regexp>] the filtering patterns
-    #
-    def filtering_patterns
-      @filtering_patterns.to_a
-    end
-
-    # Adds ignoring patterns to the record.
-    #
-    # @example Ignore some paths
-    #   ignore %r{^ignored/path/}, /man/
-    #
-    # @param [Regexp] regexp a pattern for ignoring paths
-    #
-    def ignore(*regexps)
-      @ignoring_patterns.merge(regexps)
-    end
-
-    # Adds filtering patterns to the listener.
-    #
-    # @example Filter some files
-    #   ignore /\.txt$/, /.*\.zip/
-    #
-    # @param [Regexp] regexp a pattern for filtering paths
-    #
-    def filter(*regexps)
-      @filtering_patterns.merge(regexps)
-    end
-
-    # Returns whether a path should be ignored or not.
-    #
-    # @param [String] path the path to test.
-    #
-    # @return [Boolean]
-    #
-    def ignored?(path)
-      path = relative_to_base(path)
-      @ignoring_patterns.any? { |pattern| pattern =~ path }
-    end
-
-    # Returns whether a path should be filtered or not.
-    #
-    # @param [String] path the path to test.
-    #
-    # @return [Boolean]
-    #
-    def filtered?(path)
-      # When no filtering patterns are set, ALL files are stored.
-      return true if @filtering_patterns.empty?
-
-      path = relative_to_base(path)
-      @filtering_patterns.any? { |pattern| pattern =~ path }
-    end
-
-    # Finds the paths that should be stored and adds them
-    # to the paths' hash.
-    #
-    def build
-      @paths = Hash.new { |h, k| h[k] = Hash.new }
-      important_paths { |path| insert_path(path) }
-    end
-
-    # Detects changes in the passed directories, updates
-    # the record with the new changes and returns the changes
-    #
-    # @param [Array] directories the list of directories scan for changes
-    # @param [Hash] options
-    # @option options [Boolean] recursive scan all sub-directories recursively
-    # @option options [Boolean] relative_paths whether or not to use relative paths for changes
-    #
-    # @return [Hash<Array>] the changes
-    #
-    def fetch_changes(directories, options = {})
-      @changes    = { :modified => [], :added => [], :removed => [] }
-      directories = directories.sort_by { |el| el.length }.reverse # diff sub-dir first
-
-      directories.each do |directory|
-        next unless directory[@directory] # Path is or inside directory
-        detect_modifications_and_removals(directory, options)
-        detect_additions(directory, options)
-      end
-
-      @changes
-    end
-
-    # Converts an absolute path to a path that's relative to the base directory.
-    #
-    # @param [String] path the path to convert
-    #
-    # @return [String] the relative path
-    #
-    def relative_to_base(path)
-      return nil unless path[@directory]
-      path.sub(%r{^#{Regexp.quote(@directory)}#{File::SEPARATOR}?}, '')
-    end
-
-    private
-
-    # Detects modifications and removals recursively in a directory.
-    #
-    # @note Modifications detection begins by checking the modification time (mtime)
-    #   of files and then by checking content changes (using SHA1-checksum)
-    #   when the mtime of files is not changed.
-    #
-    # @param [String] directory the path to analyze
-    # @param [Hash] options
-    # @option options [Boolean] recursive scan all sub-directories recursively
-    # @option options [Boolean] relative_paths whether or not to use relative paths for changes
-    #
-    def detect_modifications_and_removals(directory, options = {})
-      @paths[directory].each do |basename, meta_data|
-        path = File.join(directory, basename)
-
-        case meta_data.type
-        when 'Dir'
-          if File.directory?(path)
-            detect_modifications_and_removals(path, options) if options[:recursive]
-          else
-            detect_modifications_and_removals(path, { :recursive => true }.merge(options))
-            @paths[directory].delete(basename)
-            @paths.delete("#{directory}/#{basename}")
-          end
-        when 'File'
-          if File.exist?(path)
-            new_mtime = mtime_of(path)
-
-            # First check if we are in the same second (to update checksums)
-            # before checking the time difference
-            if  (meta_data.mtime.to_i == new_mtime.to_i && content_modified?(path)) || meta_data.mtime < new_mtime
-              # Update the meta data of the files
-              meta_data.mtime = new_mtime
-              @paths[directory][basename] = meta_data
-
-              @changes[:modified] << (options[:relative_paths] ? relative_to_base(path) : path)
-            end
-          else
-            @paths[directory].delete(basename)
-            @sha1_checksums.delete(path)
-            @changes[:removed] << (options[:relative_paths] ? relative_to_base(path) : path)
-          end
-        end
-      end
-    end
-
-    # Detects additions in a directory.
-    #
-    # @param [String] directory the path to analyze
-    # @param [Hash] options
-    # @option options [Boolean] recursive scan all sub-directories recursively
-    # @option options [Boolean] relative_paths whether or not to use relative paths for changes
-    #
-    def detect_additions(directory, options = {})
-      # Don't process removed directories
-      return unless File.exist?(directory)
-
-      Find.find(directory) do |path|
-        next if path == @directory
-
-        if File.directory?(path)
-          # Add a trailing slash to directories when checking if a directory is
-          # ignored to optimize finding them as Find.find doesn't.
-          if ignored?(path + File::SEPARATOR) || (directory != path && (!options[:recursive] && existing_path?(path)))
-            Find.prune # Don't look any further into this directory.
-          else
-            insert_path(path)
-          end
-        elsif !ignored?(path) && filtered?(path) && !existing_path?(path)
-          if File.file?(path)
-            @changes[:added] << (options[:relative_paths] ? relative_to_base(path) : path)
-            insert_path(path)
-          end
-        end
-      end
-    end
-
-    # Returns whether or not a file's content has been modified by
-    # comparing the SHA1-checksum to a stored one.
-    #
-    # @param [String] path the file path
-    #
-    def content_modified?(path)
-      sha1_checksum = Digest::SHA1.file(path).to_s
-      return false if @sha1_checksums[path] == sha1_checksum
-      @sha1_checksums.key?(path)
-    rescue Errno::EACCES, Errno::ENOENT
-      false
-    ensure
-      @sha1_checksums[path] = sha1_checksum if sha1_checksum
-    end
-
-    # Traverses the base directory looking for paths that should
-    # be stored; thus paths that are filters or not ignored.
-    #
-    # @yield [path] an important path
-    #
-    def important_paths
-      Find.find(@directory) do |path|
-        next if path == @directory
-
-        if File.directory?(path)
-          # Add a trailing slash to directories when checking if a directory is
-          # ignored to optimize finding them as Find.find doesn't.
-          if ignored?(path + File::SEPARATOR)
-            Find.prune # Don't look any further into this directory.
-          else
-            yield(path)
-          end
-        elsif !ignored?(path) && filtered?(path)
-          yield(path)
-        end
-      end
-    end
-
-    # Inserts a path with its type (Dir or File) in paths hash.
-    #
-    # @param [String] path the path to insert in @paths.
-    #
-    def insert_path(path)
-      meta_data = MetaData.new
-      meta_data.type = File.directory?(path) ? 'Dir' : 'File'
-      meta_data.mtime = mtime_of(path) unless meta_data.type == 'Dir' # mtimes of dirs are not used yet
-      @paths[File.dirname(path)][File.basename(path)] = meta_data
-    rescue Errno::ENOENT
-    end
-
-    # Returns whether or not a path exists in the paths hash.
-    #
-    # @param [String] path the path to check
-    #
-    # @return [Boolean]
-    #
-    def existing_path?(path)
-      @paths[File.dirname(path)][File.basename(path)] != nil
-    end
-
-    # Returns the modification time of a file based on the precision defined by the system
-    #
-    # @param [String] file the file for which the mtime must be returned
-    #
-    # @return [Fixnum, Float] the mtime of the file
-    #
-    def mtime_of(file)
-      File.lstat(file).mtime.send(HIGH_PRECISION_SUPPORTED ? :to_f : :to_i)
-    end
-  end
-end
+require 'set'
+require 'find'
+require 'digest/sha1'
+
+module Listen
+
+  # The directory record stores information about
+  # a directory and keeps track of changes to
+  # the structure of its childs.
+  #
+  class DirectoryRecord
+    attr_reader :directory, :paths, :sha1_checksums
+
+    DEFAULT_IGNORED_DIRECTORIES = %w[.rbx .bundle .git .svn log tmp vendor]
+
+    DEFAULT_IGNORED_EXTENSIONS  = %w[.DS_Store]
+
+    # Defines the used precision based on the type of mtime returned by the
+    # system (whether its in milliseconds or just seconds)
+    #
+    HIGH_PRECISION_SUPPORTED = File.mtime(__FILE__).to_f.to_s[-2..-1] != '.0'
+
+    # Data structure used to save meta data about a path
+    #
+    MetaData = Struct.new(:type, :mtime)
+
+    # Class methods
+    #
+    class << self
+
+      # Creates the ignoring patterns from the default ignored
+      # directories and extensions. It memoizes the generated patterns
+      # to avoid unnecessary computation.
+      #
+      def generate_default_ignoring_patterns
+        @@default_ignoring_patterns ||= Array.new.tap do |default_patterns|
+          # Add directories
+          ignored_directories = DEFAULT_IGNORED_DIRECTORIES.map { |d| Regexp.escape(d) }
+          default_patterns << %r{^(?:#{ignored_directories.join('|')})/}
+
+          # Add extensions
+          ignored_extensions = DEFAULT_IGNORED_EXTENSIONS.map { |e| Regexp.escape(e) }
+          default_patterns << %r{(?:#{ignored_extensions.join('|')})$}
+        end
+      end
+    end
+
+    # Initializes a directory record.
+    #
+    # @option [String] directory the directory to keep track of
+    #
+    def initialize(directory)
+      raise ArgumentError, "The path '#{directory}' is not a directory!" unless File.directory?(directory)
+
+      @directory          = directory
+      @ignoring_patterns  = Set.new
+      @filtering_patterns = Set.new
+      @sha1_checksums     = Hash.new
+
+      @ignoring_patterns.merge(DirectoryRecord.generate_default_ignoring_patterns)
+    end
+
+    # Returns the ignoring patterns in the record
+    #
+    # @return [Array<Regexp>] the ignoring patterns
+    #
+    def ignoring_patterns
+      @ignoring_patterns.to_a
+    end
+
+    # Returns the filtering patterns used in the record to know
+    # which paths should be stored.
+    #
+    # @return [Array<Regexp>] the filtering patterns
+    #
+    def filtering_patterns
+      @filtering_patterns.to_a
+    end
+
+    # Adds ignoring patterns to the record.
+    #
+    # @example Ignore some paths
+    #   ignore %r{^ignored/path/}, /man/
+    #
+    # @param [Regexp] regexp a pattern for ignoring paths
+    #
+    def ignore(*regexps)
+      @ignoring_patterns.merge(regexps)
+    end
+
+    # Adds filtering patterns to the listener.
+    #
+    # @example Filter some files
+    #   ignore /\.txt$/, /.*\.zip/
+    #
+    # @param [Regexp] regexp a pattern for filtering paths
+    #
+    def filter(*regexps)
+      @filtering_patterns.merge(regexps)
+    end
+
+    # Returns whether a path should be ignored or not.
+    #
+    # @param [String] path the path to test.
+    #
+    # @return [Boolean]
+    #
+    def ignored?(path)
+      path = relative_to_base(path)
+      @ignoring_patterns.any? { |pattern| pattern =~ path }
+    end
+
+    # Returns whether a path should be filtered or not.
+    #
+    # @param [String] path the path to test.
+    #
+    # @return [Boolean]
+    #
+    def filtered?(path)
+      # When no filtering patterns are set, ALL files are stored.
+      return true if @filtering_patterns.empty?
+
+      path = relative_to_base(path)
+      @filtering_patterns.any? { |pattern| pattern =~ path }
+    end
+
+    # Finds the paths that should be stored and adds them
+    # to the paths' hash.
+    #
+    def build
+      @paths = Hash.new { |h, k| h[k] = Hash.new }
+      important_paths { |path| insert_path(path) }
+    end
+
+    # Detects changes in the passed directories, updates
+    # the record with the new changes and returns the changes
+    #
+    # @param [Array] directories the list of directories scan for changes
+    # @param [Hash] options
+    # @option options [Boolean] recursive scan all sub-directories recursively
+    # @option options [Boolean] relative_paths whether or not to use relative paths for changes
+    #
+    # @return [Hash<Array>] the changes
+    #
+    def fetch_changes(directories, options = {})
+      @changes    = { :modified => [], :added => [], :removed => [] }
+      directories = directories.sort_by { |el| el.length }.reverse # diff sub-dir first
+
+      directories.each do |directory|
+        next unless directory[@directory] # Path is or inside directory
+        detect_modifications_and_removals(directory, options)
+        detect_additions(directory, options)
+      end
+
+      @changes
+    end
+
+    # Converts an absolute path to a path that's relative to the base directory.
+    #
+    # @param [String] path the path to convert
+    #
+    # @return [String] the relative path
+    #
+    def relative_to_base(path)
+      return nil unless path[@directory]
+      path.sub(%r{^#{Regexp.quote(@directory)}#{File::SEPARATOR}?}, '')
+    end
+
+    private
+
+    # Detects modifications and removals recursively in a directory.
+    #
+    # @note Modifications detection begins by checking the modification time (mtime)
+    #   of files and then by checking content changes (using SHA1-checksum)
+    #   when the mtime of files is not changed.
+    #
+    # @param [String] directory the path to analyze
+    # @param [Hash] options
+    # @option options [Boolean] recursive scan all sub-directories recursively
+    # @option options [Boolean] relative_paths whether or not to use relative paths for changes
+    #
+    def detect_modifications_and_removals(directory, options = {})
+      @paths[directory].each do |basename, meta_data|
+        path = File.join(directory, basename)
+
+        case meta_data.type
+        when 'Dir'
+          if File.directory?(path)
+            detect_modifications_and_removals(path, options) if options[:recursive]
+          else
+            detect_modifications_and_removals(path, { :recursive => true }.merge(options))
+            @paths[directory].delete(basename)
+            @paths.delete("#{directory}/#{basename}")
+          end
+        when 'File'
+          if File.exist?(path)
+            new_mtime = mtime_of(path)
+
+            # First check if we are in the same second (to update checksums)
+            # before checking the time difference
+            if (meta_data.mtime.to_i == new_mtime.to_i && content_modified?(path)) || meta_data.mtime < new_mtime
+              # Update the sha1 checksum of the file
+              insert_sha1_checksum(path)
+
+              # Update the meta data of the file
+              meta_data.mtime = new_mtime
+              @paths[directory][basename] = meta_data
+
+              @changes[:modified] << (options[:relative_paths] ? relative_to_base(path) : path)
+            end
+          else
+            @paths[directory].delete(basename)
+            @sha1_checksums.delete(path)
+            @changes[:removed] << (options[:relative_paths] ? relative_to_base(path) : path)
+          end
+        end
+      end
+    end
+
+    # Detects additions in a directory.
+    #
+    # @param [String] directory the path to analyze
+    # @param [Hash] options
+    # @option options [Boolean] recursive scan all sub-directories recursively
+    # @option options [Boolean] relative_paths whether or not to use relative paths for changes
+    #
+    def detect_additions(directory, options = {})
+      # Don't process removed directories
+      return unless File.exist?(directory)
+
+      Find.find(directory) do |path|
+        next if path == @directory
+
+        if File.directory?(path)
+          # Add a trailing slash to directories when checking if a directory is
+          # ignored to optimize finding them as Find.find doesn't.
+          if ignored?(path + File::SEPARATOR) || (directory != path && (!options[:recursive] && existing_path?(path)))
+            Find.prune # Don't look any further into this directory.
+          else
+            insert_path(path)
+          end
+        elsif !ignored?(path) && filtered?(path) && !existing_path?(path)
+          if File.file?(path)
+            @changes[:added] << (options[:relative_paths] ? relative_to_base(path) : path)
+            insert_path(path)
+          end
+        end
+      end
+    end
+
+    # Returns whether or not a file's content has been modified by
+    # comparing the SHA1-checksum to a stored one.
+    # Ensure that the SHA1-checksum is inserted to the sha1_checksums
+    # array for later comparaison if false.
+    #
+    # @param [String] path the file path
+    #
+    def content_modified?(path)
+      @sha1_checksum = sha1_checksum(path)
+      if @sha1_checksums[path] == @sha1_checksum || !@sha1_checksums.key?(path)
+        insert_sha1_checksum(path)
+        false
+      else
+        true
+      end
+    end
+
+    # Inserts a SHA1-checksum path in @SHA1-checksums hash.
+    #
+    # @param [String] path the SHA1-checksum path to insert in @sha1_checksums.
+    #
+    def insert_sha1_checksum(path)
+      if @sha1_checksum ||= sha1_checksum(path)
+        @sha1_checksums[path] = @sha1_checksum
+        @sha1_checksum = nil
+      end
+    end
+
+    # Returns the SHA1-checksum for the file path.
+    #
+    # @param [String] path the file path
+    #
+    def sha1_checksum(path)
+      Digest::SHA1.file(path).to_s
+    rescue Errno::EACCES, Errno::ENOENT
+      nil
+    end
+
+    # Traverses the base directory looking for paths that should
+    # be stored; thus paths that are filters or not ignored.
+    #
+    # @yield [path] an important path
+    #
+    def important_paths
+      Find.find(@directory) do |path|
+        next if path == @directory
+
+        if File.directory?(path)
+          # Add a trailing slash to directories when checking if a directory is
+          # ignored to optimize finding them as Find.find doesn't.
+          if ignored?(path + File::SEPARATOR)
+            Find.prune # Don't look any further into this directory.
+          else
+            yield(path)
+          end
+        elsif !ignored?(path) && filtered?(path)
+          yield(path)
+        end
+      end
+    end
+
+    # Inserts a path with its type (Dir or File) in paths hash.
+    #
+    # @param [String] path the path to insert in @paths.
+    #
+    def insert_path(path)
+      meta_data = MetaData.new
+      meta_data.type = File.directory?(path) ? 'Dir' : 'File'
+      meta_data.mtime = mtime_of(path) unless meta_data.type == 'Dir' # mtimes of dirs are not used yet
+      @paths[File.dirname(path)][File.basename(path)] = meta_data
+    rescue Errno::ENOENT
+    end
+
+    # Returns whether or not a path exists in the paths hash.
+    #
+    # @param [String] path the path to check
+    #
+    # @return [Boolean]
+    #
+    def existing_path?(path)
+      @paths[File.dirname(path)][File.basename(path)] != nil
+    end
+
+    # Returns the modification time of a file based on the precision defined by the system
+    #
+    # @param [String] file the file for which the mtime must be returned
+    #
+    # @return [Fixnum, Float] the mtime of the file
+    #
+    def mtime_of(file)
+      File.lstat(file).mtime.send(HIGH_PRECISION_SUPPORTED ? :to_f : :to_i)
+    end
+  end
+end