Skip to content

Allow to opt in to BindingRedirects - references #415 #436

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 6 commits into from
Dec 9, 2014
Merged

Allow to opt in to BindingRedirects - references #415 #436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7142d50
Allow to opt in to BindingRedirects - references #415
forki Dec 7, 2014
6b2b514
Parse Redirects option from DependenciesFile
forki Dec 8, 2014
8051b48
Write Redirects option into LockFile
forki Dec 9, 2014
1f014b7
Parse Redirects option from LockFile
forki Dec 9, 2014
b36f85e
Use the Redirects flag from the lockfile
forki Dec 9, 2014
f351a33
Describe redirects option in docs
forki Dec 9, 2014
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
Parse Redirects option from LockFile
  • Loading branch information
@forki
forki committed Dec 9, 2014
commit 1f014b766ff71a1210807256c361fe2997fc23a2
2 changes: 1 addition & 1 deletion src/Paket.Core/DependenciesFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ module DependenciesFileParser =
| [| _; projectSpec; fileSpec |] -> getParts projectSpec fileSpec
| _ -> failwithf "invalid http-reference specification:%s %s" Environment.NewLine trimmed

type ParserOption =
type private ParserOption =
| ReferencesMode of bool
| OmitContent of bool
| Redirects of bool
Expand Down
17 changes: 11 additions & 6 deletions src/Paket.Core/LockFile.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,11 @@ module LockFileParser =
SourceFiles : ResolvedSourceFile list
LastWasPackage : bool
Options: InstallOptions }

type private InstallOptionCase = StrictCase | OmitContentCase

type private ParserOption =
| ReferencesMode of bool
| OmitContent of bool
| Redirects of bool

let private (|Remote|NugetPackage|NugetDependency|SourceFile|RepositoryType|Blank|InstallOption|) (state, line:string) =
match (state.RepositoryType, line.Trim()) with
Expand All @@ -110,8 +113,9 @@ module LockFileParser =
| _, _ when String.IsNullOrWhiteSpace line -> Blank
| _, String.StartsWith "remote:" trimmed -> Remote(trimmed.Trim().Split(' ').[0])
| _, String.StartsWith "specs:" _ -> Blank
| _, String.StartsWith "REFERENCES:" trimmed -> InstallOption(StrictCase,trimmed.Trim() = "STRICT")
| _, String.StartsWith "CONTENT:" trimmed -> InstallOption(OmitContentCase,trimmed.Trim() = "NONE")
| _, String.StartsWith "REFERENCES:" trimmed -> InstallOption(ReferencesMode(trimmed.Trim() = "STRICT"))
| _, String.StartsWith "REDIRECTS:" trimmed -> InstallOption(Redirects(trimmed.Trim() = "ON"))
| _, String.StartsWith "CONTENT:" trimmed -> InstallOption(OmitContent(trimmed.Trim() = "NONE"))
| _, trimmed when line.StartsWith " " ->
let parts = trimmed.Split '('
NugetDependency (parts.[0].Trim(),parts.[1].Replace("(", "").Replace(")", "").Trim())
Expand All @@ -130,8 +134,9 @@ module LockFileParser =
match (state, line) with
| Remote(url) -> { state with RemoteUrl = Some url }
| Blank -> state
| InstallOption (StrictCase,mode) -> { state with Options = {state.Options with Strict = mode} }
| InstallOption (OmitContentCase,omit) -> { state with Options = {state.Options with OmitContent = omit} }
| InstallOption (ReferencesMode(mode)) -> { state with Options = {state.Options with Strict = mode} }
| InstallOption (Redirects(mode)) -> { state with Options = {state.Options with Redirects = mode} }
| InstallOption (OmitContent(omit)) -> { state with Options = {state.Options with OmitContent = omit} }
| RepositoryType repoType -> { state with RepositoryType = Some repoType }
| NugetPackage details ->
match state.RemoteUrl with
Expand Down
16 changes: 16 additions & 0 deletions tests/Paket.Tests/Lockfile/ParserSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,28 @@ let ``should parse strict lock file``() =
let packages = List.rev lockFile.Packages
packages.Length |> shouldEqual 6
lockFile.Options.Strict |> shouldEqual true
lockFile.Options.Redirects |> shouldEqual false

packages.[5].Source |> shouldEqual PackageSources.DefaultNugetSource
packages.[5].Name |> shouldEqual (PackageName "log4net")
packages.[5].Version |> shouldEqual (SemVer.Parse "1.1")
packages.[5].Dependencies |> shouldEqual (Set.ofList [PackageName "log", VersionRequirement.AllReleases, None])

let redirectsLockFile = """REDIRECTS: ON
NUGET
remote: https://nuget.org/api/v2
specs:
Castle.Windsor (2.1)
"""

[<Test>]
let ``should parse redirects lock file``() =
let lockFile = LockFileParser.Parse(toLines redirectsLockFile)
let packages = List.rev lockFile.Packages
packages.Length |> shouldEqual 1
lockFile.Options.Strict |> shouldEqual false
lockFile.Options.Redirects |> shouldEqual true

let dogfood = """NUGET
remote: https://nuget.org/api/v2
specs:
Expand Down