Merge pull request #700 from rstudio/aron-gitlab-subgroup

escape GitLab repositories, as they may have paths

NEWS.md

@@ -27,6 +27,7 @@
   it will either look for a `tar` binary on the `PATH` on Unix, or look for the
   system `tar` on Windows. If no binary is found in those locations, it will use
   R's internal `tar` implementation. (#648)
+- Allow GitLab downloads from repositories having paths (#699).
 - Update some RStudio references to Posit.
 
 # Packrat 0.8.1

R/available-updates.R

@@ -158,9 +158,9 @@ gitlabUpdates <- function(lib.loc = .libPaths()) {
     do.call(rbind, enumerate(DESCRIPTIONS, function(x) {
       url <- file.path("https://gitlab.com/",
                        "api/v4/projects/",
-                       paste0(x[, "RemoteUsername"],
-                              "%2F",
-                              x[, "RemoteRepo"]),
+                       URLencode(paste0(x[, "RemoteUsername"],
+                              "/",
+                              x[, "RemoteRepo"]), reserved = TRUE),
                        "repository",
                        "archive.tar.gz")
       response <- httr::GET(url)

R/gitlab.R

@@ -1,3 +1,4 @@
+
 # - Equivalent to other git provider download functions.
 # - Called by `getSourceForPkgRecord` (which manages the lifecycle of
 #   `destfile`). Responsible for dispatching different download implementations
@@ -67,11 +68,10 @@ gitlabArchiveUrl <- function(pkgRecord) {
     pkgRecord$remote_host <- "gitlab.com"
   }
 
-  fmt <- "%s/api/v4/projects/%s%%2F%s/repository/archive?sha=%s"
+  fmt <- "%s/api/v4/projects/%s/repository/archive?sha=%s"
   archiveUrl <- sprintf(fmt,
                         pkgRecord$remote_host,
-                        pkgRecord$remote_username,
-                        pkgRecord$remote_repo,
+                        URLencode(paste0(pkgRecord$remote_username, "/", pkgRecord$remote_repo), reserved = TRUE),
                         pkgRecord$remote_sha)
 
   protocol <- if (identical(method, "internal")) "http" else "https"

tests/testthat/test-gitlab.R

@@ -11,12 +11,29 @@ gitlab_pkg_record <- list(
   depends = list()
 )
 
+gitlab_subgroup_pkg_record <- list(
+  name = "museli",
+  source = "gitlab",
+  version = "0.1.0",
+  hash = "abc123",
+  remote_repo = "museli/strawberries",
+  remote_username = "breakfaster",
+  remote_ref = "HEAD",
+  remote_sha = "abcde12345",
+  remote_host = "gitlab.com",
+  depends = list()
+)
+
 test_that("gitlabArchiveUrl returns the correct URL", {
   mockery::stub(gitlabArchiveUrl, "secureDownloadMethod", "curl")
   expect_equal(
     gitlabArchiveUrl(gitlab_pkg_record),
     "https://gitlab.com/api/v4/projects/breakfaster%2Fmuseli/repository/archive?sha=abcde12345"
   )
+  expect_equal(
+    gitlabArchiveUrl(gitlab_subgroup_pkg_record),
+    "https://gitlab.com/api/v4/projects/breakfaster%2Fmuseli%2Fstrawberries/repository/archive?sha=abcde12345"
+  )
 })
 
 test_that("gitlabDownload calls renvDownload in the expected context", {