Merge pull request #330 from lorenzwalthert/issue-329

- locate pre-commit executable on macOs build with pip (#329).

Author: lorenzwalthert

R/config.R

@@ -40,7 +40,7 @@ use_precommit_config <- function(config_source = getOption("precommit.config_sou
   )
   escaped_name_target <- "^\\.pre-commit-config\\.yaml$"
   name_target <- ".pre-commit-config.yaml"
-  if (!fs::file_exists(fs::path(root, name_target)) | force) {
+  if (!file_exists(fs::path(root, name_target)) | force) {
     fs::file_copy(
       config_source,
       fs::path(root, name_target),
@@ -103,7 +103,7 @@ set_config_source <- function(config_source,
     )
     config_source <- system.file(name_origin, package = "precommit")
   }
-  if (!fs::file_exists(config_source)) {
+  if (!file_exists(config_source)) {
     rlang::abort(paste0(
       "File ", config_source, " does not exist. Please use the ",
       "argument `config_source` to provide a path to an existing ",

R/exec.R

@@ -20,7 +20,7 @@ path_precommit_exec <- function(check_if_exists = TRUE) {
   if (!check_if_exists) {
     return(final)
   }
-  if (!fs::file_exists(final)) {
+  if (!file_exists(final)) {
     rlang::abort(paste0(
       "pre-commit executable does not exist at ",
       final,
@@ -112,7 +112,7 @@ path_warn_multiple_execs <- function(paths) {
 
 path_candidate_to_actual <- function(candidate) {
   assumed <- fs::path(candidate, precommit_executable_file())
-  assumed[fs::file_exists(assumed)]
+  assumed[file_exists(assumed)]
 }
 
 path_derive_precommit_exec_linux <- function() {
@@ -200,7 +200,7 @@ path_derive_precommit_exec_conda_impl <- function(conda_env) {
         ifelse(is_windows(), "Scripts", ""),
         precommit_executable_file()
       )
-      unname(ifelse(fs::file_exists(derived), derived, ""))
+      unname(ifelse(file_exists(derived), derived, ""))
     },
     error = function(e) ""
   )

R/install.R

@@ -129,7 +129,7 @@ remove_usethis_readme_hook <- function() {
     encoding = "UTF-8"
   )
   candidate <- ".git/hooks/pre-commit"
-  if (fs::file_exists(candidate)) {
+  if (file_exists(candidate)) {
     if (identical(readLines(candidate, encoding = "UTF-8"), legacy)) {
       fs::file_delete(candidate)
       cli::cli_alert_info(paste(
@@ -172,7 +172,7 @@ uninstall_precommit <- function(scope = "repo",
     if (scope == "repo") {
       uninstall_repo(ask = (ask %in% c("repo", "both")))
       path_config <- ".pre-commit-config.yaml"
-      if (fs::file_exists(path_config)) {
+      if (file_exists(path_config)) {
         fs::file_delete(path_config)
         cli::cli_alert_success("Removed .pre-commit-config.yaml")
       }
@@ -260,7 +260,7 @@ uninstall_repo <- function(ask) {
       }
     }
     path_file <- ".pre-commit-config.yaml"
-    if (fs::file_exists(path_file)) {
+    if (file_exists(path_file)) {
       fs::file_delete(path_file)
       cli::cli_alert_success(paste(
         "Removed .pre-commit-config.yaml. If you want your collaborators",
@@ -280,5 +280,5 @@ uninstall_repo <- function(ask) {
 }
 
 is_installed <- function() {
-  fs::file_exists(path_precommit_exec(check_if_exists = FALSE))
+  file_exists(path_precommit_exec(check_if_exists = FALSE))
 }

R/utils.R

@@ -12,10 +12,14 @@ is_url <- function(text) {
     inherits("url")
 }
 
+file_exists <- function(...) {
+  fs::file_exists(fs::path_expand(...))
+}
+
 
 path_if_exist <- function(...) {
   path <- c(...)
-  path[fs::file_exists(path)]
+  path[file_exists(path)]
 }
 
 is_conda_installation <- function() {

tests/testthat/test-conda.R

@@ -90,7 +90,7 @@ if (!on_cran()) {
       uninstall_precommit(scope = "repo", root = tempdir),
       "Uninstalled pre-commit from repo scope.*"
     )
-    expect_false(fs::file_exists(fs::path(tempdir, ".pre-commit-config.yaml")))
+    expect_false(file_exists(fs::path(tempdir, ".pre-commit-config.yaml")))
     expect_false(any(grepl(".pre-commit", readline(fs::path(tempdir, ".Rbuildignore")))))
     # second time
     expect_message(

tests/testthat/test-config.R

@@ -54,7 +54,7 @@ test_that(".Rbuildignore is written to the right directory when root is relative
     fs::path_dir(root),
     use_precommit_config(root = fs::path_file(root))
   )
-  expect_true(fs::file_exists(fs::path(root, ".Rbuildignore")))
+  expect_true(file_exists(fs::path(root, ".Rbuildignore")))
 })
 
 test_that(".Rbuildignore is written to the right directory when root is absolute", {
@@ -67,5 +67,5 @@ test_that(".Rbuildignore is written to the right directory when root is absolute
     desc$write("DESCRIPTION")
   })
   use_precommit_config(root = root)
-  expect_true(fs::file_exists(fs::path(root, ".Rbuildignore")))
+  expect_true(file_exists(fs::path(root, ".Rbuildignore")))
 })

tests/testthat/test-setup.R

@@ -28,13 +28,13 @@ test_that("GitHub Action CI setup works", {
     git = FALSE, use_precommit = FALSE, package = TRUE, install_hooks = FALSE
   )
   use_ci("gha", root = getwd())
-  expect_true(fs::file_exists(".github/workflows/pre-commit.yaml"))
+  expect_true(file_exists(".github/workflows/pre-commit.yaml"))
 })
 
 test_that("Pre-commit CI setup works", {
   local_test_setup(
     git = FALSE, use_precommit = FALSE, package = TRUE, install_hooks = FALSE
   )
   use_ci(root = getwd())
-  expect_false(fs::file_exists(".github/workflows/pre-commit.yaml"))
+  expect_false(file_exists(".github/workflows/pre-commit.yaml"))
 })

tests/testthat/test-zzz.R

@@ -1,6 +1,6 @@
 test_that("tests don't write to styler-perm", {
   skip_on_cran()
-  expect_false(fs::file_exists(
+  expect_false(file_exists(
     fs::path(R.cache::getCacheRootPath(), "styler-perm")
   ))
 })