chore: remove superassignment operator and nolint

DESCRIPTION

@@ -33,4 +33,4 @@ Suggests:
     withr
 Config/testthat/edition: 3
 Encoding: UTF-8
-RoxygenNote: 7.3.2
+Config/roxygen2/version: 8.0.0

R/aaa-globals.R

@@ -11,6 +11,7 @@ merge_list <- function(x, y) {
 }
 
 new_defaults <- function(value = list()) {
+  env <- environment()
   defaults <- value
 
   get <- function(name, default = FALSE, drop = TRUE) {
@@ -35,11 +36,11 @@ new_defaults <- function(value = list()) {
     if (is.null(names(dots)) && length(dots) == 1 && is.list(dots[[1]])) {
       if (length(dots <- dots[[1]]) == 0) return()
     }
-    defaults <<- merge(dots) # nolint
+    assign("defaults", merge(dots), envir = env)
     invisible(NULL)
   }
   merge <- function(values) merge_list(defaults, values)
-  restore <- function(target = value) defaults <<- target # nolint
+  restore <- function(target = value) assign("defaults", target, envir = env)
 
   list(get = get, set = set, merge = merge, restore = restore)
 }

R/dependencies.R

@@ -52,7 +52,7 @@ appDependencies <- function(
   libPaths <- c(
     libDir(project),
     .libPaths(),
-    .packrat_mutables$origLibPaths
+    .packrat_mutables$get("origLibPaths")
   )
 
   ignores <- packrat::opts$ignored.packages()

tests/testthat/test-dependencies.R

@@ -243,3 +243,44 @@ withTestContext({
     expect_equal(deps, c("oatmeal"))
   })
 })
+
+test_that("appDependencies searches origLibPaths when resolving dependencies", {
+  # A library holding an installed package (origlibpkg) whose dependency
+  # (origlibdep) can only be discovered by reading origlibpkg's DESCRIPTION
+  # from this library.
+  origLib <- tempfile("origlib")
+  installFakePkg <- function(name, imports = NULL) {
+    pkgDir <- file.path(origLib, name)
+    dir.create(pkgDir, recursive = TRUE)
+    desc <- c(paste("Package:", name), "Version: 1.0.0")
+    if (!is.null(imports)) {
+      desc <- c(desc, paste("Imports:", imports))
+    }
+    writeLines(desc, file.path(pkgDir, "DESCRIPTION"))
+  }
+  installFakePkg("origlibpkg", imports = "origlibdep")
+  installFakePkg("origlibdep")
+
+  # Point origLibPaths at that library, restoring afterwards.
+  oldOrigLibPaths <- packrat:::.packrat_mutables$get("origLibPaths")
+  packrat:::.packrat_mutables$set(origLibPaths = origLib)
+  on.exit(
+    packrat:::.packrat_mutables$set(origLibPaths = oldOrigLibPaths),
+    add = TRUE
+  )
+
+  # A project whose only stated dependency is origlibpkg.
+  projDir <- tempfile("proj")
+  dir.create(projDir)
+  writeLines("library(origlibpkg)", file.path(projDir, "code.R"))
+
+  # An empty package database leaves origLib as the only place origlibpkg's
+  # dependencies can be resolved.
+  deps <- packrat:::appDependencies(
+    projDir,
+    available.packages = matrix(nrow = 0, ncol = 0),
+    implicit.packrat.dependency = FALSE
+  )
+
+  expect_true("origlibdep" %in% deps)
+})

tests/testthat/test-globals.R

@@ -0,0 +1,60 @@
+test_that("new_defaults get returns values", {
+  d <- new_defaults(list(a = 1, b = 2))
+
+  # entire list when name is missing
+  expect_identical(d$get(), list(a = 1, b = 2))
+
+  # single value, dropped by default
+  expect_identical(d$get("a"), 1)
+
+  # named subset when drop = FALSE
+  expect_identical(d$get("a", drop = FALSE), list(a = 1))
+  expect_identical(d$get(c("a", "b")), list(a = 1, b = 2))
+
+  # default = TRUE ignores anything set later
+  d$set(a = 99)
+  expect_identical(d$get("a"), 99)
+  expect_identical(d$get("a", default = TRUE), 1)
+})
+
+test_that("new_defaults set merges named arguments", {
+  d <- new_defaults(list(a = 1, b = 2))
+
+  d$set(a = 10, c = 3)
+  expect_identical(d$get(), list(a = 10, b = 2, c = 3))
+})
+
+test_that("new_defaults set merges a single list argument", {
+  d <- new_defaults(list(a = 1, b = 2))
+
+  d$set(list(a = 10, c = 3))
+  expect_identical(d$get(), list(a = 10, b = 2, c = 3))
+})
+
+test_that("new_defaults set with no arguments leaves defaults untouched", {
+  d <- new_defaults(list(a = 1))
+
+  expect_null(d$set())
+  expect_null(d$set(list()))
+  expect_identical(d$get(), list(a = 1))
+})
+
+test_that("new_defaults restore replaces all defaults", {
+  d <- new_defaults(list(a = 1, b = 2))
+  d$set(a = 10)
+
+  d$restore(list(z = 99))
+  expect_identical(d$get(), list(z = 99))
+
+  # restoring with no target reverts to the original value
+  d$restore()
+  expect_identical(d$get(), list(a = 1, b = 2))
+})
+
+test_that("new_defaults merge does not mutate stored defaults", {
+  d <- new_defaults(list(a = 1, b = 2))
+
+  expect_identical(d$merge(list(a = 10, c = 3)), list(a = 10, b = 2, c = 3))
+  # merge is non-destructive
+  expect_identical(d$get(), list(a = 1, b = 2))
+})

tests/testthat/test-hash.R

@@ -18,7 +18,7 @@ test_that("hash function is available and has expected arguments", {
   expect_identical(
     formals(hash),
     pairlist(
-      path = quote(expr = ), # nolint: infix_spaces_linter. r-lib/lintr#1889
+      path = quote(expr = ),
       descLookup = as.name("installedDescLookup")
     )
   )