sass 3.2.19 → 3.3.0.alpha.1

data/vendor/listen/listen.gemspec

@@ -15,6 +15,10 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project = 'listen'
 
+  s.add_dependency 'rb-fsevent', '~> 0.9.1'
+  s.add_dependency 'rb-inotify', '~> 0.8.8'
+  s.add_dependency 'rb-fchange', '~> 0.0.5'
+
   s.add_development_dependency 'bundler'
 
   s.files        = Dir.glob('{lib}/**/*') + %w[CHANGELOG.md LICENSE README.md]

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

@@ -21,7 +21,6 @@ describe Listen::Adapter 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 }
     end
 
@@ -32,28 +31,14 @@ describe Listen::Adapter do
         described_class.select_and_initialize('dir')
       end
 
-      it 'warns with the default polling fallback message' do
-        Kernel.should_receive(:warn).with(/#{Listen::Adapter::POLLING_FALLBACK_MESSAGE}/)
+      it "warns with the default polling fallback message" do
+        Kernel.should_receive(:warn).with(Listen::Adapter::POLLING_FALLBACK_MESSAGE)
         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/)
+          Kernel.should_receive(:warn).with('custom')
           described_class.select_and_initialize('dir', :polling_fallback_message => 'custom')
         end
       end
@@ -98,22 +83,6 @@ describe Listen::Adapter do
       end
     end
 
-    context "on BSD" do
-      before { Listen::Adapters::BSD.stub(:usable_and_works?) { true } }
-
-      it "uses Listen::Adapters::BSD" do
-        Listen::Adapters::BSD.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)
-        end
-      end
-    end
-
     context "on Windows" do
       before { Listen::Adapters::Windows.stub(:usable_and_works?) { true } }
 
@@ -131,18 +100,8 @@ describe Listen::Adapter do
     end
   end
 
-  [Listen::Adapters::Darwin, Listen::Adapters::Linux,
-   Listen::Adapters::BSD, Listen::Adapters::Windows].each do
-    |adapter_class|
+  [Listen::Adapters::Darwin, Listen::Adapters::Linux, Listen::Adapters::Windows].each do |adapter_class|
     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/darwin_spec.rb

@@ -28,10 +28,4 @@ describe Listen::Adapters::Darwin do
       described_class.should_not be_usable
     end
   end
-
-  if bsd?
-    it "isn't usable on BSD" do
-      described_class.should_not be_usable
-    end
-  end
 end

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

@@ -27,12 +27,6 @@ describe Listen::Adapters::Linux do
     end
   end
 
-  if bsd?
-    it "isn't usable on BSD" do
-      described_class.should_not be_usable
-    end
-  end
-
   if mac?
     it "isn't usable on Mac OS X" do
       described_class.should_not be_usable

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

@@ -7,7 +7,7 @@ describe Listen::Adapters::Windows do
     end
 
     it_should_behave_like 'a filesystem adapter'
-    it_should_behave_like 'an adapter that call properly listener#on_change'
+    it_should_behave_like 'an adapter that call properly listener#on_change', :recursive => true, :adapter => :windows
   end
 
   if mac?
@@ -16,12 +16,6 @@ describe Listen::Adapters::Windows do
     end
   end
 
-  if bsd?
-    it "isn't usable on BSD" do
-      described_class.should_not be_usable
-    end
-  end
-
   if linux?
     it "isn't usable on Linux" do
       described_class.should_not be_usable

data/vendor/listen/spec/listen/directory_record_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe Listen::DirectoryRecord do
@@ -42,19 +41,12 @@ describe Listen::DirectoryRecord do
   end
 
   describe '#ignore' do
-    it 'adds the passed paths to the list of ignored paths in the record' do
+    it 'adds the passed paths to the list of ignoted paths in the record' do
       subject.ignore(%r{^\.old/}, %r{\.pid$})
       subject.ignoring_patterns.should include(%r{^\.old/}, %r{\.pid$})
     end
   end
 
-  describe '#ignore!' do
-    it 'replace the ignored paths in the record' do
-      subject.ignore!(%r{^\.old/}, %r{\.pid$})
-      subject.ignoring_patterns.should =~ [%r{^\.old/}, %r{\.pid$}]
-    end
-  end
-
   describe '#filter' do
     it 'adds the passed regexps to the list of filters that determine the stored paths' do
       subject.filter(%r{\.(?:jpe?g|gif|png)}, %r{\.(?:mp3|ogg|a3c)})
@@ -62,13 +54,6 @@ describe Listen::DirectoryRecord do
     end
   end
 
-  describe '#filter!' do
-    it 'replaces the passed regexps in the list of filters that determine the stored paths' do
-      subject.filter!(%r{\.(?:jpe?g|gif|png)}, %r{\.(?:mp3|ogg|a3c)})
-      subject.filtering_patterns.should =~ [%r{\.(?:mp3|ogg|a3c)}, %r{\.(?:jpe?g|gif|png)}]
-    end
-  end
-
   describe '#ignored?' do
     before { subject.stub(:relative_to_base) { |path| path } }
 
@@ -208,12 +193,7 @@ describe Listen::DirectoryRecord do
     it 'returns nil when the passed path is not inside the base-directory' do
       subject.relative_to_base('/tmp/some_random_path').should be_nil
     end
-
-    it 'works with non UTF-8 paths' do
-      path = "tmp/\xE4\xE4"
-      subject.relative_to_base(File.join(base_directory, path))
-    end
-
+    
     context 'when containing regexp characters in the base directory' do
       before do
         fixtures do |path|
@@ -462,11 +442,6 @@ describe Listen::DirectoryRecord do
           it 'detects the modified file the second time if the content have changed' do
             fixtures do |path|
               touch 'existing_file.txt'
-              # Set sha1 path checksum
-              changes(path) do
-                touch 'existing_file.txt'
-              end
-              small_time_difference
 
               changes(path) do
                 touch 'existing_file.txt'
@@ -481,58 +456,6 @@ describe Listen::DirectoryRecord do
               removed.should be_empty
             end
           end
-
-          it "doesn't detects the modified file the second time if just touched - #62" do
-            fixtures do |path|
-              touch 'existing_file.txt'
-              # Set sha1 path checksum
-              changes(path) do
-                touch 'existing_file.txt'
-              end
-              small_time_difference
-
-              changes(path, :use_last_record => true) do
-                open('existing_file.txt', 'w') { |f| f.write('foo') }
-              end
-
-              modified, added, removed = changes(path, :use_last_record => true) do
-                touch 'existing_file.txt'
-              end
-
-              added.should be_empty
-              modified.should be_empty
-              removed.should be_empty
-            end
-          end
-
-          it "adds the path in the paths checksums if just touched - #62" do
-            fixtures do |path|
-              touch 'existing_file.txt'
-              small_time_difference
-
-              changes(path) do
-                touch 'existing_file.txt'
-              end
-
-              @record.sha1_checksums["#{path}/existing_file.txt"].should_not be_nil
-            end
-          end
-
-        it "deletes the path from the paths checksums" do
-          fixtures do |path|
-            touch 'unnecessary.txt'
-
-            changes(path) do
-              @record.sha1_checksums["#{path}/unnecessary.txt"] = 'foo'
-
-              rm 'unnecessary.txt'
-            end
-
-            @record.sha1_checksums["#{path}/unnecessary.txt"].should be_nil
-          end
-        end
-
-
         end
 
         context 'given a hidden file' do
@@ -1169,7 +1092,7 @@ describe Listen::DirectoryRecord do
 
         # simulate a race condition where the file is removed after the
         # change event is tracked, but before the hash is calculated
-        Digest::SHA1.should_receive(:file).twice.and_raise(Errno::ENOENT)
+        Digest::SHA1.should_receive(:file).and_raise(Errno::ENOENT)
 
         lambda {
           fixtures do |path|
@@ -1181,17 +1104,7 @@ describe Listen::DirectoryRecord do
       end
     end
 
-    context 'within a directory containing a unix domain socket file' do
-      it 'does not raise an exception when hashing a unix domain socket file' do
-        fixtures do |path|
-          require 'socket'
-          UNIXServer.new('unix_domain_socket.sock')
-          lambda { changes(path){} }.should_not raise_error(Errno::ENXIO)
-        end
-      end
-    end
-
-    context 'with symlinks', :unless => windows? do
+    context 'with symlinks' do
       it 'looks at symlinks not their targets' do
         fixtures do |path|
           touch 'target'

data/vendor/listen/spec/listen/listener_spec.rb

@@ -84,13 +84,6 @@ describe Listen::Listener do
     end
   end
 
-  describe '#ignore!'do
-    it 'delegates the work to the directory record' do
-      subject.directory_record.should_receive(:ignore!).with 'some_directory'
-      subject.ignore! 'some_directory'
-    end
-  end
-
   describe '#filter' do
     it 'delegates the work to the directory record' do
       subject.directory_record.should_receive(:filter).with /\.txt$/
@@ -98,13 +91,6 @@ describe Listen::Listener do
     end
   end
 
-  describe '#filter!' do
-    it 'delegates the work to the directory record' do
-      subject.directory_record.should_receive(:filter!).with /\.txt$/
-      subject.filter! /\.txt$/
-    end
-  end
-
 
   describe '#on_change' do
     let(:directories) { %w{dir1 dir2 dir3} }

data/vendor/listen/spec/listen/multi_listener_spec.rb

@@ -80,7 +80,7 @@ describe Listen::MultiListener do
     end
   end
 
-  describe '#ignore' do
+  describe '#ignore'do
     it 'delegates the work to each directory record' do
       subject.directories_records.each do |r|
         r.should_receive(:ignore).with 'some_directory'
@@ -89,15 +89,6 @@ describe Listen::MultiListener do
     end
   end
 
-  describe '#ignore!' do
-    it 'delegates the work to each directory record' do
-      subject.directories_records.each do |r|
-        r.should_receive(:ignore!).with 'some_directory'
-      end
-      subject.ignore! 'some_directory'
-    end
-  end
-
   describe '#filter' do
     it 'delegates the work to each directory record' do
       subject.directories_records.each do |r|
@@ -107,15 +98,6 @@ describe Listen::MultiListener do
     end
   end
 
-  describe '#filter!' do
-    it 'delegates the work to each directory record' do
-      subject.directories_records.each do |r|
-        r.should_receive(:filter!).with /\.txt$/
-      end
-      subject.filter! /\.txt$/
-    end
-  end
-
   describe '#on_change' do
     let(:directories) { %w{dir1 dir2 dir3} }
     let(:changes)     { {:modified => [], :added => [], :removed => []} }

data/vendor/listen/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'listen'
 
+ENV["TEST_LATENCY"] ||= "0.25"
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
@@ -9,13 +11,8 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run_excluding :broken => true
-  config.fail_fast = true
 end
 
 def test_latency
-  0.1
+  ENV["TEST_LATENCY"].to_f
 end
-
-# Crash loud in tests!
-Thread.abort_on_exception = true

data/vendor/listen/spec/support/adapter_helper.rb

@@ -3,29 +3,18 @@
 # @param [Listen::Listener] listener the adapter listener
 # @param [String] path the path to watch
 #
-def watch(listener, expected_changes, *paths)
-  callback = lambda { |changed_dirs, options| @called = true; listener.on_change(changed_dirs) }
-  @adapter = Listen::Adapter.select_and_initialize(paths, { :report_changes => false, :latency => test_latency }, &callback)
-
-  forced_stop = false
-  prevent_deadlock = Proc.new { sleep(10); puts "Forcing stop"; @adapter.stop; forced_stop = true }
-
+def watch(listener, *paths)
+  callback = lambda { |changed_dirs, options| @called = true; listener.on_change(changed_dirs, options) }
+  @adapter = Listen::Adapter.select_and_initialize(paths, { :latency => test_latency }, &callback)
   @adapter.start(false)
 
   yield
 
-  t = Thread.new(&prevent_deadlock)
-  @adapter.wait_for_changes(expected_changes)
-
-  unless forced_stop
-    Thread.kill(t)
-    @adapter.report_changes
-  end
+  t = Thread.new { sleep(test_latency * 5); @adapter.stop }
+  @adapter.wait_for_callback
 ensure
-  unless forced_stop
-    Thread.kill(t) if t
-    @adapter.stop
-  end
+  Thread.kill(t) if t
+  @adapter.stop
 end
 
 shared_examples_for 'a filesystem adapter' do
@@ -72,7 +61,7 @@ shared_examples_for 'a filesystem adapter' do
 
     context 'with a started adapter' do
       before { subject.start(false) }
-      after  { subject.stop }
+      after { subject.start }
 
       it 'returns true' do
         subject.should be_started
@@ -90,26 +79,30 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is created' do
       it 'detects the added file' do
         fixtures do |path|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include(path)
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with([path], :recursive => true)
+          else
+            listener.should_receive(:on_change).once.with([path], {})
           end
 
-          watch(listener, 1, path) do
+          watch(listener, path) do
             touch 'new_file.rb'
           end
         end
       end
 
-      context 'given a symlink', :unless => windows? do
+      context 'given a symlink' do
         it 'detects the added file' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path)
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
             end
 
             touch 'new_file.rb'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               ln_s 'new_file.rb', 'new_file_symlink.rb'
             end
           end
@@ -119,14 +112,18 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a new created directory' do
         it 'detects the added file' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path, "#{path}/a_directory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with do |array, options|
+                array.should =~ [path, "#{path}/a_directory"]
+              end
             end
 
-            watch(listener, 2, path) do
+            watch(listener, path) do
               mkdir 'a_directory'
               # Needed for INotify, because of :recursive rb-inotify custom flag?
-              sleep 0.05
+              sleep 0.05 if @adapter.is_a?(Listen::Adapters::Linux)
               touch 'a_directory/new_file.rb'
             end
           end
@@ -136,13 +133,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given an existing directory' do
         it 'detects the added file' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include("#{path}/a_directory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory"], {})
             end
 
             mkdir 'a_directory'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               touch 'a_directory/new_file.rb'
             end
           end
@@ -152,13 +151,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a directory with subdirectories' do
         it 'detects the added file' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include("#{path}/a_directory/subdirectory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
             end
 
             mkdir_p 'a_directory/subdirectory'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               touch 'a_directory/subdirectory/new_file.rb'
             end
           end
@@ -169,29 +170,33 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is modified' do
       it 'detects the modified file' do
         fixtures do |path|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include(path)
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with([path], :recursive => true)
+          else
+            listener.should_receive(:on_change).once.with([path], {})
           end
 
           touch 'existing_file.txt'
 
-          watch(listener, 1, path) do
+          watch(listener, path) do
             touch 'existing_file.txt'
           end
         end
       end
 
-      context 'given a symlink', :unless => windows? do
+      context 'given a symlink' do
         it 'detects the modified file' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path)
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
             end
 
             touch 'existing_file.rb'
             ln_s  'existing_file.rb', 'existing_file_symlink.rb'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               touch 'existing_file.rb'
             end
           end
@@ -201,30 +206,36 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a hidden file' do
         it 'detects the modified file' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path)
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
             end
 
             touch '.hidden'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               touch '.hidden'
             end
           end
         end
       end
 
-      context 'given a file mode change', :unless => windows? do
-        it 'does not detect the mode change' do
-          fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path)
-            end
+      unless options[:adapter] == :windows
+        context 'given a file mode change' do
+          it 'does not detect the mode change' do
+            fixtures do |path|
+              if options[:recursive]
+                listener.should_receive(:on_change).once.with([path], :recursive => true)
+              else
+                listener.should_receive(:on_change).once.with([path], {})
+              end
 
-            touch 'run.rb'
+              touch 'run.rb'
 
-            watch(listener, 1, path) do
-              chmod 0777, 'run.rb'
+              watch(listener, path) do
+                chmod 0777, 'run.rb'
+              end
             end
           end
         end
@@ -233,14 +244,16 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given an existing directory' do
         it 'detects the modified file' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include("#{path}/a_directory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory"], {})
             end
 
             mkdir 'a_directory'
             touch 'a_directory/existing_file.txt'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               touch 'a_directory/existing_file.txt'
             end
           end
@@ -250,14 +263,16 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a directory with subdirectories' do
         it 'detects the modified file' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include("#{path}/a_directory/subdirectory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
             end
 
             mkdir_p 'a_directory/subdirectory'
             touch   'a_directory/subdirectory/existing_file.txt'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               touch 'a_directory/subdirectory/new_file.rb'
             end
           end
@@ -268,29 +283,33 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is moved' do
       it 'detects the file move' do
         fixtures do |path|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include(path)
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with([path], :recursive => true)
+          else
+            listener.should_receive(:on_change).once.with([path], {})
           end
 
           touch 'move_me.txt'
 
-          watch(listener, 1, path) do
+          watch(listener, path) do
             mv 'move_me.txt', 'new_name.txt'
           end
         end
       end
 
-      context 'given a symlink', :unless => windows? do
+      context 'given a symlink' do
         it 'detects the file move' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path)
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
             end
 
             touch 'move_me.rb'
             ln_s  'move_me.rb', 'move_me_symlink.rb'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               mv 'move_me_symlink.rb', 'new_symlink.rb'
             end
           end
@@ -300,14 +319,18 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given an existing directory' do
         it 'detects the file move into the directory' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path, "#{path}/a_directory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with do |array, options|
+                array.should =~ [path, "#{path}/a_directory"]
+              end
             end
 
             mkdir 'a_directory'
             touch 'move_me.txt'
 
-            watch(listener, 2, path) do
+            watch(listener, path) do
               mv 'move_me.txt', 'a_directory/move_me.txt'
             end
           end
@@ -315,14 +338,18 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
         it 'detects a file move out of the directory' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path, "#{path}/a_directory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with do |array, options|
+                array.should =~ [path, "#{path}/a_directory"]
+              end
             end
 
             mkdir 'a_directory'
             touch 'a_directory/move_me.txt'
 
-            watch(listener, 2, path) do
+            watch(listener, path) do
               mv 'a_directory/move_me.txt', 'i_am_here.txt'
             end
           end
@@ -330,15 +357,19 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
         it 'detects a file move between two directories' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include("#{path}/from_directory", "#{path}/to_directory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with do |array, options|
+                array.should =~ ["#{path}/from_directory", "#{path}/to_directory"]
+              end
             end
 
             mkdir 'from_directory'
             touch 'from_directory/move_me.txt'
             mkdir 'to_directory'
 
-            watch(listener, 2, path) do
+            watch(listener, path) do
               mv 'from_directory/move_me.txt', 'to_directory/move_me.txt'
             end
           end
@@ -348,15 +379,19 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a directory with subdirectories' do
         it 'detects files movements between subdirectories' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include("#{path}/a_directory/subdirectory", "#{path}/b_directory/subdirectory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with do |array, options|
+                array.should =~ ["#{path}/a_directory/subdirectory", "#{path}/b_directory/subdirectory"]
+              end
             end
 
             mkdir_p 'a_directory/subdirectory'
             mkdir_p 'b_directory/subdirectory'
             touch   'a_directory/subdirectory/move_me.txt'
 
-            watch(listener, 2, path) do
+            watch(listener, path) do
               mv 'a_directory/subdirectory/move_me.txt', 'b_directory/subdirectory'
             end
           end
@@ -367,29 +402,33 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is deleted' do
       it 'detects the file removal' do
         fixtures do |path|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include(path)
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with([path], :recursive => true)
+          else
+            listener.should_receive(:on_change).once.with([path], {})
           end
 
           touch 'unnecessary.txt'
 
-          watch(listener, 1, path) do
+          watch(listener, path) do
             rm 'unnecessary.txt'
           end
         end
       end
 
-      context 'given a symlink', :unless => windows? do
+      context 'given a symlink' do
         it 'detects the file removal' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include(path)
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with([path], {})
             end
 
             touch 'unnecessary.rb'
             ln_s  'unnecessary.rb', 'unnecessary_symlink.rb'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               rm 'unnecessary_symlink.rb'
             end
           end
@@ -399,14 +438,16 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given an existing directory' do
         it 'detects the file removal' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include("#{path}/a_directory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory"], {})
             end
 
             mkdir 'a_directory'
             touch 'a_directory/do_not_use.rb'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               rm 'a_directory/do_not_use.rb'
             end
           end
@@ -416,14 +457,16 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a directory with subdirectories' do
         it 'detects the file removal' do
           fixtures do |path|
-            listener.should_receive(:on_change).once.with do |array|
-              array.should include("#{path}/a_directory/subdirectory")
+            if options[:recursive]
+              listener.should_receive(:on_change).once.with([path], :recursive => true)
+            else
+              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
             end
 
             mkdir_p 'a_directory/subdirectory'
             touch   'a_directory/subdirectory/do_not_use.rb'
 
-            watch(listener, 1, path) do
+            watch(listener, path) do
               rm 'a_directory/subdirectory/do_not_use.rb'
             end
           end
@@ -435,11 +478,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
   context 'multiple file operations' do
     it 'detects the added files' do
       fixtures do |path|
-        listener.should_receive(:on_change).once.with do |array|
-          array.should include(path, "#{path}/a_directory")
+        if options[:recursive]
+          listener.should_receive(:on_change).at_least(:once).with([path], :recursive => true)
+        else
+          listener.should_receive(:on_change).once.with do |array, options|
+            array.should =~ [path, "#{path}/a_directory"]
+          end
         end
 
-        watch(listener, 2, path) do
+        watch(listener, path) do
           touch 'a_file.rb'
           touch 'b_file.rb'
           mkdir 'a_directory'
@@ -454,8 +501,12 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
     it 'detects the modified files' do
       fixtures do |path|
-        listener.should_receive(:on_change).once.with do |array|
-          array.should include(path, "#{path}/a_directory")
+        if options[:recursive]
+          listener.should_receive(:on_change).once.with([path], :recursive => true)
+        else
+          listener.should_receive(:on_change).once.with do |array, options|
+            array.should =~ [path, "#{path}/a_directory"]
+          end
         end
 
         touch 'a_file.rb'
@@ -464,7 +515,7 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         touch 'a_directory/a_file.rb'
         touch 'a_directory/b_file.rb'
 
-        watch(listener, 2, path) do
+        watch(listener, path) do
           touch 'b_file.rb'
           touch 'a_directory/a_file.rb'
         end
@@ -473,8 +524,12 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
     it 'detects the removed files' do
       fixtures do |path|
-        listener.should_receive(:on_change).once.with do |array|
-          array.should include(path, "#{path}/a_directory")
+        if options[:recursive]
+          listener.should_receive(:on_change).once.with([path], :recursive => true)
+        else
+          listener.should_receive(:on_change).once.with do |array, options|
+            array.should =~ [path, "#{path}/a_directory"]
+          end
         end
 
         touch 'a_file.rb'
@@ -483,7 +538,7 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         touch 'a_directory/a_file.rb'
         touch 'a_directory/b_file.rb'
 
-        watch(listener, 2, path) do
+        watch(listener, path) do
           rm 'b_file.rb'
           rm 'a_directory/a_file.rb'
         end
@@ -494,15 +549,17 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
   context 'single directory operations' do
     it 'detects a moved directory' do
       fixtures do |path|
-        listener.should_receive(:on_change).once.with do |array|
-          array.should include(path)
+        if options[:recursive]
+          listener.should_receive(:on_change).once.with([path], :recursive => true)
+        else
+          listener.should_receive(:on_change).once.with([path], {})
         end
 
         mkdir 'a_directory'
         touch 'a_directory/a_file.rb'
         touch 'a_directory/b_file.rb'
 
-        watch(listener, 1, path) do
+        watch(listener, path) do
           mv 'a_directory', 'renamed'
         end
       end
@@ -510,15 +567,19 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
     it 'detects a removed directory' do
       fixtures do |path|
-        listener.should_receive(:on_change).once.with do |array|
-          array.should include(path, "#{path}/a_directory")
+        if options[:recursive]
+          listener.should_receive(:on_change).once.with([path], :recursive => true)
+        else
+          listener.should_receive(:on_change).once.with do |array, options|
+            array.should =~ [path, "#{path}/a_directory"]
+          end
         end
 
         mkdir 'a_directory'
         touch 'a_directory/a_file.rb'
         touch 'a_directory/b_file.rb'
 
-        watch(listener, 2, path) do
+        watch(listener, path) do
           rm_rf 'a_directory'
         end
       end
@@ -529,7 +590,7 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is created' do
       it "doesn't detects the added file" do
         fixtures do |path|
-          watch(listener, 1, path) do # The expected changes param is set to one!
+          watch(listener, path) do
             @adapter.paused = true
             touch 'new_file.rb'
           end
@@ -543,11 +604,13 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when files are added to one of multiple directories' do
       it 'detects added files' do
         fixtures(2) do |path1, path2|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include(path2)
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with([path2], :recursive => true)
+          else
+            listener.should_receive(:on_change).once.with([path2], {})
           end
 
-          watch(listener, 1, path1, path2) do
+          watch(listener, path1, path2) do
             touch "#{path2}/new_file.rb"
           end
         end
@@ -557,11 +620,17 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when files are added to multiple directories' do
       it 'detects added files' do
         fixtures(2) do |path1, path2|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include(path1, path2)
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with do |directories, options|
+              directories.should =~ [path1, path2] && options.should == {:recursive => true}
+            end
+          else
+            listener.should_receive(:on_change).once.with do |directories, options|
+              directories.should =~ [path1, path2] && options.should == {}
+            end
           end
 
-          watch(listener, 2, path1, path2) do
+          watch(listener, path1, path2) do
             touch "#{path1}/new_file.rb"
             touch "#{path2}/new_file.rb"
           end
@@ -572,15 +641,20 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'given a new and an existing directory on multiple directories' do
       it 'detects the added file' do
         fixtures(2) do |path1, path2|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include(path2, "#{path1}/a_directory", "#{path2}/b_directory")
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with do |directories, options|
+              directories.should =~ [path1, path2] && options.should == {:recursive => true}
+            end
+          else
+            listener.should_receive(:on_change).once.with do |directories, options|
+              directories.should =~ [path2, "#{path2}/b_directory", "#{path1}/a_directory"] && options.should == {}
+            end
           end
 
           mkdir "#{path1}/a_directory"
 
-          watch(listener, 3, path1, path2) do
+          watch(listener, path1, path2) do
             mkdir "#{path2}/b_directory"
-            # Needed for INotify
             sleep 0.05
             touch "#{path1}/a_directory/new_file.rb"
             touch "#{path2}/b_directory/new_file.rb"
@@ -592,15 +666,21 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is moved between the multiple watched directories' do
       it 'detects the movements of the file' do
         fixtures(3) do |path1, path2, path3|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include("#{path1}/from_directory", path2, "#{path3}/to_directory")
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with do |directories, options|
+              directories.should =~ [path1, path2, path3] && options.should == {:recursive => true}
+            end
+          else
+            listener.should_receive(:on_change).once.with do |directories, options|
+              directories.should =~ ["#{path1}/from_directory", path2, "#{path3}/to_directory"] && options.should == {}
+            end
           end
 
           mkdir "#{path1}/from_directory"
           touch "#{path1}/from_directory/move_me.txt"
           mkdir "#{path3}/to_directory"
 
-          watch(listener, 3, path1, path2, path3) do
+          watch(listener, path1, path2, path3) do
             mv "#{path1}/from_directory/move_me.txt", "#{path2}/move_me.txt"
             mv "#{path2}/move_me.txt", "#{path3}/to_directory/move_me.txt"
           end
@@ -611,14 +691,20 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when files are deleted from the multiple watched directories' do
       it 'detects the files removal' do
         fixtures(2) do |path1, path2|
-          listener.should_receive(:on_change).once.with do |array|
-            array.should include(path1, path2)
+          if options[:recursive]
+            listener.should_receive(:on_change).once.with do |directories, options|
+              directories.should =~ [path1, path2] && options.should == {:recursive => true}
+            end
+          else
+            listener.should_receive(:on_change).once.with do |directories, options|
+              directories.should =~ [path1, path2] && options.should == {}
+            end
           end
 
           touch "#{path1}/unnecessary.txt"
           touch "#{path2}/unnecessary.txt"
 
-          watch(listener, 2, path1, path2) do
+          watch(listener, path1, path2) do
             rm "#{path1}/unnecessary.txt"
             rm "#{path2}/unnecessary.txt"
           end
@@ -626,4 +712,5 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       end
     end
   end
+
 end