sass 3.2.19 → 3.3.0.alpha.1

data/vendor/listen/lib/listen/adapters/darwin.rb

@@ -4,10 +4,6 @@ module Listen
     # Adapter implementation for Mac OS X `FSEvents`.
     #
     class Darwin < Adapter
-      extend DependencyManager
-
-      # Declare the adapter's dependencies
-      dependency 'rb-fsevent', '~> 0.9'
 
       LAST_SEPARATOR_REGEX = /\/$/
 
@@ -29,14 +25,13 @@ module Listen
         end
 
         @worker_thread = Thread.new { @worker.run }
+        @poll_thread   = Thread.new { poll_changed_dirs }
 
         # The FSEvent worker needs sometime to startup. Turnstiles can't
         # be used to wait for it as it runs in a loop.
         # TODO: Find a better way to block until the worker starts.
-        sleep 0.1
-
-        @poll_thread = Thread.new { poll_changed_dirs } if @report_changes
-        @worker_thread.join if blocking
+        sleep @latency
+        @poll_thread.join if blocking
       end
 
       # Stops the adapter.
@@ -48,8 +43,8 @@ module Listen
         end
 
         @worker.stop
-        @worker_thread.join if @worker_thread
-        @poll_thread.join if @poll_thread
+        Thread.kill(@worker_thread) if @worker_thread
+        @poll_thread.join
       end
 
       # Checks if the adapter is usable on the current OS.
@@ -58,7 +53,11 @@ module Listen
       #
       def self.usable?
         return false unless RbConfig::CONFIG['target_os'] =~ /darwin(1.+)?$/i
-        super
+
+        require 'rb-fsevent'
+        true
+      rescue LoadError
+        false
       end
 
       private

data/vendor/listen/lib/listen/adapters/linux.rb

@@ -4,10 +4,6 @@ module Listen
     # Listener implementation for Linux `inotify`.
     #
     class Linux < Adapter
-      extend DependencyManager
-
-      # Declare the adapter's dependencies
-      dependency 'rb-inotify', '~> 0.9'
 
       # Watched inotify events
       #
@@ -45,9 +41,8 @@ module Listen
         end
 
         @worker_thread = Thread.new { @worker.run }
-        @poll_thread   = Thread.new { poll_changed_dirs } if @report_changes
-
-        @worker_thread.join if blocking
+        @poll_thread   = Thread.new { poll_changed_dirs }
+        @poll_thread.join if blocking
       end
 
       # Stops the adapter.
@@ -60,16 +55,20 @@ module Listen
 
         @worker.stop
         Thread.kill(@worker_thread) if @worker_thread
-        @poll_thread.join if @poll_thread
+        @poll_thread.join
       end
 
-      # Checks if the adapter is usable on the current OS.
+      # Check if the adapter is usable on the current OS.
       #
       # @return [Boolean] whether usable or not
       #
       def self.usable?
         return false unless RbConfig::CONFIG['target_os'] =~ /linux/i
-        super
+
+        require 'rb-inotify'
+        true
+      rescue LoadError
+        false
       end
 
     private
@@ -80,31 +79,29 @@ module Listen
       # @return [INotify::Notifier] initialized worker
       #
       def init_worker
-        callback = lambda do |event|
-          if @paused || (
-            # Event on root directory
-            event.name == ""
-          ) || (
-            # INotify reports changes to files inside directories as events
-            # on the directories themselves too.
-            #
-            # @see http://linux.die.net/man/7/inotify
-            event.flags.include?(:isdir) and event.flags & [:close, :modify] != []
-          )
-            # Skip all of these!
-            next
-          end
-
-          @mutex.synchronize do
-            @changed_dirs << File.dirname(event.absolute_name)
-          end
-        end
-
-        INotify::Notifier.new.tap do |worker|
-          @directories.each do |directory|
-            worker.watch(directory, *EVENTS.map(&:to_sym), &callback)
+        worker = INotify::Notifier.new
+        @directories.each do |directory|
+          worker.watch(directory, *EVENTS.map(&:to_sym)) do |event|
+            if @paused || (
+              # Event on root directory
+              event.name == ""
+            ) || (
+              # INotify reports changes to files inside directories as events
+              # on the directories themselves too.
+              #
+              # @see http://linux.die.net/man/7/inotify
+              event.flags.include?(:isdir) and event.flags & [:close, :modify] != []
+            )
+              # Skip all of these!
+              next
+            end
+
+            @mutex.synchronize do
+              @changed_dirs << File.dirname(event.absolute_name)
+            end
           end
         end
+        worker
       end
 
     end

data/vendor/listen/lib/listen/adapters/polling.rb

@@ -10,7 +10,6 @@ module Listen
     # file IO that the other implementations.
     #
     class Polling < Adapter
-      extend DependencyManager
 
       # Initialize the Adapter. See {Listen::Adapter#initialize} for more info.
       #
@@ -50,7 +49,7 @@ module Listen
       #
       def poll
         until @stop
-          next if @paused
+          sleep(0.1) && next if @paused
 
           start = Time.now.to_f
           @callback.call(@directories.dup, :recursive => true)

data/vendor/listen/lib/listen/adapters/windows.rb

@@ -3,13 +3,9 @@ require 'set'
 module Listen
   module Adapters
 
-    # Adapter implementation for Windows `wdm`.
+    # Adapter implementation for Windows `fchange`.
     #
     class Windows < Adapter
-      extend DependencyManager
-
-      # Declare the adapter's dependencies
-      dependency 'wdm', '~> 0.1'
 
       # Initializes the Adapter. See {Listen::Adapter#initialize} for more info.
       #
@@ -28,15 +24,9 @@ module Listen
           super
         end
 
-        @worker_thread = Thread.new { @worker.run! }
-
-        # Wait for the worker to start. This is needed to avoid a deadlock
-        # when stopping immediately after starting.
-        sleep 0.1
-
-        @poll_thread = Thread.new { poll_changed_dirs } if @report_changes
-
-        @worker_thread.join if blocking
+        @worker_thread = Thread.new { @worker.run }
+        @poll_thread   = Thread.new { poll_changed_dirs(true) }
+        @poll_thread.join if blocking
       end
 
       # Stops the adapter.
@@ -48,8 +38,8 @@ module Listen
         end
 
         @worker.stop
-        @worker_thread.join if @worker_thread
-        @poll_thread.join if @poll_thread
+        Thread.kill(@worker_thread) if @worker_thread
+        @poll_thread.join
       end
 
       # Checks if the adapter is usable on the current OS.
@@ -58,27 +48,31 @@ module Listen
       #
       def self.usable?
         return false unless RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
-        super
+
+        require 'rb-fchange'
+        true
+      rescue LoadError
+        false
       end
 
     private
 
-      # Initializes a WDM monitor and adds a watcher for
+      # Initializes a FChange worker and adds a watcher for
       # each directory passed to the adapter.
       #
-      # @return [WDM::Monitor] initialized worker
+      # @return [FChange::Notifier] initialized worker
       #
       def init_worker
-        callback = Proc.new do |change|
-          next if @paused
-          @mutex.synchronize do
-            @changed_dirs << File.dirname(change.path)
+        FChange::Notifier.new.tap do |worker|
+          @directories.each do |directory|
+            worker.watch(directory, :all_events, :recursive) do |event|
+              next if @paused
+              @mutex.synchronize do
+                @changed_dirs << File.expand_path(event.watcher.path)
+              end
+            end
           end
         end
-
-        WDM::Monitor.new.tap do |worker|
-          @directories.each { |d| worker.watch_recursively(d, &callback) }
-        end
       end
 
     end

data/vendor/listen/lib/listen/directory_record.rb

@@ -18,11 +18,7 @@ module Listen
     # Defines the used precision based on the type of mtime returned by the
     # system (whether its in milliseconds or just seconds)
     #
-    begin
-      HIGH_PRECISION_SUPPORTED = File.mtime(__FILE__).to_f.to_s[-2..-1] != '.0'
-    rescue
-      HIGH_PRECISION_SUPPORTED = false
-    end
+    HIGH_PRECISION_SUPPORTED = File.mtime(__FILE__).to_f.to_s[-2..-1] != '.0'
 
     # Data structure used to save meta data about a path
     #
@@ -92,17 +88,6 @@ module Listen
       @ignoring_patterns.merge(regexps)
     end
 
-    # Replaces ignoring patterns in the record.
-    #
-    # @example Ignore only these paths
-    #   ignore! %r{^ignored/path/}, /man/
-    #
-    # @param [Regexp] regexp a pattern for ignoring paths
-    #
-    def ignore!(*regexps)
-      @ignoring_patterns.replace(regexps)
-    end
-
     # Adds filtering patterns to the listener.
     #
     # @example Filter some files
@@ -114,17 +99,6 @@ module Listen
       @filtering_patterns.merge(regexps)
     end
 
-    # Replaces filtering patterns in the listener.
-    #
-    # @example Filter only these files
-    #   ignore /\.txt$/, /.*\.zip/
-    #
-    # @param [Regexp] regexp a pattern for filtering paths
-    #
-    def filter!(*regexps)
-      @filtering_patterns.replace(regexps)
-    end
-
     # Returns whether a path should be ignored or not.
     #
     # @param [String] path the path to test.
@@ -189,7 +163,6 @@ module Listen
     #
     def relative_to_base(path)
       return nil unless path[@directory]
-      path = path.force_encoding("BINARY") if path.respond_to?(:force_encoding)
       path.sub(%r{^#{Regexp.quote(@directory)}#{File::SEPARATOR}?}, '')
     end
 
@@ -225,11 +198,8 @@ module Listen
 
             # 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
+            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
 
@@ -277,40 +247,17 @@ module Listen
 
     # 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, Errno::ENXIO, Errno::EOPNOTSUPP
-      nil
+      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

data/vendor/listen/lib/listen/listener.rb

@@ -93,17 +93,6 @@ module Listen
       self
     end
 
-    # Replaces ignoring patterns in the listener.
-    #
-    # @param (see Listen::DirectoryRecord#ignore!)
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def ignore!(*regexps)
-      @directory_record.ignore!(*regexps)
-      self
-    end
-
     # Adds filtering patterns to the listener.
     #
     # @param (see Listen::DirectoryRecord#filter)
@@ -115,17 +104,6 @@ module Listen
       self
     end
 
-    # Replacing filtering patterns in the listener.
-    #
-    # @param (see Listen::DirectoryRecord#filter!)
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def filter!(*regexps)
-      @directory_record.filter!(*regexps)
-      self
-    end
-
     # Sets the latency for the adapter. This is a helper method
     # to simplify changing the latency directly from the listener.
     #

data/vendor/listen/lib/listen/multi_listener.rb

@@ -65,17 +65,6 @@ module Listen
       self
     end
 
-    # Replaces ignored paths in the listener.
-    #
-    # @param (see Listen::DirectoryRecord#ignore!)
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def ignore!(*paths)
-      @directories_records.each { |r| r.ignore!(*paths) }
-      self
-    end
-
     # Adds file filters to the listener.
     #
     # @param (see Listen::DirectoryRecord#filter)
@@ -87,17 +76,6 @@ module Listen
       self
     end
 
-    # Replaces file filters in the listener.
-    #
-    # @param (see Listen::DirectoryRecord#filter!)
-    #
-    # @return [Listen::Listener] the listener
-    #
-    def filter!(*regexps)
-      @directories_records.each { |r| r.filter!(*regexps) }
-      self
-    end
-
     # Runs the callback passing it the changes if there are any.
     #
     # @param (see Listen::DirectoryRecord#fetch_changes)

data/vendor/listen/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '0.7.3'
+  VERSION = '0.4.7'
 end