sass 3.3.0 → 3.3.1

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/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,39 @@ describe Listen::Adapter do
       end
     end
 
-    context "on Mac OX >= 10.6" do
-      before { Listen::Adapters::Darwin.stub(:usable_and_works?) { true } }
-
-      it "uses Listen::Adapters::Darwin" do
-        Listen::Adapters::Darwin.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
+    Listen::Adapter::OPTIMIZED_ADAPTERS.each do |adapter|
+      adapter_class = Listen::Adapters.const_get(adapter)
 
-    context "on Linux" do
-      before { Listen::Adapters::Linux.stub(:usable_and_works?) { true } }
+      context "on #{adapter}" do
+        before { adapter_class.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)
+        it "uses Listen::Adapters::#{adapter}" do
+          adapter_class.should_receive(:new).with('dir', {})
+          described_class.select_and_initialize('dir')
         end
-      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)
+        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 Windows" do
-      before { Listen::Adapters::Windows.stub(:usable_and_works?) { true } }
+  describe '.load_dependend_adapter' do
+    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)
 
-      it "uses Listen::Adapters::Windows" do
-        Listen::Adapters::Windows.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
+      described_class.load_dependent_adapter.should be_true
     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

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