Merge branch 'v2.2.1-rc'

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: devtools
 Title: Tools to Make Developing R Packages Easier
-Version: 2.2.0.9000
+Version: 2.2.1
 Authors@R: c(
     person("Hadley", "Wickham", role = "aut"),
     person("Jim", "Hester", , "[email protected]", role = c("aut", "cre")),
@@ -66,3 +66,4 @@ VignetteBuilder: knitr
 Encoding: UTF-8
 RoxygenNote: 6.1.1
 Roxygen: list(markdown = TRUE)
+Language: en-US

NAMESPACE

@@ -85,7 +85,6 @@ export(uses_testthat)
 export(wd)
 export(with_debug)
 importFrom(cli,cat_bullet)
-importFrom(cli,cat_line)
 importFrom(cli,cat_rule)
 importFrom(ellipsis,check_dots_used)
 importFrom(memoise,memoise)

NEWS.md

@@ -1,4 +1,4 @@
-# devtools (development version)
+# devtools 2.2.1
 
 * `test()` now sets the collation order to `C` before running, which matches
   the behavior of tests when run with `R CMD check` (#2121)
@@ -19,14 +19,14 @@
 
 * `install()` now throws an error when it fails, as intended (#2120)
 
-* `test()` now explicitly passes `stop_on_failure = FALSE` to
-  `testthat::test_dir()` (@jameslamb, #2099)
-
 * `install()` now again reloads and re-attaches packages if they were
   previously loaded (#2111).
 
 * `release()` no longer calls the deprecated `dr_devtools()` (#2105)
 
+* `test()` now explicitly passes `stop_on_failure = FALSE` to
+  `testthat::test_dir()` (@jameslamb, #2099)
+
 # devtools 2.2.0
 
 ## New Features
@@ -108,7 +108,7 @@
 * `check_cran()`, `revdep_check()`, `revdep_check_print_problems()`,
   `revdep_check_reset()`, `revdep_check_resume()`, `revdep_check_save_summary()`,
   `revdep_email()` have been removed after being
-  deprecated in prevous releases. It is recommended to use the
+  deprecated in previous releases. It is recommended to use the
   [revdepcheck](https://github.com/r-lib/revdepcheck) package instead.
 
 * `system_check()`, `system_output()` have been removed after being deprecated
@@ -1000,7 +1000,7 @@ There were a handful of smaller fixes:
   `utils::unzip()` (#761, @robertzk).
 
 * `release()` now reminds you to check the existing CRAN check results page
-  (#613) ands shows file size before uploading to CRAN (#683, @krlmlr).
+  (#613) and shows file size before uploading to CRAN (#683, @krlmlr).
 
 * `RCMD()` and `system_check()` are now exported so they can be used by other 
   packages. (@jimhester, #699).
@@ -1434,7 +1434,7 @@ Two dependencies were incremented:
 
 * `source_url()` (and `source_gist()`) accept SHA1 prefixes.
 
-* `source_gist()` uses the github api to reliably locate the raw gist.
+* `source_gist()` uses the GitHub API to reliably locate the raw gist.
   Additionally it now only attempts to source files with `.R` or `.r`
   extensions, and gains a `quiet` argument. (#348)
 
@@ -1799,7 +1799,7 @@ Two dependencies were incremented:
 * The NAMESPACE file is now used for loading imports, instead of the
   DESCRIPTION file. Previously, `load_all` loaded all objects from the
   packages listed in DESCRIPTION. Now it loads packages (and,
-  when 'importfrom' is used, specific objects from packages) listed in
+  when 'importFrom' is used, specific objects from packages) listed in
   NAMESPACE. This more closely simulates normal package loading. It
   still checks version numbers of packages listed in DESCRIPTION.
   (Winston Chang)

R/check.R

@@ -223,7 +223,7 @@ aspell_env_var <- function() {
 }
 
 show_env_vars <- function(env_vars, trailing = TRUE) {
-  cat_line("Setting env vars:", col = "darkgrey")
+  cli::cat_line("Setting env vars:", col = "darkgrey")
   cat_bullet(paste0(format(names(env_vars)), ": ", unname(env_vars)), col = "darkgrey")
   if (trailing) {
     cat_rule(col = "cyan")

R/document.R

@@ -23,7 +23,7 @@ document <- function(pkg = ".", roclets = NULL, quiet = FALSE) {
     load_all(pkg$path, quiet = quiet)
   }
 
-  if (packageVersion("roxyen2") >= "6.1.99.9001") {
+  if (packageVersion("roxygen2") >= "6.1.99.9001") {
     load_code <- NULL
   } else {
     if (pkg$package == "roxygen2") {

R/lint.R

@@ -1,7 +1,7 @@
 #' Lint all source files in a package.
 #'
 #' The default linters correspond to the style guide at
-#' <https://r-pkgs.had.co.nz/r.html#style>, however it is possible to
+#' <http://r-pkgs.had.co.nz/r.html#style>, however it is possible to
 #' override any or all of them using the `linters` parameter.
 #' @template devtools
 #' @param cache store the lint results so repeated lints of the same content

R/zzz.R

@@ -1,7 +1,7 @@
 #' @importFrom utils available.packages contrib.url install.packages
 #'   installed.packages modifyList packageDescription
 #'   packageVersion remove.packages
-#' @importFrom cli cat_rule cat_line cat_bullet
+#' @importFrom cli cat_rule cat_bullet
 NULL
 
 #' Package development tools for R.

README.md

@@ -85,16 +85,16 @@ look in the current working directory - this is recommended practice.
 R package development can be intimidating, however there are now a number of
 valuable resources to help!
 
-<a href="https://r-pkgs.org"><img src="https://r-pkgs.org/images/cover.png" height="252" align = "right"/></a>
+<a href="http://r-pkgs.org"><img src="http://r-pkgs.org/images/cover.png" height="252" align = "right"/></a>
 
 1. R Packages is a book that gives a comprehensive treatment of all common parts
    of package development and uses devtools throughout.
     * The first edition is available at <http://r-pkgs.had.co.nz>, but note that
       it has grown somewhat out of sync with the current version of devtools.
     * A second edition is under development and is evolving to reflect the
-      current state of devtools. It is available at <https://r-pkgs.org>.
-    * The [Whole Game](https://r-pkgs.org/whole-game.html) and
-      [Package structure](https://r-pkgs.org/package-structure-state.html) chapters
+      current state of devtools. It is available at <http://r-pkgs.org>.
+    * The [Whole Game](http://r-pkgs.org/whole-game.html) and
+      [Package structure](http://r-pkgs.org/package-structure-state.html) chapters
       make great places to start.
 
 2. [RStudio community - package
@@ -166,9 +166,9 @@ e.g. use `sessioninfo::session_info()` rather than `devtools::session_info()`,
 or `remotes::install_github()` vs `devtools::install_github()`.
 
 However for day to day development we recommend you continue to use
-`library(devtools)` to quickly load all needed deveolpment tools, just like
-`library(tidyverse)` quickly loads all the tools nessesary for data exploration
-and vizualization.
+`library(devtools)` to quickly load all needed development tools, just like
+`library(tidyverse)` quickly loads all the tools necessary for data exploration
+and visualization.
 
 ## Code of conduct
 

inst/WORDLIST

@@ -1,53 +1,174 @@
+Allaire
+AppVeyor
+BiocInstaller
+Bioconductor
+Bitbucket
+BugReports
+Bugfix
+CMD
+CYGWIN
+Cheatsheet
+Chun
+Coallier
+DT
+ERRORs
+Fong
+GitLab
+Github
+HKCU
+HKLM
+Hadley
+JJ
+JSON
+Jefferis
+Kirill
+Kohske
+Kornelius
+Laake
+LinkingTo
+Lovell
+Makevars
+Maëlle
+Müller
+NOTEs
+README
+RStudio
+Rbuildignore
+Rcpp
+Redd
+Rmarkdown
+Rmd
+Rohmeyer
+Rprofile
+RTools
+SHA
+Studer
+Takahashi
+Titov
+UNC
+VignetteBuilder
+VignetteEncoding
+VignetteEngine
+VignetteIndexEntry
+WARNINGs
+Westlake
+Wickham
+Xie
+xxxx
+YAML
+Yihui
+addin
+addins
+al
 amongst
 artefacts
 behaviour
-Bioconductor
+bioc
+bitbucket
+callr
+cleandoc
+cli
+codecov
+codemeta
+compileAttributes
+config
+covr
 cran
-CMD
 dev
+devmode
 dir
+dplyr
 env
-ERRORs
+envvar
+et
+fieldnames
+focussed
 forkable
+forseeable
+gcc
 gists
+github
+gitorious
 gui
-Hadley
+gz
+hadley
 http
 https
+hunspell
+importFrom
+initialising
 installable
+io
+json
 knitr
+landroni
 lexicographically
-LinkingTo
+libcurl
+libpaths
 linters
 lintr
+linux
+macOS
 maintainer's
 makefiles
 md
-NOTEs
+mnel
+nchar
+nz
 objs
+pandoc
+param
+params
+passthrough
 pkgbuild
+pkgdown
+pkgload
+pkgs
+pre
+processx
+pryr
+rOpenSci
+randomises
+rcmdcheck
 rds
 readme
-README
 realisation
+reinstalls
+repo
+repos
 revdep
 revdepcheck
+rgl
 rhub
 rmarkdown
-Rmarkdown
-Rmd
 roclet
 roxygen
-RStudio
-SHA
+rstudio
+rstudioapi
+rtools
+sessioninfo
+sha
+snuck
+src
+srcreferences
 srcrefs
+subdir
+submodules
+summarised
+summarises
+svg
+synchronise
 testthat
 tex
+tgz
+toolchain
+travis
+trimws
 un
-VignetteEncoding
-VignetteEngine
-VignetteIndexEntry
-WARNINGs
-Wickham
+uncommited
+usethis
+vectorised
+withr
+wordlists
 xyz
-YAML
+yml

tests/spelling.R

@@ -0,0 +1,3 @@
+if(requireNamespace('spelling', quietly = TRUE))
+  spelling::spell_check_test(vignettes = TRUE, error = FALSE,
+                             skip_on_cran = TRUE)