Merge pull request #782 from voiceofwisdom/watchchanges-pathfix

Fix for watching files via relative paths.

Author: forki

help/watch.md

@@ -14,7 +14,7 @@ Add a new target named "Watch" to your build:
     Target "Watch" (fun _ ->
         use watcher = !! "docs/**/*.*" |> WatchChanges (fun changes -> 
             tracefn "%A" changes
-            RunTarget "GenerateDocs"
+            Run "GenerateDocs"
         )
 
         System.Console.ReadLine() |> ignore //Needed to keep FAKE from exiting
@@ -34,7 +34,7 @@ If you need to watch only a subset of the files, say you want to rerun tests as
     Target "Watch" (fun _ ->
         use watcher = !! "tests/**/bin/debug/*.dll" |> WatchChanges (fun changes -> 
             tracefn "%A" changes
-            RunTarget "RunTests"
+            Run "RunTests"
         )
 
         System.Console.ReadLine() |> ignore //Needed to keep FAKE from exiting

src/app/FakeLib/Globbing/FileSystem.fs

@@ -24,15 +24,21 @@ type FileIncludes =
 
     /// Checks if a particular file is matched
     member this.IsMatch (path : string) =
+        let fullDir pattern = 
+            if Path.IsPathRooted(pattern) then
+                pattern
+            else
+                System.IO.Path.Combine(this.BaseDirectory, pattern)
+
         let included = 
             this.Includes
             |> Seq.exists(fun fileInclude ->
-                Globbing.isMatch fileInclude path
+                Globbing.isMatch (fullDir fileInclude) path
             )
         let excluded = 
             this.Excludes
-            |> Seq.exists(fun fileInclude ->
-                Globbing.isMatch fileInclude path
+            |> Seq.exists(fun fileExclude ->
+                Globbing.isMatch (fullDir fileExclude) path
             )
 
         included && not excluded

src/test/Test.FAKECore/Globbing/FileIncludesSpecs.cs

@@ -0,0 +1,58 @@
+using System.Linq;
+using Fake;
+using Machine.Specifications;
+using Test.FAKECore.FileHandling;
+
+namespace Test.FAKECore.Globbing
+{
+    public class when_matching_files_to_patterns_using_filesystem : BaseFunctions
+    {
+        static void IsMatch(string include, string[] files)
+        {
+            var fi = FileSystem.Include(include).SetBaseDirectory("/root");
+            foreach (var file in files)
+            {
+                fi.IsMatch(file).ShouldBeTrue();
+            }
+        }
+
+        static void IsMatchWithExclude(string include, string exclude, string[] files)
+        {
+            var fi = FileSystem.Include(include).ButNot(exclude).SetBaseDirectory("/root");
+            foreach (var file in files)
+            {
+                fi.IsMatch(file).ShouldBeTrue();
+            }
+        }
+
+        static void IsNotMatch(string include, string[] files)
+        {
+            var fi = FileSystem.Include(include).SetBaseDirectory("/root");
+            foreach (var file in files)
+            {
+                fi.IsMatch(file).ShouldBeFalse();
+            }
+        }
+
+        static void IsNotMatchWithExclude(string include, string exclude, string[] files)
+        {
+            var fi = FileSystem.Include(include).ButNot(exclude).SetBaseDirectory("/root");
+            foreach (var file in files)
+            {
+                fi.IsMatch(file).ShouldBeFalse();
+            }
+        }
+
+        It should_match =
+            () => IsMatch("foo.bar", new[] { "/root/foo.bar" });
+
+        It should_not_match =
+            () => IsNotMatch("foo.bar", new[] { "foo.bar", "/other/foo.bar" });
+
+        It should_match_absolute =
+            () => IsMatch("/other/**/*.*", new[] { "/other/foo.bar", "/other/sub/foo.bar" });
+
+        It should__not_match_absolute =
+            () => IsNotMatch("/other/**/*.*", new[] { "foo.bar", "sub/foo.bar" });
+    }
+}

src/test/Test.FAKECore/Test.FAKECore.csproj

@@ -71,6 +71,7 @@
     <Compile Include="FileHandling\CopyFileSpecs.cs" />
     <Compile Include="FixProjectFileSpecs.cs" />
     <Compile Include="CompareProjectFilesSpecs.cs" />
+    <Compile Include="Globbing\FileIncludesSpecs.cs" />
     <Compile Include="Globbing\GlobbingSpecs.cs" />
     <Compile Include="Globbing\SampeWithParens\SampleWithParensSpecs.cs" />
     <Compile Include="Globbing\TestSample7\CountersRegressionSpecs.cs" />