Ignore whitespace after Additional_repositories

Fixes #251
r-lib · Apr 10, 2019 · 91c64b3 · 91c64b3
1 parent 2c5c036
commit 91c64b3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -22,6 +22,9 @@
 * remotes now understands the "standard" remote type, as produced by packages
   installed from CRAN using `pak` (#309)
 
+* Fix parsing of Additional_Repositories which have a leading newline
+  (@tmelliott, #251).
+
 * Fix return type of `install_remote()` when there is a circular dependency (#225)
 
 * `remote_package_name.github_remote()` now works properly on Windows (#248)

diff --git a/R/deps.R b/R/deps.R
@@ -451,7 +451,8 @@ has_additional_repositories <- function(pkg) {
 
 parse_additional_repositories <- function(pkg) {
   if (has_additional_repositories(pkg)) {
-    strsplit(pkg[["additional_repositories"]], "[,[:space:]]+")[[1]]
+
+    strsplit(trim_ws(pkg[["additional_repositories"]]), "[,[:space:]]+")[[1]]
   }
 }
 

diff --git a/inst/install-github.R b/inst/install-github.R
@@ -727,7 +727,8 @@ has_additional_repositories <- function(pkg) {
 
 parse_additional_repositories <- function(pkg) {
   if (has_additional_repositories(pkg)) {
-    strsplit(pkg[["additional_repositories"]], "[,[:space:]]+")[[1]]
+
+    strsplit(trim_ws(pkg[["additional_repositories"]]), "[,[:space:]]+")[[1]]
   }
 }
 

diff --git a/install-github.R b/install-github.R
@@ -727,7 +727,8 @@ has_additional_repositories <- function(pkg) {
 
 parse_additional_repositories <- function(pkg) {
   if (has_additional_repositories(pkg)) {
-    strsplit(pkg[["additional_repositories"]], "[,[:space:]]+")[[1]]
+
+    strsplit(trim_ws(pkg[["additional_repositories"]]), "[,[:space:]]+")[[1]]
   }
 }
 

diff --git a/tests/testthat/test-deps.R b/tests/testthat/test-deps.R
@@ -178,6 +178,17 @@ test_that("Additional_repositories field", {
     parse_additional_repositories(pkg),
     c("http://packages.ropensci.org", "http://foo.bar.com")
   )
+
+  pkg <- list(
+    additional_repositories = 
+      "\n  http://packages.ropensci.org, \nhttp://foo.bar.com"
+  )
+
+  expect_equal(
+    parse_additional_repositories(pkg),
+    c("http://packages.ropensci.org", "http://foo.bar.com")
+  )
+
 })
 
 test_that("update.package_deps", {