Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow passing arguments down to source() from loadConfig() #98

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow passing arguments down to source() from loadConfig() #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions R/conf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
NULL

# sources 1 config file and returns the envir
sourceConfFile = function(conffile) {
sourceConfFile = function(conffile, ...) {
assertFile(conffile)

conf = new.env()
x = try(sys.source(conffile, envir = conf))
x = try(sys.source(conffile, envir = conf, ...))
if (is.error(x))
stopf("There was an error in sourcing your configuration file '%s': %s!", conffile, as.character(x))
checkConf(conf)
Expand Down Expand Up @@ -205,12 +205,14 @@ print.Config = function(x, ...) {
#' @param conffile [\code{character(1)}]\cr
#' Location of the configuration file to load.
#' Default is \dQuote{.BatchJobs.conf} in the current working directory.
#' @param ...
#' Further arguments to \code{sys.source} (currently just \code{chdir})
#' @return Invisibly returns a list of configuration settings.
#' @family conf
#' @export
loadConfig = function(conffile = ".BatchJobs.R") {
loadConfig = function(conffile = ".BatchJobs.R", ...) {
# checks are done in sourceConfFile
conf = sourceConfFile(conffile)
conf = sourceConfFile(conffile, ...)
assignConf(conf)
invisible(setClasses(as.list(conf), "Config"))
}
Expand Down
4 changes: 3 additions & 1 deletion man/loadConfig.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
\alias{loadConfig}
\title{Load a specific configuration file.}
\usage{
loadConfig(conffile = ".BatchJobs.R")
loadConfig(conffile = ".BatchJobs.R", ...)
}
\arguments{
\item{conffile}{[\code{character(1)}]\cr
Location of the configuration file to load.
Default is \dQuote{.BatchJobs.conf} in the current working directory.}

\item{...}{Further arguments to \code{sys.source} (currently just \code{chdir})}
}
\value{
Invisibly returns a list of configuration settings.
Expand Down