sass 3.3.0 → 3.4.0

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

@@ -9,7 +9,7 @@ describe Listen::DirectoryRecord do
   describe '.generate_default_ignoring_patterns' do
     it 'creates regexp patterns from the default ignored directories and extensions' do
       described_class.generate_default_ignoring_patterns.should include(
-        %r{^(?:\.rbx|\.bundle|\.git|\.svn|log|tmp|vendor)/},
+        %r{^(?:\.rbx|\.bundle|\.git|\.svn|bundle|log|tmp|vendor)/},
         %r{(?:\.DS_Store)$}
       )
     end
@@ -24,6 +24,12 @@ describe Listen::DirectoryRecord do
       subject.directory.should eq base_directory
     end
 
+    it 'sets the base directory expanded' do
+      cd File.dirname(base_directory)
+      subject = described_class.new(File.basename(base_directory))
+      subject.directory.should eq base_directory
+    end
+
     it 'sets the default ignoring patterns' do
       subject.ignoring_patterns.should =~ described_class.generate_default_ignoring_patterns
     end
@@ -43,28 +49,31 @@ describe Listen::DirectoryRecord do
 
   describe '#ignore' do
     it 'adds the passed paths to the list of ignored paths in the record' do
-      subject.ignore(%r{^\.old/}, %r{\.pid$})
+      subject.ignore(%r{^\.old/}, %r{\.pid$}, nil)
       subject.ignoring_patterns.should include(%r{^\.old/}, %r{\.pid$})
+      subject.ignoring_patterns.should_not include(nil)
     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$}]
+      subject.ignore!(%r{^\.old/}, %r{\.pid$}, nil)
+      subject.ignoring_patterns.should eq [%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)})
+      subject.filter(%r{\.(?:jpe?g|gif|png)}, %r{\.(?:mp3|ogg|a3c)}, nil)
       subject.filtering_patterns.should include(%r{\.(?:jpe?g|gif|png)}, %r{\.(?:mp3|ogg|a3c)})
+      subject.filtering_patterns.should_not include(nil)
     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 have(2).regexps
       subject.filtering_patterns.should =~ [%r{\.(?:mp3|ogg|a3c)}, %r{\.(?:jpe?g|gif|png)}]
     end
   end
@@ -214,6 +223,21 @@ describe Listen::DirectoryRecord do
       subject.relative_to_base(File.join(base_directory, path))
     end
 
+    context 'when there are utf-8 chars in base directory' do
+      before do
+        fixtures do |path|
+          mkdir '目录'
+          @dir = described_class.new(path + '/目录')
+          @dir.build
+        end
+      end
+
+      it 'works' do
+        path = File.join @dir.directory, 'tmp/file.rb'
+        @dir.relative_to_base path
+      end
+    end
+
     context 'when containing regexp characters in the base directory' do
       before do
         fixtures do |path|
@@ -394,7 +418,7 @@ describe Listen::DirectoryRecord do
             touch 'existing_file.txt'
 
             modified, added, removed = changes(path) do
-              sleep 1.5 # make a difference in the mtime of the file
+              small_time_difference
               touch 'existing_file.txt'
             end
 
@@ -414,7 +438,7 @@ describe Listen::DirectoryRecord do
               touch 'existing_file.txt'
 
               modified, added, removed = changes(path) do
-                sleep 0.3 # make sure the mtime is changed a bit
+                small_time_difference
                 touch 'existing_file.txt'
               end
 
@@ -428,7 +452,7 @@ describe Listen::DirectoryRecord do
             # This issue was the result of checking a file for content changes when
             # the mtime and the checking time are the same. In this case there
             # is no checksum saved, so the file was reported as being changed.
-            it ' does not report any changes' do
+            it 'does not report any changes' do
               fixtures do |path|
                 touch 'a_file.rb'
 
@@ -441,34 +465,17 @@ describe Listen::DirectoryRecord do
             end
           end
 
-          it "doesn't detects the modified file the second time if the content haven't changed" do
-            fixtures do |path|
-              touch 'existing_file.txt'
-
-              changes(path) do
-                touch 'existing_file.txt'
-              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 '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
+                small_time_difference
                 touch 'existing_file.txt'
               end
 
@@ -482,16 +489,36 @@ describe Listen::DirectoryRecord do
             end
           end
 
-          it "doesn't detects the modified file the second time if just touched - #62" do
+          it "doesn't checksum the contents of local sockets (#85)", :unless => windows? do
+            require 'socket'
+            fixtures do |path|
+              Digest::SHA1.should_not_receive(:file)
+              socket_path = File.join(path, "unix_domain_socket")
+              server = UNIXServer.new(socket_path)
+              modified, added, removed = changes(path) do
+                t = Thread.new do
+                  client = UNIXSocket.new(socket_path)
+                  client.write("foo")
+                end
+                t.join
+              end
+              added.should be_empty
+              modified.should be_empty
+              removed.should be_empty
+            end
+          end
+
+          it "doesn't detects the modified file the second time if just touched - #62", :unless => described_class::HIGH_PRECISION_SUPPORTED 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
+                small_time_difference
                 open('existing_file.txt', 'w') { |f| f.write('foo') }
               end
 
@@ -508,9 +535,9 @@ describe Listen::DirectoryRecord do
           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
+                small_time_difference
                 touch 'existing_file.txt'
               end
 
@@ -518,23 +545,21 @@ describe Listen::DirectoryRecord do
             end
           end
 
-        it "deletes the path from the paths checksums" do
-          fixtures do |path|
-            touch 'unnecessary.txt'
+          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'
+              changes(path) do
+                @record.sha1_checksums["#{path}/unnecessary.txt"] = 'foo'
 
-              rm 'unnecessary.txt'
-            end
+                rm 'unnecessary.txt'
+              end
 
-            @record.sha1_checksums["#{path}/unnecessary.txt"].should be_nil
+              @record.sha1_checksums["#{path}/unnecessary.txt"].should be_nil
+            end
           end
         end
 
-
-        end
-
         context 'given a hidden file' do
           it 'detects the modified file' do
             fixtures do |path|
@@ -556,9 +581,9 @@ describe Listen::DirectoryRecord do
           it 'does not detect the mode change' do
             fixtures do |path|
               touch 'run.rb'
-              sleep 1.5 # make a difference in the mtime of the file
 
               modified, added, removed = changes(path) do
+                small_time_difference
                 chmod 0777, 'run.rb'
               end
 
@@ -985,9 +1010,8 @@ describe Listen::DirectoryRecord do
           touch 'a_directory/a_file.rb'
           touch 'a_directory/b_file.rb'
 
-          small_time_difference
-
           modified, added, removed = changes(path) do
+            small_time_difference
             touch 'b_file.rb'
             touch 'a_directory/a_file.rb'
           end
@@ -1022,16 +1046,18 @@ describe Listen::DirectoryRecord do
       it 'detects a moved directory' do
         fixtures do |path|
           mkdir 'a_directory'
+          mkdir 'a_directory/nested'
           touch 'a_directory/a_file.rb'
           touch 'a_directory/b_file.rb'
+          touch 'a_directory/nested/c_file.rb'
 
           modified, added, removed = changes(path) do
             mv 'a_directory', 'renamed'
           end
 
-          added.should =~ %w(renamed/a_file.rb renamed/b_file.rb)
+          added.should =~ %w(renamed/a_file.rb renamed/b_file.rb renamed/nested/c_file.rb)
           modified.should be_empty
-          removed.should =~ %w(a_directory/a_file.rb a_directory/b_file.rb)
+          removed.should =~ %w(a_directory/a_file.rb a_directory/b_file.rb a_directory/nested/c_file.rb)
         end
       end
 
@@ -1134,7 +1160,7 @@ describe Listen::DirectoryRecord do
           chmod 000, 'unreadable_file.txt'
 
           modified, added, removed = changes(path) do
-            sleep 1.1
+            small_time_difference
             touch 'unreadable_file.txt'
           end
 
@@ -1171,22 +1197,21 @@ describe Listen::DirectoryRecord do
         # change event is tracked, but before the hash is calculated
         Digest::SHA1.should_receive(:file).twice.and_raise(Errno::ENOENT)
 
-        lambda {
-          fixtures do |path|
-            file = 'removed_file.txt'
-            touch file
-            changes(path) { touch file }
-          end
-        }.should_not raise_error(Errno::ENOENT)
+        fixtures do |path|
+          lambda {
+            touch 'removed_file.txt'
+            changes(path) { touch 'removed_file.txt' }
+          }.should_not raise_error
+        end
       end
     end
 
-    context 'within a directory containing a unix domain socket file' do
+    context 'within a directory containing a unix domain socket file', :unless => windows? 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)
+          lambda { changes(path){} }.should_not raise_error
         end
       end
     end

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 }