Merge pull request #7 from kforner/fixing_for_devtools_2.5

Fixing for devtools 2.5

Author: kforner

DESCRIPTION

@@ -9,7 +9,7 @@ Description: Manage a collection/library of R source packages. Discover, documen
 License: GPL (>= 3)
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 URL: https://github.com/kforner/srcpkgs
 BugReports: https://github.com/kforner/srcpkgs/issues
 Imports:

R/pkg_check.R

@@ -33,12 +33,6 @@ as.data.frame.pkg_check <- function(x, ...) {
 #' @param ...                   passed to `devtools::check()`
 #' @return the results as a `pkg_test` object, or NULL if no tests found
 #' @export
-#' @examples
-#' \donttest{
-#'  pkg <- setup_and_get_dummy_srcpkg()
-#'  res <- pkg_check(pkg, lib = tempfile(), error_on = "never")
-#'  print(res)
-#' }
 pkg_check <- function(pkgid, src_pkgs = get_srcpkgs(), lib = ".check",  roxygen = TRUE,
   quiet = FALSE, error_on = "error",  check_system_clock = FALSE, ...) 
 {  

R/pkg_load.R

@@ -27,7 +27,9 @@
 #' @return the load plan as a data frame, or NULL if there is nothing to do.
 #' @export
 #' @examples
-#'  pkg <- setup_and_get_dummy_srcpkg()
+#' root <- tempfile()
+#' pkg <- setup_and_get_dummy_srcpkg(root)
+#' reset(root)
 #' # load and attach a package
 #' pkg_load(pkg)
 #' 

R/pkg_meta.R

@@ -5,18 +5,24 @@
 # fetches meta data about loaded source packages as a data frame, or NULL if no info
 #  N.B: use the devtools meta data, and stores the package hash inside it
 fetch_srcpkgs_meta <- function() {
-  pkgs_names <- sort(devtools::dev_packages())
+  pkgs_names <- sort(dev_packages_fixed())
   pkgs <- lapply(pkgs_names, fetch_srcpkg_meta)
   pkgs <- pkgs[lengths(pkgs) > 0] %||% return(NULL)
   pkgs <- srcpkgs(pkgs)
-  
+
   df <- as.data.frame(pkgs)
 
   df$attached <- !is.na(match(rownames(df), sub('package:', '', search())))
 
   df
 }
 
+# devtools::dev_packages() does not work any longer in devtools >= 2.5
+dev_packages_fixed <- function() {
+  loaded <- loadedNamespaces()
+  have_meta <- sapply(loaded, function(x) !is.null(pkgload::dev_meta(x)))
+  loaded[have_meta]
+}
 
 get_or_set_meta <- function(meta_env, value) {
   key <- 'SRCPKGS_META_KEY'

R/pkg_test.R

@@ -12,7 +12,9 @@
 #' @importFrom testthat   test_dir
 #' @export
 #' @examples
-#'  pkg <- setup_and_get_dummy_srcpkg()
+#'  root <- tempfile()
+#'  pkg <- setup_and_get_dummy_srcpkg(root)
+#'  reset(root)
 #'  res <- pkg_test(pkg)
 #'  print(res)
 pkg_test <- function(pkgid, filter = NULL, src_pkgs = get_srcpkgs(), export_all = TRUE, quiet = TRUE, ...)

R/pkg_unload.R

@@ -11,7 +11,9 @@
 #'  attached, invisibly or NULL if the package is not loaded
 #' @export
 #' @examples
-#' pkg <- setup_and_get_dummy_srcpkg()
+#' root <- tempfile()
+#' pkg <- setup_and_get_dummy_srcpkg(root)
+#' reset(root)
 #' pkg_load(pkg)
 #' 
 #' pkg_unload(pkg)

R/pkgs_check.R

@@ -58,12 +58,6 @@ summary.pkgs_check <- function(object, ...) {
 #' @param ...   passed to `pkg_check`
 #' @return the results as a `pkgs_test` object
 #' @export
-#' @examples
-#' \donttest{
-#'  pkg <- setup_and_get_dummy_srcpkg()
-#'  res <- pkgs_check(pkg, lib = tempfile(), fail_on_error = FALSE)
-#'  print(res)
-#' }
 pkgs_check <- function(pkgids = names(filter_srcpkgs(src_pkgs, filter)), src_pkgs = get_srcpkgs(), 
   filter = NULL, lib = ".check",  quiet = FALSE, fail_on_error = FALSE,  ...) 
 {  

R/pkgs_install.R

@@ -9,10 +9,6 @@
 #' @param ...   passed to `devtools::install()`
 #' @return the names of the packages actually installed
 #' @export
-#' @examples 
-#' pkg <- setup_and_get_dummy_srcpkg()
-#' dest <- tempfile()
-#' pkgs_install(pkg, dest)
 pkgs_install <- function(pkgids, lib, src_pkgs = get_srcpkgs(), only_deps = FALSE,  quiet = TRUE, ...)
 {
   stop_unless(length(pkgids), "No package to test")
@@ -29,7 +25,8 @@ pkgs_install <- function(pkgids, lib, src_pkgs = get_srcpkgs(), only_deps = FALS
     pkg <- src_pkgs[[pkg_name]]
 
     # is_loaded <- pkg_is_loaded(pkg_name)
-    pkg_roxygenise(pkg$path, quiet = quiet)
+    # pkg_roxygenise(pkg$path, quiet = quiet)
+    pkg_load(pkg, src_pkgs, attach = FALSE, roxygen = TRUE, quiet = quiet)
     # if (!is_loaded) unloadNamespace(pkg_name)
 
     if (!pkg_needs_install(pkg$path, lib)) return(NULL)

dev.R

@@ -9,10 +9,12 @@ test(filter = "graph")
 test(filter = "examples")
 test(filter = "pkg_check")
 test(filter = "pkg_load")
+test(filter = "pkg_meta")
 test(filter = "pkg_test")
 test(filter = "pkg_utils")
 test(filter = "pkgs_check")
 test(filter = "pkgs_deps")
+test(filter = "pkgs_install")
 test(filter = "pkgs_test")
 test(filter = "project_root")
 test(filter = "srcpkg$")
@@ -30,5 +32,7 @@ system.time(withr::with_dir("vignettes", rmarkdown::render("demo.Rmd")))
 build_vignettes()
 run_examples()
 run_examples(run_donttest = TRUE)
+run_examples(start = "pkgs_install")
+
 
 rhub::rhub_check(platforms="windows")

inst/extdata/examples/dummy_srcpkg/tests/testthat/test_failure.R

@@ -1,5 +1,5 @@
 
 test_that("does_nothing_special - failure", {
-  expect_equal(does_nothing_special(), 0)
+  expect_equal(dummy.srcpkg:::does_nothing_special(), 0)
 })