Fix rtools_needed always returning custom

NEWS.md

@@ -1,6 +1,7 @@
 # pkgbuild (development version)
 
 * `compile_dll()` now supports automatic cpp11 registration if the package links to cpp11.
+* `rtools_needed` returns correct version instead of "custom" (@burgerga, #97)
 
 # pkgbuild 1.0.8
 

R/rtools.R

@@ -192,12 +192,13 @@ is.rtools <- function(x) inherits(x, "rtools")
 #'
 #' @keywords internal
 #' @export
-rtools_needed <- function() {
-  r_version <- getRversion()
+rtools_needed <- function(r_version = getRversion()) {
+  vi <- version_info
+  vi$custom <- NULL
 
-  for (i in rev(seq_along(version_info))) {
-    version <- names(version_info)[i]
-    info <- version_info[[i]]
+  for (i in rev(seq_along(vi))) {
+    version <- names(vi)[i]
+    info <- vi[[i]]
     ok <- r_version >= info$version_min && r_version <= info$version_max
     if (ok)
       return(paste("Rtools", version))

tests/testthat/test-rtools.r

@@ -23,3 +23,12 @@ test_that("has_rtools finds rtools", {
       expect_true(rtools_path() != "")
     }))
 })
+
+test_that("rtools_needed works", {
+  skip_if_not(is_windows())
+
+  # Test only frozen versions
+  expect_equal(rtools_needed("3.6.3"), "Rtools 3.5")
+  expect_equal(rtools_needed("2.9"), "Rtools 3.0")
+  expect_equal(rtools_needed("0.0.0"), "the appropriate version of Rtools")
+})