sass 3.3.0 → 3.3.1

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

@@ -1,64 +1,131 @@
 require 'spec_helper'
 
 describe Listen::Listener do
-  let(:adapter)           { mock(Listen::Adapter, :start => true).as_null_object }
-  let(:watched_directory) { File.dirname(__FILE__) }
-
-  subject { described_class.new(watched_directory) }
+  let(:adapter)             { double(Listen::Adapter, :start => true).as_null_object }
+  let(:watched_directories) { [File.dirname(__FILE__), File.expand_path('../..', __FILE__)] }
 
   before do
     Listen::Adapter.stub(:select_and_initialize) { adapter }
     # Don't build a record of the files inside the base directory.
-    subject.directory_record.stub(:build)
+    Listen::DirectoryRecord.any_instance.stub(:build)
+    Kernel.stub(:warn)
   end
+  subject { described_class.new(watched_directories) }
 
   it_should_behave_like 'a listener to changes on a file-system'
 
   describe '#initialize' do
-    context 'with no options' do
-      it 'sets the directory' do
-        subject.directory.should eq watched_directory
+    context 'listening to a single directory' do
+      let(:watched_directory)   { File.dirname(__FILE__) }
+      let(:watched_directories) { nil }
+      subject { described_class.new(watched_directory) }
+
+      it 'sets the directories' do
+        subject.directories.should eq [watched_directory]
       end
 
-      it 'converts the passed path into an absolute path - #21' do
-        described_class.new(File.join(watched_directory, '..')).directory.should eq File.expand_path('..', watched_directory)
+      context 'with no options' do
+        it 'sets the option for using relative paths in the callback to false' do
+          subject.instance_variable_get(:@use_relative_paths).should eq false
+        end
+      end
+
+      context 'with :relative_paths => false' do
+        it 'sets the option for using relative paths in the callback to false' do
+          listener = described_class.new(watched_directory, :relative_paths => false)
+          listener.instance_variable_get(:@use_relative_paths).should eq false
+        end
+      end
+
+      context 'with :relative_paths => true' do
+        it 'sets the option for using relative paths in the callback to true' do
+          listener = described_class.new(watched_directory, :relative_paths => true)
+          listener.instance_variable_get(:@use_relative_paths).should eq true
+        end
+      end
+    end
+
+    context 'listening to multiple directories' do
+      subject { described_class.new(watched_directories) }
+
+      it 'sets the directories' do
+        subject.directories.should eq watched_directories
+      end
+
+      context 'with no options' do
+        it 'sets the option for using relative paths in the callback to false' do
+          subject.instance_variable_get(:@use_relative_paths).should eq false
+        end
+      end
+
+      context 'with :relative_paths => false' do
+        it 'sets the option for using relative paths in the callback to false' do
+          listener = described_class.new(watched_directories, :relative_paths => false)
+          listener.instance_variable_get(:@use_relative_paths).should eq false
+        end
+      end
+
+      context 'with :relative_paths => true' do
+        it 'warns' do
+          Kernel.should_receive(:warn).with("[Listen warning]: #{Listen::Listener::RELATIVE_PATHS_WITH_MULTIPLE_DIRECTORIES_WARNING_MESSAGE}")
+          listener = described_class.new(watched_directories, :relative_paths => true)
+        end
+
+        it 'sets the option for using relative paths in the callback to false' do
+          listener = described_class.new(watched_directories, :relative_paths => true)
+          listener.instance_variable_get(:@use_relative_paths).should eq false
+        end
       end
+    end
 
-      it 'sets the option for using relative paths in the callback to the default one' do
-        subject.instance_variable_get(:@use_relative_paths).should eq described_class::DEFAULT_TO_RELATIVE_PATHS
+    context 'with a directory' do
+      let(:watched_directory)   { File.dirname(__FILE__) }
+      it 'converts the passed path into an absolute path - #21' do
+        described_class.new(File.join(watched_directory, '..')).directories.should eq [File.expand_path('..', watched_directory)]
       end
     end
 
     context 'with custom options' do
-      subject { described_class.new(watched_directory, :ignore => /\.ssh/, :filter => [/.*\.rb/,/.*\.md/],
-                                    :latency => 0.5, :force_polling => true, :relative_paths => true) }
+      let(:watched_directory)   { File.dirname(__FILE__) }
+      let(:adapter_class) { double('adapter class') }
 
-      it 'passes the custom ignored paths to the directory record' do
-        subject.directory_record.ignoring_patterns.should include /\.ssh/
+      let(:options) do
+        {
+          :ignore => /\.ssh/, :filter => [/.*\.rb/, /.*\.md/],
+          :latency => 0.5, :force_polling => true, :relative_paths => true,
+          :force_adapter => adapter_class
+        }
       end
+      subject { described_class.new(watched_directory, options) }
 
-      it 'passes the custom filters to the directory record' do
-        subject.directory_record.filtering_patterns.should =~  [/.*\.rb/,/.*\.md/]
+      it 'passes the custom ignored paths to the directory record' do
+        subject.directories_records.each do |directory_record|
+          directory_record.ignoring_patterns.should include /\.ssh/
+        end
       end
 
-      it 'sets the cutom option for using relative paths in the callback' do
-        subject.instance_variable_get(:@use_relative_paths).should be_true
+      it 'passes the custom filters to the directory record' do
+        subject.directories_records.each do |directory_record|
+          directory_record.filtering_patterns.should =~  [/.*\.rb/,/.*\.md/]
+        end
       end
 
       it 'sets adapter_options' do
-        subject.instance_variable_get(:@adapter_options).should eq(:latency => 0.5, :force_polling => true)
+        subject.instance_variable_get(:@adapter_options).should eq(:latency => 0.5, :force_polling => true, :force_adapter => adapter_class)
       end
     end
   end
 
   describe '#start' do
     it 'selects and initializes an adapter' do
-      Listen::Adapter.should_receive(:select_and_initialize).with(watched_directory, {}) { adapter }
+      Listen::Adapter.should_receive(:select_and_initialize).with(watched_directories, {}) { adapter }
       subject.start
     end
 
     it 'builds the directory record' do
-      subject.directory_record.should_receive(:build)
+      subject.directories_records.each do |directory_record|
+        directory_record.should_receive(:build)
+      end
       subject.start
     end
   end
@@ -71,7 +138,9 @@ describe Listen::Listener do
 
     describe '#unpause' do
       it 'rebuilds the directory record' do
-        subject.directory_record.should_receive(:build)
+        subject.directories_records.each do |directory_record|
+          directory_record.should_receive(:build)
+        end
         subject.unpause
       end
     end
@@ -79,33 +148,40 @@ describe Listen::Listener do
 
   describe '#ignore'do
     it 'delegates the work to the directory record' do
-      subject.directory_record.should_receive(:ignore).with 'some_directory'
+      subject.directories_records.each do |directory_record|
+        directory_record.should_receive(:ignore).with 'some_directory'
+      end
       subject.ignore 'some_directory'
     end
   end
 
   describe '#ignore!'do
     it 'delegates the work to the directory record' do
-      subject.directory_record.should_receive(:ignore!).with 'some_directory'
+      subject.directories_records.each do |directory_record|
+        directory_record.should_receive(:ignore!).with 'some_directory'
+      end
       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$/
+      subject.directories_records.each do |directory_record|
+        directory_record.should_receive(:filter).with /\.txt$/
+      end
       subject.filter /\.txt$/
     end
   end
 
   describe '#filter!' do
     it 'delegates the work to the directory record' do
-      subject.directory_record.should_receive(:filter!).with /\.txt$/
+      subject.directories_records.each do |directory_record|
+        directory_record.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 => []} }
@@ -113,23 +189,32 @@ describe Listen::Listener do
 
     before do
       @called = false
-      subject.directory_record.stub(:fetch_changes => changes)
+      subject.stub(:fetch_records_changes => changes)
     end
 
-    it 'fetches the changes of the directory record' do
-      subject.directory_record.should_receive(:fetch_changes).with(
-        directories, hash_including(:relative_paths => described_class::DEFAULT_TO_RELATIVE_PATHS)
-      )
+    it 'fetches the changes of all directories records' do
+      subject.unstub(:fetch_records_changes)
+
+      subject.directories_records.each do |record|
+        record.should_receive(:fetch_changes).with(directories, an_instance_of(Hash)).and_return(changes)
+      end
       subject.on_change(directories)
     end
 
-    context 'with relative paths option set to true' do
-      subject { described_class.new(watched_directory, :relative_paths => true) }
+    context "with a callback raising an exception" do
+      let(:callback) { Proc.new { raise 'foo' } }
+
+      before do
+        subject.change(&callback)
+        subject.stub(:fetch_records_changes => { :modified => ['foo'], :added => [], :removed => [] } )
+      end
 
-      it 'fetches the changes of the directory record' do
-        subject.directory_record.should_receive(:fetch_changes).with(directories, hash_including(:relative_paths => true))
+      it "stops the adapter and warns" do
+        Kernel.should_receive(:warn).with("[Listen warning]: Change block raise an execption: foo")
+        Kernel.should_receive(:warn).with(/^Backtrace:.*/)
         subject.on_change(directories)
       end
+
     end
 
     context 'with no changes to report' do
@@ -149,7 +234,11 @@ describe Listen::Listener do
     end
 
     context 'with changes to report' do
-      let(:changes)     { {:modified => %w{path1}, :added => [], :removed => %w{path2}} }
+      let(:changes) do
+        {
+          :modified => %w{path1}, :added => [], :removed => %w{path2}
+        }
+      end
 
       if RUBY_VERSION[/^1.8/]
         it 'runs the callback passing it the changes' do

data/vendor/listen/spec/listen_spec.rb

@@ -2,21 +2,20 @@ require 'spec_helper'
 
 describe Listen do
   describe '#to' do
-    context 'with one path to listen to' do
-      let(:listener)       { mock(Listen::Listener) }
-      let(:listener_class) { Listen::Listener }
-
-      before { listener_class.stub(:new => listener) }
+    let(:listener)       { double(Listen::Listener) }
+    let(:listener_class) { Listen::Listener }
+    before { listener_class.stub(:new => listener) }
 
+    context 'with one path to listen to' do
       context 'without options' do
-        it 'creates an instance of Listner' do
+        it 'creates an instance of Listener' do
           listener_class.should_receive(:new).with('/path')
           described_class.to('/path')
         end
       end
 
       context 'with options' do
-        it 'creates an instance of Listner with the passed params' do
+        it 'creates an instance of Listener with the passed params' do
           listener_class.should_receive(:new).with('/path', :filter => '**/*')
           described_class.to('/path', :filter => '**/*')
         end
@@ -29,7 +28,7 @@ describe Listen do
       end
 
       context 'with a block' do
-        it 'starts the listner after creating it' do
+        it 'starts the listener after creating it' do
           listener.should_receive(:start)
           described_class.to('/path', :filter => '**/*') { |modified, added, removed| }
         end
@@ -37,34 +36,29 @@ describe Listen do
     end
 
     context 'with multiple paths to listen to' do
-      let(:multi_listener)       { mock(Listen::MultiListener) }
-      let(:multi_listener_class) { Listen::MultiListener }
-
-      before { multi_listener_class.stub(:new => multi_listener) }
-
       context 'without options' do
-        it 'creates an instance of MultiListner' do
-          multi_listener_class.should_receive(:new).with('path1', 'path2')
+        it 'creates an instance of Listener' do
+          listener_class.should_receive(:new).with('path1', 'path2')
           described_class.to('path1', 'path2')
         end
       end
 
       context 'with options' do
-        it 'creates an instance of MultiListner with the passed params' do
-          multi_listener_class.should_receive(:new).with('path1', 'path2', :filter => '**/*')
+        it 'creates an instance of Listener with the passed params' do
+          listener_class.should_receive(:new).with('path1', 'path2', :filter => '**/*')
           described_class.to('path1', 'path2', :filter => '**/*')
         end
       end
 
       context 'without a block' do
-        it 'returns a MultiListener instance created with the passed params' do
-          described_class.to('path1', 'path2', :filter => '**/*').should eq multi_listener
+        it 'returns a Listener instance created with the passed params' do
+          described_class.to('path1', 'path2', :filter => '**/*').should eq listener
         end
       end
 
       context 'with a block' do
-        it 'starts a MultiListener instance after creating it with the passed params' do
-          multi_listener.should_receive(:start)
+        it 'starts a Listener instance after creating it with the passed params' do
+          listener.should_receive(:start)
           described_class.to('path1', 'path2', :filter => '**/*') { |modified, added, removed| }
         end
       end

data/vendor/listen/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+require 'rubygems'
+require 'coveralls'
+Coveralls.wear!
+
 require 'listen'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

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

@@ -4,13 +4,24 @@
 # @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)
+  sleep 0.05 # allow file/creation to be done (!)
+
+  callback = lambda do |changed_directories, options|
+    @called = true
+    listener.on_change(changed_directories)
+  end
+  @adapter = Listen::Adapter.select_and_initialize(paths, { :latency => test_latency }, &callback)
+  @adapter.stub(:start_poller) { nil }
 
   forced_stop = false
-  prevent_deadlock = Proc.new { sleep(10); puts "Forcing stop"; @adapter.stop; forced_stop = true }
+  prevent_deadlock = lambda do
+    sleep(10)
+    puts 'Forcing stop'
+    @adapter.stop
+    forced_stop = true
+  end
 
-  @adapter.start(false)
+  @adapter.start
 
   yield
 
@@ -32,25 +43,51 @@ shared_examples_for 'a filesystem adapter' do
   subject { described_class.new(File.dirname(__FILE__), &Proc.new {}) }
 
   describe '#start' do
+    before { Kernel.stub(:warn) }
     after { subject.stop }
 
-    context 'with the blocking param set to true' do
-      it 'blocks the current thread after starting the workers' do
+    it 'do not block the current thread after starting the workers' do
+      @called = false
+      t = Thread.new { subject.start; @called = true }
+      sleep(test_latency * 3)
+      Thread.kill(t) if t
+      @called.should be_true
+    end
+
+    context 'with the blocking hash option set to false' do
+      subject { described_class.new(File.dirname(__FILE__), { :blocking => false }, &Proc.new {}) }
+
+      it 'does not block the current thread after starting the workers' do
         @called = false
-        t = Thread.new { subject.start(true); @called = true }
+        t = Thread.new { subject.start; @called = true }
         sleep(test_latency * 3)
         Thread.kill(t) if t
-        @called.should be_false
+        @called.should be_true
       end
     end
+  end
 
-    context 'with the blocking param set to false' do
-      it 'does not block the current thread after starting the workers' do
+  describe '#start!' do
+    before { Kernel.stub(:warn) }
+    after { subject.stop }
+
+    it 'blocks the current thread after starting the workers' do
+      @called = false
+      t = Thread.new { subject.start!; @called = true }
+      sleep(test_latency * 3)
+      Thread.kill(t) if t
+      @called.should be_false
+    end
+
+    context 'with the blocking hash option set to false' do
+      subject { described_class.new(File.dirname(__FILE__), { :blocking => true }, &Proc.new {}) }
+
+      it 'blocks the current thread after starting the workers' do
         @called = false
-        t = Thread.new { subject.start(false); @called = true }
+        t = Thread.new { subject.start!; @called = true }
         sleep(test_latency * 3)
         Thread.kill(t) if t
-        @called.should be_true
+        @called.should be_false
       end
     end
   end
@@ -63,7 +100,7 @@ shared_examples_for 'a filesystem adapter' do
     end
 
     context 'with a stopped adapter' do
-      before { subject.start(false); subject.stop }
+      before { subject.start; subject.stop }
 
       it 'returns false' do
         subject.should_not be_started
@@ -71,7 +108,7 @@ shared_examples_for 'a filesystem adapter' do
     end
 
     context 'with a started adapter' do
-      before { subject.start(false) }
+      before { subject.start }
       after  { subject.stop }
 
       it 'returns true' do
@@ -83,7 +120,7 @@ end
 
 shared_examples_for 'an adapter that call properly listener#on_change' do |*args|
   options = (args.first && args.first.is_a?(Hash)) ? args.first : {}
-  let(:listener) { mock(Listen::Listener) }
+  let(:listener) { double(Listen::Listener) }
   before { described_class.stub(:works?) { true } }
 
   context 'single file operations' do