added functions for running flowr through docker

NAMESPACE

@@ -2,7 +2,9 @@
 
 export(connect)
 export(disconnect)
+export(exec_docker_command)
 export(exec_flowr)
+export(exec_flowr_docker)
 export(exec_node_command)
 export(get_default_node_base_dir)
 export(install_flowr)

R/node.R → R/flowr_local.R

@@ -79,6 +79,22 @@ exec_flowr <- function(args, verbose = FALSE, base_dir = get_default_node_base_d
   exec_node_command("node", c(flowr_path, args), verbose, base_dir, background)
 }
 
+#' Executes a local version of the flowR CLI with the given arguments in the given directory.
+#' This function expects docker to exist on the system.
+#'
+#' @param docker_args Additional arguments to pass to docker, as a character vector.
+#' @param flowr_ver The version of flowR to use
+#' @param flowr_args The arguments to pass to the flowR CLI, as a character vector.
+#' @param verbose Whether to print out information about the commands being executed.
+#' @param cmd The command to use for docker. Defaults to "docker".
+#' @param background Whether the command should be executed as a background process.
+#' @return The return value of the [exec_node_command()] call, which is the exit code if background is false, or the pid if background is true.
+#'
+#' @export
+exec_flowr_docker <- function(docker_args, flowr_ver, flowr_args, verbose = FALSE, cmd = "docker", background = FALSE) {
+  exec_docker_command(c("run", "--rm", docker_args, paste0("eagleoutice/flowr:", flowr_ver), flowr_args), verbose, cmd, background)
+}
+
 #' Executes the given Node subcommand in the given arguments in the given directory.
 #' This function expects Node to have been installed using [install_node()].
 #'
@@ -104,6 +120,27 @@ exec_node_command <- function(app = c("node", "npm", "npx"), args, verbose = FAL
   }
 }
 
+#' Executes the given docker command in the given directory.
+#' This function expects docker to exist on the system.
+#'
+#' @param args The arguments to pass to the docker command, as a character vector.
+#' @param verbose Whether to print out information about the commands being executed.
+#' @param cmd The command to use for docker. Defaults to "docker".
+#' @param background Whether the command should be executed as a background process.
+#' @return The return value of the call, which is the exit code if background is false, or the pid if background is true.
+#'
+#' @export
+exec_docker_command <- function(args, verbose = FALSE, cmd = "docker", background = FALSE) {
+  if (verbose) {
+    print(paste0("Executing ", cmd, " ", paste0(args, collapse = " ")))
+  }
+  if (background) {
+    return(sys::exec_background(cmd, args))
+  } else {
+    return(sys::exec_wait(cmd, args))
+  }
+}
+
 #' Returns the default node base directory to use when installing Node, which is the directory that the package with the given name is installed in.
 #'
 #' @param pkg_dir_name The name of the package to find the installation directory of. By default, this is "flowr", the name of this package.

tests/testthat/test-docker.R

@@ -0,0 +1,6 @@
+test_that("run flowr (docker)", {
+  skip_on_os("windows")
+  skip_on_os("mac")
+
+  expect_output(exec_flowr_docker(c(), "2.0.11", c("--version"), TRUE), paste0("flowR: ", "2.0.11"))
+})