Prefer rlang::is_interactive(), is_string(), and seq2() to our DIY versions (#1084)

* Prefer rlang::is_interactive() to our DIY version

Closes #1082

* Prefer rlang::is_string() to our DIY version

* Prefer rlang::seq2() to our DIY version

Author: jennybc

R/addin.R

@@ -9,7 +9,7 @@
 #' @inheritParams use_template
 #'
 #' @export
-use_addin <- function(addin = "new_addin", open = interactive()) {
+use_addin <- function(addin = "new_addin", open = rlang::is_interactive()) {
   addin_dcf_path <- proj_path("inst", "rstudio", "addins.dcf")
 
   if (!file_exists(addin_dcf_path)) {

R/ci.R

@@ -21,7 +21,7 @@ NULL
 #'   https://travis-ci.com. Change to `"org"` for https://travis-ci.org.
 #' @export
 #' @rdname ci
-use_travis <- function(browse = interactive(), ext = c("com", "org")) {
+use_travis <- function(browse = rlang::is_interactive(), ext = c("com", "org")) {
   check_uses_github()
   ext <- arg_match(ext)
   new <- use_template(
@@ -51,7 +51,7 @@ use_travis_badge <- function(ext = c("com", "org")) {
   use_badge("Travis build status", url, img)
 }
 
-travis_activate <- function(browse = interactive(), ext = c("com", "org")) {
+travis_activate <- function(browse = is_interactive(), ext = c("com", "org")) {
   ext <- arg_match(ext)
   url <- glue("https://travis-ci.{ext}/profile/{github_owner()}")
 
@@ -85,7 +85,7 @@ check_uses_travis <- function(base_path = proj_get()) {
 #' integration service for Windows.
 #' @export
 #' @rdname ci
-use_appveyor <- function(browse = interactive()) {
+use_appveyor <- function(browse = rlang::is_interactive()) {
   check_uses_github()
 
   new <- use_template("appveyor.yml", ignore = TRUE)
@@ -99,7 +99,7 @@ use_appveyor <- function(browse = interactive()) {
   invisible(TRUE)
 }
 
-appveyor_activate <- function(browse = interactive()) {
+appveyor_activate <- function(browse = is_interactive()) {
   url <- "https://ci.appveyor.com/projects/new"
   ui_todo("Turn on AppVeyor for this repo at {url}")
   if (browse) {
@@ -179,7 +179,7 @@ check_uses_gitlab_ci <- function(base_path = proj_get()) {
 #'   `rocker/r-ver:3.5.3`.
 #' @export
 #' @rdname ci
-use_circleci <- function(browse = interactive(), image = "rocker/verse:latest") {
+use_circleci <- function(browse = rlang::is_interactive(), image = "rocker/verse:latest") {
   check_uses_github()
   use_directory(".circleci", ignore = TRUE)
   new <- use_template(
@@ -210,7 +210,7 @@ use_circleci_badge <- function() {
   use_badge("CircleCI build status", url, img)
 }
 
-circleci_activate <- function(browse = interactive()) {
+circleci_activate <- function(browse = is_interactive()) {
   url <- glue("https://circleci.com/add-projects/gh/{github_owner()}")
 
   ui_todo("Turn on CircleCI for your repo at {url}")

R/course.R

@@ -63,7 +63,7 @@ use_course <- function(url, destdir = getOption("usethis.destdir")) {
   destdir <- user_path_prep(destdir %||% conspicuous_place())
   check_path_is_directory(destdir)
 
-  if (destdir_not_specified && interactive()) {
+  if (destdir_not_specified && is_interactive()) {
     ui_line(c(
       "Downloading into {ui_path(destdir)}.",
       "Prefer a different location? Cancel, try again, and specify {ui_code('destdir')}"
@@ -87,7 +87,7 @@ use_course <- function(url, destdir = getOption("usethis.destdir")) {
 #' @export
 use_zip <- function(url,
                     destdir = getwd(),
-                    cleanup = if (interactive()) NA else FALSE) {
+                    cleanup = if (rlang::is_interactive()) NA else FALSE) {
   url <- normalize_url(url)
   check_path_is_directory(destdir)
   ui_done("Downloading from {ui_value(url)}")
@@ -295,7 +295,7 @@ download_url <- function(url,
   }
 
   status <- try_download(url, destfile, handle = handle)
-  if (inherits(status, "error") && interactive()) {
+  if (inherits(status, "error") && is_interactive()) {
     ui_oops(status$message)
     if (ui_nope("
       Download failed :(
@@ -366,7 +366,7 @@ tidy_unzip <- function(zipfile, cleanup = FALSE) {
   )
 
   if (isNA(cleanup)) {
-    cleanup <- interactive() &&
+    cleanup <- is_interactive() &&
       ui_yeah("Shall we delete the ZIP file ({ui_path(zipfile, base_path)})?")
   }
 
@@ -375,7 +375,7 @@ tidy_unzip <- function(zipfile, cleanup = FALSE) {
     file_delete(zipfile)
   }
 
-  if (interactive()) {
+  if (is_interactive()) {
     rproj_path <- dir_ls(target, regexp = "[.]Rproj$")
     if (length(rproj_path) == 1 && rstudioapi::hasFun("openProject")) {
       ui_done("Opening project in RStudio")

R/cran.R

@@ -9,7 +9,7 @@
 #'
 #' @export
 #' @inheritParams use_template
-use_cran_comments <- function(open = interactive()) {
+use_cran_comments <- function(open = rlang::is_interactive()) {
   check_is_package("use_cran_comments()")
   use_template(
     "cran-comments.md",

R/create.R

@@ -33,7 +33,7 @@ create_package <- function(path,
                            rstudio = rstudioapi::isAvailable(),
                            roxygen = TRUE,
                            check_name = TRUE,
-                           open = interactive()) {
+                           open = rlang::is_interactive()) {
   path <- user_path_prep(path)
   check_path_is_directory(path_dir(path))
 
@@ -69,7 +69,7 @@ create_package <- function(path,
 #' @rdname create_package
 create_project <- function(path,
                            rstudio = rstudioapi::isAvailable(),
-                           open = interactive()) {
+                           open = rlang::is_interactive()) {
   path <- user_path_prep(path)
   name <- path_file(path)
   check_not_nested(path_dir(path), name)
@@ -167,7 +167,7 @@ create_from_github <- function(repo_spec,
                                destdir = NULL,
                                fork = NA,
                                rstudio = NULL,
-                               open = interactive(),
+                               open = rlang::is_interactive(),
                                protocol = git_protocol(),
                                credentials = NULL,
                                auth_token = github_token(),

R/data.R

@@ -113,7 +113,7 @@ check_files_absent <- function(paths, overwrite) {
 #' \dontrun{
 #' use_data_raw("daisy")
 #' }
-use_data_raw <- function(name = "DATASET", open = interactive()) {
+use_data_raw <- function(name = "DATASET", open = rlang::is_interactive()) {
   stopifnot(is_string(name))
   r_path <- path("data-raw", asciify(name), ext = "R")
   use_directory("data-raw", ignore = TRUE)

R/edit.R

@@ -5,9 +5,7 @@
 #' created. If the parent directory does not exist, it is also created.
 #'
 #' @param path Path to target file.
-#' @param open If, `NULL`, the default, will open the file when in an
-#'   interactive environment that is not running tests. Use `TRUE` or
-#'   `FALSE` to override the default.
+#' @param open Whether to open the file for interactive editing.
 #' @return Target path, invisibly.
 #' @export
 #' @keywords internal
@@ -17,13 +15,11 @@
 #' edit_file("DESCRIPTION")
 #' edit_file("~/.gitconfig")
 #' }
-edit_file <- function(path, open = NULL) {
+edit_file <- function(path, open = rlang::is_interactive()) {
   path <- user_path_prep(path)
   create_directory(path_dir(path))
   file_create(path)
 
-  open <- open %||% (interactive() && !is_testing())
-
   if (open) {
     ui_todo("Modify {ui_path(path)}")
 

R/git.R

@@ -30,7 +30,7 @@ use_git <- function(message = "Initial commit") {
 }
 
 git_ask_commit <- function(message, untracked = FALSE) {
-  if (!interactive() || !uses_git()) {
+  if (!is_interactive() || !uses_git()) {
     return(invisible())
   }
 
@@ -182,7 +182,7 @@ use_git_config <- function(scope = c("user", "project"), ...) {
 git_protocol <- function() {
   protocol <- getOption(
     "usethis.protocol",
-    default = if (interactive()) NA else "ssh"
+    default = if (is_interactive()) NA else "ssh"
   )
 
   ## this is where a user-supplied protocol gets checked, because
@@ -227,8 +227,7 @@ use_git_protocol <- function(protocol) {
 }
 
 choose_protocol <- function() {
-  ## intercept with our internal interactive()
-  if (!interactive()) {
+  if (!is_interactive()) {
     return(invisible())
   }
   choices <- c(

R/github.R

@@ -58,7 +58,7 @@ use_github <- function(organisation = NULL,
   repo_desc <- project_data()$Title %||% ""
   repo_desc <- gsub("\n", " ", repo_desc)
 
-  if (interactive()) {
+  if (is_interactive()) {
     ui_todo("Check title and description")
     ui_code_block(
       "

R/helpers.R

@@ -95,7 +95,7 @@ version_spec <- function(x) {
   numeric_version(x)
 }
 
-view_url <- function(..., open = interactive()) {
+view_url <- function(..., open = is_interactive()) {
   url <- paste(..., sep = "/")
   if (open) {
     ui_done("Opening URL {ui_value(url)}")