paket install correctly parses HTTP references - references #571

fsprojects · Feb 6, 2015 · 574ef30 · 574ef30
1 parent fce21c3
commit 574ef30
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 11 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,10 +1,11 @@
-#### 0.27.0-alpha005 - 03.02.2015
+#### 0.27.0-alpha006 - 03.02.2015
 * Allow to reference `.props` and `.targets` files - https://github.com/fsprojects/Paket/issues/516
 * Create a install function in the api which takes a `paket.dependencies` file as text - https://github.com/fsprojects/Paket/issues/576
 * Don't internalize in paket.exe during ILMerge
 * Allow to download from pre-authenticated MyGet feed - https://github.com/fsprojects/Paket/issues/466
 * BUGFIX: Fix `paket install --hard` for FSharp.Core - https://github.com/fsprojects/Paket/issues/579
-* BUGFIX: `paket convert-from-nuget]`` ignore case when looking for nuget.targets - https://github.com/fsprojects/Paket/issues/580
+* BUGFIX: `paket convert-from-nuget` ignores casing when looking for nuget.targets - https://github.com/fsprojects/Paket/issues/580
+* BUGFIX: `paket install` correctly parses HTTP references - https://github.com/fsprojects/Paket/pull/571
 * COSMETICS: Prerelease strings are checked if they contain operators
 
 #### 0.26.0 - 31.01.2015

diff --git a/src/Paket.Core/LockFile.fs b/src/Paket.Core/LockFile.fs
@@ -210,14 +210,22 @@ module LockFileParser =
                 | HttpLink x ->
                     match state.RemoteUrl |> Option.map(fun s -> s.Split '/' |> Array.toList) with
                     | Some [ protocol; _; domain; ] ->
+                        let name, path = 
+                            match details.Split ' ' with
+                            | [| filePath; path |] -> filePath, path |> removeBrackets
+                            | _ -> failwith "invalid file source details."
+
+                        let sourceFile =
+                            { Commit = String.Empty
+                              Owner = domain
+                              Origin = HttpLink(state.RemoteUrl.Value + path)
+                              Project = domain
+                              Dependencies = Set.empty
+                              Name = name } 
+
                         { state with  
                             LastWasPackage = false
-                            SourceFiles = { Commit = String.Empty
-                                            Owner = domain
-                                            Origin = HttpLink(state.RemoteUrl.Value)
-                                            Project = domain
-                                            Dependencies = Set.empty
-                                            Name = details } :: state.SourceFiles }
+                            SourceFiles = sourceFile :: state.SourceFiles }
                     | Some [ protocol; _; domain; project ] ->
                         { state with  
                             LastWasPackage = false
@@ -358,7 +366,12 @@ type LockFile(fileName:string,options,resolution:PackageResolution,remoteFiles:R
     /// Parses a paket.lock file from lines
     static member Parse(lockFileName,lines) : LockFile =        
         LockFileParser.Parse lines
-        |> fun state -> LockFile(lockFileName, state.Options ,state.Packages |> Seq.fold (fun map p -> Map.add (NormalizedPackageName p.Name) p map) Map.empty, List.rev state.SourceFiles)
+        |> fun state -> 
+            LockFile(
+                lockFileName, 
+                state.Options,
+                state.Packages |> Seq.fold (fun map p -> Map.add (NormalizedPackageName p.Name) p map) Map.empty, 
+                List.rev state.SourceFiles)
 
     member this.GetPackageHull(referencesFile:ReferencesFile) =
         let usedPackages = Dictionary<_,_>()

diff --git a/tests/Paket.Tests/Lockfile/ParserSpecs.fs b/tests/Paket.Tests/Lockfile/ParserSpecs.fs
@@ -267,6 +267,31 @@ let ``should parse simple http reference``() =
     references.[0].Name |> shouldEqual "ikvmbin-8.0.5449.0.zip"  
     references.[0].Origin |> shouldEqual (SingleSourceFileOrigin.HttpLink("http://www.frijters.net/ikvmbin-8.0.5449.0.zip"))
 
+
+let lockFileForStanfordNLPdotNET = """HTTP
+  remote: http://www.frijters.net
+  specs:
+    ikvmbin-8.0.5449.0.zip (/ikvmbin-8.0.5449.0.zip)
+  remote: http://nlp.stanford.edu
+  specs:
+    stanford-corenlp-full-2014-10-31.zip (/software/stanford-corenlp-full-2014-10-31.zip)
+    stanford-ner-2014-10-26.zip (/software/stanford-ner-2014-10-26.zip)
+    stanford-parser-full-2014-10-31.zip (/software/stanford-parser-full-2014-10-31.zip)
+    stanford-postagger-full-2014-10-26.zip (/software/stanford-postagger-full-2014-10-26.zip)
+    stanford-segmenter-2014-10-26.zip (/software/stanford-segmenter-2014-10-26.zip)"""
+
+[<Test>]
+let ``should parse lock file for http Stanford.NLP.NET project``() =
+    let lockFile = LockFileParser.Parse(toLines lockFileForStanfordNLPdotNET)
+    let references = lockFile.SourceFiles
+
+    references.Length |> shouldEqual 6
+
+    references.[0].Origin |> shouldEqual (SingleSourceFileOrigin.HttpLink("http://nlp.stanford.edu/software/stanford-segmenter-2014-10-26.zip"))
+    references.[0].Name |> shouldEqual "stanford-segmenter-2014-10-26.zip"  
+
+    ()
+
 let realWorldHTTP = """
 NUGET
   remote: https://nuget.org/api/v2
@@ -308,12 +333,20 @@ HTTP
   remote: http://www.w3.org/2013/N-QuadsTests/TESTS.zip
   specs:
     TESTS.zip
+  remote: https://gist.githubusercontent.com
+  specs:
+    paket.txt (/JonCanning/37769e635aaece6dcef3/raw/adffa54dd02f94e5b06667700ef44e1a5feded73/paket.txt)
 """
 
 [<Test>]
 let ``should parse real world http reference``() = 
     let lockFile = LockFileParser.Parse(toLines realWorldHTTP)
     let references = lockFile.SourceFiles
 
-    references.[0].Name |> shouldEqual "TESTS.zip"  
-    references.[0].Origin |> shouldEqual (SingleSourceFileOrigin.HttpLink("http://www.w3.org/2013/N-QuadsTests/TESTS.zip"))
+    references.Length |> shouldEqual 3
+
+    references.[0].Origin |> shouldEqual (SingleSourceFileOrigin.HttpLink("https://gist.githubusercontent.com/JonCanning/37769e635aaece6dcef3/raw/adffa54dd02f94e5b06667700ef44e1a5feded73/paket.txt"))
+    references.[0].Name |> shouldEqual "paket.txt"  
+
+    references.[1].Name |> shouldEqual "TESTS.zip"  
+    references.[1].Origin |> shouldEqual (SingleSourceFileOrigin.HttpLink("http://www.w3.org/2013/N-QuadsTests/TESTS.zip"))