Merge pull request #320 from LoopPerfect/bugfix/gitlab-urls

njlr · web-flow · commit 0d76f14637f2 · 2019-02-25T21:33:13.000Z
* Fixes GitLab URLs
diff --git a/buckaroo/DefaultSourceExplorer.fs b/buckaroo/DefaultSourceExplorer.fs
@@ -142,6 +142,7 @@ type DefaultSourceExplorer (console : ConsoleManager, downloadManager : Download
 
   let fetchVersionsFromGit gitUrl = asyncSeq {
     let! refs = gitManager.FetchRefs gitUrl
+
     // Sem-vers
     yield!
       refs
@@ -256,7 +257,7 @@ type DefaultSourceExplorer (console : ConsoleManager, downloadManager : Download
         yield!
           fetchRevisionsFromGitVersion gitUrl version
           |> AsyncSeq.map (fun revision ->
-            PackageLocation.GitHub {
+            PackageLocation.GitLab {
               Package = gitLab;
               Revision = revision;
             }
@@ -266,7 +267,7 @@ type DefaultSourceExplorer (console : ConsoleManager, downloadManager : Download
         yield!
           fetchRevisionsFromGitVersion gitUrl version
           |> AsyncSeq.map (fun revision ->
-            PackageLocation.GitHub {
+            PackageLocation.BitBucket {
               Package = bitBucket;
               Revision = revision;
             }
diff --git a/buckaroo/GitManager.fs b/buckaroo/GitManager.fs
@@ -152,6 +152,7 @@ type GitManager (console : ConsoleManager, git : IGit, cacheDirectory : string)
           ((endTime-startTime).TotalSeconds.ToString("N3")|>info), LoggingLevel.Info)
       return refs
   }
+
   member this.getFile (url : string) (revision : Revision) (file : string) : Async<string> =
     async {
       let targetDirectory = cloneFolderName(url)

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ type GitManager (console : ConsoleManager, git : IGit, cacheDirectory : string)`
`152`	`152`	`((endTime-startTime).TotalSeconds.ToString("N3")\|>info), LoggingLevel.Info)`
`153`	`153`	`return refs`
`154`	`154`	`}`
	`155`	`+`
`155`	`156`	`member this.getFile (url : string) (revision : Revision) (file : string) : Async<string> =`
`156`	`157`	`async {`
`157`	`158`	`let targetDirectory = cloneFolderName(url)`