Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: checked
Title: Systematically Run R CMD Checks
Version: 0.5.5
Version: 0.6.0
Authors@R:
c(
person(
Expand Down Expand Up @@ -47,7 +47,6 @@ Imports:
utils (>= 3.6.2),
tools
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.3
Suggests:
remotes,
testthat (>= 3.0.0),
Expand All @@ -56,3 +55,4 @@ Suggests:
Config/Needs/website:
r-lib/asciicast
Config/testthat/edition: 3
Config/roxygen2/version: 8.0.0
6 changes: 6 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ S3method(report_sleep,default)
S3method(report_sleep,reporter_ansi_tty)
S3method(report_sleep,reporter_basic_tty)
S3method(report_start_checks,"NULL")
S3method(report_start_checks,default)
S3method(report_start_checks,reporter_ansi_tty)
S3method(report_start_setup,"NULL")
S3method(report_start_setup,reporter_ansi_tty)
Expand Down Expand Up @@ -126,6 +127,10 @@ S3method(start_task,igraph.vs)
S3method(start_task,install_task)
S3method(task_graph,task)
S3method(task_graph,task_graph)
S3method(version,"NULL")
S3method(version,default)
S3method(version,pkg_origin)
S3method(version,task)
export(STATUS)
export(check_pkgs)
export(check_rev_deps)
Expand Down Expand Up @@ -156,6 +161,7 @@ import(cli)
import(options)
importFrom(R6,R6Class)
importFrom(callr,r_process)
importFrom(callr,r_process_options)
importFrom(cli,make_spinner)
importFrom(igraph,"E<-")
importFrom(igraph,"V<-")
Expand Down
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# checked 0.6.0

* Add 'install_cmdargs' option which can be used to specify R CMD args
for subprocesses installing packages.

* Add version information R CMD check diff output.

# checked 0.5.5

* Add 'install_opts_to_inherit' option which can be used to specify parameters
Expand Down
16 changes: 12 additions & 4 deletions R/install.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#' @importFrom utils packageName install.packages
#' @importFrom R6 R6Class
#' @importFrom callr r_process
#' @importFrom callr r_process r_process_options
install_process <- R6::R6Class(
"install_process",
inherit = callr::r_process,
Expand All @@ -17,8 +17,15 @@ install_process <- R6::R6Class(
if (!dir.exists(lib)) dir.create(lib, recursive = TRUE)
private$package <- pkgs
self$log <- log
cmdargs <- options::opt("install_cmdargs")
hooks <- if (any(c("--vanilla", "--no-init-file") %in% cmdargs)) {
callr::r_process_options()$load_hook
} else {
""
}
private$callr_r_bg(
function(..., opts_to_inherit) {
function(..., opts_to_inherit, hooks) {
eval(parse(text = hooks))
do.call(options, opts_to_inherit)
invisible(capture.output(withCallingHandlers(
utils::install.packages(..., quiet = FALSE, verbose = TRUE),
Expand All @@ -33,14 +40,15 @@ install_process <- R6::R6Class(
lib = lib,
opts_to_inherit = do.call(
options, options::opt("install_opts_to_inherit")
)
),
hooks = hooks
),
libpath = libpaths,
stdout = self$log,
stderr = "2>&1",
system_profile = options::opt("install_system_profile"),
user_profile = options::opt("install_user_profile"),
cmdargs = c("--slave", "--no-save", "--no-restore", "--vanilla"),
cmdargs = cmdargs,
env = env
)
},
Expand Down
6 changes: 5 additions & 1 deletion R/options.R
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@ options::define_options(
"available_packages_filters",
"HTTPUserAgent",
"pkgType"
)
),

"`character` vector of args passed to the separate R package installation
process.",
install_cmdargs = c("--slave", "--no-save", "--no-restore")
)

#' @eval options::as_roxygen_docs()
Expand Down
1 change: 1 addition & 0 deletions R/reporter.R
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ report_start_checks <- function(reporter, checker, ..., envir = parent.frame())
}

#' @rdname reporters-internal
#' @export
report_start_checks.default <- function(reporter, checker, ..., envir = parent.frame()) { # nolint
NULL
}
Expand Down
17 changes: 15 additions & 2 deletions R/results.R
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ results_revdep_check <- function(dev, release, output = NULL, ...) {
}),
names = CHECK_ISSUES_TYPES,
package = dev_check$package,
version = dev_check$version,
class = c("rcmdcheck_rev_dep_results", "rcmdcheck_results")
)
}
Expand Down Expand Up @@ -372,13 +373,25 @@ rcmdcheck_from_json <- function(file) {

#' @export
print.rcmdcheck_rev_dep_results <- function(x, ...) {
cat(sprintf("%s package R CMD check diff \n", attr(x, "package")))
cat(
sprintf(
"%s (v%s) package R CMD check diff \n",
attr(x, "package"),
attr(x, "version")
)
)
NextMethod()
}

#' @export
print.rcmdcheck_check_results <- function(x, ...) {
cat(sprintf("%s package R CMD check \n", attr(x, "package")))
cat(
sprintf(
"%s (v%s) package R CMD check \n",
attr(x, "package"),
attr(x, "version")
)
)
NextMethod()
}

Expand Down
24 changes: 24 additions & 0 deletions R/task.R
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,27 @@ package.task <- function(x) {
package.pkg_origin <- function(x) {
x$package
}

version <- function(x) {
UseMethod("version")
}

#' @export
version.default <- function(x) {
stop("Unrecognized type")
}

#' @export
version.NULL <- function(x) {
""
}

#' @export
version.task <- function(x) {
version(x$origin)
}

#' @export
version.pkg_origin <- function(x) {
x$version
}
4 changes: 0 additions & 4 deletions man/DB_COLNAMES.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions man/DEP.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions man/DEP_STRONG.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions man/RELATION.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 4 additions & 9 deletions man/STATUS.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/check_pkgs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/check_rev_deps.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions man/check_task.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/checked-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading