Merge branch 'dev'

Author: OlegZee

XakeLibTests/FilesetTests.fs

@@ -93,6 +93,12 @@ type FilesetTests() =
         fileNames |> List.iter System.Console.WriteLine
         Assert.That (fileNames, Is.All.EndsWith("rdl"))
 
+    [<Test (Description = "Verifies ls could search for directories")>]
+    member o.LsDirs() =
+
+        let files = ls "c:/*/" |> getFiles1 root1 @"c:\rpt"
+        Assert.That (files |> List.map name, Is.EquivalentTo (List.toSeq ["bak"; "rpt"; "jparsec"]))
+
     [<Test>]
     member o.Builder() =
         let fileset = fileset {

core/Fileset.fs

@@ -131,12 +131,7 @@ module Fileset =
             fsroot @ (Array.map mapPart parts |> List.ofArray) @ filepart
                 |> Pattern |> normalize
 
-        /// Parses file mask
-        let parseFileMask = parseDirFileMask false
-
-        /// Parses file mask
-        let parseDir = parseDirFileMask true
-        
+       
         let FileSystem = {
             GetDisk = fun d -> d + Path.DirectorySeparatorChar.ToString()
             GetDirRoot = fun x -> Directory.GetDirectoryRoot x
@@ -213,7 +208,7 @@ module Fileset =
 
         /// Returns true if a file name (parsedto p) matches specific file mask.            
         let matchesPattern (Pattern mask) file =
-            let (Pattern fileParts) = parseFileMask file in
+            let (Pattern fileParts) = (parseDirFileMask false) file in
             matchPathsImpl mask fileParts
 
         let private ifNone v2 = function | None -> v2 | Some v -> v
@@ -222,7 +217,7 @@ module Fileset =
         /// "Materializes" fileset to a filelist
         let scan fileSystem root (Fileset (options,filesetItems)) =
 
-            let startDirPat = options.BaseDir |> ifNone root |> parseDir
+            let startDirPat = options.BaseDir |> ifNone root |> parseDirFileMask true
             let startDir = startDirPat |> cd fileSystem "."
 
             // TODO check performance, build function
@@ -317,7 +312,8 @@ module Fileset =
     /// </summary>
     /// <param name="filePattern"></param>
     let ls (filePattern:FilePattern) =
-        Fileset (DefaultOptions, [filePattern |> parseFileMask |> Includes])
+        let parse = (filePattern.EndsWith ("/") || filePattern.EndsWith ("\\")) |> Impl.parseDirFileMask
+        Fileset (DefaultOptions, [filePattern |> parse |> Includes])
 
     /// <summary>
     /// Create a file set for specific file mask. The same as "ls"
@@ -355,7 +351,7 @@ module Fileset =
         // matches "src/**/*.cs" "c:\!\src\a\b\c.cs" -> true
 
         // TODO alternative implementation, convert pattern to a match function using combinators
-        Impl.matchesPattern <| joinPattern (parseDir rootPath) (parseFileMask filePattern)
+        Impl.matchesPattern <| joinPattern (parseDirMask rootPath) (parseFileMask filePattern)
 
     let FileSystem = Impl.FileSystem
 

docs/overview.md

@@ -286,11 +286,15 @@ In the sample above `cp` function ensures the source file is build before it's c
 
 ### Filesets
 
-### Internal functions
+* `getFiles` - (only allowed inside action) returns list of files specified by a fileset
+* `ls` - creates a fileset for specified file mask. In case mask ends with "/" or "\" it returns directory list
+
+File masks follow Ant/Fake rules.
+
+### Other functions
 
-* `need '['<targets...>']'`
 * `trace <level> <format> <args...>`
-* `getCtxOptions`
+* `getCtxOptions` - gets action context
 * `getVar <varname>` - gets the variable value (and records dependency!)
 * `getEnv <varname>` - gets environment variable (and records dependency!)
 * `alwaysRerun` - instructs Xake to rebuild the target even if dependencies are not changed

docs/todo.md

@@ -27,6 +27,7 @@
   * rule "Viewer" -> fun folder -> action {need [folder <\\> "bin" <\\> folder <.> "exe"]...}
 
 ## Done
+ * ls returns directory list in case it ends with "/" ("\")
  * MSBuild task
  * performance of rules lookup (takes 2s now)
  * FSC task (f# compiler), self bootstrap