Polish code and docs re: options for DESCRIPTION fields

DESCRIPTION

@@ -33,6 +33,7 @@ Imports:
     rprojroot,
     rstudioapi,
     spelling,
+    utils,
     whisker
 Suggests: 
     covr,
@@ -43,10 +44,10 @@ Suggests:
     styler,
     testthat (>= 2.0.0),
     withr
+Remotes: 
+    ropensci/git2r
 Encoding: UTF-8
+Language: en-US
 LazyData: true
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 6.0.1.9000
-Language: en-US
-Remotes: 
-    ropensci/git2r

R/create.R

@@ -26,7 +26,7 @@
 #'   in RStudio, working directory is set to the new project.
 #' @export
 create_package <- function(path,
-                           fields = getOption("devtools.desc"),
+                           fields = NULL,
                            rstudio = rstudioapi::isAvailable(),
                            open = interactive()) {
   path <- normalizePath(path, mustWork = FALSE)
@@ -44,7 +44,7 @@ create_package <- function(path,
 
   use_directory("R")
   use_directory("man")
-  use_description(fields = fields)
+  use_description(fields)
   use_namespace()
 
   if (rstudio) {

R/description.R

@@ -1,38 +1,48 @@
-#' Create a default DESCRIPTION file for a package.
+#' Create a DESCRIPTION file
 #'
 #' @description
-#' If you create a lot of packages, you can override the defaults by setting
-#' option `"usethis.description"` to a named list. Here's an example of code one
-#' could include in `.Rprofile`:
+#' usethis consults the following sources, in this order, to set DESCRIPTION
+#' fields:
+#' * `fields` argument of [create_package()] or [use_description()]
+#' * `getOption("usethis.description")` or `getOption("devtools.desc")`. The
+#' devtools option is consulted only for backwards compatibility and it's
+#' recommended to switch to an option named "usethis.description".
+#' * Defaults built into usethis
+#'
+#' If you create a lot of packages, consider storing personalized defaults as a
+#' named list in an option named `"usethis.description"`. Here's an example of
+#' code to include in `.Rprofile`:
 #'
 #' ```
 #' options(
 #'   usethis.name = "Jane Doe",
 #'   usethis.description = list(
-#'     `Authors@R` = 'person("Jane", "Doe", email = "jane@example.com", role = c#' ("aut", "cre"))',
+#'     `Authors@R` = 'person("Jane", "Doe", email = "jane@example.com", role = c("aut", "cre"))',
 #'     License = "MIT + file LICENSE",
-#'     Version = "0.0.0.9000"
+#'     Language: es
 #'   )
 #' )
 #' ```
 #'
-#' @param fields A named list of fields to add to \file{DESCRIPTION},
-#'   potentially overriding the defaults. If `NULL`, retrieved from
-#'   `getOption("usethis.description")`, and (for backward compatibility) from
-#'   `getOption("devtools.desc")`.
+#' @param fields A named list of fields to add to DESCRIPTION, potentially
+#'   overriding default values. See [use_description()] for how you can set
+#'   personalized defaults using package options
 #' @export
 #' @examples
 #' \dontrun{
 #' use_description()
+#'
+#' use_description(fields = list(Language = "es"))
 #' }
 use_description <- function(fields = NULL) {
   name <- project_name()
   check_package_name(name)
 
-  fields <- fields %||%
-    getOption("usethis.description") %||%
-    getOption("devtools.desc") %||%
-    list()
+  ## the definitive source of user-supplied info: in this call or via options
+  fields <- utils::modifyList(
+    fields %||% list(),
+    getOption("usethis.description") %||% getOption("devtools.desc") %||% list()
+  )
 
   desc <- build_description(name, fields)
   write_over(proj_get(), "DESCRIPTION", desc)
@@ -48,22 +58,15 @@ build_description <- function(name, fields = list()) {
 }
 
 build_description_list <- function(name, fields = list()) {
-  author <- getOption("devtools.desc.author") %||%
-    'person("First", "Last", , "first.last@example.com", c("aut", "cre"))'
-  license <- getOption("devtools.desc.license") %||% "What license it uses"
-  suggests <- getOption("devtools.desc.suggests")
-
   defaults <- list(
     Package = name,
     Version = "0.0.0.9000",
     Title = "What the Package Does (One Line, Title Case)",
     Description = "What the package does (one paragraph).",
-    "Authors@R" = author,
-    License = license,
-    Suggests = suggests,
+    "Authors@R" = 'person("First", "Last", , "first.last@example.com", c("aut", "cre"))',
+    License = "What license it uses",
     Encoding = "UTF-8",
-    LazyData = "true",
-    ByteCompile = "true"
+    LazyData = "true"
   )
 
   # Override defaults with user supplied options

R/license.R

@@ -96,13 +96,13 @@ license_data <- function(name, base_path = proj_get()) {
 
 
 find_name <- function() {
-  name <- getOption("devtools.name")
-  if (!is.null(name) && name != "Your name goes here") {
+  name <- getOption("usethis.full_name")
+  if (!is.null(name)) {
     return(name)
   }
 
-  name <- getOption("usethis.full_name")
-  if (!is.null(name)) {
+  name <- getOption("devtools.name")
+  if (!is.null(name) && name != "Your name goes here") {
     return(name)
   }
 

tests/testthat/helper.R

@@ -23,9 +23,11 @@ scoped_temporary_thing <- function(dir = tempfile(pattern = pattern),
   # Can't schedule a deferred project reset if calling this from the R console,
   # which is useful when developing tests
   if (identical(env, globalenv())) {
+    ## I use proj_get() here deliberately, because after load_all()
+    ## proj$cur is typically NULL
     todo(
       "Switching to a temporary project! To restore current project:\n",
-      "proj_set(\"", old, "\")"
+      "proj_set(\"", proj_get(), "\")"
     )
   } else {
     withr::defer(proj_set(old), envir = env)