Merge pull request #313 from rubemz/bugfix/subpath-event-watcher

fix the listen watcher

Author: jonleighton

lib/spring/watcher/listen.rb

@@ -43,8 +43,8 @@ def changed(modified, added, removed)
 
       def base_directories
         ([root] +
-          files.reject       { |f| f.start_with? root }.map { |f| File.expand_path("#{f}/..") } +
-          directories.reject { |d| d.start_with? root }
+          files.reject       { |f| f.start_with? "#{root}/" }.map { |f| File.expand_path("#{f}/..") } +
+          directories.reject { |d| d.start_with? "#{root}/" }
         ).uniq
       end
     end

test/unit/watcher_test.rb

@@ -184,6 +184,27 @@ def watcher_class
       FileUtils.rmdir other_dir_2
     end
   end
+
+  test "root directories with a root subpath directory" do
+    begin
+      other_dir_1 = "#{dir}_other"
+      other_dir_2 = "#{dir}_core"
+      # same subpath as dir but with _other or _core appended
+      FileUtils::mkdir_p(other_dir_1)
+      FileUtils::mkdir_p(other_dir_2)
+      File.write("#{other_dir_1}/foo", "foo")
+      File.write("#{other_dir_2}/foo", "foo")
+      File.write("#{dir}/foo", "foo")
+
+      watcher.add "#{other_dir_1}/foo"
+      watcher.add other_dir_2
+
+      assert_equal [dir, other_dir_1, other_dir_2].sort, watcher.base_directories.sort
+    ensure
+      FileUtils.rmdir other_dir_1
+      FileUtils.rmdir other_dir_2
+    end
+  end
 end
 
 class PollingWatcherTest < ActiveSupport::TestCase