sass 3.2.5 → 3.2.6

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

@@ -4,6 +4,10 @@ module Listen
     # Adapter implementation for Mac OS X `FSEvents`.
     #
     class Darwin < Adapter
+      extend DependencyManager
+
+      # Declare the adapter's dependencies
+      dependency 'rb-fsevent', '~> 0.9.1'
 
       LAST_SEPARATOR_REGEX = /\/$/
 
@@ -25,13 +29,14 @@ 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 @latency
-        @poll_thread.join if blocking
+        sleep 0.1
+
+        @poll_thread = Thread.new { poll_changed_dirs } if @report_changes
+        @worker_thread.join if blocking
       end
 
       # Stops the adapter.
@@ -43,8 +48,8 @@ module Listen
         end
 
         @worker.stop
-        Thread.kill(@worker_thread) if @worker_thread
-        @poll_thread.join
+        @worker_thread.join if @worker_thread
+        @poll_thread.join if @poll_thread
       end
 
       # Checks if the adapter is usable on the current OS.
@@ -53,11 +58,7 @@ module Listen
       #
       def self.usable?
         return false unless RbConfig::CONFIG['target_os'] =~ /darwin(1.+)?$/i
-
-        require 'rb-fsevent'
-        true
-      rescue LoadError
-        false
+        super
       end
 
       private

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

@@ -4,6 +4,10 @@ module Listen
     # Listener implementation for Linux `inotify`.
     #
     class Linux < Adapter
+      extend DependencyManager
+
+      # Declare the adapter's dependencies
+      dependency 'rb-inotify', '~> 0.8.8'
 
       # Watched inotify events
       #
@@ -41,8 +45,9 @@ module Listen
         end
 
         @worker_thread = Thread.new { @worker.run }
-        @poll_thread   = Thread.new { poll_changed_dirs }
-        @poll_thread.join if blocking
+        @poll_thread   = Thread.new { poll_changed_dirs } if @report_changes
+
+        @worker_thread.join if blocking
       end
 
       # Stops the adapter.
@@ -55,20 +60,16 @@ module Listen
 
         @worker.stop
         Thread.kill(@worker_thread) if @worker_thread
-        @poll_thread.join
+        @poll_thread.join if @poll_thread
       end
 
-      # Check if the adapter is usable on the current OS.
+      # Checks 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
-
-        require 'rb-inotify'
-        true
-      rescue LoadError
-        false
+        super
       end
 
     private
@@ -79,29 +80,31 @@ module Listen
       # @return [INotify::Notifier] initialized worker
       #
       def init_worker
-        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
+        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)
           end
         end
-        worker
       end
 
     end

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

@@ -10,6 +10,7 @@ module Listen
     # file IO that the other implementations.
     #
     class Polling < Adapter
+      extend DependencyManager
 
       # Initialize the Adapter. See {Listen::Adapter#initialize} for more info.
       #
@@ -49,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/vendor/listen/lib/listen/adapters/windows.rb

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

data/vendor/listen/lib/listen/dependency_manager.rb

@@ -0,0 +1,126 @@
+require 'set'
+
+module Listen
+
+  # The dependency-manager offers a simple DSL which allows
+  # classes to declare their gem dependencies and load them when
+  # needed.
+  # It raises a user-friendly exception when the dependencies
+  # can't be loaded which has the install command in the message.
+  #
+  module DependencyManager
+
+    GEM_LOAD_MESSAGE = <<-EOS.gsub(/^ {6}/, '')
+      Missing dependency '%s' (version '%s')!
+    EOS
+
+    GEM_INSTALL_COMMAND = <<-EOS.gsub(/^ {6}/, '')
+      Please run the following to satisfy the dependency:
+        gem install --version '%s' %s
+    EOS
+
+    BUNDLER_DECLARE_GEM = <<-EOS.gsub(/^ {6}/, '')
+      Please add the following to your Gemfile to satisfy the dependency:
+        gem '%s', '%s'
+    EOS
+
+    Dependency = Struct.new(:name, :version)
+
+    # The error raised when a dependency can't be loaded.
+    class Error < StandardError; end
+
+    # A list of all loaded dependencies in the dependency manager.
+    @_loaded_dependencies = Set.new
+
+    # class methods
+    class << self
+
+      # Initializes the extended class.
+      #
+      # @param [Class] the class for which some dependencies must be managed
+      #
+      def extended(base)
+        base.class_eval do
+          @_dependencies = Set.new
+        end
+      end
+
+      # Adds a loaded dependency to a list so that it doesn't have
+      # to be loaded again by another classes.
+      #
+      # @param [Dependency] dependency
+      #
+      def add_loaded(dependency)
+        @_loaded_dependencies << dependency
+      end
+
+      # Returns whether the dependency is alread loaded or not.
+      #
+      # @param [Dependency] dependency
+      # @return [Boolean]
+      #
+      def already_loaded?(dependency)
+        @_loaded_dependencies.include?(dependency)
+      end
+
+      # Clears the list of loaded dependencies.
+      #
+      def clear_loaded
+        @_loaded_dependencies.clear
+      end
+    end
+
+    # Registers a new dependency.
+    #
+    # @param [String] name the name of the gem
+    # @param [String] version the version of the gem
+    #
+    def dependency(name, version)
+      @_dependencies << Dependency.new(name, version)
+    end
+
+    # Loads the registered dependencies.
+    #
+    # @raise DependencyManager::Error if the dependency can't be loaded.
+    #
+    def load_depenencies
+      @_dependencies.each do |dependency|
+        begin
+          next if DependencyManager.already_loaded?(dependency)
+          gem(dependency.name, dependency.version)
+          require(dependency.name)
+          DependencyManager.add_loaded(dependency)
+          @_dependencies.delete(dependency)
+        rescue Gem::LoadError
+          args = [dependency.name, dependency.version]
+          command = if running_under_bundler?
+            BUNDLER_DECLARE_GEM % args
+          else
+            GEM_INSTALL_COMMAND % args.reverse
+          end
+          message = GEM_LOAD_MESSAGE % args
+
+          raise Error.new(message + command)
+        end
+      end
+    end
+
+    # Returns whether all the dependencies has been loaded or not.
+    #
+    # @return [Boolean]
+    #
+    def dependencies_loaded?
+      @_dependencies.empty?
+    end
+
+    private
+
+    # Returns whether we are running under bundler or not
+    #
+    # @return [Boolean]
+    #
+    def running_under_bundler?
+      !!(File.exists?('Gemfile') && ENV['BUNDLE_GEMFILE'])
+    end
+  end
+end

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

@@ -18,7 +18,11 @@ module Listen
     # 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'
+    begin
+      HIGH_PRECISION_SUPPORTED = File.mtime(__FILE__).to_f.to_s[-2..-1] != '.0'
+    rescue
+      HIGH_PRECISION_SUPPORTED = false
+    end
 
     # Data structure used to save meta data about a path
     #
@@ -88,6 +92,17 @@ 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
@@ -99,6 +114,17 @@ 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.
@@ -163,6 +189,7 @@ 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
 
@@ -198,8 +225,11 @@ 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 meta data of the files
+            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
 
@@ -247,17 +277,40 @@ 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 = 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
+      @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
     end
 
     # Traverses the base directory looking for paths that should