Merge pull request #84 from wlandau/main

Fix record_nonstandard_licenses()

Author: wlandau

DESCRIPTION

@@ -2,7 +2,7 @@ Package: multiverse.internals
 Title: Internal Infrastructure for R-multiverse
 Description: R-multiverse requires this internal infrastructure package to
   automate contribution reviews and populate universes.
-Version: 1.0.11
+Version: 1.0.12
 License: MIT + file LICENSE
 URL:
   https://r-multiverse.org/multiverse.internals/,

NEWS.md

@@ -1,3 +1,7 @@
+# multiverse.internals 1.0.12
+
+* Fix `record_nonstandard_licenses()` (continuation of 1.0.11).
+
 # multiverse.internals 1.0.11
 
 * Use `tools::analyze_license()` for continuous license checks because `utils::available.packages(repos = "https://community.r-multiverse.org", filters = "license/FOSS")` no longer returns output.

R/record_nonstandard_licenses.R

@@ -7,21 +7,22 @@
 #'   [record_nonstandard_licenses()] records packages with nonstandard
 #'   licenses.
 #' @return `NULL` (invisibly). Called for its side effects.
-#' @param repo Character string, URL of the repository.
-#' @param path Character string, output path to write JSON data with the names
+#' @param path_status Character string, local path to the `status.json` file
+#'   of the repository.
+#' @param path_nonstandard_licenses Character string,
+#'   output path to write JSON data with the names
 #'   and licenses of packages with non-standard licenses.
 record_nonstandard_licenses <- function(
-  repo = "https://community.r-multiverse.org",
-  path = "nonstandard_licenses.json"
+  path_status = "status.json",
+  path_nonstandard_licenses = "nonstandard_licenses.json"
 ) {
-  url <- utils::contrib.url(trim_url(repo), type = "source")
-  all <- utils::available.packages(contriburl = url)
-  foss <- utils::available.packages(contriburl = url, filters = "license/FOSS")
-  package <- as.character(setdiff(all[, "Package"], foss[, "Package"]))
-  license <- as.character(all[package, "License"])
+  json_status <- jsonlite::read_json(path_status, simplifyVector = TRUE)
+  nonstandard <- Filter(function(json) !is.null(json$license), json_status)
+  package <- names(nonstandard)
+  license <- as.character(lapply(nonstandard, function(json) json$license))
   jsonlite::write_json(
     x = data.frame(package = package, license = license),
-    path = path,
+    path = path_nonstandard_licenses,
     pretty = TRUE
   )
 }

man/record_nonstandard_licenses.Rd

@@ -1,10 +1,18 @@
-test_that("record_nonstandard_licenses()", {
-  skip_if_offline()
-  temp <- tempfile()
-  on.exit(unlink(temp))
+test_that("record_status() mocked", {
+  status <- tempfile()
+  nonstandard <- tempfile()
+  record_status(
+    versions = mock_versions(),
+    mock = list(packages = mock_meta_packages),
+    output = status,
+    verbose = FALSE
+  )
   record_nonstandard_licenses(
-    repo = "https://wlandau.r-universe.dev",
-    path = temp
+    path_nonstandard_licenses = nonstandard,
+    path_status = status
   )
-  expect_true(file.exists(temp))
+  out <- jsonlite::read_json(nonstandard, simplifyVector = TRUE)
+  expect_equal(nrow(out), 1L)
+  expect_equal(out$package, "INLA")
+  expect_equal(out$license, "NOT FOUND")
 })