Merge branch 'master' into pull_requests

DylanCarbone · Apr 27, 2024 · 1df0fb1 · 1df0fb1
2 parents 5b0cb1c + 47e28a6
commit 1df0fb1
Show file tree

Hide file tree

Showing 6 changed files with 271 additions and 421 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -21,7 +21,6 @@ jobs:
           - {os: macos-latest,   r: 'release'}
           - {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'}
 
     env:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -39,6 +39,7 @@ Imports:
     ggplot2,
     LearnBayes,
     plyr,
+    mockr,
     reshape2,
     rmarkdown,
     sp,

diff --git a/R/detect_os_compat.r b/R/detect_os_compat.r
@@ -0,0 +1,8 @@
+# Detect whether the user is on a mac or Windows OS (compatable with Frescalo) or a different OS. This function is needed to work with Mockery functions in tests
+detect_os_compat <- function() {
+    if (Sys.info()["sysname"] %in% c("Darwin", "Windows")) {
+        return(TRUE)
+    } else {
+        return(FALSE)
+    }
+}
diff --git a/R/run_fresc_file.R b/R/run_fresc_file.R
@@ -17,6 +17,11 @@ function(
 	Plot=TRUE
 
 ){
+
+if (!detect_os_compat()) {
+    stop("Apologies, Frescalo is currently only avaiable on mac and Windows operating systems.")
+}
+
 # BODY OF FUNCTION
 	# Print status to screen 
 		cat("\nSAVING DATA TO FRESCALO WORKING DIRECTORY\n",rep("*",20),"\n\n", sep="")

diff --git a/tests/testthat/testerrorChecks.R b/tests/testthat/testerrorChecks.R