Minor improvement to installed package checks (#1348)

Fixes #1332

Author: hadley

DESCRIPTION

@@ -37,7 +37,7 @@ Imports:
     lifecycle,
     purrr,
     rappdirs,
-    rlang (>= 0.4.3),
+    rlang (>= 0.4.10),
     rprojroot (>= 1.2),
     rstudioapi,
     stats,

NEWS.md

@@ -1,5 +1,7 @@
 # usethis (development version)
 
+* All functions that require a package now ask you if you'd like to install it.
+
 `use_readme_rmd()`, `use_readme_md()`, `use_tidy_contributing()`, and `use_tidy_support()` use updated logic for determining the `OWNER/REPO` spec of the target repo (#1312).
 
 # usethis 2.0.0

R/helpers.R

@@ -27,11 +27,8 @@ use_dependency <- function(package, type, min_version = NULL) {
   stopifnot(is_string(package))
   stopifnot(is_string(type))
 
-  if (package != "R" && !is_installed(package)) {
-    ui_stop(c(
-      "{ui_value(package)} must be installed before you can ",
-      "take a dependency on it."
-    ))
+  if (package != "R") {
+    check_installed(package)
   }
 
   if (isTRUE(min_version)) {

R/roxygen.R

@@ -21,8 +21,10 @@ use_roxygen_md <- function() {
     if (!uses_git()) {
       ui_todo("Use git to ensure that you don't lose any data")
     }
+
+    check_installed("roxygen2md")
     ui_todo(
-      "Run {ui_code('roxygen2md::roxygen2md()')} to convert existing Rd markdown to RMarkdown"
+      "Run {ui_code('roxygen2md::roxygen2md()')} to convert existing Rd commands to RMarkdown"
     )
     ui_todo("Run {ui_code('devtools::document()')} when you're done.")
   }

R/utils.R

@@ -44,14 +44,12 @@ compact <- function(x) {
   x[!is_empty]
 }
 
-check_installed <- function(pkg) {
-  if (!is_installed(pkg)) {
-    ui_stop("Package {ui_value(pkg)} required. Please install before re-trying.")
-  }
-}
-
+# Needed for mocking
 is_installed <- function(pkg) {
-  requireNamespace(pkg, quietly = TRUE)
+  rlang::is_installed(pkg)
+}
+check_installed <- function(pkg) {
+  rlang::check_installed(pkg)
 }
 
 interactive <- function() {

tests/testthat/test-cpp11.R

@@ -10,7 +10,7 @@ test_that("use_cpp11() creates files/dirs, edits DESCRIPTION and .gitignore", {
   local_interactive(FALSE)
   with_mock(
     # Required to pass the check re: whether cpp11 is installed
-    is_installed = function(pkg) TRUE,
+    check_installed = function(pkg) TRUE,
     check_cpp_register_deps = function() invisible(),
     use_cpp11()
   )

tests/testthat/test-data-table.R

@@ -6,7 +6,7 @@ test_that("use_data_table() requires a package", {
 test_that("use_data_table() Imports data.table", {
   create_local_package()
   with_mock(
-    is_installed = function(pkg) TRUE,
+    check_installed = function(pkg) TRUE,
     use_data_table()
   )
   expect_match(desc::desc_get("Imports"), "data.table")

tests/testthat/test-lifecycle.R

@@ -1,7 +1,7 @@
 test_that("use_lifecycle() imports badges", {
   create_local_package()
   with_mock(
-    is_installed = function(pkg) TRUE,
+    check_installed = function(pkg) TRUE,
     use_lifecycle()
   )
   expect_proj_file("man", "figures", "lifecycle-stable.svg")

tests/testthat/test-pkgdown.R

@@ -7,7 +7,7 @@ test_that("use_pkgdown() creates and ignores the promised file/dir", {
   create_local_package()
   local_interactive(FALSE)
   with_mock(
-    is_installed = function(pkg) TRUE,
+    check_installed = function(pkg) TRUE,
     use_pkgdown()
   )
   expect_true(uses_pkgdown())
@@ -28,7 +28,7 @@ test_that("pkgdown_config_meta() returns a list", {
   create_local_package()
   local_interactive(FALSE)
   with_mock(
-    is_installed = function(pkg) TRUE,
+    check_installed = function(pkg) TRUE,
     use_pkgdown()
   )
   expect_equal(pkgdown_config_meta(), list())
@@ -43,7 +43,7 @@ test_that("pkgdown_url() returns correct data, warns if pedantic", {
   create_local_package()
   local_interactive(FALSE)
   with_mock(
-    is_installed = function(pkg) TRUE,
+    check_installed = function(pkg) TRUE,
     use_pkgdown()
   )
 

tests/testthat/test-rcpp.R

@@ -23,7 +23,7 @@ test_that("use_rcpp_armadillo() creates Makevars files and edits DESCRIPTION", {
   local_interactive(FALSE)
   with_mock(
     # Required to pass the check re: whether RcppArmadillo is installed
-    is_installed = function(pkg) TRUE,
+    check_installed = function(pkg) TRUE,
     use_rcpp_armadillo()
   )
   expect_match(desc::desc_get("LinkingTo"), "RcppArmadillo")
@@ -37,7 +37,7 @@ test_that("use_rcpp_eigen() edits DESCRIPTION", {
 
   with_mock(
     # Required to pass the check re: whether RcppEigen is installed
-    is_installed = function(pkg) TRUE,
+    check_installed = function(pkg) TRUE,
     use_rcpp_eigen()
   )
   expect_match(desc::desc_get("LinkingTo"), "RcppEigen")