Reformat source using air

Author: georgestagg

R/build.R

@@ -14,11 +14,13 @@
 #'
 #' @importFrom pkgdepends new_pkg_download_proposal
 #' @export
-build <- function(packages,
-                  out_dir = ".",
-                  remotes = NULL,
-                  dependencies = FALSE,
-                  compress = TRUE) {
+build <- function(
+  packages,
+  out_dir = ".",
+  remotes = NULL,
+  dependencies = FALSE,
+  compress = TRUE
+) {
   tmp_dir <- tempfile()
   on.exit(unlink(tmp_dir, recursive = TRUE))
   dir.create(tmp_dir)
@@ -110,8 +112,11 @@ wasm_build <- function(pkg, tarball_path, contrib_bin, compress) {
   desc <- packageDescription(pkg, lib.loc = tmp_dir, fields = "Built")
   if (!is.na(desc)) {
     stop(paste0(
-      "Unable to build Wasm package: '", pkg,
-      "'. Source tarball at '", tarball_path, "' is a binary."
+      "Unable to build Wasm package: '",
+      pkg,
+      "'. Source tarball at '",
+      tarball_path,
+      "' is a binary."
     ))
   }
 
@@ -193,11 +198,20 @@ wasm_build <- function(pkg, tarball_path, contrib_bin, compress) {
   # Build the package
   status <- withr::with_dir(
     tmp_dir,
-    system2(host_r_bin,
+    system2(
+      host_r_bin,
       args = c(
-        "CMD", "INSTALL", "--build", paste0("--library=", lib_dir), pkg,
-        "--no-docs", "--no-html", "--no-test-load", "--no-staged-install",
-        "--no-byte-compile", configure_flag
+        "CMD",
+        "INSTALL",
+        "--build",
+        paste0("--library=", lib_dir),
+        pkg,
+        "--no-docs",
+        "--no-html",
+        "--no-test-load",
+        "--no-staged-install",
+        "--no-byte-compile",
+        configure_flag
       ),
       env = webr_env
     )

R/lib.R

@@ -20,7 +20,10 @@ make_library <- function(repo_dir = "./repo", lib_dir = "./lib", strip = NULL) {
   fs::dir_create(lib_dir)
   r_version <- R_system_version(getOption("rwasm.webr_version"))
   contrib_bin <- fs::path(
-    repo_dir, "bin", "emscripten", "contrib",
+    repo_dir,
+    "bin",
+    "emscripten",
+    "contrib",
     paste0(r_version$major, ".", r_version$minor)
   )
 
@@ -63,7 +66,10 @@ make_library <- function(repo_dir = "./repo", lib_dir = "./lib", strip = NULL) {
 make_vfs_repo <- function(repo_dir = "./repo", compress = FALSE) {
   r_version <- R_system_version(getOption("rwasm.webr_version"))
   contrib_bin <- fs::path(
-    repo_dir, "bin", "emscripten", "contrib",
+    repo_dir,
+    "bin",
+    "emscripten",
+    "contrib",
     paste0(r_version$major, ".", r_version$minor)
   )
 
@@ -114,11 +120,13 @@ make_vfs_repo <- function(repo_dir = "./repo", compress = FALSE) {
 #' @inheritDotParams make_library strip
 #'
 #' @export
-make_vfs_library <- function(out_dir = "./vfs",
-                             out_name = "library.data",
-                             repo_dir = "./repo",
-                             compress = FALSE,
-                             ...) {
+make_vfs_library <- function(
+  out_dir = "./vfs",
+  out_name = "library.data",
+  repo_dir = "./repo",
+  compress = FALSE,
+  ...
+) {
   lib_dir <- fs::path(tempfile())
   lib_abs <- fs::path_abs(lib_dir)
   on.exit(unlink(lib_dir, recursive = TRUE), add = TRUE)
@@ -153,10 +161,12 @@ make_vfs_library <- function(out_dir = "./vfs",
 #' @param compress Logical. If `TRUE`, a compressed version of the filesystem
 #' data is included in the output. Defaults to `FALSE`.
 #' @export
-file_packager <- function(in_dir,
-                          out_dir = "./vfs",
-                          out_name = NULL,
-                          compress = FALSE) {
+file_packager <- function(
+  in_dir,
+  out_dir = "./vfs",
+  out_name = NULL,
+  compress = FALSE
+) {
   fs::dir_create(out_dir)
 
   if (is.null(out_name)) {
@@ -168,7 +178,9 @@ file_packager <- function(in_dir,
   message(paste("Packaging:", data_file))
 
   file_packager <- fs::path(
-    getOption("rwasm.emscripten_root"), "tools", "file_packager"
+    getOption("rwasm.emscripten_root"),
+    "tools",
+    "file_packager"
   )
 
   # Pack the contents of in_dir with Emscripten's `file_packager`
@@ -178,8 +190,11 @@ file_packager <- function(in_dir,
     system2(
       file_packager,
       args = c(
-        data_file, "--preload", sprintf("'%s@/'", in_dir),
-        "--separate-metadata", sprintf("--js-output='%s'", js_file)
+        data_file,
+        "--preload",
+        sprintf("'%s@/'", in_dir),
+        "--separate-metadata",
+        sprintf("--js-output='%s'", js_file)
       ),
       stdout = TRUE,
       stderr = TRUE

R/repo.R

@@ -31,10 +31,14 @@ add_repo <- function(repos = ppm_config$cran_mirror, skip = FALSE, ...) {
     mutate(
       sources = as.list(sprintf(
         "%s/%s_%s.tar.gz",
-        .data$Repository, .data$package, .data$version
+        .data$Repository,
+        .data$package,
+        .data$version
       )),
       target = sprintf(
-        "src/contrib/%s_%s.tar.gz", .data$package, .data$version
+        "src/contrib/%s_%s.tar.gz",
+        .data$package,
+        .data$version
       ),
       ref = .data$package,
       status = "OK"
@@ -87,11 +91,13 @@ add_list <- function(list_file, ...) {
 #' @importFrom dplyr rows_update select
 #' @importFrom pkgdepends new_pkg_download_proposal
 #' @export
-add_pkg <- function(packages,
-                    repo_dir = "./repo",
-                    remotes = NA,
-                    dependencies = FALSE,
-                    compress = TRUE) {
+add_pkg <- function(
+  packages,
+  repo_dir = "./repo",
+  remotes = NA,
+  dependencies = FALSE,
+  compress = TRUE
+) {
   # Set up pkgdepends configuration
   config <- ppm_config
   config$dependencies <- dependencies
@@ -116,7 +122,10 @@ rm_pkg <- function(packages, repo_dir = "./repo") {
   r_version <- R_system_version(getOption("rwasm.webr_version"))
   contrib_src <- fs::path(repo_dir, "src", "contrib")
   contrib_bin <- fs::path(
-    repo_dir, "bin", "emscripten", "contrib",
+    repo_dir,
+    "bin",
+    "emscripten",
+    "contrib",
     paste0(r_version$major, ".", r_version$minor)
   )
 
@@ -137,7 +146,10 @@ write_packages <- function(repo_dir = "./repo") {
   r_version <- R_system_version(getOption("rwasm.webr_version"))
   contrib_src <- fs::path(repo_dir, "src", "contrib")
   contrib_bin <- fs::path(
-    repo_dir, "bin", "emscripten", "contrib",
+    repo_dir,
+    "bin",
+    "emscripten",
+    "contrib",
     paste0(r_version$major, ".", r_version$minor)
   )
   update_packages(contrib_src, contrib_bin)
@@ -184,18 +196,23 @@ prefer_remotes <- function(package_info, remotes = NA) {
 }
 
 # Build packages and update a CRAN-like repo on disk
-update_repo <- function(package_info,
-                        remotes = NA,
-                        repo_dir = "./repo",
-                        compress = TRUE) {
+update_repo <- function(
+  package_info,
+  remotes = NA,
+  repo_dir = "./repo",
+  compress = TRUE
+) {
   r_version <- R_system_version(getOption("rwasm.webr_version"))
 
   writeLines(sprintf("Processing %d package(s).", nrow(package_info)))
 
   # Create contrib paths
   contrib_src <- fs::path(repo_dir, "src", "contrib")
   contrib_bin <- fs::path(
-    repo_dir, "bin", "emscripten", "contrib",
+    repo_dir,
+    "bin",
+    "emscripten",
+    "contrib",
     paste0(r_version$major, ".", r_version$minor)
   )
   fs::dir_create(contrib_src)
@@ -283,10 +300,12 @@ update_repo <- function(package_info,
 }
 
 update_packages <- function(contrib_src, contrib_bin) {
-  if (any(c(
-    grepl(".tar.gz", fs::dir_ls(contrib_src)),
-    grepl(".tgz", fs::dir_ls(contrib_bin))
-  ))) {
+  if (
+    any(c(
+      grepl(".tar.gz", fs::dir_ls(contrib_src)),
+      grepl(".tgz", fs::dir_ls(contrib_bin))
+    ))
+  ) {
     tools::write_PACKAGES(contrib_src, verbose = TRUE)
     tools::write_PACKAGES(contrib_bin, verbose = TRUE, type = "mac.binary")
     invisible(TRUE)

R/tar.R

@@ -30,7 +30,8 @@ add_tar_index <- function(file, strip = 0) {
   # Check if our tar is compatible
   if (!any(file_ext == c("tgz", "gz", "tar"))) {
     stop(paste0(
-      "Can't make index for \"", file,
+      "Can't make index for \"",
+      file,
       "\". Only uncompressed or `gzip` compressed tar files can be indexed."
     ))
   }