Use rlang to check if required package versions are installed

DESCRIPTION

@@ -19,6 +19,7 @@ Imports:
     jsonlite,
     openssl (>= 2.0.0),
     packrat (>= 0.6),
+    rlang (>= 1.0.0),
     rstudioapi (>= 0.5),
     tools,
     yaml (>= 2.1.5)
@@ -38,7 +39,7 @@ Suggests:
     withr
 License: GPL-2
 Encoding: UTF-8
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.3
 Roxygen: list(markdown = TRUE)
 URL: https://github.com/rstudio/rsconnect
 BugReports: https://github.com/rstudio/rsconnect/issues

NAMESPACE

@@ -49,6 +49,7 @@ export(tasks)
 export(terminateApp)
 export(unsetProperty)
 export(writeManifest)
+import(rlang)
 importFrom(stats,na.omit)
 importFrom(stats,setNames)
 importFrom(utils,available.packages)

R/bundle.R

@@ -839,11 +839,6 @@ validatePackageSource <- function(pkg) {
   return()
 }
 
-hasRequiredDevtools <- function() {
-  "devtools" %in% .packages(all.available = TRUE) &&
-    packageVersion("devtools") > "1.3"
-}
-
 preservePackageDescriptions <- function(bundleDir) {
   # Copy all the DESCRIPTION files we're relying on into packrat/desc.
   # That directory will contain one file for each package, e.g.
@@ -1111,7 +1106,6 @@ snapshotRDependencies <- function(appDir, implicit_dependencies = c(), verbose =
 }
 
 addPackratSnapshot <- function(bundleDir, implicit_dependencies = c(), verbose = FALSE) {
-
   logger <- verboseLogger(verbose)
 
   # if we discovered any extra dependencies, write them to a file for packrat to
@@ -1134,16 +1128,6 @@ addPackratSnapshot <- function(bundleDir, implicit_dependencies = c(), verbose =
     }, add = TRUE)
   }
 
-  # ensure we have an up-to-date packrat lockfile
-  packratVersion <- packageVersion("packrat")
-  requiredVersion <- "0.4.6"
-  if (packratVersion < requiredVersion) {
-    stop("rsconnect requires version '", requiredVersion, "' of Packrat; ",
-         "you have version '", packratVersion, "' installed.\n",
-         "Please install the latest version of Packrat from CRAN with:\n- ",
-         "install.packages('packrat', type = 'source')")
-  }
-
   # generate the packrat snapshot
   logger("Starting to perform packrat snapshot")
   tryCatch({

R/deployAPI.R

@@ -16,11 +16,12 @@
 #' @export
 deployAPI <- function(api,
                       ...) {
-  if (!requireNamespace("plumber") ||
-      packageVersion("plumber") < "0.3.2") {
-    stop("Version 0.3.2 or later of the plumber package is required to ",
-         "deploy plumber APIs.")
-  }
+  check_installed(
+    "plumber",
+    version = "0.3.2",
+    reason = "to deploy plumber APIs"
+  )
+
   if (!file.exists(api)) {
     stop("The api at '", api, "' does not exist.")
   }

R/deployDoc.R

@@ -23,15 +23,16 @@
 #' @family Deployment functions
 #' @export
 deployDoc <- function(doc, ...) {
+  check_installed(
+    "rmarkdown",
+    version = "0.5.2",
+    reason = "to deploy individual R Markdown documents"
+  )
+
   # validate inputs
   if (!file.exists(doc)) {
     stop("The document '", doc, "' does not exist.")
   }
-  if (!requireNamespace("rmarkdown") ||
-      packageVersion("rmarkdown") < "0.5.2") {
-    stop("Version 0.5.2 or later of the rmarkdown package is required to ",
-         "deploy individual R Markdown documents.")
-  }
 
   # get qualified doc
   qualified_doc <- normalizePath(doc, winslash = "/")

R/deploySite.R

@@ -33,20 +33,16 @@ deploySite <- function(siteDir = getwd(),
                        python = NULL,
                        ...) {
 
+  check_installed(
+    "rmarkdown",
+    version = "0.9.5.3",
+    reason = "to deploy websites"
+  )
+
   # switch to siteDir for duration of this function
   oldwd <- setwd(siteDir)
   on.exit(setwd(oldwd), add = TRUE)
 
-  # validate we have the version of rmarkdown required to discover
-  # whether this directory has a website in it, what it's name
-  # and content directory are, etc.
-  rmarkdownVersion <- "0.9.5.3"
-  if (!requireNamespace("rmarkdown") ||
-      packageVersion("rmarkdown") < rmarkdownVersion) {
-    stop("Version ", rmarkdownVersion, " or later of the rmarkdown package ",
-         "is required to deploy websites.")
-  }
-
   # validate and normalize siteDir
   if (!isStringParam(siteDir))
     stop(stringParamErrorMessage("siteDir"))

R/rsconnect-package.R

@@ -46,6 +46,7 @@
 #'
 #' @name rsconnect-package
 #' @aliases rsconnect-package rsconnect
+#' @import rlang
 #' @docType package
 #' @keywords package
 NULL

R/utils.R

@@ -233,22 +233,6 @@ md5.as.string <- function(md5) {
   paste(md5, collapse = "")
 }
 
-# Returns true if the package is installed and satisfies the version constraint.
-isAvailable <- function(package, min_version = NULL) {
-  installed <- nzchar(system.file(package = package))
-  if (!installed) {
-    # Not installed.
-    return(FALSE)
-  }
-  if (is.null(min_version)) {
-    # No version constraint; installation indicates availability.
-    return(TRUE)
-  }
-  # When installed and we have a version constraint, make sure
-  # the package has at least that version.
-  return(utils::packageVersion(package) >= min_version)
-}
-
 # Escape characters that have special meaning for extended regular expressions as supported by
 # list.files.
 #