Detect the version of a GitHub gist correctly - fixes #499

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 0.20.14 - 02.01.2015
+* BUGFIX: Detect the version of a GitHub gist correctly - https://github.com/fsprojects/Paket/issues/499
+
 #### 0.20.13 - 02.01.2015
 * Do not fail on BadCrcException during unzip and only show a warning - https://github.com/fsprojects/Paket/issues/484
 

src/Paket.Core/LockFile.fs

@@ -111,7 +111,8 @@ module LockFileSerializer =
                     let path = file.Name.TrimStart '/'
                     match String.IsNullOrEmpty(file.Commit) with
                     | false -> yield sprintf "    %s (%s)" path file.Commit 
-                    | true -> yield sprintf "    %s" path 
+                    | true -> yield sprintf "    %s" path
+
                     for (PackageName name,v) in file.Dependencies do
                         let versionStr = 
                             let s = v.ToString()

src/Paket.Core/ModuleResolver.fs

@@ -34,23 +34,21 @@ type UnresolvedSourceFile =
             | Some commit -> sprintf "%s %s/%s:%s%s" link this.Owner this.Project commit name
             | None -> sprintf "%s %s/%s%s" link this.Owner this.Project name
 
-
-type ResolvedSourceFile =
+type ResolvedSourceFile = 
     { Owner : string
       Project : string
-      Name : string      
+      Name : string
       Commit : string
-      Dependencies : Set<PackageName*VersionRequirement>
-      Origin : SingleSourceFileOrigin
-      }
-    member this.FilePath = this.ComputeFilePath(this.Name)
+      Dependencies : Set<PackageName * VersionRequirement>
+      Origin : SingleSourceFileOrigin }
 
-    member this.ComputeFilePath(name:string) =
+    member this.FilePath = this.ComputeFilePath(this.Name)
+
+    member this.ComputeFilePath(name : string) = 
         let path = normalizePath (name.TrimStart('/'))
-
         let di = DirectoryInfo(Path.Combine(Constants.PaketFilesFolderName, this.Owner, this.Project, path))
         di.FullName
-
+    
     override this.ToString() = sprintf "%s/%s:%s %s" this.Owner this.Project this.Commit this.Name
 
 let private getCommit (file : UnresolvedSourceFile) = defaultArg file.Commit "master"

src/Paket.Core/RemoteDownload.fs

@@ -26,7 +26,8 @@ let getSHA1OfBranch origin owner project branch =
             let url = sprintf "https://api.github.com/gists/%s/%s" project branch
             let! document = getFromUrl(None, url)
             let json = JObject.Parse(document)
-            return json.["id"].ToString()
+            let latest = json.["history"].First.["version"]
+            return latest.ToString()
         | ModuleResolver.SingleSourceFileOrigin.HttpLink _ -> return ""
     }
 

src/Paket/Paket.fsproj

@@ -28,7 +28,7 @@
     <DocumentationFile>
     </DocumentationFile>
     <StartArguments>update -f</StartArguments>
-    <StartArguments>add nuget nhibernate</StartArguments>
+    <StartArguments>update -f</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>

tests/Paket.Tests/DependenciesFile/ParserSpecs.fs

@@ -306,6 +306,21 @@ let ``should read gist source file from config without quotes with file specs``(
             Origin = ModuleResolver.SingleSourceFileOrigin.GistLink
             Commit = None } ]
 
+[<Test>]
+let ``should read gist source file``() =
+    let config = """source https://www.nuget.org/api/v2
+
+nuget JetBrainsAnnotations.Fody
+
+gist misterx/5d9c6983004c1c9ec91f""" 
+    let dependencies = DependenciesFile.FromCode(config)
+    dependencies.RemoteFiles
+    |> shouldEqual
+        [ { Owner = "misterx"
+            Project = "5d9c6983004c1c9ec91f"
+            Name = "FULLPROJECT"
+            Origin = ModuleResolver.SingleSourceFileOrigin.GistLink
+            Commit = None } ]
 
 [<Test>]
 let ``should read http source file from config without quotes, parsing rules``() =