Pass all authentication and build arguments to dependencies

NEWS.md

@@ -5,6 +5,9 @@
 
 # Development
 
+* `install_()` functions now pass arguments, including authentication
+  information and upgrade down to dependencies (#53, #86, #87).
+
 * `install_()` functions now return the name of the package(s) which were
   installed (#55).
 

R/deps.R

@@ -111,7 +111,7 @@ local_package_deps <- function(pkgdir = ".", dependencies = NA) {
 
 dev_package_deps <- function(pkgdir = ".", dependencies = NA,
                              repos = getOption("repos"),
-                             type = getOption("pkgType")) {
+                             type = getOption("pkgType"), ...) {
 
   pkg <- load_pkg_description(pkgdir)
   repos <- c(repos, parse_additional_repositories(pkg))
@@ -129,7 +129,7 @@ dev_package_deps <- function(pkgdir = ".", dependencies = NA,
 
   combine_deps(
     package_deps(deps, repos = repos, type = type),
-    remote_deps(pkg))
+    remote_deps(pkg, ...))
 }
 
 combine_deps <- function(cran_deps, remote_deps) {
@@ -280,25 +280,39 @@ update.package_deps <- function(object, ..., quiet = FALSE, upgrade = TRUE) {
 
 install_packages <- function(packages, repos = getOption("repos"),
                              type = getOption("pkgType"), ...,
-                             dependencies = FALSE, quiet = NULL,
-                             # These are options to `install()` used when
-                             # installing remotes, but can get passed to us by
-                             # `...` so we just ignore them here
-                             build, build_opts) {
+                             dependencies = FALSE, quiet = NULL) {
+
+  # We want to pass only args that exist in the downstream functions
+  args_to_keep <-
+    unique(
+      names(
+        c(
+          formals(install.packages),
+          formals(download.file)
+        )
+      )
+    )
+
+  args <- list(...)
+  args <- args[names(args) %in% args_to_keep]
 
   if (is.null(quiet))
     quiet <- !identical(type, "source")
 
   message("Installing ", length(packages), " packages: ",
     paste(packages, collapse = ", "))
 
-  safe_install_packages(
-    packages,
-    repos = repos,
-    type = type,
-    ...,
-    dependencies = dependencies,
-    quiet = quiet
+  do.call(
+    safe_install_packages,
+    c(list(
+        packages,
+        repos = repos,
+        type = type,
+        dependencies = dependencies,
+        quiet = quiet
+      ),
+      args
+    )
   )
 }
 
@@ -381,7 +395,7 @@ fix_repositories <- function(repos) {
   repos
 }
 
-parse_one_remote <- function(x) {
+parse_one_remote <- function(x, ...) {
   pieces <- strsplit(x, "::", fixed = TRUE)[[1]]
 
   if (length(pieces) == 1) {
@@ -397,7 +411,7 @@ parse_one_remote <- function(x) {
     fun <- get(paste0(tolower(type), "_remote"),
       envir = asNamespace("remotes"), mode = "function", inherits = FALSE)
 
-    res <- fun(repo)
+    res <- fun(repo, ...)
     }, error = function(e) stop("Unknown remote type: ", type, "\n  ", conditionMessage(e), call. = FALSE)
   )
   res
@@ -412,13 +426,13 @@ split_remotes <- function(x) {
 }
 
 
-remote_deps <- function(pkg) {
+remote_deps <- function(pkg, ...) {
   if (!has_dev_remotes(pkg)) {
     return(NULL)
   }
 
   dev_packages <- split_remotes(pkg[["remotes"]])
-  remote <- lapply(dev_packages, parse_one_remote)
+  remote <- lapply(dev_packages, parse_one_remote, ...)
 
   package <- vapply(remote, remote_package_name, character(1), USE.NAMES = FALSE)
   installed <- vapply(package, local_sha, character(1), USE.NAMES = FALSE)

R/install-bioc.R

@@ -30,20 +30,20 @@
 install_bioc <- function(repo, mirror = getOption("BioC_git", download_url("git.bioconductor.org/packages")),
   git = c("auto", "git2r", "external"), ...) {
 
-  bioc_remote <- select_bioc_git_remote(match.arg(git))
-
-  remotes <- lapply(repo, bioc_remote, mirror = mirror)
+  remotes <- lapply(repo, bioc_remote, mirror = mirror, git = match.arg(git))
 
   install_remotes(remotes, ...)
 }
 
-select_bioc_git_remote <- function(git) {
+bioc_remote <- function(repo, mirror = getOption("BioC_git", download_url("git.bioconductor.org/packages")),
+  git = c("auto", "git2r", "external"), ...) {
+
+  git <- match.arg(git)
   if (git == "auto") {
     git <- if (pkg_installed("git2r")) "git2r" else "external"
   }
-  switch(git,
-    git2r = bioc_git2r_remote,
-    external = bioc_xgit_remote)
+
+  list(git2r = bioc_git2r_remote, external = bioc_xgit_remote)[[git]](repo, mirror)
 }
 
 # Parse concise git repo specification: [username:password@][branch/]repo[#commit]

R/install-bitbucket.R

@@ -38,12 +38,12 @@ install_bitbucket <- function(repo, ref = "master", subdir = NULL,
   remotes <- lapply(repo, bitbucket_remote, ref = ref,
     subdir = subdir, auth_user = auth_user, password = password, host = host)
 
-  install_remotes(remotes, ...)
+  install_remotes(remotes, auth_user = auth_user, password = password, host = host, ...)
 }
 
-bitbucket_remote <- function(repo, ref = NULL, subdir = NULL,
+bitbucket_remote <- function(repo, ref = "master", subdir = NULL,
                               auth_user = NULL, password = NULL, sha = NULL,
-                              host = NULL) {
+                              host = NULL, ...) {
 
   meta <- parse_git_repo(repo)
 

R/install-cran.R

@@ -20,7 +20,7 @@ install_cran <- function(pkgs, repos = getOption("repos"), type = getOption("pkg
   install_remotes(remotes, quiet = quiet, ...)
 }
 
-cran_remote <- function(pkg, repos, type) {
+cran_remote <- function(pkg, repos, type, ...) {
 
   remote("cran",
     name = pkg,

R/install-git.R

@@ -28,7 +28,7 @@ install_git <- function(url, subdir = NULL, branch = NULL,
 }
 
 
-git_remote <- function(url, subdir = NULL, branch = NULL, git = c("auto", "git2r", "external")) {
+git_remote <- function(url, subdir = NULL, branch = NULL, git = c("auto", "git2r", "external"), ...) {
   git <- match.arg(git)
   if (git == "auto") {
     git <- if (pkg_installed("git2r")) "git2r" else "external"

R/install-github.R

@@ -47,12 +47,12 @@ install_github <- function(repo,
   remotes <- lapply(repo, github_remote, ref = ref,
     subdir = subdir, auth_token = auth_token, host = host)
 
-  install_remotes(remotes, ...)
+  install_remotes(remotes, auth_token = auth_token, host = host, ...)
 }
 
-github_remote <- function(repo, ref = NULL, subdir = NULL,
+github_remote <- function(repo, ref = "master", subdir = NULL,
                        auth_token = github_pat(), sha = NULL,
-                       host = "api.github.com") {
+                       host = "api.github.com", ...) {
 
   meta <- parse_git_repo(repo)
   meta <- github_resolve_ref(meta$ref %||% ref, meta, auth_token)

R/install-gitlab.R

@@ -23,12 +23,12 @@ install_gitlab <- function(repo,
 
   remotes <- lapply(repo, gitlab_remote, auth_token = auth_token, host = host)
 
-  install_remotes(remotes, ...)
+  install_remotes(remotes, auth_token = auth_token, host = host, ...)
 }
 
 gitlab_remote <- function(repo,
                        auth_token = gitlab_pat(), sha = NULL,
-                       host = "gitlab.com") {
+                       host = "gitlab.com", ...) {
 
   meta <- parse_git_repo(repo)
   meta$ref <- meta$ref %||% "master"

R/install-local.R

@@ -21,7 +21,7 @@ install_local <- function(path, subdir = NULL, ...) {
   install_remotes(remotes, ...)
 }
 
-local_remote <- function(path, subdir = NULL, branch = NULL, args = character(0)) {
+local_remote <- function(path, subdir = NULL, branch = NULL, args = character(0), ...) {
   remote("local",
     path = normalizePath(path),
     subdir = subdir

R/install-svn.R

@@ -27,11 +27,11 @@ install_svn <- function(url, subdir = NULL, args = character(0),
   remotes <- lapply(url, svn_remote, svn_subdir = subdir,
     revision = revision, args = args)
 
-  install_remotes(remotes, ...)
+  install_remotes(remotes, args = args, ...)
 }
 
 svn_remote <- function(url, svn_subdir = NULL, revision = NULL,
-  args = character(0)) {
+  args = character(0), ...) {
   remote("svn",
     url = url,
     svn_subdir = svn_subdir,

R/install-url.R

@@ -20,7 +20,7 @@ install_url <- function(url, subdir = NULL, ...) {
   install_remotes(remotes, ...)
 }
 
-url_remote <- function(url, subdir = NULL) {
+url_remote <- function(url, subdir = NULL, ...) {
   remote("url",
     url = url,
     subdir = subdir

R/install.R

@@ -99,6 +99,8 @@ safe_build_package <- function(pkgdir, build_opts, dest_path, quiet, use_pkgbuil
 #' @param threads Number of threads to start, passed to
 #'   \code{\link[utils]{install.packages}} as \code{Ncpus}.
 #' @param ... additional arguments passed to \code{\link[utils]{install.packages}}.
+#' @param build If \code{TRUE} build the pacakge before installing.
+#' @param build_opts Options to pass to `R CMD build`.
 #' @export
 #' @examples
 #' \dontrun{install_deps(".")}
@@ -109,13 +111,16 @@ install_deps <- function(pkgdir = ".", dependencies = NA,
                          type = getOption("pkgType"),
                          ...,
                          upgrade = TRUE,
-                         quiet = FALSE) {
+                         quiet = FALSE,
+                         build = TRUE,
+                         build_opts = c("--no-resave-data", "--no-manual", "--no-build-vignettes")) {
 
   packages <- dev_package_deps(
     pkgdir,
     repos = repos,
     dependencies = dependencies,
-    type = type
+    type = type,
+    ...
   )
 
   dep_deps <- if (isTRUE(dependencies)) NA else dependencies
@@ -126,6 +131,8 @@ install_deps <- function(pkgdir = ".", dependencies = NA,
     ...,
     Ncpus = threads,
     quiet = quiet,
-    upgrade = upgrade
+    upgrade = upgrade,
+    build = build,
+    build_opts = build_opts
   )
 }