Drop crayon dependency

Use cli instead.
r-lib · Nov 20, 2023 · 3ba537a · 3ba537a
1 parent a1ac687
commit 3ba537a
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 16 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,12 +13,11 @@ Description: Provides functions used to build R packages. Locates
 License: MIT + file LICENSE
 URL: https://github.com/r-lib/pkgbuild, https://pkgbuild.r-lib.org
 BugReports: https://github.com/r-lib/pkgbuild/issues
-Depends: 
+Depends:
  R (>= 3.5)
 Imports:
  callr (>= 3.2.0),
  cli (>= 3.4.0),
- crayon,
  desc,
  prettyunits,
  processx,

diff --git a/NAMESPACE b/NAMESPACE
@@ -34,10 +34,6 @@ importFrom(R6,R6Class)
 importFrom(callr,rcmd_process)
 importFrom(callr,rcmd_process_options)
 importFrom(cli,symbol)
-importFrom(crayon,bold)
-importFrom(crayon,green)
-importFrom(crayon,make_style)
-importFrom(crayon,red)
 importFrom(prettyunits,pretty_dt)
 importFrom(utils,head)
 importFrom(utils,tail)
diff --git a/R/compiler-flags.R b/R/compiler-flags.R
@@ -48,7 +48,7 @@ compiler_flags <- function(debug = FALSE) {
  )
  }
 
- if (crayon::has_color() && has_compiler_colored_diagnostics()) {
+ if (cli::num_ansi_colors() > 1 && has_compiler_colored_diagnostics()) {
  flags <- c(
  "CFLAGS", "CXXFLAGS", "CXX11FLAGS",
  "CXX14FLAGS", "CXX17FLAGS", "CXX20FLAGS"
@@ -60,7 +60,9 @@ compiler_flags <- function(debug = FALSE) {
 
 has_compiler_colored_diagnostics <- function() {
  val <- interpret_envvar_flag("PKG_BUILD_COLOR_DIAGNOSTICS", NA_character_)
- if (!is.na(val)) return(val)
+ if (!is.na(val)) {
+ return(val)
+ }
 
  if (cache_exists("has_compiler_colored_diagnostics")) {
  return(cache_get("has_compiler_colored_diagnostics"))

diff --git a/R/styles.R b/R/styles.R
@@ -1,17 +1,15 @@
-#' @importFrom crayon red green make_style bold
-
 # This is from https://github.com/r-lib/rcmdcheck/blob/7ee14764c2b17ee2c2f4131a9e19d1b56a66ed0f/R/styles.R
 style <- function(..., sep = "") {
  args <- list(...)
  st <- names(args)
 
  styles <- list(
- "ok" = green,
- "note" = make_style("orange"),
- "warn" = make_style("orange")$ bold,
- "err" = red,
- "pale" = make_style("darkgrey"),
- "timing" = make_style("cyan")
+ "ok" = cli::col_green,
+ "note" = cli::make_ansi_style("orange"),
+ "warn" = function(x) cli::style_bold(cli::make_ansi_style("orange")(x)),
+ "err" = cli::col_red,
+ "pale" = cli::make_ansi_style("darkgrey"),
+ "timing" = cli::make_ansi_style("cyan")
  )
 
  nms <- names(args)

diff --git a/tests/testthat/_snaps/style.md b/tests/testthat/_snaps/style.md
@@ -0,0 +1,13 @@
+# style
+
+ Code
+  cat(style(ok = "OK", "\n", note = "NOTE", "\n", warn = "WARN", "\n", err = "ERROR",
+  "\n", pale = "Not important", "\n", timing = "[1m]", "\n"))
+ Output
+  [32mOK[39m
+  [38;5;214mNOTE[39m
+  [1m[38;5;214mWARN[39m[22m
+  [31mERROR[39m
+  [38;5;247mNot important[39m
+  [36m[1m][39m
+
diff --git a/tests/testthat/test-style.R b/tests/testthat/test-style.R
@@ -0,0 +1,13 @@
+test_that("style", {
+ withr::local_options(cli.num_colors = 256)
+ expect_snapshot(
+ cat(style(
+ ok = "OK", "\n",
+ note = "NOTE", "\n",
+ warn = "WARN", "\n",
+ err = "ERROR", "\n",
+ pale = "Not important", "\n",
+ timing = "[1m]", "\n"
+ ))
+ )
+})