Merge pull request #494 from r-lib/upkeep-2025-04

Author: gaborcsardi

.Rbuildignore

@@ -25,3 +25,5 @@
 ^src/README\.md$
 ^MAINTENANCE\.md$
 ^pkgdown$
+^[\.]?air\.toml$
+^\.vscode$

.github/workflows/R-CMD-check.yaml

@@ -24,33 +24,24 @@ jobs:
       matrix:
         config:
           - {os: macos-latest,   r: 'release'}
-          - {os: macos-13,       r: 'devel'}
 
-          # Use 3.6 to trigger usage of RTools35
-          - {os: windows-latest, r: '3.6'}
+          - {os: windows-latest, r: 'release'}
           # use 4.0 or 4.1 to check with rtools40's older compiler
           - {os: windows-latest, r: 'oldrel-4'}
-          - {os: windows-latest, r: 'release'}
 
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
-          - {os: ubuntu-latest,   r: 'oldrel-2'}
-          - {os: ubuntu-latest,   r: 'oldrel-3'}
-          - {os: ubuntu-latest,   r: 'oldrel-4'}
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release', locale: 'en_US'}
+          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release', locale: 'en_US'}
+          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,  r: 'release'}
+          - {os: ubuntu-latest,  r: 'oldrel-1'}
+          - {os: ubuntu-latest,  r: 'oldrel-2'}
+          - {os: ubuntu-latest,  r: 'oldrel-3'}
+          - {os: ubuntu-latest,  r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - name: Set locale
-        if: matrix.config.locale == 'en_US'
-        run: |
-          sudo locale-gen en_US
-          echo "LC_ALL=en_US" >> $GITHUB_ENV
-
       - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2

.github/workflows/test-coverage.yaml

@@ -34,15 +34,16 @@ jobs:
             clean = FALSE,
             install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
+          print(cov)
           covr::to_cobertura(cov)
         shell: Rscript {0}
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           # Fail if error if not on PR, or if on PR and token is given
           fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
-          file: ./cobertura.xml
-          plugin: noop
+          files: ./cobertura.xml
+          plugins: noop
           disable_search: true
           token: ${{ secrets.CODECOV_TOKEN }}
 

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "Posit.air-vscode"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "[r]": {
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "Posit.air-vscode"
+    }
+}

DESCRIPTION

@@ -9,15 +9,16 @@ Authors@R: c(
            comment = "libuv library"),
     person("Joyent, Inc. and other Node contributors", role = "cph",
            comment = "libuv library"),
-    person("Posit Software, PBC", role = c("cph", "fnd"))
+    person("Posit Software, PBC", role = c("cph", "fnd"),
+           comment = c(ROR = "03wc8by49"))
   )
 Description: A cross-platform interface to file system operations, built
     on top of the 'libuv' C library.
 License: MIT + file LICENSE
 URL: https://fs.r-lib.org, https://github.com/r-lib/fs
 BugReports: https://github.com/r-lib/fs/issues
 Depends: 
-    R (>= 3.6)
+    R (>= 4.1)
 Imports:
     methods
 Suggests: 
@@ -36,6 +37,7 @@ VignetteBuilder:
 ByteCompile: true
 Config/Needs/website: tidyverse/tidytemplate
 Config/testthat/edition: 3
+Config/usethis/last-upkeep: 2025-04-23
 Copyright: file COPYRIGHTS
 Encoding: UTF-8
 Language: en-US

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2023
+YEAR: 2025
 COPYRIGHT HOLDER: fs authors

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2023 fs authors
+Copyright (c) 2025 fs authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

R/copy.R

@@ -57,7 +57,10 @@ file_copy <- function(path, new_path, overwrite = FALSE) {
   if (length(new) == 1 && is_directory[[1]]) {
     new <- rep(new, length(path))
   }
-  assert("Length of `path` must equal length of `new_path`", length(old) == length(new))
+  assert(
+    "Length of `path` must equal length of `new_path`",
+    length(old) == length(new)
+  )
 
   new[is_directory] <- path(new[is_directory], basename(old))
 
@@ -72,7 +75,10 @@ dir_copy <- function(path, new_path, overwrite = FALSE) {
   assert_no_missing(path)
   assert_no_missing(new_path)
   assert("`path` must be a directory", all(is_dir(path)))
-  assert("Length of `path` must equal length of `new_path`", length(path) == length(new_path))
+  assert(
+    "Length of `path` must equal length of `new_path`",
+    length(path) == length(new_path)
+  )
 
   for (i in seq_along(path)) {
     if (!isTRUE(overwrite) && isTRUE(unname(is_dir(new_path[[i]])))) {
@@ -83,13 +89,31 @@ dir_copy <- function(path, new_path, overwrite = FALSE) {
     dirs <- dir_ls(path[[i]], type = "directory", recurse = TRUE, all = TRUE)
     dir_create(path(new_path[[i]], path_rel(dirs, path[[i]])))
 
-    files <- dir_ls(path[[i]], recurse = TRUE,
-      type = c("unknown", "file", "FIFO", "socket", "character_device", "block_device"), all = TRUE)
-    file_copy(files, path(new_path[[i]], path_rel(files, path[[i]])), overwrite = overwrite)
-
-    links <- dir_ls(path[[i]], recurse = TRUE,
-      type = "symlink", all = TRUE)
-    link_copy(links, path(new_path[[i]], path_rel(links, path[[i]])), overwrite = overwrite)
+    files <- dir_ls(
+      path[[i]],
+      recurse = TRUE,
+      type = c(
+        "unknown",
+        "file",
+        "FIFO",
+        "socket",
+        "character_device",
+        "block_device"
+      ),
+      all = TRUE
+    )
+    file_copy(
+      files,
+      path(new_path[[i]], path_rel(files, path[[i]])),
+      overwrite = overwrite
+    )
+
+    links <- dir_ls(path[[i]], recurse = TRUE, type = "symlink", all = TRUE)
+    link_copy(
+      links,
+      path(new_path[[i]], path_rel(links, path[[i]])),
+      overwrite = overwrite
+    )
   }
 
   invisible(path_tidy(new_path))

R/create.R

@@ -6,7 +6,7 @@
 #' compared to [dir.create()], `dir_create()` will silently ignore existing
 #' directories.
 #'
-#' @param path A character vector of one or more paths. For `link_create()`, 
+#' @param path A character vector of one or more paths. For `link_create()`,
 #'   this is the target.
 #' @param mode If file/directory is created, what mode should it have?
 #'
@@ -47,13 +47,23 @@ file_create <- function(path, ..., mode = "u=rw,go=r") {
 
 #' @export
 #' @rdname create
-dir_create <- function(path, ..., mode = "u=rwx,go=rx", recurse = TRUE, recursive) {
+dir_create <- function(
+  path,
+  ...,
+  mode = "u=rwx,go=rx",
+  recurse = TRUE,
+  recursive
+) {
   assert_no_missing(path)
   assert("`mode` must be of length 1", length(mode) == 1)
 
   if (!missing(recursive)) {
     recurse <- recursive
-    warning("`recursive` is deprecated, please use `recurse` instead", immediate. = TRUE, call. = FALSE)
+    warning(
+      "`recursive` is deprecated, please use `recurse` instead",
+      immediate. = TRUE,
+      call. = FALSE
+    )
   }
 
   mode <- as_fs_perms(mode)
@@ -88,7 +98,10 @@ dir_create <- function(path, ..., mode = "u=rwx,go=rx", recurse = TRUE, recursiv
 link_create <- function(path, new_path, symbolic = TRUE) {
   assert_no_missing(path)
   assert_no_missing(new_path)
-  assert("Length of `path` must equal length of `new_path`", length(path) == length(new_path))
+  assert(
+    "Length of `path` must equal length of `new_path`",
+    length(path) == length(new_path)
+  )
 
   old <- path_expand(path)
   new <- path_expand(new_path)

R/delete.R

@@ -65,10 +65,20 @@ dir_delete <- function(path) {
   old <- path_expand(path)
 
   dirs <- dir_ls(old, type = "directory", recurse = TRUE, all = TRUE)
-  files <- dir_ls(old,
-    type = c("unknown", "file", "symlink", "FIFO", "socket", "character_device", "block_device"),
+  files <- dir_ls(
+    old,
+    type = c(
+      "unknown",
+      "file",
+      "symlink",
+      "FIFO",
+      "socket",
+      "character_device",
+      "block_device"
+    ),
     recurse = TRUE,
-    all = TRUE)
+    all = TRUE
+  )
   .Call(fs_unlink_, files)
   .Call(fs_rmdir_, rev(c(old, dirs)))
 
@@ -80,9 +90,7 @@ dir_delete <- function(path) {
 link_delete <- function(path) {
   assert_no_missing(path)
 
-  assert("`path` must be a link",
-    all(is_link(path))
-  )
+  assert("`path` must be a link", all(is_link(path)))
 
   old <- path_expand(path)
 

R/file.R

@@ -57,13 +57,25 @@ file_info <- function(path, fail = TRUE, follow = FALSE) {
   res$change_time <- .POSIXct(res$change_time)
   res$birth_time <- .POSIXct(res$birth_time)
 
-  important <- c("path", "type", "size", "permissions", "modification_time", "user", "group")
+  important <- c(
+    "path",
+    "type",
+    "size",
+    "permissions",
+    "modification_time",
+    "user",
+    "group"
+  )
   res <- res[c(important, setdiff(names(res), important))]
 
   is_symlink <- !is.na(res$type) & res$type == "symlink"
-  while(follow && any(is_symlink)) {
+  while (follow && any(is_symlink)) {
     lpath <- link_path(path[is_symlink])
-    lpath <- ifelse(is_absolute_path(lpath), lpath, path(path_dir(path[is_symlink]), lpath))
+    lpath <- ifelse(
+      is_absolute_path(lpath),
+      lpath,
+      path(path_dir(path[is_symlink]), lpath)
+    )
     res[is_symlink, ] <- file_info(lpath, fail = fail, follow = FALSE)
     is_symlink <- !is.na(res$type) & res$type == "symlink"
   }
@@ -88,7 +100,8 @@ file_types <- c(
   "FIFO" = 3L,
   "symlink" = 4L,
   "file" = 5L,
-  "socket" = 6L)
+  "socket" = 6L
+)
 
 #' Change file permissions
 #' @template fs
@@ -216,7 +229,10 @@ file_move <- function(path, new_path) {
   if (length(new) == 1 && is_directory[[1]]) {
     new <- rep(new, length(path))
   }
-  assert("Length of `path` must equal length of `new_path`", length(old) == length(new))
+  assert(
+    "Length of `path` must equal length of `new_path`",
+    length(old) == length(new)
+  )
 
   new[is_directory] <- path(new[is_directory], basename(old))
 
@@ -240,7 +256,11 @@ file_move <- function(path, new_path) {
 #' file_info("foo")[c("access_time", "modification_time", "change_time", "birth_time")]
 #' \dontshow{setwd(.old_wd)}
 #' @export
-file_touch <- function(path, access_time = Sys.time(), modification_time = access_time) {
+file_touch <- function(
+  path,
+  access_time = Sys.time(),
+  modification_time = access_time
+) {
   assert_no_missing(path)
 
   access_time <- as.POSIXct(access_time)