sass 3.3.0 → 3.4.0

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

@@ -2,14 +2,18 @@ require 'pathname'
 
 module Listen
   class Listener
-    attr_reader :directory, :directory_record, :adapter
+    attr_reader :directories, :directories_records, :block, :adapter, :adapter_options, :use_relative_paths
 
-    # The default value for using relative paths in the callback.
-    DEFAULT_TO_RELATIVE_PATHS = false
+    BLOCKING_PARAMETER_DEPRECATION_MESSAGE = <<-EOS.gsub(/^\s*/, '')
+      The blocking parameter of Listen::Listener#start is deprecated.\n
+      Please use Listen::Adapter#start for a non-blocking listener and Listen::Listener#start! for a blocking one.
+    EOS
 
-    # Initializes the directory listener.
+    RELATIVE_PATHS_WITH_MULTIPLE_DIRECTORIES_WARNING_MESSAGE = "The relative_paths option doesn't work when listening to multiple diretories."
+
+    # Initializes the directories listener.
     #
-    # @param [String] directory the directory to listen to
+    # @param [String] directory the directories to listen to
     # @param [Hash] options the listen options
     # @option options [Regexp] ignore a pattern for ignoring paths
     # @option options [Regexp] filter a pattern for filtering paths
@@ -17,42 +21,55 @@ module Listen
     # @option options [Boolean] relative_paths whether or not to use relative-paths in the callback
     # @option options [Boolean] force_polling whether to force the polling adapter or not
     # @option options [String, Boolean] polling_fallback_message to change polling fallback message or remove it
+    # @option options [Class] force_adapter force the use of this adapter class, skipping usual adapter selection
     #
     # @yield [modified, added, removed] the changed files
     # @yieldparam [Array<String>] modified the list of modified files
     # @yieldparam [Array<String>] added the list of added files
     # @yieldparam [Array<String>] removed the list of removed files
     #
-    def initialize(directory, options = {}, &block)
-      @block              = block
-      @directory          = Pathname.new(directory).realpath.to_s
-      @directory_record   = DirectoryRecord.new(@directory)
-      @use_relative_paths = DEFAULT_TO_RELATIVE_PATHS
+    def initialize(*args, &block)
+      options     = args.last.is_a?(Hash) ? args.pop : {}
+      directories = args.flatten
+      initialize_directories_and_directories_records(directories)
+      initialize_relative_paths_usage(options)
+      @block = block
 
-      @use_relative_paths = options.delete(:relative_paths) if options[:relative_paths]
-      @directory_record.ignore(*options.delete(:ignore))    if options[:ignore]
-      @directory_record.filter(*options.delete(:filter))    if options[:filter]
+      ignore(*options.delete(:ignore))
+      filter(*options.delete(:filter))
 
       @adapter_options = options
     end
 
     # Starts the listener by initializing the adapter and building
     # the directory record concurrently, then it starts the adapter to watch
-    # for changes.
+    # for changes. The current thread is not blocked after starting.
     #
-    # @param [Boolean] blocking whether or not to block the current thread after starting
+    # @see Listen::Listener#start!
     #
-    def start(blocking = true)
-      t = Thread.new { @directory_record.build }
-      @adapter = initialize_adapter
-      t.join
-      @adapter.start(blocking)
+    def start(deprecated_blocking = nil)
+      Kernel.warn "[Listen warning]:\n#{BLOCKING_PARAMETER_DEPRECATION_MESSAGE}" unless deprecated_blocking.nil?
+      setup
+      adapter.start
+    end
+
+    # Starts the listener by initializing the adapter and building
+    # the directory record concurrently, then it starts the adapter to watch
+    # for changes. The current thread is blocked after starting.
+    #
+    # @see Listen::Listener#start
+    #
+    # @since 1.0.0
+    #
+    def start!
+      setup
+      adapter.start!
     end
 
     # Stops the listener.
     #
     def stop
-      @adapter.stop
+      adapter && adapter.stop
     end
 
     # Pauses the listener.
@@ -60,7 +77,7 @@ module Listen
     # @return [Listen::Listener] the listener
     #
     def pause
-      @adapter.paused = true
+      adapter.pause
       self
     end
 
@@ -69,8 +86,8 @@ module Listen
     # @return [Listen::Listener] the listener
     #
     def unpause
-      @directory_record.build
-      @adapter.paused = false
+      build_directories_records
+      adapter.unpause
       self
     end
 
@@ -79,7 +96,7 @@ module Listen
     # @return [Boolean] adapter paused status
     #
     def paused?
-      !!@adapter && @adapter.paused == true
+      !!adapter && adapter.paused?
     end
 
     # Adds ignoring patterns to the listener.
@@ -88,8 +105,10 @@ module Listen
     #
     # @return [Listen::Listener] the listener
     #
+    # @see Listen::DirectoryRecord#ignore
+    #
     def ignore(*regexps)
-      @directory_record.ignore(*regexps)
+      directories_records.each { |r| r.ignore(*regexps) }
       self
     end
 
@@ -99,8 +118,10 @@ module Listen
     #
     # @return [Listen::Listener] the listener
     #
+    # @see Listen::DirectoryRecord#ignore!
+    #
     def ignore!(*regexps)
-      @directory_record.ignore!(*regexps)
+      directories_records.each { |r| r.ignore!(*regexps) }
       self
     end
 
@@ -110,19 +131,23 @@ module Listen
     #
     # @return [Listen::Listener] the listener
     #
+    # @see Listen::DirectoryRecord#filter
+    #
     def filter(*regexps)
-      @directory_record.filter(*regexps)
+      directories_records.each { |r| r.filter(*regexps) }
       self
     end
 
-    # Replacing filtering patterns in the listener.
+    # Replaces filtering patterns in the listener.
     #
     # @param (see Listen::DirectoryRecord#filter!)
     #
     # @return [Listen::Listener] the listener
     #
+    # @see Listen::DirectoryRecord#filter!
+    #
     def filter!(*regexps)
-      @directory_record.filter!(*regexps)
+      directories_records.each { |r| r.filter!(*regexps) }
       self
     end
 
@@ -156,6 +181,21 @@ module Listen
       self
     end
 
+    # Sets whether to force the use of a particular adapter, rather than
+    # going through usual adapter selection process on start.
+    #
+    # @example Force use of Linux polling
+    #   force_adapter Listen::Adapters::Linux
+    #
+    # @param [Class] adapter class to use for file system event notification.
+    #
+    # @return [Listen::Listener] the listener
+    #
+    def force_adapter(adapter_class)
+      @adapter_options[:force_adapter] = adapter_class
+      self
+    end
+
     # Sets whether the paths in the callback should be
     # relative or absolute.
     #
@@ -171,7 +211,7 @@ module Listen
       self
     end
 
-    # Defines a custom polling fallback message of disable it.
+    # Defines a custom polling fallback message or disable it.
     #
     # @example Disabling the polling fallback message
     #   polling_fallback_message false
@@ -204,22 +244,80 @@ module Listen
     #
     # @param (see Listen::DirectoryRecord#fetch_changes)
     #
+    # @see Listen::DirectoryRecord#fetch_changes
+    #
     def on_change(directories, options = {})
-      changes = @directory_record.fetch_changes(directories, options.merge(
-        :relative_paths => @use_relative_paths
-      ))
+      changes = fetch_records_changes(directories, options)
       unless changes.values.all? { |paths| paths.empty? }
-        @block.call(changes[:modified],changes[:added],changes[:removed])
+        block.call(changes[:modified], changes[:added], changes[:removed])
       end
+    rescue => ex
+      Kernel.warn "[Listen warning]: Change block raise an execption: #{$!}"
+      Kernel.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
     end
 
     private
 
+    # Initializes the directories to watch as well as the directories records.
+    #
+    # @see Listen::DirectoryRecord
+    #
+    def initialize_directories_and_directories_records(directories)
+      @directories = directories.map { |d| Pathname.new(d).realpath.to_s }
+      @directories_records = directories.map { |d| DirectoryRecord.new(d) }
+    end
+
+    # Initializes whether or not using relative paths.
+    #
+    def initialize_relative_paths_usage(options)
+      if directories.size > 1 && options[:relative_paths]
+        Kernel.warn "[Listen warning]: #{RELATIVE_PATHS_WITH_MULTIPLE_DIRECTORIES_WARNING_MESSAGE}"
+      end
+      @use_relative_paths = directories.one? && options.delete(:relative_paths) { false }
+    end
+
+    # Build the directory record concurrently and initialize the adapter.
+    #
+    def setup
+      t = Thread.new { build_directories_records }
+      @adapter = initialize_adapter
+      t.join
+    end
+
     # Initializes an adapter passing it the callback and adapters' options.
     #
     def initialize_adapter
-      callback = lambda { |changed_dirs, options| self.on_change(changed_dirs, options) }
-      Adapter.select_and_initialize(@directory, @adapter_options, &callback)
+      callback = lambda { |changed_directories, options| self.on_change(changed_directories, options) }
+      Adapter.select_and_initialize(directories, adapter_options, &callback)
     end
+
+    # Build the watched directories' records.
+    #
+    def build_directories_records
+      directories_records.each { |r| r.build }
+    end
+
+    # Returns the sum of all the changes to the directories records
+    #
+    # @param (see Listen::DirectoryRecord#fetch_changes)
+    #
+    # @return [Hash] the changes
+    #
+    def fetch_records_changes(directories_to_search, options)
+      directories_records.inject({}) do |h, r|
+        # directory records skips paths outside their range, so passing the
+        # whole `directories` array is not a problem.
+        record_changes = r.fetch_changes(directories_to_search, options.merge(:relative_paths => use_relative_paths))
+
+        if h.empty?
+          h.merge!(record_changes)
+        else
+          h.each { |k, v| h[k] += record_changes[k] }
+        end
+
+        h
+      end
+    end
+
   end
 end

data/vendor/listen/lib/listen/turnstile.rb

@@ -1,28 +1,32 @@
 module Listen
+
   # Allows two threads to wait on eachother.
   #
   # @note Only two threads can be used with this Turnstile
   #   because of the current implementation.
   class Turnstile
+    attr_accessor :queue
 
     # Initialize the turnstile.
     #
     def initialize
-      # Until ruby offers semahpores, only queues can be used
+      # Until Ruby offers semahpores, only queues can be used
       # to implement a turnstile.
-      @q = Queue.new
+      @queue = Queue.new
     end
 
     # Blocks the current thread until a signal is received.
     #
     def wait
-      @q.pop if @q.num_waiting == 0
+      queue.pop if queue.num_waiting == 0
     end
 
-    # Unblocks the waiting thread if there is one.
+    # Unblocks the waiting thread if any.
     #
     def signal
-      @q.push :dummy if @q.num_waiting == 1
+      queue.push(:dummy) if queue.num_waiting == 1
     end
+
   end
+
 end

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

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

data/vendor/listen/lib/listen.rb

@@ -1,24 +1,20 @@
-module Listen
+require 'listen/turnstile'
+require 'listen/listener'
+require 'listen/directory_record'
+require 'listen/adapter'
 
-  autoload :Turnstile,         'listen/turnstile'
-  autoload :Listener,          'listen/listener'
-  autoload :MultiListener,     'listen/multi_listener'
-  autoload :DirectoryRecord,   'listen/directory_record'
-  autoload :DependencyManager, 'listen/dependency_manager'
-  autoload :Adapter,           'listen/adapter'
+module Listen
 
   module Adapters
-    autoload :Darwin,  'listen/adapters/darwin'
-    autoload :Linux,   'listen/adapters/linux'
-    autoload :BSD,     'listen/adapters/bsd'
-    autoload :Windows, 'listen/adapters/windows'
-    autoload :Polling, 'listen/adapters/polling'
+    Adapter::ADAPTERS.each do |adapter|
+      require "listen/adapters/#{adapter.downcase}"
+    end
   end
 
-  # Listens to filesystem modifications on a either single directory or multiple directories.
+  # Listens to file system modifications on a either single directory or multiple directories.
+  # When calling this method, the current thread is not blocked.
   #
   # @param (see Listen::Listener#new)
-  # @param (see Listen::MultiListener#new)
   #
   # @yield [modified, added, removed] the changed files
   # @yieldparam [Array<String>] modified the list of modified files
@@ -28,13 +24,31 @@ module Listen
   # @return [Listen::Listener] the file listener if no block given
   #
   def self.to(*args, &block)
-    listener = if args.length == 1 || ! args[1].is_a?(String)
-      Listener.new(*args, &block)
-    else
-      MultiListener.new(*args, &block)
-    end
+    listener = _init_listener(*args, &block)
 
     block ? listener.start : listener
   end
 
+  # Listens to file system modifications on a either single directory or multiple directories.
+  # When calling this method, the current thread is blocked.
+  #
+  # @param (see Listen::Listener#new)
+  #
+  # @yield [modified, added, removed] the changed files
+  # @yieldparam [Array<String>] modified the list of modified files
+  # @yieldparam [Array<String>] added the list of added files
+  # @yieldparam [Array<String>] removed the list of removed files
+  #
+  # @since 1.0.0
+  #
+  def self.to!(*args, &block)
+    _init_listener(*args, &block).start!
+  end
+
+  # @private
+  #
+  def self._init_listener(*args, &block)
+    Listener.new(*args, &block)
+  end
+
 end

data/vendor/listen/listen.gemspec

@@ -9,13 +9,19 @@ Gem::Specification.new do |s|
   s.authors     = ['Thibaud Guillaume-Gentil', 'Maher Sallam']
   s.email       = ['thibaud@thibaud.me', 'maher@sallam.me']
   s.homepage    = 'https://github.com/guard/listen'
+  s.license     = 'MIT'
   s.summary     = 'Listen to file modifications'
   s.description = 'The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!'
 
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project = 'listen'
 
+  s.add_dependency 'rb-fsevent', '>= 0.9.3'
+  s.add_dependency 'rb-inotify', '>= 0.9'
+  s.add_dependency 'rb-kqueue',  '>= 0.2'
+
   s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rspec'
 
   s.files        = Dir.glob('{lib}/**/*') + %w[CHANGELOG.md LICENSE README.md]
   s.require_path = 'lib'

data/vendor/listen/spec/listen/adapter_spec.rb

@@ -19,10 +19,23 @@ describe Listen::Adapter do
 
   describe ".select_and_initialize" do
     before do
-      Listen::Adapters::Darwin.stub(:usable_and_works?) { false }
-      Listen::Adapters::Linux.stub(:usable_and_works?) { false }
-      Listen::Adapters::BSD.stub(:usable_and_works?) { false }
-      Listen::Adapters::Windows.stub(:usable_and_works?) { false }
+      Listen::Adapter::OPTIMIZED_ADAPTERS.each do |adapter|
+        Listen::Adapters.const_get(adapter).stub(:usable_and_works?) { false }
+      end
+    end
+
+    context "with force_adapter option" do
+      it "returns an instance of the given adapter class" do
+        expected_adapter = Object.new
+        adapter_class = double('adapter_class')
+        options = {:force_adapter => adapter_class}
+
+        adapter_class.should_receive(:load_dependent_adapter)
+        adapter_class.should_receive(:new).with('dir', options) { expected_adapter }
+
+        adapter = described_class.select_and_initialize('dir', options)
+        adapter.should be(expected_adapter)
+      end
     end
 
     context "with no specific adapter usable" do
@@ -37,20 +50,6 @@ describe Listen::Adapter do
         described_class.select_and_initialize('dir')
       end
 
-      context 'when the dependencies of an adapter are not satisfied' do
-        before do
-          Listen::Adapters::Darwin.stub(:usable_and_works?).and_raise(Listen::DependencyManager::Error)
-          Listen::Adapters::Linux.stub(:usable_and_works?).and_raise(Listen::DependencyManager::Error)
-          Listen::Adapters::BSD.stub(:usable_and_works?).and_raise(Listen::DependencyManager::Error)
-          Listen::Adapters::Windows.stub(:usable_and_works?).and_raise(Listen::DependencyManager::Error)
-        end
-
-        it 'invites the user to satisfy the dependencies of the adapter in the warning' do
-          Kernel.should_receive(:warn).with(/#{Listen::Adapter::MISSING_DEPENDENCY_MESSAGE}/)
-          described_class.select_and_initialize('dir')
-        end
-      end
-
       context "with custom polling_fallback_message option" do
         it "warns with the custom polling fallback message" do
           Kernel.should_receive(:warn).with(/custom/)
@@ -66,83 +65,50 @@ describe Listen::Adapter do
       end
     end
 
-    context "on Mac OX >= 10.6" do
-      before { Listen::Adapters::Darwin.stub(:usable_and_works?) { true } }
+    Listen::Adapter::OPTIMIZED_ADAPTERS.each do |adapter|
+      adapter_class = Listen::Adapters.const_get(adapter)
 
-      it "uses Listen::Adapters::Darwin" do
-        Listen::Adapters::Darwin.should_receive(:new).with('dir', {})
-        described_class.select_and_initialize('dir')
-      end
+      context "on #{adapter}" do
+        before { adapter_class.stub(:usable_and_works?) { true } }
 
-      context 'when the use of the polling adapter is forced' do
-        it 'uses Listen::Adapters::Polling' do
-          Listen::Adapters::Polling.should_receive(:new).with('dir', {})
-          described_class.select_and_initialize('dir', :force_polling => true)
+        it "uses Listen::Adapters::#{adapter}" do
+          adapter_class.should_receive(:new).with('dir', {})
+          described_class.select_and_initialize('dir')
         end
-      end
-    end
 
-    context "on Linux" do
-      before { Listen::Adapters::Linux.stub(:usable_and_works?) { true } }
-
-      it "uses Listen::Adapters::Linux" do
-        Listen::Adapters::Linux.should_receive(:new).with('dir', {})
-        described_class.select_and_initialize('dir')
-      end
-
-      context 'when the use of the polling adapter is forced' do
-        it 'uses Listen::Adapters::Polling' do
-          Listen::Adapters::Polling.should_receive(:new).with('dir', {})
-          described_class.select_and_initialize('dir', :force_polling => true)
+        context 'when the use of the polling adapter is forced' do
+          it 'uses Listen::Adapters::Polling' do
+            Listen::Adapters::Polling.should_receive(:new).with('dir', {})
+            described_class.select_and_initialize('dir', :force_polling => true)
+          end
         end
       end
     end
+  end
 
-    context "on BSD" do
-      before { Listen::Adapters::BSD.stub(:usable_and_works?) { true } }
+  describe '.load_dependend_adapter' do
+    after(:each) { described_class.instance_variable_set('@loaded', nil) }
 
-      it "uses Listen::Adapters::BSD" do
-        Listen::Adapters::BSD.should_receive(:new).with('dir', {})
-        described_class.select_and_initialize('dir')
-      end
+    it 'returns true (success) even if the adapter_gem has already been required' do
+      described_class.stub(:adapter_gem => 'already_loaded_gem')
+      described_class.stub(:require => false)
 
-      context 'when the use of the polling adapter is forced' do
-        it 'uses Listen::Adapters::Polling' do
-          Listen::Adapters::Polling.should_receive(:new).with('dir', {})
-          described_class.select_and_initialize('dir', :force_polling => true)
-        end
-      end
+      described_class.load_dependent_adapter.should be_true
     end
 
-    context "on Windows" do
-      before { Listen::Adapters::Windows.stub(:usable_and_works?) { true } }
-
-      it "uses Listen::Adapters::Windows" do
-        Listen::Adapters::Windows.should_receive(:new).with('dir', {})
-        described_class.select_and_initialize('dir')
+    it 'returns false (failure) if the adapter_gem cannot be required' do
+      described_class.stub(:adapter_gem => 'unloadable_gem')
+      described_class.stub(:require) do
+        raise LoadError.new('no such file to load -- unloadable_gem')
       end
 
-      context 'when the use of the polling adapter is forced' do
-        it 'uses Listen::Adapters::Polling' do
-          Listen::Adapters::Polling.should_receive(:new).with('dir', {})
-          described_class.select_and_initialize('dir', :force_polling => true)
-        end
-      end
+      described_class.load_dependent_adapter.should be_false
     end
   end
 
-  [Listen::Adapters::Darwin, Listen::Adapters::Linux,
-   Listen::Adapters::BSD, Listen::Adapters::Windows].each do
-    |adapter_class|
+  Listen::Adapter::OPTIMIZED_ADAPTERS.each do |adapter|
+    adapter_class = Listen::Adapters.const_get(adapter)
     if adapter_class.usable?
-      describe '.usable?' do
-        it 'checks the dependencies' do
-          adapter_class.should_receive(:load_depenencies)
-          adapter_class.should_receive(:dependencies_loaded?)
-          adapter_class.usable?
-        end
-      end
-
       describe '.usable_and_works?' do
         it 'checks if the adapter is usable' do
           adapter_class.stub(:works?)

data/vendor/listen/spec/listen/adapters/polling_spec.rb

@@ -12,8 +12,8 @@ describe Listen::Adapters::Polling do
   end
 
   describe '#poll' do
-    let(:listener) { mock(Listen::Listener) }
-    let(:callback) { lambda { |changed_dirs, options| @called = true; listener.on_change(changed_dirs, options) } }
+    let(:listener) { double(Listen::Listener) }
+    let(:callback) { lambda { |changed_directories, options| @called = true; listener.on_change(changed_directories, options) } }
 
     after { subject.stop }
 
@@ -22,20 +22,20 @@ describe Listen::Adapters::Polling do
 
       it 'calls listener.on_change' do
         listener.should_receive(:on_change).at_least(1).times.with(['dir'], :recursive => true)
-        subject.start(false)
+        subject.start
         subject.wait_for_callback
       end
 
       it 'calls listener.on_change continuously' do
         subject.latency = 0.001
         listener.should_receive(:on_change).at_least(10).times.with(['dir'], :recursive => true)
-        subject.start(false)
+        subject.start
         10.times { subject.wait_for_callback }
       end
 
       it "doesn't call listener.on_change if paused" do
         subject.paused = true
-        subject.start(false)
+        subject.start
         subject.wait_for_callback
         @called.should be_nil
       end
@@ -46,20 +46,20 @@ describe Listen::Adapters::Polling do
 
       it 'calls listener.on_change' do
         listener.should_receive(:on_change).at_least(1).times.with(%w{dir1 dir2}, :recursive => true)
-        subject.start(false)
+        subject.start
         subject.wait_for_callback
       end
 
       it 'calls listener.on_change continuously' do
         subject.latency = 0.001
         listener.should_receive(:on_change).at_least(10).times.with(%w{dir1 dir2}, :recursive => true)
-        subject.start(false)
+        subject.start
         10.times { subject.wait_for_callback }
       end
 
       it "doesn't call listener.on_change if paused" do
         subject.paused = true
-        subject.start(false)
+        subject.start
         subject.wait_for_callback
         @called.should be_nil
       end