wrap and set cli.width option

Bioconductor · Aug 14, 2024 · e14c9cb · e14c9cb
1 parent 93012d6
commit e14c9cb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/R/BiocCheck-class.R b/R/BiocCheck-class.R
@@ -279,17 +279,17 @@ NULL
 
 cli_warning <- function(...) {
     cli::cli_div(theme = list(.warning = list(color = "orange")))
-    cli::cli_alert_warning(paste0("{.warning W: ", ..., "}"))
+    cli::cli_alert_warning(paste0("{.warning W: ", ..., "}"), wrap = TRUE)
 }
 
 cli_error <- function(...) {
     cli::cli_div(theme = list(.error = list(color = "red")))
-    cli::cli_alert_danger(paste0("{.error E: ", ..., "}"))
+    cli::cli_alert_danger(paste0("{.error E: ", ..., "}"), wrap = TRUE)
 }
 
 cli_note <- function(...) {
     cli::cli_div(theme = list(.note = list(color = "blue")))
-    cli::cli_alert_info(paste0("{.note N: ", ..., "}"))
+    cli::cli_alert_info(paste0("{.note N: ", ..., "}"), wrap = TRUE)
 }
 
 # Message-class -----------------------------------------------------------

diff --git a/R/BiocCheck.R b/R/BiocCheck.R
@@ -139,8 +139,11 @@ BiocCheckRun <-
         dots <- dots[[1]]               # command line args come as list
 
     oldwarn <- getOption("warn")
-    on.exit(options(warn=oldwarn))
-    options(warn=1)
+    oldwidth <- getOption("cli.width")
+    on.exit({
+        options(warn = oldwarn, cli.width = oldwidth)
+    })
+    options(warn = 1, cli.width = 80)
 
     .BiocPackage <- .BiocPackage$initialize(
         packageDir = package, checkDir = checkDir

diff --git a/R/BiocCheckGitClone.R b/R/BiocCheckGitClone.R
@@ -83,8 +83,11 @@ BiocCheckGitClone <- function(package=".", ...)
         dots <- dots[[1]]               # command line args come as list
 
     oldwarn <- getOption("warn")
-    on.exit(options(warn=oldwarn))
-    options(warn=1)
+    oldwidth <- getOption("cli.width")
+    on.exit({
+        options(warn = oldwarn, cli.width = oldwidth)
+    })
+    options(warn = 1, cli.width = 80)
 
     .BiocCheck$addMetadata(.BiocPackage)
     .BiocCheck$verbose <- TRUE
@@ -107,16 +110,18 @@ BiocCheckGitClone <- function(package=".", ...)
     checkForCitationFile(.BiocPackage)
 
     # BiocCheck results -------------------------------------------------------
-    message("\n\U2500 BiocCheck results \U2500\U2500")
-    .msg(
-        "%d ERRORS | %d WARNINGS | %d NOTES",
-        .BiocCheck$getNum("error"),
-        .BiocCheck$getNum("warning"),
-        .BiocCheck$getNum("note")
+    cli::cli_rule(
+        left = paste0("BiocCheck v", packageVersion("BiocCheck"), " results")
     )
-    message(
-        "\nFor more details, run\n",
-        "    browseVignettes(package = 'BiocCheck')"
+    cli::cli_text(
+        paste0(
+            "{symbol$cross} { .BiocCheck$getNum('error') } ERRORS | ",
+            "{symbol$warning} { .BiocCheck$getNum('warning') } WARNINGS | ",
+            "{symbol$bullet} { .BiocCheck$getNum('note') } NOTES\n"
+        )
+    )
+    cli::cli_alert_info(
+        "\nFor more details, run\n  browseVignettes(package = 'BiocCheck')"
     )
 
     if (isTRUE(dots[["quit-with-status"]])) {

diff --git a/R/util.R b/R/util.R
@@ -69,7 +69,7 @@ handleNoteFiles <- function(..., help_text = "Found in files:") {
 handleMessage <- function(..., indent=4, exdent=6)
 {
     msg <- paste0(...)
-    cli::cli_alert_info(msg)
+    cli::cli_alert_info(msg, wrap = TRUE)
 }
 
 installAndLoad <- function(.BiocPackage, install_dir = tempfile())