refactor: adapt code to new funky pkg

Author: salim-b

DESCRIPTION

@@ -17,6 +17,7 @@ Imports:
     clock (>= 0.6.1),
     dplyr (>= 1.0.0),
     fs (>= 1.4.1),
+    funky (>= 0.0.9000),
     glue (>= 1.4.1),
     heck (>= 0.1.1),
     magrittr (>= 2.0),
@@ -34,6 +35,7 @@ Suggests:
     testthat (>= 3.0.0),
     utils
 Remotes:
+    gitlab::rpkg.dev/funky,
     gitlab::rpkg.dev/pal,
     gitlab::rpkg.dev/pkgpins,
     gitlab::rpkg.dev/pkgsnip

NAMESPACE

@@ -2,9 +2,9 @@
 
 export(bundled_cli_path)
 export(bundled_cli_vrsn)
+export(funky_config)
 export(is_latest)
 export(latest_version)
-export(pkg_config)
 export(pkg_status)
 export(releases)
 importFrom(magrittr,"%!>%")

R/rstd-package.R

@@ -1,9 +1,9 @@
 #' @section Package configuration:
 #'
-#' `r pkgsnip::md_snip(id = "pkg_config", pkg = this_pkg)`
+#' `r pkgsnip::md_snip(id = "funky_config")`
 #'
 #' ```{r, echo = FALSE}
-#' pal::print_pkg_config(this_pkg)
+#' funky::print_config()
 #' ```
 #'
 #' @keywords internal

R/rstd.gen.R

@@ -2,7 +2,7 @@
 # See `README.md#r-markdown-format` for more information on the literate programming approach used applying the R Markdown format.
 
 # rstd: Unofficial Utility Functions Around the RStudio IDE
-# Copyright (C) 2024 Salim Brüggemann
+# Copyright (C) 2025 Salim Brüggemann
 # 
 # This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or any later version.
@@ -16,7 +16,7 @@
 
   # clear pkgpins cache
   tryCatch(expr = pkgpins::clear_cache(board = pkgpins::board(pkg = pkgname),
-                                       max_age = pal::pkg_config_val(key = "global_max_cache_age",
+                                       max_age = funky::config_val(key = "global_max_cache_age",
                                                                      pkg = pkgname)),
            error = function(e) cli::cli_alert_warning(text = "Failed to clear pkgpins cache on load of {.pkg {pkgname}}. Error message: {e$message}"))
 }
@@ -276,11 +276,11 @@ pkg_status <- function() {
 
 #' `r this_pkg` package configuration metadata
 #'
-#' A [tibble][tibble::tbl_df] with metadata of all possible `r this_pkg` package configuration options. See [pal::pkg_config_val()] for more information.
+#' A [tibble][tibble::tbl_df] with metadata of all possible `r this_pkg` package configuration options. See [funky::config_val()] for more information.
 #'
-#' @format `r pkgsnip::return_lbl("tibble_cols", cols = colnames(pkg_config))`
+#' @format `r pkgsnip::return_lbl("tibble_cols", cols = colnames(funky_config))`
 #' @export
 #'
 #' @examples
-#' rstd::pkg_config
-"pkg_config"
+#' rstd::funky_config
+"funky_config"

R/sysdata.rda

@@ -12,7 +12,7 @@ editor_options:
   
   # clear pkgpins cache
   tryCatch(expr = pkgpins::clear_cache(board = pkgpins::board(pkg = pkgname),
-                                       max_age = pal::pkg_config_val(key = "global_max_cache_age",
+                                       max_age = funky::config_val(key = "global_max_cache_age",
                                                                      pkg = pkgname)),
            error = function(e) cli::cli_alert_warning(text = "Failed to clear pkgpins cache on load of {.pkg {pkgname}}. Error message: {e$message}"))
 }
@@ -382,17 +382,17 @@ pkg_status <- function() {
 
 ## Miscellaneous
 
-### `pkg_config`
+### `funky_config`
 
 ```{r}
 #' `r this_pkg` package configuration metadata
 #'
-#' A [tibble][tibble::tbl_df] with metadata of all possible `r this_pkg` package configuration options. See [pal::pkg_config_val()] for more information.
+#' A [tibble][tibble::tbl_df] with metadata of all possible `r this_pkg` package configuration options. See [funky::config_val()] for more information.
 #'
-#' @format `r pkgsnip::return_lbl("tibble_cols", cols = colnames(pkg_config))`
+#' @format `r pkgsnip::return_lbl("tibble_cols", cols = colnames(funky_config))`
 #' @export
 #'
 #' @examples
-#' rstd::pkg_config
-"pkg_config"
+#' rstd::funky_config
+"funky_config"
 ```

Rmd/rstd.Rmd

@@ -10,21 +10,19 @@ editor_options:
 
 -   The chunks below have to be manually executed in order to regenerate the package data.
 
--   Although the datasets below are saved as ["internal data" in `R/sysdata.rda`](https://r-pkgs.org/data.html#sec-data-sysdata), they can still be
-    exported and documented (by documenting the dataset's quoted name in the main `.Rmd` source file – which only works when the dataset is also `@export`ed),
-    something [not explicitly mentioned](https://coolbutuseless.github.io/2018/12/10/r-packages-internal-and-external-data/) in the book [R
+-   Although the datasets below are saved as ["internal data" in `R/sysdata.rda`](https://r-pkgs.org/data.html#sec-data-sysdata), they can still be exported and
+    documented (by documenting the dataset's quoted name in the main `.Rmd` source file – which only works when the dataset is also `@export`ed), something [not
+    explicitly mentioned](https://coolbutuseless.github.io/2018/12/10/r-packages-internal-and-external-data/) in the book [R
     Packages](https://r-pkgs.org/data.html#sec-data-data). To do so, you first need to manually add the `export()` directive in the NAMESPACE file since
     roxygen2 won't add it automatically.
 
 # Define data
 
-## `pkg_config`
+## `funky_config`
 
 ```{r}
-pkg_config <-
-  tibble::tibble(key = character(),
-                 default_value = list(),
-                 description = character()) %>%
+funky_config <-
+  funky::ptype_config %>%
   tibble::add_row(key = "global_max_cache_age",
                   default_value = list("30 days"),
                   description = pkgsnip::md_snip("opt_global_max_cache_age"))
@@ -36,7 +34,7 @@ Save all the small data objects as a single internal file `R/sysdata.rda`. Note
 to package users.
 
 ```{r}
-usethis::use_data(pkg_config,
+usethis::use_data(funky_config,
                   internal = TRUE,
                   overwrite = TRUE,
                   compress = "xz",

Rmd/sysdata.nopurl.Rmd

@@ -10,4 +10,4 @@ reference:
   - bundled_cli_vrsn
   - pkg_status
 - title: Miscellaneous
-- contents: pkg_config
+- contents: funky_config