From 4b9adbb2a3770fd3a8d2a8477e14e2ce9490fba7 Mon Sep 17 00:00:00 2001
From: Sebastian Jentschke <Sebastian.Jentschke@gmail.com>
Date: Tue, 14 May 2024 18:04:12 +0200
Subject: [PATCH 1/2] Added functions for the --home and the --rhome arguments,
 added a check whether the jamovi compiler has a higher / equal version than
 required by minVer (in jamovi/0000.yaml)

---
 R/main.R | 74 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/R/main.R b/R/main.R
index e6115ab..d5f2c26 100644
--- a/R/main.R
+++ b/R/main.R
@@ -14,6 +14,42 @@ isLinux <- function() {
     Sys.info()['sysname'] == 'Linux'
 }
 
+argHome <- function(home = NULL) {
+    if (is.null(home))
+        home <- getOption('jamovi_home')
+    if (is.null(home) && isLinux())
+        home <- 'flatpak'
+    if ( ! is.null(home) && isWindows())
+        home <- paste0('"', home, '"')
+    if ( ! is.null(home)) {
+        c('--home', home)
+    } else {
+        NULL
+    }
+}
+
+argRHome <- function() {
+    if ( ! isWindows()) {
+        c('--rpath', paste0('"', R.home(component='bin'), '"'))
+    } else {
+        NULL
+    }
+}
+
+checkMinVer <- function(pkg = ".") {
+    lines <- readLines(file.path(pkg, "jamovi", "0000.yaml"))
+    # if there is a minVer entry, compare it the the version of the jamovi compiler (and throw error if it is higher)
+    if (any(grepl("minApp:", lines))) {
+        pkgMinVer <- trimws(strsplit(lines[grepl("minApp:", lines)], ":")[[1]][2])
+        if (utils::compareVersion(version(), pkgMinVer) < 0) {
+            stop(sprintf("The minVer (%s) of the module (in jamovi/0000.yaml) is lower than this version of the jamovi compiler (%s).",
+              pkgMinVer, version(), ))
+        }
+    }
+
+    invisible(NULL)
+}
+
 #' The current version
 #'
 #' returns the current version of jmvtools
@@ -36,15 +72,7 @@ check <- function(home=NULL) {
     exe <- node()
     jmc <- jmcPath()
 
-    args <- c(jmc, '--check')
-    if (is.null(home))
-        home <- getOption('jamovi_home')
-    if (is.null(home) && isLinux())
-        home <- 'flatpak'
-    if ( ! is.null(home) && isWindows())
-        home <- paste0('"', home, '"')
-    if ( ! is.null(home))
-        args <- c(args, '--home', home)
+    args <- c(jmc, '--check', argHome(home))
 
     system2(exe, args, wait=TRUE)
 }
@@ -56,23 +84,14 @@ check <- function(home=NULL) {
 #' @importFrom node node
 #' @export
 install <- function(pkg='.', home=NULL, debug=FALSE) {
+    
+    checkMinVer(pkg)
 
     exe <- node()
     jmc <- jmcPath()
     pkg <- paste0('"', pkg, '"')
-    rhome <- paste0('"', R.home(component='bin'), '"')
 
-    args <- c(jmc, '--install', pkg)
-    if (is.null(home))
-        home <- getOption('jamovi_home')
-    if (is.null(home) && isLinux())
-        home <- 'flatpak'
-    if ( ! is.null(home) && isWindows())
-        home <- paste0('"', home, '"')
-    if ( ! is.null(home))
-        args <- c(args, '--home', home)
-    if ( ! isWindows())
-        args <- c(args, '--rpath', rhome)
+    args <- c(jmc, '--install', pkg, argHome(home), argRHome())
     if (debug)
         args <- c(args, '--debug')
 
@@ -89,19 +108,8 @@ prepare <- function(pkg='.', home=NULL) {
     exe <- node()
     jmc <- jmcPath()
     pkg <- paste0('"', pkg, '"')
-    rhome <- paste0('"', R.home(component='bin'), '"')
 
-    args <- c(jmc, '--prepare', pkg)
-    if (is.null(home))
-        home <- getOption('jamovi_home')
-    if (is.null(home) && isLinux())
-        home <- 'flatpak'
-    if ( ! is.null(home) && isWindows())
-        home <- paste0('"', home, '"')
-    if ( ! is.null(home))
-        args <- c(args, '--home', home)
-    if ( ! isWindows())
-        args <- c(args, '--rpath', rhome)
+    args <- c(jmc, '--prepare', pkg, argHome(home), argRHome())
 
     system2(exe, args, wait=TRUE)
 }

From 2d03d53d906974a649cc5dfed53f17db7385cde4 Mon Sep 17 00:00:00 2001
From: Sebastian Jentschke <Sebastian.Jentschke@gmail.com>
Date: Tue, 14 May 2024 18:37:44 +0200
Subject: [PATCH 2/2] Added a function jmc_version that extracts the output
 from --check; use jmc_version in checkMinVer

---
 R/main.R | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/R/main.R b/R/main.R
index d5f2c26..b8265fc 100644
--- a/R/main.R
+++ b/R/main.R
@@ -41,9 +41,9 @@ checkMinVer <- function(pkg = ".") {
     # if there is a minVer entry, compare it the the version of the jamovi compiler (and throw error if it is higher)
     if (any(grepl("minApp:", lines))) {
         pkgMinVer <- trimws(strsplit(lines[grepl("minApp:", lines)], ":")[[1]][2])
-        if (utils::compareVersion(version(), pkgMinVer) < 0) {
+        if (utils::compareVersion(jmc_version(), pkgMinVer) < 0) {
             stop(sprintf("The minVer (%s) of the module (in jamovi/0000.yaml) is lower than this version of the jamovi compiler (%s).",
-              pkgMinVer, version(), ))
+              pkgMinVer, jmc_version(), ))
         }
     }
 
@@ -62,6 +62,27 @@ version <- function() {
     version
 }
 
+#' The current jamovi compiler version
+#'
+#' returns the current version of the jamovi compiler (if not found, the version of jmvtools is returned)
+#'
+#' @export
+jmc_version <- function(home = NULL) {
+
+    exe <- node()
+    jmc <- jmcPath()
+    version <- version() # fallback if the compiler is not found
+
+    args <- c(jmc, '--check', argHome(home))
+
+    jmcOutput <- system2(exe, args, wait=TRUE, stdout=TRUE)
+
+    if (any(grepl("jamovi .* found", jmcOutput)))
+        version <- gsub("jamovi (\\d\\.\\d\\.\\d) found .*", "\\1", jmcOutput[grepl("jamovi .* found", jmcOutput)])
+
+    version
+}
+
 #' Check that jmvtools is able to find jamovi
 #'
 #' @param home path to a local jamovi installation