Should stop execution if it can't find .inst/apps (#235)

Author: karangattu

DESCRIPTION

@@ -16,6 +16,7 @@ Imports:
     progress,
     callr,
     sessioninfo,
+    rprojroot,
     rstudioapi (>= 0.11),
     cli
 Suggests:

R/accept_snaps.R

@@ -5,7 +5,7 @@
 #' @inheritParams fix_snaps
 #' @export
 accept_snaps <- function(
-  repo_dir = "."
+  repo_dir = rprojroot::find_package_root_file()
 ) {
 
   app_paths <- repo_apps_paths(repo_dir)
@@ -32,7 +32,7 @@ accept_snaps <- function(
 
 
 # Removes all snaps that are below the minimum R version
-remove_snaps_cruft <- function(repo_dir = ".", min_r_version = "3.6") {
+remove_snaps_cruft <- function(repo_dir = rprojroot::find_package_root_file(), min_r_version = "3.6") {
   app_paths <- repo_apps_paths(repo_dir)
 
   pb <- progress_bar(

R/apps.R

@@ -46,16 +46,16 @@ is_manual_app <- function(app_dir) {
 
 
 ### Start GHA
-apps_with_tests <- function(repo_dir = ".") {
+apps_with_tests <- function(repo_dir = rprojroot::find_package_root_file()) {
   basename(Filter(x = repo_apps_paths(repo_dir), has_tests_folder))
 }
-repo_apps_path <- function(repo_dir = ".") {
+repo_apps_path <- function(repo_dir = rprojroot::find_package_root_file()) {
   file.path(repo_dir, "inst", "apps")
 }
-repo_apps_paths <- function(repo_dir = ".") {
+repo_apps_paths <- function(repo_dir = rprojroot::find_package_root_file()) {
   dir(repo_apps_path(repo_dir), pattern = "^\\d\\d\\d-", full.names = TRUE)
 }
-repo_app_path <- function(app_name, repo_dir = ".") {
+repo_app_path <- function(app_name, repo_dir = rprojroot::find_package_root_file()) {
   file.path(repo_apps_path(repo_dir), app_name)
 }
 

R/fix_snaps.R

@@ -29,7 +29,7 @@ fix_snaps <- function(
   ask_apps = FALSE,
   ask_branches = TRUE,
   ask_if_not_main = TRUE,
-  repo_dir = "."
+  repo_dir = rprojroot::find_package_root_file()
 ) {
   original_sys_call <- sys.call()
   ask_apps <- as.logical(ask_apps)
@@ -39,6 +39,10 @@ fix_snaps <- function(
 
   apps_folder <- file.path(repo_dir, "inst", "apps")
 
+  if (!dir.exists(apps_folder)) {
+    stop("Apps folder does not exist: ", apps_folder)
+  }
+
   verify_if_not_main_branch(ask_if_not_main, repo_dir = repo_dir)
   verify_no_git_changes(repo_dir = repo_dir, apps_folder = apps_folder)
   verify_no_untracked_files(repo_dir = repo_dir, apps_folder = apps_folder)
@@ -275,7 +279,7 @@ fix_snaps <- function(
       f = function(app_name) {
         pb$tick(tokens = list(name = app_name))
         # Use `.` as `git_cmd_` runs within `repo_dir`
-        app_path <- repo_app_path(repo_dir = ".", app_name = app_name)
+        app_path <- repo_app_path(repo_dir = rprojroot::find_package_root_file(), app_name = app_name)
         git_cmd_("git checkout -- ", app_path)
         git_cmd_("git clean -df -- ", app_path)
       }
@@ -291,7 +295,7 @@ fix_snaps <- function(
 
 
 # Note: Logic should be duplicated in pre-check GHA workflow
-verify_no_new_snaps <- function(repo_dir = ".", folder = "inst/apps") {
+verify_no_new_snaps <- function(repo_dir = rprojroot::find_package_root_file(), folder = "inst/apps") {
   new_snaps <- dir(file.path(repo_dir, folder), pattern = "\\.new", recursive = TRUE, include.dirs = FALSE)
   if (length(new_snaps) > 0) {
     message("There should be no `.new` _snaps in `", folder, "`. Found: \n", paste0("* ", new_snaps, collapse = "\n"))

R/save-test-results.R

@@ -10,7 +10,7 @@
 #' @inheritParams test_in_local
 #' @rdname test-results
 #' @export
-save_test_results <- function(output, gha_branch_name, pr_number, username, repo_dir = ".") {
+save_test_results <- function(output, gha_branch_name, pr_number, username, repo_dir = rprojroot::find_package_root_file()) {
   if (!inherits(output, "shinycoreci_test_output")) {
     stop("`output` must be an object returned by test_in_local()", call. = FALSE)
   }

R/test-in-local.R

@@ -23,7 +23,7 @@ test_in_local <- function(
   assert = TRUE,
   timeout = 10 * 60,
   retries = 2,
-  repo_dir = "."
+  repo_dir = rprojroot::find_package_root_file()
 ) {
   retries <- as.numeric(retries)
   repo_dir <- normalizePath(repo_dir, mustWork = TRUE)

R/view-test-images.R

@@ -2,7 +2,7 @@
 #'
 #' @param repo_dir directory to the shinycoreci repo
 #' @export
-view_test_images <- function(repo_dir = ".") {
+view_test_images <- function(repo_dir = rprojroot::find_package_root_file()) {
   app_folders <- Filter(repo_apps_paths(repo_dir), f = function(app_folder) {
     dir.exists(file.path(app_folder, "tests/testthat/_snaps"))
   })