Initial support for autocomplete of private sources - references #1298

fsprojects · Jan 16, 2016 · 154d5ad · 154d5ad
1 parent 2953930
commit 154d5ad
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,5 @@
 #### 2.44.4 - 16.01.2016
+* Initial support for autocomplete of private sources - https://github.com/fsprojects/Paket/issues/1298
 * Allow to set project url in paket pack
 
 #### 2.44.3 - 15.01.2016

diff --git a/integrationtests/Paket.IntegrationTests/AutocompleteSpecs.fs b/integrationtests/Paket.IntegrationTests/AutocompleteSpecs.fs
@@ -21,4 +21,19 @@ let ``#1298 should autocomplete for FAKE on NuGet 2``() =
 let ``#1298 should autocomplete for FAKE on NuGet3``() = 
     let result = Dependencies.FindPackagesByName([PackageSource.NuGetV3Source Constants.DefaultNuGetV3Stream],"fake")
     result |> shouldContain "FAKE"
-    result |> shouldContain "FAKE.IIS"
+    result |> shouldContain "FAKE.IIS"
+
+[<Test>]
+let ``#1298 should autocomplete for nunit on NuGet3``() = 
+    let result = Dependencies.FindPackagesByName([PackageSource.NuGetV3Source Constants.DefaultNuGetV3Stream],"nunit")
+    result |> shouldContain "NUnit.Runners"
+    result |> shouldContain "Cloak.NUnit"
+    result |> shouldContain "NUnit"
+
+[<Test>]
+[<Ignore>] // it's only wrking on forki's machine
+let ``#1298 should autocomplete for msu on local teamcity``() = 
+    let result = Dependencies.FindPackagesByName([PackageSource.NuGetV2Source "http://teamcity/guestAuth/app/nuget/v1/FeedService.svc/"],"msu")
+    result |> shouldContain "msu.Addins"
+
+
diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs
@@ -530,6 +530,25 @@ let getVersionsCached key f (source, auth, nugetURL, package) =
             | _ -> return None
     }
 
+/// Uses the NuGet v2 API to retrieve all packages with the given prefix.
+let FindPackages(auth, nugetURL, packageNamePrefix, maxResults) =
+    async {
+        try 
+            let url = sprintf "%s/Packages()?$filter=IsLatestVersion and IsAbsoluteLatestVersion and substringof('%s',Id)" nugetURL packageNamePrefix 
+            let! raw = getFromUrl(auth |> Option.map toBasicAuth,url,acceptXml)
+            let doc = XmlDocument()
+            doc.LoadXml raw
+            return
+                match doc |> getNode "feed" with
+                | Some n ->
+                    [| for entry in n |> getNodes "entry" do
+                        match (entry |> getNode "properties" |> optGetNode "Id") ++ (entry |> getNode "title") with
+                        | Some node -> yield node.InnerText
+                        | _ -> () |]
+                | _ ->  [||]
+        with _ -> return [||]
+    }
+
 /// Allows to retrieve all version no. for a package from the given sources.
 let GetVersions force root (sources, packageName:PackageName) = 
     let trial force =

diff --git a/src/Paket.Core/PublicAPI.fs b/src/Paket.Core/PublicAPI.fs
@@ -453,7 +453,11 @@ type Dependencies(dependenciesFileName: string) =
         |> Seq.distinct
         |> Seq.choose (fun source -> 
             match source with 
-            | NuGetV2 s -> Some(NuGetV3.FindPackages(s.Authentication, s.Url, searchTerm, maxResults))
+            | NuGetV2 s ->
+                if s.Url.Contains "nuget.org" || s.Url.Contains "myget.org" then
+                    Some(NuGetV3.FindPackages(s.Authentication, s.Url, searchTerm, maxResults))
+                else
+                    Some(NuGetV2.FindPackages(s.Authentication, s.Url, searchTerm, maxResults))
             | NuGetV3 s -> Some(NuGetV3.FindPackages(s.Authentication, s.Url, searchTerm, maxResults))
             | _ -> None)