Merge pull request #840 from lorenzwalthert/rc-1.6.0

- Prepare release v1.6.0 (#840).

Author: lorenzwalthert

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: styler
 Title: Non-Invasive Pretty Printing of R Code
-Version: 1.5.1.9001
+Version: 1.6.1
 Authors@R: 
     c(person(given = "Kirill",
              family = "Müller",
@@ -19,6 +19,7 @@ BugReports: https://github.com/r-lib/styler/issues
 Imports: 
     backports (>= 1.1.0),
     cli (>= 1.1.0),
+    glue,
     magrittr (>= 2.0.0),
     purrr (>= 0.2.3),
     R.cache (>= 0.15.0),

NEWS.md

@@ -1,5 +1,4 @@
-
-# styler 1.5.1.9000 (Development version)
+# styler 1.6.1
 
 * Files with `.Rmarkdown` extension are now recognized as an R markdown files in
   `style_file()` and friends (#824).
@@ -16,10 +15,14 @@
 
 * Break the line between `%>%` and `{` inside and outside function calls (#825).
 
-* Add language server to third-party integrations vignette (#835).
+* Add language server to third-party integration vignette (#835).
 
 * improved test setup with fixtures and similar (#798).
 
+We'd like to thank all people who helped making this release possible:
+
+[@bersbersbers](https://github.com/bersbersbers), [@eutwt](https://github.com/eutwt), [@IndrajeetPatil](https://github.com/IndrajeetPatil), [@j-mammen](https://github.com/j-mammen), [@jennybc](https://github.com/jennybc), [@JohannesNE](https://github.com/JohannesNE), [@jonkeane](https://github.com/jonkeane), [@lorenzwalthert](https://github.com/lorenzwalthert), and [@MichaelChirico](https://github.com/MichaelChirico).
+
 
 # styler 1.5.1
 
@@ -110,7 +113,7 @@ We’d like to thank everyone who has furthered the development of the latest
 release of styler through their contributions in issues and pull requests:
 
 [@ardydavari](https://github.com/ardydavari), 
-[@gadenbuie](https://github.com/gadenbuie), [@IndrajeetPatil](https://github.com/IndrajeetPatil), [@jasonhan-vassar](https://github.com/jasonhan-vassar), [@laresbernardo](https://github.com/laresbernardo), [@lorenzwalthert](https://github.com/lorenzwalthert), [@MichaelChirico](https://github.com/MichaelChirico), 
+[@gadenbuie](https://github.com/gadenbuie), [@IndrajeetPatil](https://github.com/IndrajeetPatil), @jasonhan-vassar, [@laresbernardo](https://github.com/laresbernardo), [@lorenzwalthert](https://github.com/lorenzwalthert), [@MichaelChirico](https://github.com/MichaelChirico), 
 [@Moohan](https://github.com/Moohan), 
 [@njtierney](https://github.com/njtierney), 
 [@pat-s](https://github.com/pat-s),
@@ -127,6 +130,9 @@ release of styler through their contributions in issues and pull requests:
 * hexadecimal integers now preserve the trailing `L` when styled (#761).
 * add a pre-push hook to make sure news bullets are added to each PR (#765).
 
+Thanks to everyone who contributed to this release:
+
+[@krlmlr](https://github.com/krlmlr), [@lorenzwalthert](https://github.com/lorenzwalthert), and [@renkun-ken](https://github.com/renkun-ken).
 
 # styler 1.4.0
 
@@ -400,7 +406,7 @@ Thanks to all contributors involved, in particular
 
 Thanks to all contributors involved, in particular
 
-[@Banana1530](https://github.com/Banana1530), [@batpigandme](https://github.com/batpigandme), [@cpsievert](https://github.com/cpsievert), [@ellessenne](https://github.com/ellessenne), [@Emiller88](https://github.com/Emiller88), [@hadley](https://github.com/hadley), [@IndrajeetPatil](https://github.com/IndrajeetPatil), [@krlmlr](https://github.com/krlmlr), [@lorenzwalthert](https://github.com/lorenzwalthert), [@lwjohnst86](https://github.com/lwjohnst86), [@michaelquinn32](https://github.com/michaelquinn32), [@mine-cetinkaya-rundel](https://github.com/mine-cetinkaya-rundel), [@Moohan](https://github.com/Moohan), [@nxskok](https://github.com/nxskok), [@oliverbeagley](https://github.com/oliverbeagley), [@pat-s](https://github.com/pat-s), [@reddy-ia](https://github.com/reddy-ia), and [@russHyde](https://github.com/russHyde)
+[@Banana1530](https://github.com/Banana1530), [@batpigandme](https://github.com/batpigandme), [@cpsievert](https://github.com/cpsievert), [@ellessenne](https://github.com/ellessenne), [@Emiller88](https://github.com/Emiller88), [@hadley](https://github.com/hadley), [@IndrajeetPatil](https://github.com/IndrajeetPatil), [@krlmlr](https://github.com/krlmlr), [@lorenzwalthert](https://github.com/lorenzwalthert), [@lwjohnst86](https://github.com/lwjohnst86), [@michaelquinn32](https://github.com/michaelquinn32), [@mine-cetinkaya-rundel](https://github.com/mine-cetinkaya-rundel), [@Moohan](https://github.com/Moohan), [@nxskok](https://github.com/nxskok), [@oliverbeagley](https://github.com/oliverbeagley), [@pat-s](https://github.com/pat-s), @reddy-ia, and [@russHyde](https://github.com/russHyde)
 
 # styler 1.1.1
 

R/zzz.R

@@ -8,9 +8,54 @@
     styler.ignore_start = "# styler: off",
     styler.ignore_stop = "# styler: on",
     styler.quiet = FALSE,
-    styler.test_dir_writable = TRUE
+    styler.test_dir_writable = TRUE,
+    styler.interactive_ask_remove_old_caches = TRUE
   )
   toset <- !(names(op.styler) %in% names(op))
   if (any(toset)) options(op.styler[toset])
+  remind_removing_old_cache()
   invisible()
 }
+
+#' Ask people to remove the cache
+#'
+#' The way RStudio Startup works does not allow o read the prompt for some
+#' reasons (https://stackoverflow.com/questions/55772436/readline-does-not-prompt-user-input-from-rprofile-site-in-rstudio)
+#' So we better don't use the prompt and issue a message only.
+#' @keywords internal
+remind_removing_old_cache <- function() {
+  if (interactive() && getOption("styler.interactive_ask_remove_old_caches", TRUE)) {
+    dirs <- list.dirs(R.cache::getCachePath("styler"), recursive = FALSE)
+    if (length(dirs) < 1) {
+      return()
+    }
+    dirs <- dirs[unname(sapply(dirs, function(x) length(list.files(x)) > 0))]
+    package_versions <- package_version(basename(dirs), strict = FALSE)
+    package_versions <- package_versions[!is.na(package_versions)]
+    old_package_versions <- package_versions[package_versions < styler_version]
+    if (length(old_package_versions) < 1) {
+      return()
+    }
+
+    cmd <- glue::glue("styler::cache_clear(\"{basename(dirs)}\", ask = FALSE)") %>%
+      paste0(collapse = "\n")
+    cli::cli_alert_info(paste0(
+      "You are using {{styler}} version {styler_version} but we found ",
+      "caches for older versions of {{styler}}.\n",
+      "You can delete them with the following commands:"
+    ))
+    cat("\n")
+    cli::cli_code(cmd)
+    cat("\n")
+    cli::cli_alert_info(
+      paste(
+        "We'll remind you every time you update {{styler}}.",
+        "To suppress this prompt in the future:"
+      )
+    )
+    cat("\n")
+    cli::cli_code(
+      'options("styler.interactive_ask_remove_old_caches" = FALSE)'
+    )
+  }
+}

cran-comments.md

@@ -1,9 +1,12 @@
+This is a submission to fix a problem with persistent caching, reported by 
+Prof Ripley on 07.09.2021, and invalid URLs, based on an email from Uwe Ligges 
+on 17.09.2021.
 
 ## Test environments
 
-* local OS X install (10.15.7): R 4.0.3
-* ubuntu 18.04 (on GitHub Actions): R devel, R 4.0.3, R 3.6, R 3.5, R 3.4, R 3.3
-* Windows Server 10 (on GitHub Actions): R 3.6, R 4.0.3
+* local OS X install (10.15.7): R 4.1.0
+* ubuntu 18.04 (on GitHub Actions): R devel, R 4.1.1, R 4.0.5, R 3.6, R 3.5, R 3.4
+* Windows Server 10 (on GitHub Actions): R 3.6, R 4.0.5
 * win-builder: R devel
 
 ## R CMD check results
@@ -32,13 +35,14 @@ I also ran R CMD check on all downstream dependencies of styler using the
 revdepcheck package. The 
 downstream dependencies are: 
 
-* Reverse imports: biocthis, exampletestr, iNZightTools, languageserver, 
-  questionr, shinymeta, shinyobjects, ShinyQuickStarter, systemPipeShiny, 
-  tidypaleo.
+* Reverse imports: biocthis, boomer, exampletestr, flow, iNZightTools, 
+  languageserver, questionr, shinymeta, shinyobjects, ShinyQuickStarter, 
+  systemPipeShiny, tidypaleo
 
-* Reverse suggests:	autothresholdr, crunch, datastructures, drake, epigraphdb, 
-  knitr, multiverse, nph, precommit, reprex, shinydashboardPlus, 
-  shinyMonacoEditor, usethis.
+* Reverse suggests: autothresholdr, autothresholdr, crunch, datastructures, 
+  drake, epigraphdb, knitr, multiverse, nph, precommit, reprex, shiny.react,
+  shinydashboardPlus, shinyMonacoEditor, usethis.
+
 
 
 All of them finished R CMD CHECK with the same number of ERRORS, WARNINGS and 

inst/WORDLIST

@@ -102,6 +102,7 @@ levelName
 LF
 LIBS
 lifecycle
+Ligges
 linux
 lorenz
 lorenzwalthert
@@ -144,6 +145,7 @@ questionr
 rcmdcheck
 RcppExports
 rds
+readline
 readme
 README
 rebased
@@ -199,6 +201,7 @@ shinyMonacoEditor
 shinyobjects
 ShinyQuickStarter
 sprintf
+stackoverflow
 StackOverflow
 startsWith
 STR
@@ -239,6 +242,7 @@ unnest
 unstyled
 usethis
 utf
+Uwe
 VignetteBuilder
 Visit'em
 walthert