Compute cache path consistently (#574)

Always do it in the board generation, not earlier. Fixes #529

NEWS.md

@@ -1,5 +1,8 @@
 # pins (development version)
 
+* Cache paths all computed in the same way, avoiding inconsistency and an
+  error when calling `board_register()` directly (#529).
+
 * Drop add ins since they're not tested or documented (#525)
 
 # pins 1.0.0

R/legacy_azure.R

@@ -58,7 +58,7 @@ board_register_azure <- function(name = "azure",
                                  container = Sys.getenv("AZURE_STORAGE_CONTAINER"),
                                  account = Sys.getenv("AZURE_STORAGE_ACCOUNT"),
                                  key = Sys.getenv("AZURE_STORAGE_KEY"),
-                                 cache = board_cache_path(name),
+                                 cache = NULL,
                                  path = NULL,
                                  ...) {
   board <- legacy_azure(

R/legacy_board_registry.R

@@ -18,7 +18,7 @@
 #' @export
 board_register <- function(board,
                            name = NULL,
-                           cache = board_cache_path(name),
+                           cache = NULL,
                            versions = NULL,
                            ...) {
   if (is_url(board)) {
@@ -50,7 +50,7 @@ board_register_rsconnect <- function(name = "rsconnect",
                                      account = NULL,
                                      key = NULL,
                                      output_files = FALSE,
-                                     cache = board_cache_path(name),
+                                     cache = NULL,
                                      ...) {
   board <- board_rsconnect(
     name = name,

R/legacy_datatxt.R

@@ -28,7 +28,7 @@
 #' @export
 legacy_datatxt <- function(url,
                           headers = NULL,
-                          cache = board_cache_path(name),
+                          cache = NULL,
                           needs_index = TRUE,
                           browse_url = url,
                           index_updated = NULL,
@@ -40,6 +40,7 @@ legacy_datatxt <- function(url,
 
   # use only subdomain as friendly name which is also used as cache folder
   name <- name %||% gsub("https?://|\\..*", "", url)
+  cache <- cache %||% board_cache_path(name)
 
   board <- new_board_v0("pins_board_datatxt",
     name = name,
@@ -64,7 +65,7 @@ legacy_datatxt <- function(url,
 board_register_datatxt <- function(url,
                                    name = NULL,
                                    headers = NULL,
-                                   cache = board_cache_path(name),
+                                   cache = NULL,
                                    ...) {
   board <- legacy_datatxt(
     name = name,

R/legacy_dospaces.R

@@ -60,7 +60,7 @@ board_register_dospace <- function(name = "dospace",
                                    key = Sys.getenv("DO_ACCESS_KEY_ID"),
                                    secret = Sys.getenv("DO_SECRET_ACCESS_KEY"),
                                    datacenter = Sys.getenv("DO_DATACENTER"),
-                                   cache = board_cache_path(name),
+                                   cache = NULL,
                                    host = "digitaloceanspaces.com",
                                    path = NULL,
                                    ...) {

R/legacy_gcloud.R

@@ -65,7 +65,7 @@ legacy_gcloud <- function(
 board_register_gcloud <- function(name = "gcloud",
                                   bucket = Sys.getenv("GCLOUD_STORAGE_BUCKET"),
                                   token = NULL,
-                                  cache = board_cache_path(name),
+                                  cache = NULL,
                                   path = NULL,
                                   ...) {
   board <- legacy_gcloud(

R/legacy_github.R

@@ -39,8 +39,10 @@ legacy_github <- function(
                          path = "",
                          host = "https://api.github.com",
                          name = "github",
+                         cache = NULL,
                          ...) {
 
+  cache <- cache %||% board_cache_path(name)
   token <- token %||% envvar_get("GITHUB_PAT") %||%
     abort("Specify GitHub PAT with `token` or 'GITHUB_PAT' env var")
 
@@ -50,6 +52,7 @@ legacy_github <- function(
     repo = repo,
     path = if (!is.null(path) && nchar(path) > 0) paste0(path, "/") else "",
     host = host,
+    cache = cache,
     ...
   )
 
@@ -97,7 +100,7 @@ board_register_github <- function(name = "github",
                                   token = NULL,
                                   path = "",
                                   host = "https://api.github.com",
-                                  cache = board_cache_path(name),
+                                  cache = NULL,
                                   ...) {
   board <- legacy_github(
     name = name,

R/legacy_kaggle.R

@@ -45,8 +45,11 @@ legacy_kaggle <- function(token = NULL, name = "kaggle", ...) {
 #' @export
 board_register_kaggle <- function(name = "kaggle",
                                   token = NULL,
-                                  cache = board_cache_path(name),
+                                  cache = NULL,
                                   ...) {
+
+  cache <- cache %||% board_cache_path(name)
+
   board <- legacy_kaggle("kaggle",
     name = name,
     token = token,

R/legacy_local.R

@@ -37,9 +37,7 @@ legacy_local <- function(path = NULL, name = "local", versions = FALSE) {
 
 #' @rdname legacy_local
 #' @export
-board_register_local <- function(name = "local",
-                                 cache = board_cache_path(name),
-                                 ...) {
+board_register_local <- function(name = "local", cache = NULL, ...) {
   board <- legacy_local(path = cache, name = name, ...)
   board_register2(board)
 }

R/legacy_s3.R

@@ -62,7 +62,7 @@ board_register_s3 <- function(name = "s3",
                               bucket = Sys.getenv("AWS_BUCKET"),
                               key = Sys.getenv("AWS_ACCESS_KEY_ID"),
                               secret = Sys.getenv("AWS_SECRET_ACCESS_KEY"),
-                              cache = board_cache_path(name),
+                              cache = NULL,
                               host = "s3.amazonaws.com",
                               region = NULL,
                               path = NULL,