Merge commit 'cfc4392720456f70d1626d3872d2628c44155115'

.Rbuildignore

@@ -10,7 +10,7 @@
 ^\.Rprofile$
 ^r-packages$
 ^README_cache$
-^tools$
+^tools/doc$
 ^doc$
 ^Meta$
 ^_pkgdown\.yml$
@@ -22,3 +22,4 @@
 ^dev-lib$
 ^revdep$
 ^codecov\.yml$
+^man/macros/eval2[.]Rd$

.gitignore

@@ -13,3 +13,4 @@ Meta
 /vignettes/pkgdepends-how-to_files
 /dev-lib
 /man/_cache
+/man/macros/eval2.Rd

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: pkgdepends
 Title: Package Dependency Resolution and Downloads
-Version: 0.5.0.9000
+Version: 0.6.0.9000
 Authors@R: c(
     person("Gábor", "Csárdi", , "[email protected]", role = c("aut", "cre")),
     person("RStudio", role = c("cph", "fnd"))
@@ -14,9 +14,11 @@ Description: Find recursive dependencies of 'R' packages from various
     all 'HTTP' requests, downloads, builds and installations in parallel.
     'pkgdepends' is the workhorse of the 'pak' package.
 License: MIT + file LICENSE
-URL: https://github.com/r-lib/pkgdepends#readme
+URL:
+    https://r-lib.github.io/pkgdepends/,
+    https://github.com/r-lib/pkgdepends#readme
 BugReports: https://github.com/r-lib/pkgdepends/issues
-Depends: R (>= 3.4)
+Depends: R (>= 3.5)
 Imports:
     callr (>= 3.3.1),
     cli (>= 3.6.0),
@@ -27,7 +29,7 @@ Imports:
     jsonlite,
     lpSolve,
     pkgbuild (>= 1.0.2),
-    pkgcache (>= 2.1.0),
+    pkgcache (>= 2.2.0),
     prettyunits (>= 1.1.1),
     processx (>= 3.4.2),
     ps,
@@ -54,6 +56,7 @@ Suggests:
     webfakes (>= 1.1.5.9000),
     withr (>= 2.1.1),
 Config/Needs/coverage:
+    r-lib/asciicast,
     covr,
     rmarkdown,
     svglite

NAMESPACE

@@ -2,26 +2,28 @@
 
 S3method("[",pkg_resolution_result)
 S3method("[",pkg_solution_result)
+S3method("[",pkg_sysreqs_check_result)
 S3method("[",pkgplan_downloads)
 S3method(format,package_build_error)
 S3method(format,package_packaging_error)
 S3method(format,package_uncompress_error)
 S3method(format,pkg_name_check)
-S3method(format,pkg_name_check_acromine)
 S3method(format,pkg_name_check_basics)
 S3method(format,pkg_name_check_sentiment)
 S3method(format,pkg_name_check_urban)
 S3method(format,pkg_name_check_wikipedia)
 S3method(format,pkg_name_check_wiktionary)
 S3method(format,pkg_solution_failures)
 S3method(format,pkg_solution_result)
+S3method(format,pkg_sysreqs_check_result)
 S3method(format,pkgplan_lp_problem)
 S3method(format,remote_ref)
 S3method(print,package_build_error)
 S3method(print,package_packaging_error)
 S3method(print,package_uncompress_error)
 S3method(print,pkg_name_check)
 S3method(print,pkg_solution_result)
+S3method(print,pkg_sysreqs_check_result)
 S3method(print,pkginstall_result)
 S3method(print,pkgplan_lp_problem)
 S3method(print,snapshot)
@@ -48,6 +50,15 @@ export(pkg_installation_plan)
 export(pkg_installation_proposal)
 export(pkg_name_check)
 export(pkg_rx)
+export(sysreqs_check_installed)
+export(sysreqs_db_list)
+export(sysreqs_db_match)
+export(sysreqs_db_update)
+export(sysreqs_fix_installed)
+export(sysreqs_install_plan)
+export(sysreqs_is_supported)
+export(sysreqs_list_system_packages)
+export(sysreqs_platforms)
 importFrom(callr,poll)
 importFrom(callr,r_process_options)
 importFrom(cli,ansi_hide_cursor)

NEWS.md

@@ -1,9 +1,52 @@
 # pkgdepends (development version)
 
+* Fix `@*release` reference for the latest release.
+
+# pkgdepends 0.6.0
+
+* Many system requirements improvements:
+  - New functions:
+    - `sysreqs_check_installed()`: check if all required system packages
+      are installed,
+    - `sysreqs_fix_installed()`: install missing system packages,
+    - `sysreqs_db_list()`: list system requirements database,
+    - `sysreqs_db_match()`: match `SystemRrequirements` field(s) to database,
+    - `sysreqs_db_update()`: update system requirements database,
+    - `sysreqs_install_plan()`: look up system requirements for a package and
+      its dependencies,
+    - `sysreqs_is_supported()`: check if pkgdepends supports system
+      requirements on your platform,
+    - `sysreqs_list_system_packages()`: list installed system packages,
+    - `sysreqs_platforms()`: list supported platforms.
+    - New `pkg_installation_proposal` methods: `get_sysreqs()`, `show_sysreqs()`
+      and `update_sysreqs()`.
+  - The output of `$show_solution()` now includes system requirements.
+  - New `sysreqs_platform` configuration option.
+  - pkgdepends now looks up system requirements asynchronously, during
+    dependency resolution.
+  - pkgdepends now does not reinstall system requirements by default,
+    if they are already installed. (You can force a reinstall/upgrade
+    with the `sysreqs_update` configuration option.)
+
+* New `gitlab::` package source to install packages from GitLab (#315).
+
 * pkgdepends now correctly parses multiple `git::` packages at once (#318).
 
 * Fix `@*release` reference for the latest release.
 
+* `git::` package sources now support version 1 of the git protocol.
+  E.g. the Bioconductor git repositories now work:
+  `git::https://git.bioconductor.org/packages/limma` (#314).
+
+* The `platforms` config parameter now works correctly with `deps::`
+  package sources (https://github.com/r-lib/pak/issues/522).
+
+* New `include_linkingto` config parameter to always include `LinkingTo`
+  packages in the solution, even for binaries (#485).
+
+* `pkg_name_check()` now does not include Acromine results, because the web
+  site was unstable.
+
 # pkgdepends 0.5.0
 
 * pkgdepends now support git repositories as package references. E.g.

R/config.R

@@ -204,7 +204,7 @@ config <- local({
     name <- standard_name(name)
     if (!name %in% names(env$data)) {
       throw(pkg_error(
-        "Unknown conifguration entry: {.code {name}}.",
+        "Unknown configuration entry: {.code {name}}.",
         i = "This is an probably an internal error in the
              {.pkg {env$package}} package."
       ))
@@ -233,7 +233,11 @@ config <- local({
     # otherwise the default, but if it is a function, then call it
     def <- rec$default
     if (is.function(def)) {
-      def <- def()
+      if (length(formals(def)) > 0) {
+        def <- def(env)
+      } else {
+        def <- def()
+      }
       if (!is.null(chk <- env$data[[name]]$check)) chk(def)
     }
     list("default", def)

R/docs.R

@@ -100,3 +100,7 @@ read_char <- function(path) {
 write_char <- function(x, path) {
   writeBin(charToRaw(x), path)
 }
+
+man_config_link <- function(txt) {
+  paste0("\\link[=pkgdepends-config]{", txt, "}")
+}

R/download-progress-bar.R

@@ -386,7 +386,7 @@ pkgplan__done_progress_bar <- function(bar) {
     cli_alert_success(
       paste0(
         "Downloaded {dld} package{?s} {.size ({bts})}",
-        if (bar$show_time) "in {.time {dt}}"
+        if (bar$show_time) " in {.time {dt}}"
       )
     )
   } else {