cran: change static cachedir to function cachedir()

japhir · Apr 12, 2024 · ca868ac · ca868ac
1 parent 75e26db
commit ca868ac
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/R/get_solution.R b/R/get_solution.R
@@ -21,7 +21,7 @@
 #'
 #' # ignore the below, this is just to make CRAN builds happy!
 #' # remove the directory with the cached astronomical solution to clean up
-#' unlink(snvecR:::cachedir, recursive = TRUE)
+#' unlink(snvecR:::cachedir(), recursive = TRUE)
 #' }
 #' @export
 get_solution <- function(astronomical_solution = "full-ZB18a", quiet = FALSE, force = FALSE) {
@@ -153,9 +153,9 @@ get_ZB <- function(astronomical_solution = "full-ZB18a",
   }
 
   # where will we save our cached results?
-  raw_path <- paste0(cachedir, "/", astronomical_solution, ".dat")
-  csv_path <- paste0(cachedir, "/", astronomical_solution, ".csv")
-  rds_path <- paste0(cachedir, "/", astronomical_solution, ".rds")
+  raw_path <- paste0(cachedir(), "/", astronomical_solution, ".dat")
+  csv_path <- paste0(cachedir(), "/", astronomical_solution, ".csv")
+  rds_path <- paste0(cachedir(), "/", astronomical_solution, ".rds")
 
   # read final processed file from cache if available
   if (!force && file.exists(rds_path)) {
@@ -242,12 +242,12 @@ get_ZB <- function(astronomical_solution = "full-ZB18a",
     if (!save_cache) {
       return(raw)
     } else {
-      if (!dir.exists(cachedir)) {
-        dir.create(cachedir, recursive = TRUE, showWarnings = TRUE)
+      if (!dir.exists(cachedir())) {
+        dir.create(cachedir(), recursive = TRUE, showWarnings = TRUE)
       }
       if (!quiet) {
         cli::cli_alert_info(
-          "The cache directory is {.file {cachedir}}."
+          "The cache directory is {.file {cachedir()}}."
         )
       }
 

diff --git a/R/globals.R b/R/globals.R
@@ -1,6 +1,8 @@
 VER <- glue::glue("snvecR VERSION: {packageVersion('snvecR')} {if(!is.na(packageDate('snvecR'))) packageDate('snvecR') else Sys.Date()}")
 
-cachedir <- R_user_dir("snvecR", which = "cache")
+cachedir <- function() {
+  R_user_dir("snvecR", which = "cache")
+}
 
 AU <- 1.49597870700e11 # m
 GM <- 1.32712440041e20 # m3/s2

diff --git a/R/snvec.R b/R/snvec.R
@@ -164,7 +164,7 @@
 #'
 #' # ignore the below, this is just to make CRAN builds happy!
 #' # remove the directory with the cached astronomical solution to clean up
-#' unlink(snvecR:::cachedir, recursive = TRUE)
+#' unlink(snvecR:::cachedir(), recursive = TRUE)
 #' }
 #' @export
 snvec <- function(tend = -1e3,

diff --git a/man/get_solution.Rd b/man/get_solution.Rd
diff --git a/man/snvec.Rd b/man/snvec.Rd
diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
@@ -1,11 +1,11 @@
 cleanup <- function() {
   # get cachedir from globals.R
   ## cachedir <- R_user_dir("snvecR", which = "cache")
-  if (dir.exists(cachedir) && !interactive()) {
+  if (dir.exists(cachedir()) && !interactive()) {
     cli::cli_inform(
-      "Removing {.file {cachedir}} from reproducible environment."
+      "Removing {.file {cachedir()}} from reproducible environment."
     )
-    unlink(cachedir, recursive = TRUE)
+    unlink(cachedir(), recursive = TRUE)
   }
 }
 

diff --git a/vignettes/analyze_grid_td-ed.Rmd b/vignettes/analyze_grid_td-ed.Rmd
@@ -262,5 +262,5 @@ Wickham, H., Çetinkaya-Rundel, M., & Grolemund, G. (2023). R for Data Science:
 ```{r teardown, include = FALSE}
 # ignore the below, this is just to make CRAN builds happy!
 # remove the directory with the cached astronomical solution to clean up
-unlink(snvecR:::cachedir, recursive = TRUE)
+unlink(snvecR:::cachedir(), recursive = TRUE)
 ```