Merge pull request #68 from topepo/fix/fit-pkg-library-call

Fix) get_method() should be called before the package installation checks

Author: topepo

R/engines.R

@@ -41,12 +41,12 @@ check_engine <- function(object) {
 #' @importFrom utils installed.packages
 check_installs <- function(x) {
   lib_inst <- rownames(installed.packages())
-  if (length(x$method$library) > 0) {
-    is_inst <- x$method$library %in% lib_inst
+  if (length(x$method$libs) > 0) {
+    is_inst <- x$method$libs %in% lib_inst
     if (any(!is_inst)) {
       stop(
         "This engine requires some package installs: ",
-        paste0("'", x$method$library[!is_inst], "'", collapse = ", ")
+        paste0("'", x$method$libs[!is_inst], "'", collapse = ", ")
       )
     }
   }

R/fit.R

@@ -117,13 +117,13 @@ fit.model_spec <-
         "with a spark data object.", call. = FALSE
       )
 
+    # populate `method` with the details for this model type
+    object <- get_method(object, engine = object$engine)
+
     check_installs(object)  # TODO rewrite with pkgman
     # TODO Should probably just load the namespace
     load_libs(object, control$verbosity < 2)
 
-    # populate `method` with the details for this model type
-    object <- get_method(object, engine = object$engine)
-
     interfaces <- paste(fit_interface, object$method$fit$interface, sep = "_")
 
     # Now call the wrappers that transition between the interface

R/misc.R

@@ -67,19 +67,19 @@ model_printer <- function(x, ...) {
     if (!is.null(x$method$fit_call)) {
       cat("Fit function:\n")
       print(x$method$fit_call)
-      if (length(x$method$library) > 0) {
-        if (length(x$method$library) > 1)
+      if (length(x$method$libs) > 0) {
+        if (length(x$method$libs) > 1)
           cat("\nRequired packages:\n")
         else
           cat("\nRequired package: ")
-        cat(paste0(x$method$library, collapse = ", "), "\n")
+        cat(paste0(x$method$libs, collapse = ", "), "\n")
       }
     }
   }
 }
 
 load_libs <- function(x, quiet) {
-  for (pkg in x$method$library)
+  for (pkg in x$method$libs)
     suppressPackageStartupMessages(requireNamespace(pkg, quietly = quiet))
   invisible(x)
 }