sass 3.1.16 → 3.1.17

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

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

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

@@ -1,21 +1,34 @@
 require 'spec_helper'
 
 describe Listen::DirectoryRecord do
-  let(:base_directory) { Dir.tmpdir }
+  let(:base_directory) { File.dirname(__FILE__) }
 
   subject { described_class.new(base_directory) }
 
+  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{(?:\.DS_Store)$}
+      )
+    end
+
+    it 'memoizes the generated results' do
+      described_class.generate_default_ignoring_patterns.should equal described_class.generate_default_ignoring_patterns
+    end
+  end
+
   describe '#initialize' do
     it 'sets the base directory' do
       subject.directory.should eq base_directory
     end
 
-    it 'sets the default ignored paths' do
-      subject.ignored_paths.should =~ described_class::DEFAULT_IGNORED_PATHS
+    it 'sets the default ignoring patterns' do
+      subject.ignoring_patterns.should =~ described_class.generate_default_ignoring_patterns
     end
 
-    it 'sets the default filters' do
-      subject.filters.should eq []
+    it 'sets the default filtering patterns' do
+      subject.filtering_patterns.should eq []
     end
 
     it 'raises an error when the passed path does not exist' do
@@ -29,39 +42,76 @@ describe Listen::DirectoryRecord do
 
   describe '#ignore' do
     it 'adds the passed paths to the list of ignoted paths in the record' do
-      subject.ignore('.old', '.pid')
-      subject.ignored_paths.should include('.old', '.pid')
+      subject.ignore(%r{^\.old/}, %r{\.pid$})
+      subject.ignoring_patterns.should include(%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.filters.should include(%r{\.(?:jpe?g|gif|png)}, %r{\.(?:mp3|ogg|a3c)})
+      subject.filtering_patterns.should include(%r{\.(?:jpe?g|gif|png)}, %r{\.(?:mp3|ogg|a3c)})
     end
   end
 
   describe '#ignored?' do
+    before { subject.stub(:relative_to_base) { |path| path } }
+
+    it 'tests paths relative to the base directory' do
+      subject.should_receive(:relative_to_base).with('file.txt')
+      subject.ignored?('file.txt')
+    end
+
+    it 'returns true when the passed path is a default ignored path' do
+      subject.ignored?('tmp/some_process.pid').should be_true
+      subject.ignored?('dir/.DS_Store').should be_true
+      subject.ignored?('.git/config').should be_true
+    end
+
+    it 'returns false when the passed path is not a default ignored path' do
+      subject.ignored?('nested/tmp/some_process.pid').should be_false
+      subject.ignored?('nested/.git').should be_false
+      subject.ignored?('dir/.DS_Store/file').should be_false
+      subject.ignored?('file.git').should be_false
+    end
+
     it 'returns true when the passed path is ignored' do
-      subject.ignore('.pid')
-      subject.ignored?('/tmp/some_process.pid').should be_true
+      subject.ignore(%r{\.pid$})
+      subject.ignored?('dir/some_process.pid').should be_true
     end
 
     it 'returns false when the passed path is not ignored' do
-      subject.ignore('.pid')
-      subject.ignored?('/tmp/some_file.txt').should be_false
+      subject.ignore(%r{\.pid$})
+      subject.ignored?('dir/some_file.txt').should be_false
     end
   end
 
-  describe '#filterd?' do
-    it 'returns true when the passed path is filtered' do
-      subject.filter(%r{\.(?:jpe?g|gif|png)})
-      subject.filtered?('/tmp/picture.jpeg').should be_true
+  describe '#filtered?' do
+    before { subject.stub(:relative_to_base) { |path| path } }
+
+    context 'when no filtering patterns are set' do
+      it 'returns true for any path' do
+        subject.filtered?('file.txt').should be_true
+      end
     end
 
-    it 'returns false when the passed path is not filtered' do
-      subject.filter(%r{\.(?:jpe?g|gif|png)})
-      subject.filtered?('/tmp/song.mp3').should be_false
+    context 'when filtering patterns are set' do
+      before { subject.filter(%r{\.(?:jpe?g|gif|png)}) }
+
+      it 'tests paths relative to the base directory' do
+        subject.should_receive(:relative_to_base).with('file.txt')
+        subject.filtered?('file.txt')
+      end
+
+      it 'returns true when the passed path is filtered' do
+        subject.filter(%r{\.(?:jpe?g|gif|png)})
+        subject.filtered?('dir/picture.jpeg').should be_true
+      end
+
+      it 'returns false when the passed path is not filtered' do
+        subject.filter(%r{\.(?:jpe?g|gif|png)})
+        subject.filtered?('dir/song.mp3').should be_false
+      end
     end
   end
 
@@ -89,7 +139,7 @@ describe Listen::DirectoryRecord do
           touch 'ignored_directory/file.txt'
 
           record = described_class.new(path)
-          record.ignore 'ignored_directory'
+          record.ignore %r{^ignored_directory/}
           record.build
 
           record.paths[path]['/a_ignored_directory'].should be_nil
@@ -103,7 +153,7 @@ describe Listen::DirectoryRecord do
           touch 'ignored_file.rb'
 
           record = described_class.new(path)
-          record.ignore 'ignored_file.rb'
+          record.ignore %r{^ignored_file.rb$}
           record.build
 
           record.paths[path]['ignored_file.rb'].should be_nil
@@ -134,6 +184,17 @@ describe Listen::DirectoryRecord do
     end
   end
 
+  describe '#relative_to_base' do
+    it 'removes the path of the base-directory from the passed path' do
+      path = 'dir/to/app/file.rb'
+      subject.relative_to_base(File.join(base_directory, path)).should eq path
+    end
+
+    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
+  end
+
   describe '#fetch_changes' do
     context 'with single file changes' do
       context 'when a file is created' do
@@ -211,7 +272,7 @@ describe Listen::DirectoryRecord do
                 fixtures do |path|
                   mkdir 'ignored_directory'
 
-                  modified, added, removed = changes(path, :ignore => 'ignored_directory', :recursive => true) do
+                  modified, added, removed = changes(path, :ignore => %r{^ignored_directory/}, :recursive => true) do
                     touch 'ignored_directory/new_file.rb'
                   end
 
@@ -225,7 +286,7 @@ describe Listen::DirectoryRecord do
                 fixtures do |path|
                   mkdir 'ignored_directory'
 
-                  modified, added, removed = changes(path, :paths => ["#{path}/ignored_directory"], :ignore => 'ignored_directory', :recursive => true) do
+                  modified, added, removed = changes(path, :paths => ["#{path}/ignored_directory"], :ignore => %r{^ignored_directory/}, :recursive => true) do
                     touch 'ignored_directory/new_file.rb'
                   end
 
@@ -253,6 +314,39 @@ describe Listen::DirectoryRecord do
             end
           end
         end
+
+        context 'given a directory with subdirectories' do
+          it 'detects the added file' do
+            fixtures do |path|
+              mkdir_p 'a_directory/subdirectory'
+
+              modified, added, removed = changes(path, :recursive => true) do
+                touch 'a_directory/subdirectory/new_file.rb'
+              end
+
+              added.should =~ %w(a_directory/subdirectory/new_file.rb)
+              modified.should be_empty
+              removed.should be_empty
+            end
+          end
+
+          context 'with an ignored directory' do
+            it "doesn't detect added files in neither the directory nor the subdirectory" do
+              fixtures do |path|
+                mkdir_p 'ignored_directory/subdirectory'
+
+                modified, added, removed = changes(path, :ignore => %r{^ignored_directory/}, :recursive => true) do
+                  touch 'ignored_directory/new_file.rb'
+                  touch 'ignored_directory/subdirectory/new_file.rb'
+                end
+
+                added.should be_empty
+                modified.should be_empty
+                removed.should be_empty
+              end
+            end
+          end
+        end
       end
 
       context 'when a file is modified' do
@@ -261,7 +355,7 @@ describe Listen::DirectoryRecord do
             touch 'existing_file.txt'
 
             modified, added, removed = changes(path) do
-              sleep 1.5 # make a diffrence in the mtime of the file
+              sleep 1.5 # make a difference in the mtime of the file
               touch 'existing_file.txt'
             end
 
@@ -272,13 +366,12 @@ describe Listen::DirectoryRecord do
         end
 
         context 'during the same second' do
-          before { ensure_same_second }
-
           it 'always detects the modified file the first time' do
             fixtures do |path|
               touch 'existing_file.txt'
 
               modified, added, removed = changes(path) do
+                small_time_difference
                 touch 'existing_file.txt'
               end
 
@@ -306,7 +399,7 @@ describe Listen::DirectoryRecord do
             end
           end
 
-          it "detects the modified file the second time if the content have changed" do
+          it 'detects the modified file the second time if the content have changed' do
             fixtures do |path|
               touch 'existing_file.txt'
 
@@ -315,6 +408,7 @@ describe Listen::DirectoryRecord do
               end
 
               modified, added, removed = changes(path, :use_last_record => true) do
+                small_time_difference
                 open('existing_file.txt', 'w') { |f| f.write('foo') }
               end
 
@@ -331,6 +425,7 @@ describe Listen::DirectoryRecord do
               touch '.hidden'
 
               modified, added, removed = changes(path) do
+                small_time_difference
                 touch '.hidden'
               end
 
@@ -345,7 +440,7 @@ describe Listen::DirectoryRecord do
           it 'does not detect the mode change' do
             fixtures do |path|
               touch 'run.rb'
-              sleep 1.5 # make a diffrence in the mtime of the file
+              sleep 1.5 # make a difference in the mtime of the file
 
               modified, added, removed = changes(path) do
                 chmod 0777, 'run.rb'
@@ -366,6 +461,7 @@ describe Listen::DirectoryRecord do
                 touch 'a_directory/existing_file.txt'
 
                 modified, added, removed = changes(path, :recursive => true) do
+                  small_time_difference
                   touch 'a_directory/existing_file.txt'
                 end
 
@@ -383,6 +479,7 @@ describe Listen::DirectoryRecord do
                 touch 'a_directory/existing_file.txt'
 
                 modified, added, removed = changes(path, :recursive => false) do
+                  small_time_difference
                   touch 'a_directory/existing_file.txt'
                 end
 
@@ -393,6 +490,43 @@ describe Listen::DirectoryRecord do
             end
           end
         end
+
+        context 'given a directory with subdirectories' do
+          it 'detects the modified file' do
+            fixtures do |path|
+              mkdir_p 'a_directory/subdirectory'
+              touch   'a_directory/subdirectory/existing_file.txt'
+
+              modified, added, removed = changes(path, :recursive => true) do
+                small_time_difference
+                touch 'a_directory/subdirectory/existing_file.txt'
+              end
+
+              added.should be_empty
+              modified.should =~ %w(a_directory/subdirectory/existing_file.txt)
+              removed.should be_empty
+            end
+          end
+
+          context 'with an ignored subdirectory' do
+            it "doesn't detect the modified files in neither the directory nor the subdirectory" do
+              fixtures do |path|
+                mkdir_p 'ignored_directory/subdirectory'
+                touch   'ignored_directory/existing_file.txt'
+                touch   'ignored_directory/subdirectory/existing_file.txt'
+
+                modified, added, removed = changes(path, :ignore => %r{^ignored_directory/}, :recursive => true) do
+                  touch 'ignored_directory/existing_file.txt'
+                  touch 'ignored_directory/subdirectory/existing_file.txt'
+                end
+
+                added.should be_empty
+                modified.should be_empty
+                removed.should be_empty
+              end
+            end
+          end
+        end
       end
 
       context 'when a file is moved' do
@@ -506,7 +640,43 @@ describe Listen::DirectoryRecord do
               end
             end
 
-            context 'with all paths are passed as params' do
+            context 'given a directory with subdirectories' do
+              it 'detects a file movement between two subdirectories' do
+                fixtures do |path|
+                  mkdir_p 'a_directory/subdirectory'
+                  mkdir_p 'b_directory/subdirectory'
+                  touch   'a_directory/subdirectory/move_me.txt'
+
+                  modified, added, removed = changes(path, :recursive => true) do
+                    mv 'a_directory/subdirectory/move_me.txt', 'b_directory/subdirectory'
+                  end
+
+                  added.should =~ %w(b_directory/subdirectory/move_me.txt)
+                  modified.should be_empty
+                  removed.should =~ %w(a_directory/subdirectory/move_me.txt)
+                end
+              end
+
+              context 'with an ignored subdirectory' do
+                it "doesn't detect the file movement between subdirectories" do
+                  fixtures do |path|
+                    mkdir_p 'a_ignored_directory/subdirectory'
+                    mkdir_p 'b_ignored_directory/subdirectory'
+                    touch   'a_ignored_directory/subdirectory/move_me.txt'
+
+                    modified, added, removed = changes(path, :ignore => %r{^(?:a|b)_ignored_directory/}, :recursive => true) do
+                      mv 'a_ignored_directory/subdirectory/move_me.txt', 'b_ignored_directory/subdirectory'
+                    end
+
+                    added.should be_empty
+                    modified.should be_empty
+                    removed.should be_empty
+                  end
+                end
+              end
+            end
+
+            context 'with all paths passed as params' do
               it 'detects the file movement into the directory' do
                 fixtures do |path|
                   mkdir 'a_directory'
@@ -635,6 +805,42 @@ describe Listen::DirectoryRecord do
             end
           end
         end
+
+        context 'given a directory with subdirectories' do
+          it 'detects the file removal in subdirectories' do
+            fixtures do |path|
+              mkdir_p 'a_directory/subdirectory'
+              touch   'a_directory/subdirectory/do_not_use.rb'
+
+              modified, added, removed = changes(path, :recursive => true) do
+                rm 'a_directory/subdirectory/do_not_use.rb'
+              end
+
+              added.should be_empty
+              modified.should be_empty
+              removed.should =~ %w(a_directory/subdirectory/do_not_use.rb)
+            end
+          end
+
+          context 'with an ignored subdirectory' do
+            it "doesn't detect files removals in neither the directory nor its subdirectories" do
+              fixtures do |path|
+                mkdir_p 'ignored_directory/subdirectory'
+                touch   'ignored_directory/do_not_use.rb'
+                touch   'ignored_directory/subdirectory/do_not_use.rb'
+
+                modified, added, removed = changes(path, :ignore => %r{^ignored_directory/}, :recursive => true) do
+                  rm 'ignored_directory/do_not_use.rb'
+                  rm 'ignored_directory/subdirectory/do_not_use.rb'
+                end
+
+                added.should be_empty
+                modified.should be_empty
+                removed.should be_empty
+              end
+            end
+          end
+        end
       end
     end
 
@@ -662,9 +868,9 @@ describe Listen::DirectoryRecord do
           mkdir 'a_directory'
           touch 'a_directory/a_file.rb'
           touch 'a_directory/b_file.rb'
-          sleep 1.5 # make files mtime old
 
           modified, added, removed = changes(path) do
+            small_time_difference
             touch 'b_file.rb'
             touch 'a_directory/a_file.rb'
           end
@@ -682,7 +888,6 @@ describe Listen::DirectoryRecord do
           mkdir 'a_directory'
           touch 'a_directory/a_file.rb'
           touch 'a_directory/b_file.rb'
-          sleep 1.5 # make files mtime old
 
           modified, added, removed = changes(path) do
             rm 'b_file.rb'
@@ -751,16 +956,16 @@ describe Listen::DirectoryRecord do
       context 'with nested paths' do
         it 'detects removals without crashing - #18' do
           fixtures do |path|
-            mkdir_p 'a_directory/b_directory'
-            touch 'a_directory/b_directory/do_not_use.rb'
+            mkdir_p 'a_directory/subdirectory'
+            touch   'a_directory/subdirectory/do_not_use.rb'
 
-            modified, added, removed = changes(path, :paths => [path, "#{path}/a_directory", "#{path}/b_directory"]) do
+            modified, added, removed = changes(path) do
               rm_r 'a_directory'
             end
 
             added.should be_empty
             modified.should be_empty
-            removed.should =~ %w(a_directory/b_directory/do_not_use.rb)
+            removed.should =~ %w(a_directory/subdirectory/do_not_use.rb)
           end
         end
       end
@@ -790,6 +995,7 @@ describe Listen::DirectoryRecord do
           touch 'b_file.rb'
 
           modified, added, removed = changes(path, :relative_paths => false) do
+            small_time_difference
             rm    'a_file.rb'
             touch 'b_file.rb'
             touch 'c_file.rb'