Update uses_WHATEVER() functions

These `base_path` arguments are NEVER used in earnest.

Their existence feels like it dates back to before we truly embraced the notion of the active project.

And remember `with_project()` and `local_project()` are always available for the very rare situation where you want to use usethis functions on something other than active project.

Author: jennybc

R/description.R

@@ -171,13 +171,10 @@ tidy_desc <- function(desc) {
 #
 # I won't change use_description_field() now, but use_description_list() is
 # implemented differently, more in keeping with our current style
-use_description_field <- function(name,
-                                  value,
-                                  base_path = proj_get(),
-                                  overwrite = FALSE) {
+use_description_field <- function(name, value, overwrite = FALSE) {
   # account for `value`s produced via `glue::glue()`
   value <- as.character(value)
-  curr <- desc::desc_get(name, file = base_path)[[1]]
+  curr <- desc::desc_get(name, file = proj_get())[[1]]
   curr <- gsub("^\\s*|\\s*$", "", curr)
 
   if (identical(curr, value)) {
@@ -192,7 +189,7 @@ use_description_field <- function(name,
   }
 
   ui_done("Setting {ui_field(name)} field in DESCRIPTION to {ui_value(value)}")
-  desc::desc_set(name, value, file = base_path)
+  desc::desc_set(name, value, file = proj_get())
   invisible()
 }
 

R/github-actions.R

@@ -76,18 +76,18 @@ use_github_actions_badge <- function(name = "R-CMD-check", repo_spec = NULL) {
   use_badge(name, url, img)
 }
 
-uses_github_actions <- function(base_path = proj_get()) {
-  path <- glue("{base_path}/.github/workflows")
+uses_github_actions <- function() {
+  path <- proj_path(".github", "workflows")
   file_exists(path)
 }
 
-check_uses_github_actions <- function(base_path = proj_get()) {
-  if (uses_github_actions(base_path)) {
+check_uses_github_actions <- function() {
+  if (uses_github_actions()) {
     return(invisible())
   }
 
   ui_stop("
-    Cannot detect that package {ui_value(project_name(base_path))} already \\
+    Cannot detect that package {ui_value(project_name())} already \\
     uses GitHub Actions.
     Do you need to run {ui_code('use_github_actions()')}?")
 }

R/make.R

@@ -12,8 +12,3 @@ use_make <- function() {
   )
   use_build_ignore("Makefile")
 }
-
-uses_make <- function(base_path = proj_get()) {
-  makefile_path <- proj_path("Makefile")
-  file_exists(makefile_path)
-}

R/pkgdown.R

@@ -139,10 +139,9 @@ tidyverse_url <- function(url, tr = NULL) {
   }
 }
 
-pkgdown_config_path <- function(base_path = proj_get()) {
+pkgdown_config_path <- function() {
   path_first_existing(
-    path(
-      base_path,
+    proj_path(
       c(
         "_pkgdown.yml",
         "_pkgdown.yaml",
@@ -153,24 +152,24 @@ pkgdown_config_path <- function(base_path = proj_get()) {
   )
 }
 
-uses_pkgdown <- function(base_path = proj_get()) {
-  !is.null(pkgdown_config_path(base_path))
+uses_pkgdown <- function() {
+  !is.null(pkgdown_config_path())
 }
 
-pkgdown_config_meta <- function(base_path = proj_get()) {
-  if (!uses_pkgdown(base_path)) {
+pkgdown_config_meta <- function() {
+  if (!uses_pkgdown()) {
     return(list())
   }
-  path <- pkgdown_config_path(base_path)
+  path <- pkgdown_config_path()
   yaml::read_yaml(path) %||% list()
 }
 
-pkgdown_url <- function(base_path = proj_get(), pedantic = FALSE) {
-  if (!uses_pkgdown(base_path)) {
+pkgdown_url <- function(pedantic = FALSE) {
+  if (!uses_pkgdown()) {
     return(NULL)
   }
 
-  meta <- pkgdown_config_meta(base_path)
+  meta <- pkgdown_config_meta()
   url <- meta$url
   if (is.null(url)) {
     if (pedantic) {

R/roxygen.R

@@ -32,12 +32,12 @@ use_roxygen_md <- function() {
   invisible()
 }
 
-uses_roxygen_md <- function(base_path = proj_get()) {
-  if (!desc::desc_has_fields("Roxygen", base_path)) {
+uses_roxygen_md <- function() {
+  if (!desc::desc_has_fields("Roxygen", file = proj_get())) {
     return(FALSE)
   }
 
-  roxygen <- desc::desc_get("Roxygen", base_path)[[1]]
+  roxygen <- desc::desc_get("Roxygen", file = proj_get())[[1]]
   value <- tryCatch(
     {
       eval(parse(text = roxygen))
@@ -50,8 +50,8 @@ uses_roxygen_md <- function(base_path = proj_get()) {
   isTRUE(value$markdown)
 }
 
-uses_roxygen <- function(base_path = proj_get()) {
-  desc::desc_has_fields("RoxygenNote", base_path)
+uses_roxygen <- function() {
+  desc::desc_has_fields("RoxygenNote", file = proj_get())
 }
 
 roxygen_ns_append <- function(tag) {

R/test.R

@@ -81,11 +81,7 @@ check_edition <- function(edition = NULL) {
 }
 
 
-uses_testthat <- function(base_path = proj_get()) {
-  paths <- c(
-    path(base_path, "inst", "tests"),
-    path(base_path, "tests", "testthat")
-  )
-
+uses_testthat <- function() {
+  paths <- proj_path(c(path("inst", "tests"), path("tests", "testthat")))
   any(dir_exists(paths))
 }

tests/testthat/test-description.R

@@ -125,3 +125,45 @@ test_that("use_description_list() can initiate, add to, or replace", {
   desc <- desc::desc()
   expect_equal(desc$get_list("Config/Needs/foofy"), "charlie")
 })
+
+
+test_that("use_description_field() can address an existing field", {
+  pkg <- create_local_package()
+  orig <- tools::md5sum(proj_path("DESCRIPTION"))
+
+  ## specify existing value of existing field --> should be no op
+  use_description_field(
+    name = "Version",
+    value = desc::desc_get("Version", file = pkg)[[1]]
+  )
+  expect_identical(orig, tools::md5sum(proj_path("DESCRIPTION")))
+
+  expect_usethis_error(
+    use_description_field(
+      name = "Version",
+      value = "1.1.1"
+    ),
+    "has a different value"
+  )
+
+  ## overwrite existing field
+  use_description_field(
+    name = "Version",
+    value = "1.1.1",
+    overwrite = TRUE
+  )
+  expect_identical(c(Version = "1.1.1"), desc::desc_get("Version", file = pkg))
+})
+
+test_that("use_description_field() can add new field", {
+  pkg <- create_local_package()
+  use_description_field(name = "foo", value = "bar")
+  expect_identical(c(foo = "bar"), desc::desc_get("foo", file = pkg))
+})
+
+test_that("use_description_field() ignores whitespace", {
+  pkg <- create_local_package()
+  use_description_field(name = "foo", value = "\n bar")
+  use_description_field(name = "foo", value = "bar")
+  expect_identical(c(foo = "\n bar"), desc::desc_get("foo", file = pkg))
+})

tests/testthat/test-helpers.R

@@ -1,48 +1,3 @@
-
-test_that("use_description_field() can address an existing field", {
-  pkg <- create_local_package()
-  orig <- tools::md5sum(proj_path("DESCRIPTION"))
-
-  ## specify existing value of existing field --> should be no op
-  use_description_field(
-    name = "Version",
-    value = desc::desc_get("Version", pkg)[[1]],
-    base_path = pkg
-  )
-  expect_identical(orig, tools::md5sum(proj_path("DESCRIPTION")))
-
-  expect_usethis_error(
-    use_description_field(
-      name = "Version",
-      value = "1.1.1",
-      base_path = pkg
-    ),
-    "has a different value"
-  )
-
-  ## overwrite existing field
-  use_description_field(
-    name = "Version",
-    value = "1.1.1",
-    base_path = pkg,
-    overwrite = TRUE
-  )
-  expect_identical(c(Version = "1.1.1"), desc::desc_get("Version", pkg))
-})
-
-test_that("use_description_field() can add new field", {
-  pkg <- create_local_package()
-  use_description_field(name = "foo", value = "bar", base_path = pkg)
-  expect_identical(c(foo = "bar"), desc::desc_get("foo", pkg))
-})
-
-test_that("use_description_field() ignores whitespace", {
-  pkg <- create_local_package()
-  use_description_field(name = "foo", value = "\n bar")
-  use_description_field(name = "foo", value = "bar")
-  expect_identical(c(foo = "\n bar"), desc::desc_get("foo", pkg))
-})
-
 test_that("valid_package_name() enforces valid package names", {
   # Contain only ASCII letters, numbers, and '.'
   # Have at least two characters