Skip to content

Exclusion syntax for paket.template files #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 9 commits into from
Jun 22, 2015
Merged

Exclusion syntax for paket.template files #882

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d084448
Parses -- syntax to exclude file-patterns in paket.template files
devboy Jun 19, 2015
4919d36
Exclusion pattern starts with ! now
devboy Jun 19, 2015
dea44fd
Disallows space between ! and file pattern to exclude
devboy Jun 19, 2015
52bb9db
Respects file-exclusion filters during packaging
devboy Jun 20, 2015
06f3231
Adds test-data that was missing in template-parsing test
devboy Jun 20, 2015
409d36e
Handles drives, root and relative paths in exclusion pattern ('..','.…
devboy Jun 22, 2015
65e8edd
Splitting up exclusion pattern paths no considers other platform sepe…
devboy Jun 22, 2015
170fea9
Removes log-statements
devboy Jun 22, 2015
9b5c712
Adds documentation about exclusion patterns in template files.
devboy Jun 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Disallows space between ! and file pattern to exclude
  • Loading branch information
@devboy
devboy committed Jun 22, 2015
commit dea44fd69f6e1a266b0a7bec064704b3d7135ff5
10 changes: 4 additions & 6 deletions src/Paket.Core/TemplateFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,12 @@ module internal TemplateFile =

let private fromReg = Regex("from (?<from>.*)", RegexOptions.Compiled)
let private toReg = Regex("to (?<to>.*)", RegexOptions.Compiled)

let private fileExclusionChar = '!'
let private isFileExclusion (l:string) = l.Trim().StartsWith(fileExclusionChar.ToString())
let private isExclude = Regex("\s*!\S", RegexOptions.Compiled)

let private getFiles (map : Map<string, string>) =
Map.tryFind "files" map
|> Option.map (fun d -> d.Split '\n')
|> Option.map (Array.filter (fun l -> l |> isFileExclusion |> not))
|> Option.map (Array.filter (fun l -> l |> isExclude.IsMatch |> not))
|> Option.map
(Seq.map
(fun (line:string) ->
Expand All @@ -245,10 +243,10 @@ module internal TemplateFile =
let private getFileExcludes (map : Map<string, string>) =
Map.tryFind "files" map
|> Option.map (fun d -> d.Split '\n')
|> Option.map (Array.filter isFileExclusion)
|> Option.map (Array.filter isExclude.IsMatch)
|> Option.map
(Seq.map
(fun (line:string) -> line.Trim().TrimStart(fileExclusionChar)))
(fun (line:string) -> line.Trim().TrimStart('!')))
|> Option.map List.ofSeq
|> fun x -> defaultArg x []

Expand Down
25 changes: 25 additions & 0 deletions tests/Paket.Tests/TemplateFileParsing.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,31 @@ files
| [x] -> x |> shouldEqual "excludeDir"
| _ -> Assert.Fail()

[<Test>]
let ``disallow the space to avoid ambiguity in exclusion file pattern``() =
let text = """type file
id My.Thing
authors Bob McBob
description
A longer description
on two lines.
version
1.0
files
someDir
anotherDir ==> someLib
! excludeDir
"""
let sut =
TemplateFile.Parse("file1.template", None, strToStream text)
|> returnOrFail
|> function
| CompleteInfo (_, opt)
| ProjectInfo (_, opt) -> opt
match sut.FilesExcluded with
| [] -> Assert.Pass()
| _ -> Assert.Fail()

[<Literal>]
let ProjectType1 = """type project
"""
Expand Down