clean up package detection

R/class_builder.R

@@ -62,7 +62,7 @@ target_prepare.tar_builder <- function(
   meta,
   pending = FALSE
 ) {
-  if (installed_autometric) {
+  if (package_installed("autometric (>= 0.1.0)")) {
     phase <- paste("prepare:", target_get_name(target))
     autometric::log_phase_set(phase = phase)
     on.exit(autometric::log_phase_reset())
@@ -134,7 +134,7 @@ target_needs_worker.tar_builder <- function(target) {
 
 #' @export
 target_run.tar_builder <- function(target, envir, path_store) {
-  if (installed_autometric) {
+  if (package_installed("autometric (>= 0.1.0)")) {
     autometric::log_phase_set(phase = target_get_name(target))
     on.exit(autometric::log_phase_reset())
   }
@@ -167,7 +167,7 @@ target_run_worker.tar_builder <- function(
   options,
   envvars
 ) {
-  if (installed_autometric) {
+  if (package_installed("autometric (>= 0.1.0)")) {
     autometric::log_phase_set(phase = target_get_name(target))
     on.exit(autometric::log_phase_reset())
   }
@@ -214,7 +214,7 @@ target_skip.tar_builder <- function(
 
 #' @export
 target_conclude.tar_builder <- function(target, pipeline, scheduler, meta) {
-  if (installed_autometric) {
+  if (package_installed("autometric (>= 0.1.0)")) {
     phase <- paste("conclude:", target_get_name(target))
     autometric::log_phase_set(phase = phase)
     on.exit(autometric::log_phase_reset())

R/class_runtime.R

@@ -10,7 +10,6 @@ runtime_new <- function(
   file_exist = NULL,
   file_info = NULL,
   file_info_exist = NULL,
-  nanonext = NULL,
   inventories = NULL,
   traceback = NULL,
   pid_parent = NULL,
@@ -32,7 +31,6 @@ runtime_new <- function(
   out$file_exist <- file_exist
   out$file_info <- file_info
   out$file_info_exist <- file_info_exist
-  out$nanonext <- nanonext
   out$inventories <- inventories
   out$traceback <- traceback
   out$pid_parent <- pid_parent
@@ -105,10 +103,6 @@ runtime_validate_extras <- function(x) {
   if (!is.null(x$file_info_exist)) {
     tar_assert_envir(x$file_info_exist)
   }
-  if (!is.null(x$nanonext)) {
-    tar_assert_scalar(x$nanonext)
-    tar_assert_lgl(x$nanonext)
-  }
   if (!is.null(x$inventories)) {
     tar_assert_list(x$inventories)
   }

R/utils_packages.R

@@ -20,7 +20,16 @@ load_packages <- function(packages, library) {
   tar_assert_true(all(out), msg)
 }
 
-installed_autometric <- rlang::is_installed(
-  pkg = "autometric",
-  version = "0.1.0"
-)
+package_installed <- function(package) {
+  installed_packages <- .subset2(tar_runtime, "installed_packages")
+  if (is.null(installed_packages)) {
+    installed_packages <- lookup_new()
+    tar_runtime$installed_packages <- installed_packages
+  }
+  result <- .subset2(installed_packages, package)
+  if (is.null(result)) {
+    result <- rlang::is_installed(pkg = package)
+    installed_packages[[package]] <- result
+  }
+  result
+}

R/utils_rstudio.R

@@ -34,7 +34,7 @@ rstudio_symbol_at_cursor <- function(context) {
 # nocov start
 rstudio_available <- function(verbose = TRUE) {
   available <- TRUE
-  if (!rlang::is_installed("rstudioapi")) {
+  if (!package_installed("rstudioapi")) {
     available <- FALSE
     reason <- "package {rstudioapi} is not installed."
   }

R/utils_time.R

@@ -31,12 +31,9 @@ time_seconds <- function() {
 }
 
 time_seconds_local <- function() {
-  if (is.null(tar_runtime$nanonext)) {
-    tar_runtime$nanonext <- rlang::is_installed("nanonext")
+  if (package_installed("nanonext")) {
+    nanonext::mclock() / 1e3
+  } else {
+    as.numeric(proc.time()["elapsed"]) # nocov
   }
-  if_any(
-    tar_runtime$nanonext,
-    nanonext::mclock() / 1e3,
-    as.numeric(proc.time()["elapsed"])
-  )
 }

tests/testthat/test-class_runtime.R

@@ -89,14 +89,6 @@ tar_test("file_info_exist", {
   expect_silent(runtime_validate(x))
 })
 
-tar_test("nanonext", {
-  x <- runtime_new()
-  expect_null(x$nanonext)
-  x$nanonext <- TRUE
-  expect_true(x$nanonext)
-  expect_silent(runtime_validate(x))
-})
-
 tar_test("traceback", {
   x <- runtime_new()
   expect_null(x$traceback)