feat: drop vendored renv, parse lockfiles with jsonlite (#94) (#97)

* feat: drop vendored renv, parse lockfiles with jsonlite (#94)

Removes the ~30,000-line vendored copy of renv 1.0.3 (in
inst/vendor/renv.R) and the bootstrap shell (R/renv.R, ~90 lines).
The full renv toolkit was embedded for one runtime use only:
renv$lockfile_read(). It is replaced by jsonlite::read_json() which
already lives in Imports and produces the same structure for the
fields dockerfiler reads (R$Version, names(Packages),
Packages$<name>$Version).

Public API change: the exported dockerfiler::renv data symbol is
removed. Documented as @doctype data in 0.2.5; users who relied on
it (unlikely outside of dockerfiler tests) should switch to renv::
directly.

Behaviour change in the missing(renv_version) + lockfile-without-renv
case: the previous fallback was the vendored 1.0.3 (frozen 2023-11),
which produced remotes::install_version("renv", version = "1.0.3")
in the generated Dockerfile. The new fallback is NULL, which now
emits install.packages("renv") and pulls the latest renv from the
configured repos. This aligns with the existing
renv_version = NULL behaviour and avoids shipping increasingly stale
renv builds.

Tests use renv::snapshot() via Suggests + skip_if_not_installed
guard. The "missing" assertion for the unpinned-renv lockfile now
expects install.packages("renv") instead of install_version 1.0.3.

Side effect: the inline-R in roxygen
(`r dockerfiler::renv$initialize();...`) goes away, eliminating the
attachment::att_amend_desc() regeneration trap on man/dock_from_renv.Rd.

Closes #94.

* fix(message): typo "the must" -> "the most up to date version"

Address self-review nit on PR #97. Pre-existing typo in the
`message("renv version = ", ...)` displayed when renv_version
is NULL. Now fires more often since the unpinned-renv-in-lockfile
path also lands here, so worth fixing.

* release: bump to 0.3.0

The vendored-renv removal is a breaking change (the exported
`dockerfiler::renv` symbol is dropped), so bump to 0.3.0 and split
the development NEWS section into Breaking changes / New features /
Bug fixes per tidyverse convention.

Author: VincentGuyader

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dockerfiler
 Title: Easy Dockerfile Creation from R
-Version: 0.2.6
+Version: 0.3.0
 Authors@R: c(
     person("Colin", "Fay", , "contact@colinfay.me", role = c("cre", "aut"),
            comment = c(ORCID = "0000-0001-7343-1846")),
@@ -34,6 +34,7 @@ Imports:
     utils
 Suggests:
     knitr (>= 1.31),
+    renv,
     rmarkdown (>= 2.6),
     testthat (>= 3.0.0),
     withr

NAMESPACE

@@ -8,7 +8,6 @@ export(docker_ignore_add)
 export(get_sysreqs)
 export(parse_dockerfile)
 export(r)
-export(renv)
 importFrom(R6,R6Class)
 importFrom(attempt,map_try_catch)
 importFrom(attempt,warn_if_not)

NEWS.md

@@ -1,6 +1,39 @@
-# dockerfiler (development version)
+# dockerfiler 0.3.0
 
-- fix: `r()` no longer silently rewrites user code. The previous
+## Breaking changes
+
+- The vendored copy of `{renv}` (~30,000 lines under `inst/vendor/`)
+  is removed. Lockfiles are now parsed with `jsonlite::read_json()`
+  (already in Imports). The exported `dockerfiler::renv` symbol is
+  removed: it was a public-API surface only because the vendor pattern
+  required it. The fallback `renv_version` value, when both the user
+  argument is missing and the lockfile does not pin renv, is now
+  `NULL` (install the latest renv from the configured repos), aligned
+  with the existing `renv_version = NULL` behaviour. Closes #94.
+
+## New features
+
+- `dock$ARG()` and the internal `add_arg()` helper gain a `default`
+  parameter to emit `ARG <name>=<default>` instead of `ARG <name>`.
+  Closes #8.
+- `dock_from_desc()` and `dock_from_renv()` gain a `github_pat`
+  parameter (default `"none"`) controlling how a GitHub PAT is provided
+  to `remotes::install_github()` / `remotes::install_local()` /
+  `renv::restore()` for private dependency repositories. Set to
+  `"build_arg"` to emit `ARG GITHUB_PAT` + `ENV` propagation (passed
+  via `--build-arg GITHUB_PAT=$GITHUB_PAT`), or `"secret"` to use
+  BuildKit secret mounts (the PAT is never persisted in image
+  metadata; recommended for published images). Closes #18.
+- `dock_from_renv()` gains a `renv_paths_cache` parameter (default
+  `/root/.cache/R/renv`) used as the build-arg default, the propagated
+  `ENV` value and the cache mount target. Users can override the renv
+  cache location at image build time with
+  `--build-arg RENV_PATHS_CACHE=...` without regenerating the
+  Dockerfile.
+
+## Bug fixes
+
+- `r()` no longer silently rewrites user code. The previous
   implementation called `gsub(" [2,]", " ", code)` (a typo for
   `{2,}`) which deleted any digit `2` or comma preceded by a space:
   `r(c(1, 2, 3))` returned `R -e 'c(1, , 3)'`. The replacement
@@ -10,36 +43,19 @@
   line then `paste(collapse = " ")`: only the line-wrap indentation
   added by `deparse()` is removed, internal whitespace is preserved.
   Closes #95.
-- fix: `r()` now wraps the deparsed R expression with
+- `r()` now wraps the deparsed R expression with
   `shQuote(., type = "sh")` instead of inlining it inside a hand-rolled
   single-quoted shell string. Apostrophes inside string literals no
   longer break the emitted command: `r(message("don't"))` used to emit
   `R -e 'message("don't")'`, which the shell refuses to parse
   (unterminated quoted string). The new wrapping is shell-safe by
   construction.
-- fix: `dock_from_desc(build_from_source = FALSE)` no longer carries
+- `dock_from_desc(build_from_source = FALSE)` no longer carries
   a dead-code branch (`if (missing(out))`) on the locally-assigned
   result of `pkgbuild::build()`. `missing()` only reports unsupplied
   function arguments, so the branch was unreachable; the success path
   always ran when `build()` returned. The branch is removed; failures
   of `pkgbuild::build()` propagate normally via `stop()`. Closes #98.
-- `dock$ARG()` and the internal `add_arg()` helper gain a `default`
-  parameter to emit `ARG <name>=<default>` instead of `ARG <name>`.
-  Closes #8.
-- `dock_from_desc()` and `dock_from_renv()` gain a `github_pat`
-  parameter (default `"none"`) controlling how a GitHub PAT is provided
-  to `remotes::install_github()` / `remotes::install_local()` /
-  `renv::restore()` for private dependency repositories. Set to
-  `"build_arg"` to emit `ARG GITHUB_PAT` + `ENV` propagation (passed
-  via `--build-arg GITHUB_PAT=$GITHUB_PAT`), or `"secret"` to use
-  BuildKit secret mounts (the PAT is never persisted in image
-  metadata; recommended for published images). Closes #18.
-- `dock_from_renv()` gains a `renv_paths_cache` parameter (default
-  `/root/.cache/R/renv`) used as the build-arg default, the propagated
-  `ENV` value and the cache mount target. Users can override the renv
-  cache location at image build time with
-  `--build-arg RENV_PATHS_CACHE=...` without regenerating the
-  Dockerfile.
 
 
 # dockerfiler 0.2.6

R/dock_from_renv.R

@@ -19,9 +19,9 @@ pkg_sysreqs_mem <- memoise::memoise(
 #'    Will be installed with apt-get install.
 #' @param renv_version character. The renv version to use in the generated Dockerfile. By default, it is set to the version specified in the `renv.lock` file.
 #'   If the `renv.lock` file does not specify a renv version,
-#'   the version of renv bundled with dockerfiler,
-#'   specifically `r dockerfiler::renv$initialize();toString(dockerfiler::renv$the$metadata$version)`, will be used.
-#'   If you set it to `NULL`, the latest available version of renv will be used.
+#'   the latest available version of renv will be installed.
+#'   Set it to `NULL` to force installing the latest renv even when the
+#'   lockfile pins a specific version.
 #' @param use_pak boolean. If `TRUE` use pak to deal with dependencies  during `renv::restore()`. FALSE by default
 #' @param user Name of the user to specify in the Dockerfile with the USER instruction. Default is `NULL`, in which case the user from the FROM image is used.
 #' @param dependencies What kinds of dependencies to install. Most commonly
@@ -88,9 +88,12 @@ dock_from_renv <- function(
   renv_paths_cache = "/root/.cache/R/renv"
 ) {
   github_pat <- match.arg(github_pat)
-  try(dockerfiler::renv$initialize(),silent=TRUE)
-  lock <- dockerfiler::renv$lockfile_read(file = lockfile) # using vendored renv
-  # https://rstudio.github.io/renv/reference/vendor.html?q=vendor#null
+  lock <- jsonlite::read_json(
+    lockfile,
+    simplifyVector = TRUE,
+    simplifyDataFrame = FALSE,
+    simplifyMatrix = FALSE
+  )
 
   # start the dockerfile
   R_major_minor <- lock$R$Version
@@ -110,15 +113,11 @@ dock_from_renv <- function(
   # get renv version
 
   if (missing(renv_version)) {
-    if (!is.null(lock$Packages$renv$Version)) {
-      renv_version <- lock$Packages$renv$Version
-    } else {
-      renv_version <-  dockerfiler::renv$the$metadata$version
-    }
+    renv_version <- lock$Packages$renv$Version
   }
 
   message("renv version = ",
-          ifelse(!is.null(renv_version),renv_version,"the must up to date in the repos")
+          ifelse(!is.null(renv_version), renv_version, "the most up to date version in the repos")
           )