diff --git a/R/loadConfig.R b/R/loadConfig.R index ab804440434cc0459b1f1b8d9b8fb2bf26012e0f..67140a80ced276f4a247cba58fa427b37314cdc6 100644 --- a/R/loadConfig.R +++ b/R/loadConfig.R @@ -8,11 +8,12 @@ #' #' @param userFile location of the user config YML file (Use NULL or empty character to ignore) #' @param pathDefaultCfg The location of the default configuration (located in "inst/config.yml" of the package by default) +#' @param ... Other parameters than `file` sent to [config::get] such as `config` or `value` #' #' @return A configuration as it is returned by [config::get] #' @export #' -loadConfig <- function(userFile = "config.yml", pathDefaultCfg) { +loadConfig <- function(userFile = "config.yml", pathDefaultCfg, ...) { if (missing(pathDefaultCfg)) { # fairify::loadConfig is called directly, we must # find the fairified package and set its default config folder @@ -21,7 +22,7 @@ loadConfig <- function(userFile = "config.yml", pathDefaultCfg) { pathDefaultCfg <- system.file("config.yml", package = sub("^package:", "", pkg)) } } - cfg <- config::get(file = pathDefaultCfg) + cfg <- config::get(file = pathDefaultCfg, ...) if (!is.null(userFile) && userFile != "") { if (userFile == basename(userFile)) { # Search in package sub folders @@ -42,7 +43,7 @@ loadConfig <- function(userFile = "config.yml", pathDefaultCfg) { } if (file.exists(userFile)) { message("Read user configuration from: ", userFile) - cfg = config::merge(cfg, config::get(file = userFile)) + cfg = config::merge(cfg, config::get(file = userFile, ...)) } } stopifnot(cfg$data$mode %in% c("local", "remote"), diff --git a/inst/functions/loadConfig.R b/inst/functions/loadConfig.R index caeac6b240921936c77f0570cad3f67c1d231633..ce39aa1210c6bd4b61fe3343f317c2f92e4863f0 100644 --- a/inst/functions/loadConfig.R +++ b/inst/functions/loadConfig.R @@ -1,5 +1,7 @@ #' @inherit fairify::loadConfig #' @export -loadConfig <- function(userFile = "config.yml", pathDefaultCfg = system.file("config.yml", package = utils::packageName())) { - fairify::loadConfig(userFile = userFile, pathDefaultCfg = pathDefaultCfg) +loadConfig <- function(userFile = "config.yml", + pathDefaultCfg = system.file("config.yml", package = utils::packageName()), + ...) { + fairify::loadConfig(userFile = userFile, pathDefaultCfg = pathDefaultCfg, ...) } diff --git a/inst/reports_gitignore.txt b/inst/reports_gitignore.txt index 2fb2f5ac7f024a738c444b92fb3bbc7a06c0d74b..a4c458922962d8f1985af5a6df8bd61c4ea91264 100644 --- a/inst/reports_gitignore.txt +++ b/inst/reports_gitignore.txt @@ -10,4 +10,6 @@ myBook.* *.log *.wrt *.rds +*.RDS *.pdf +*/_render_book.* diff --git a/man/loadConfig.Rd b/man/loadConfig.Rd index 8fe528fcca3b39bb133edf54dd3968dad906d7fa..fc73388f635c7d1a99bc2ea0bacc83a32da23258 100644 --- a/man/loadConfig.Rd +++ b/man/loadConfig.Rd @@ -4,12 +4,14 @@ \alias{loadConfig} \title{Read package configuration} \usage{ -loadConfig(userFile = "config.yml", pathDefaultCfg) +loadConfig(userFile = "config.yml", pathDefaultCfg, ...) } \arguments{ \item{userFile}{location of the user config YML file (Use NULL or empty character to ignore)} \item{pathDefaultCfg}{The location of the default configuration (located in "inst/config.yml" of the package by default)} + +\item{...}{Other parameters than \code{file} sent to \link[config:get]{config::get} such as \code{config} or \code{value}} } \value{ A configuration as it is returned by \link[config:get]{config::get}