chore: format everything with air (#392)

Author: nealrichardson

.lintr

@@ -9,6 +9,5 @@ linters: linters_with_defaults(
 exclusions: list(
   "tests/testthat/2024.07.0/",
   "tests/testthat/2024.08.0/",
-  "tests/testthat/2024.09.0/",
-  "inst/scratch/"
+  "tests/testthat/2024.09.0/"
   )

DESCRIPTION

@@ -66,3 +66,29 @@ Language: en-US
 RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
 Config/testthat/edition: 3
+Collate: 
+    'audits.R'
+    'browse.R'
+    'connect.R'
+    'connectapi-package.R'
+    'connectapi.R'
+    'content.R'
+    'deploy.R'
+    'get.R'
+    'git.R'
+    'groups.R'
+    'lazy.R'
+    'page.R'
+    'parse.R'
+    'promote.R'
+    'ptype.R'
+    'remote.R'
+    'runtime-caches.R'
+    'schedule.R'
+    'tags.R'
+    'utils.R'
+    'thumbnail.R'
+    'user.R'
+    'utils-ci.R'
+    'utils-pipe.R'
+    'variant.R'

NAMESPACE

@@ -159,6 +159,7 @@ importFrom(magrittr,"%>%")
 importFrom(rlang,"%||%")
 importFrom(rlang,":=")
 importFrom(rlang,arg_match)
+importFrom(rlang,is_string)
 importFrom(utils,browseURL)
 importFrom(utils,capture.output)
 importFrom(utils,compareVersion)

R/audits.R

@@ -39,7 +39,10 @@ audit_r_versions <- function(content) {
     stop("gridExtra is required for this function")
   }
 
-  timeline <- content[!is.na(content$r_version), c("r_version", "last_deployed_time")]
+  timeline <- content[
+    !is.na(content$r_version),
+    c("r_version", "last_deployed_time")
+  ]
 
   # histogram
   p1 <- ggplot2::ggplot(timeline) +
@@ -79,7 +82,11 @@ audit_r_versions <- function(content) {
 #' @family audit functions
 #' @export
 audit_runas <- function(content) {
-  content$run_as <- ifelse(content$run_as_current_user, "current user", content$run_as)
+  content$run_as <- ifelse(
+    content$run_as_current_user,
+    "current user",
+    content$run_as
+  )
   content <- content[!is.na(content$run_as), c("name", "run_as")]
   names(content) <- c("app_name", "run_as_user")
   content

R/connect.R

@@ -47,7 +47,9 @@ Connect <- R6::R6Class(
     initialize = function(server, api_key) {
       message(glue::glue("Defining Connect with server: {server}"))
       if (is.null(httr::parse_url(server)$scheme)) {
-        stop(glue::glue("ERROR: Please provide a protocol (http / https). You gave: {server}"))
+        stop(glue::glue(
+          "ERROR: Please provide a protocol (http / https). You gave: {server}"
+        ))
       }
       self$server <- base::sub("^(.*)/$", "\\1", server)
       self$api_key <- api_key
@@ -179,13 +181,22 @@ Connect <- R6::R6Class(
     #' @param parser How the response is parsed. If `NULL`, the `httr_response`
     #' will be returned. Otherwise, the argument is forwarded to
     #' `httr::content(res, as = parser)`.
-    PUT = function(path,
-                   body = "{}",
-                   ...,
-                   url = self$api_url(path),
-                   encode = "json",
-                   parser = "parsed") {
-      self$request("PUT", url, parser = parser, body = body, encode = encode, ...)
+    PUT = function(
+      path,
+      body = "{}",
+      ...,
+      url = self$api_url(path),
+      encode = "json",
+      parser = "parsed"
+    ) {
+      self$request(
+        "PUT",
+        url,
+        parser = parser,
+        body = body,
+        encode = encode,
+        ...
+      )
     },
 
     #' @description Perform an HTTP HEAD request of the named API path.
@@ -220,13 +231,22 @@ Connect <- R6::R6Class(
     #' @param parser How the response is parsed. If `NULL`, the `httr_response`
     #' will be returned. Otherwise, the argument is forwarded to
     #' `httr::content(res, as = parser)`.
-    PATCH = function(path,
-                     body = "{}",
-                     ...,
-                     url = self$api_url(path),
-                     encode = "json",
-                     parser = "parsed") {
-      self$request("PATCH", url, parser = parser, body = body, encode = encode, ...)
+    PATCH = function(
+      path,
+      body = "{}",
+      ...,
+      url = self$api_url(path),
+      encode = "json",
+      parser = "parsed"
+    ) {
+      self$request(
+        "PATCH",
+        url,
+        parser = parser,
+        body = body,
+        encode = encode,
+        ...
+      )
     },
 
     #' @description Perform an HTTP POST request of the named API path.
@@ -239,13 +259,22 @@ Connect <- R6::R6Class(
     #' @param parser How the response is parsed. If `NULL`, the `httr_response`
     #' will be returned. Otherwise, the argument is forwarded to
     #' `httr::content(res, as = parser)`.
-    POST = function(path,
-                    body = "{}",
-                    ...,
-                    url = self$api_url(path),
-                    encode = "json",
-                    parser = "parsed") {
-      self$request("POST", url, parser = parser, body = body, encode = encode, ...)
+    POST = function(
+      path,
+      body = "{}",
+      ...,
+      url = self$api_url(path),
+      encode = "json",
+      parser = "parsed"
+    ) {
+      self$request(
+        "POST",
+        url,
+        parser = parser,
+        body = body,
+        encode = encode,
+        ...
+      )
     },
 
     #' @description Perform an HTTP GET request of the "me" server endpoint.
@@ -363,15 +392,23 @@ Connect <- R6::R6Class(
     #' @param .collapse How multiple filters are combined.
     #' @param .limit The limit.
     #' @param page_size The page size.
-    get_apps = function(filter = NULL, .collapse = "&", .limit = Inf, page_size = 25) {
+    get_apps = function(
+      filter = NULL,
+      .collapse = "&",
+      .limit = Inf,
+      page_size = 25
+    ) {
       path <- unversioned_url("applications")
       query <- list(
         count = min(page_size, .limit)
       )
       if (!is.null(filter)) {
-        query$filter <- paste(sapply(seq_along(filter), function(i) {
-          sprintf("%s:%s", names(filter)[i], filter[[i]])
-        }), collapse = .collapse)
+        query$filter <- paste(
+          sapply(seq_along(filter), function(i) {
+            sprintf("%s:%s", names(filter)[i], filter[[i]])
+          }),
+          collapse = .collapse
+        )
       }
 
       prg <- optional_progress_bar(
@@ -453,7 +490,12 @@ Connect <- R6::R6Class(
     #' @param owner_guid The target content owner.
     #' @param name The target name.
     #' @param include Additional response fields.
-    content = function(guid = NULL, owner_guid = NULL, name = NULL, include = "tags,owner") {
+    content = function(
+      guid = NULL,
+      owner_guid = NULL,
+      name = NULL,
+      include = "tags,owner"
+    ) {
       if (!is.null(guid)) {
         return(self$GET(v1_url("content", guid)))
       }
@@ -553,14 +595,16 @@ Connect <- R6::R6Class(
     #' @param user_must_set_password Indicates that user sets password on first login.
     #' @param user_role Role for user.
     #' @param unique_id Identifier for user.
-    users_create = function(username,
-                            email,
-                            first_name = NULL,
-                            last_name = NULL,
-                            password = NULL,
-                            user_must_set_password = NULL,
-                            user_role = NULL,
-                            unique_id = NULL) {
+    users_create = function(
+      username,
+      email,
+      first_name = NULL,
+      last_name = NULL,
+      password = NULL,
+      user_must_set_password = NULL,
+      user_role = NULL,
+      unique_id = NULL
+    ) {
       path <- v1_url("users")
       self$POST(
         path = path,
@@ -708,14 +752,16 @@ Connect <- R6::R6Class(
     #' @param previous Previous item.
     #' @param nxt Next item.
     #' @param asc_order Indicates ascending result order.
-    inst_content_visits = function(content_guid = NULL,
-                                   min_data_version = NULL,
-                                   from = NULL,
-                                   to = NULL,
-                                   limit = 500,
-                                   previous = NULL,
-                                   nxt = NULL,
-                                   asc_order = TRUE) {
+    inst_content_visits = function(
+      content_guid = NULL,
+      min_data_version = NULL,
+      from = NULL,
+      to = NULL,
+      limit = 500,
+      previous = NULL,
+      nxt = NULL,
+      asc_order = TRUE
+    ) {
       path <- v1_url("instrumentation", "content", "visits")
       query <- list(
         content_guid = content_guid,
@@ -744,14 +790,16 @@ Connect <- R6::R6Class(
     #' @param previous Previous item.
     #' @param nxt Next item.
     #' @param asc_order Indicates ascending result order.
-    inst_shiny_usage = function(content_guid = NULL,
-                                min_data_version = NULL,
-                                from = NULL,
-                                to = NULL,
-                                limit = 500,
-                                previous = NULL,
-                                nxt = NULL,
-                                asc_order = TRUE) {
+    inst_shiny_usage = function(
+      content_guid = NULL,
+      min_data_version = NULL,
+      from = NULL,
+      to = NULL,
+      limit = 500,
+      previous = NULL,
+      nxt = NULL,
+      asc_order = TRUE
+    ) {
       path <- v1_url("instrumentation", "shiny", "usage")
       query <- list(
         content_guid = content_guid,
@@ -785,7 +833,9 @@ Connect <- R6::R6Class(
       warn_experimental("repo_account")
       parsed_url <- httr::parse_url(host)
       if (is.null(parsed_url$scheme) || is.null(parsed_url$hostname)) {
-        stop(glue::glue("Scheme and hostname must be provided (i.e. 'https://github.com'). You provided '{host}'"))
+        stop(glue::glue(
+          "Scheme and hostname must be provided (i.e. 'https://github.com'). You provided '{host}'"
+        ))
       }
       host <- glue::glue(parsed_url$scheme, "://", parsed_url$hostname)
       path <- unversioned_url("repo", "account")
@@ -815,7 +865,11 @@ Connect <- R6::R6Class(
     #' @param start Starting time.
     #' @param end Ending time.
     #' @param detailed Indicates detailed schedule information.
-    schedules = function(start = Sys.time(), end = Sys.time() + 60 * 60 * 24 * 7, detailed = FALSE) {
+    schedules = function(
+      start = Sys.time(),
+      end = Sys.time() + 60 * 60 * 24 * 7,
+      detailed = FALSE
+    ) {
       warn_experimental("schedules")
       url <- v1_url("experimental", "schedules")
       query_params <- list(
@@ -860,7 +914,12 @@ Connect <- R6::R6Class(
     #' @param previous Previous item.
     #' @param nxt Next item.
     #' @param asc_order Indicates ascending result order.
-    audit_logs = function(limit = 500, previous = NULL, nxt = NULL, asc_order = TRUE) {
+    audit_logs = function(
+      limit = 500,
+      previous = NULL,
+      nxt = NULL,
+      asc_order = TRUE
+    ) {
       path <- v1_url("audit_logs")
       query <- list(
         limit = valid_page_size(limit),
@@ -880,7 +939,11 @@ Connect <- R6::R6Class(
 
     #' @description Get R installations.
     server_settings_r = function() {
-      lifecycle::deprecate_soft("0.3.1", "Connect$server_settings_r()", "get_runtimes()")
+      lifecycle::deprecate_soft(
+        "0.3.1",
+        "Connect$server_settings_r()",
+        "get_runtimes()"
+      )
       self$GET(v1_url("server_settings", "r"))
     },
 
@@ -964,13 +1027,14 @@ Connect <- R6::R6Class(
 #'
 #' @export
 connect <- function(
-    server = Sys.getenv(paste0(prefix, "_SERVER"), NA_character_),
-    api_key = Sys.getenv(paste0(prefix, "_API_KEY"), NA_character_),
-    token,
-    token_local_testing_key = api_key,
-    prefix = "CONNECT",
-    ...,
-    .check_is_fatal = TRUE) {
+  server = Sys.getenv(paste0(prefix, "_SERVER"), NA_character_),
+  api_key = Sys.getenv(paste0(prefix, "_API_KEY"), NA_character_),
+  token,
+  token_local_testing_key = api_key,
+  prefix = "CONNECT",
+  ...,
+  .check_is_fatal = TRUE
+) {
   if (is.null(api_key) || is.na(api_key) || nchar(api_key) == 0) {
     msg <- "Invalid (empty) API key. Please provide a valid API key"
     if (.check_is_fatal) {

R/connectapi.R

@@ -1,6 +1,6 @@
 #' @importFrom utils compareVersion untar
 #' @importFrom lifecycle deprecate_warn
-#' @importFrom rlang arg_match
+#' @importFrom rlang arg_match is_string
 "_PACKAGE"
 
 # Even if we don't currently have any references to functions in lifecycle,