Skip to content

Commit 22e8430

Browse files
Merge branch 'develop' of github.com:HenrikBengtsson/progressr into develop
2 parents 3483519 + 3f5a75d commit 22e8430

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: progressr
2-
Version: 0.6.0-9000
2+
Version: 0.6.0-9001
33
Title: An Inclusive, Unifying API for Progress Updates
44
Description: A minimal, unifying API for scripts and packages to report progress updates from anywhere including when using parallel processing. The package is designed such that the developer can to focus on what progress should be reported on without having to worry about how to present it. The end user has full control of how, where, and when to render these progress updates, e.g. in the terminal using utils::txtProgressBar() or progress::progress_bar(), in a graphical user interface using utils::winProgressBar(), tcltk::tkProgressBar() or shiny::withProgress(), via the speakers using beep::beepr(), or on a file system via the size of a file. Anyone can add additional, customized, progression handlers. The 'progressr' package uses R's condition framework for signaling progress updated. Because of this, progress can be reported from almost anywhere in R, e.g. from classical for and while loops, from map-reduce APIs like the lapply() family of functions, 'purrr', 'plyr', and 'foreach'. It will also work with parallel processing via the 'future' framework, e.g. future.apply::future_lapply(), furrr::future_map(), and 'foreach' with 'doFuture'. The package is compatible with Shiny applications.
55
Authors@R: c(
@@ -22,7 +22,7 @@ Suggests:
2222
foreach,
2323
plyr,
2424
doFuture,
25-
future (>= 1.16.0),
25+
future,
2626
future.apply,
2727
furrr,
2828
shiny,

R/handler_pbcol.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ handler_pbcol <- function(adjust = 0.0, pad = 1L, complete = function(s) crayon:
3939

4040
redraw_progress_bar <- function(ratio, message, spin = " ") {
4141
stop_if_not(ratio >= 0, ratio <= 1)
42-
if (crayon_enabled && !is.null(getOption("crayon.enabled", NULL))) {
42+
if (crayon_enabled) {
4343
options(crayon.enabled = TRUE)
4444
on.exit(options(crayon.enabled = TRUE), add = TRUE)
4545
}

revdep/test_with_global_handlers.R

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ local({
4545
if (!is.null(logfile)) cat(msg, file = logfile, append = TRUE)
4646
}
4747

48+
debug <- nzchar(Sys.getenv("R_BASE_STARTUP_DEBUG"))
49+
if (debug) {
50+
log_("R_BASE_STARTUP_DEBUG=%s", Sys.getenv("R_BASE_STARTUP_DEBUG"))
51+
log_("R_BASE_STARTUP=%s", Sys.getenv("R_BASE_STARTUP"))
52+
log_("R_BASE_STARTUP_FILE=%s", Sys.getenv("R_BASE_STARTUP_FILE"))
53+
}
54+
4855
## R CMD check package tests?
4956
if (nzchar(testfile <- Sys.getenv("R_TESTS"))) {
5057
log_("commandArgs()=%s", paste(commandArgs(), collapse = " "))

0 commit comments

Comments
 (0)