Skip to content

Commit

Permalink
Update for more account activity (#37)
Browse files Browse the repository at this point in the history
jonthegeek authored Mar 12, 2024
1 parent 0755a2e commit fe9c5c7
Showing 3 changed files with 182 additions and 145 deletions.
3 changes: 2 additions & 1 deletion r4ds-helpers-mastodon.R
Original file line number Diff line number Diff line change
@@ -47,7 +47,8 @@ get_r4ds_toots <- function() {
id = "109243727882736782",
hashtag = "#TidyTuesday",
exclude_reblogs = TRUE,
limit = 3
# Get a bunch in case I go on a promotion spree.
limit = 10
) |>
dplyr::filter(
stringr::str_starts(
218 changes: 117 additions & 101 deletions renv.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"R": {
"Version": "4.3.1",
"Version": "4.3.2",
"Repositories": [
{
"Name": "CRAN",
@@ -21,24 +21,24 @@
},
"Rcpp": {
"Package": "Rcpp",
"Version": "1.0.11",
"Version": "1.0.12",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"methods",
"utils"
],
"Hash": "ae6cbbe1492f4de79c45fce06f967ce8"
"Hash": "5ea2700d21e038ace58269ecdbeb9ec0"
},
"askpass": {
"Package": "askpass",
"Version": "1.1",
"Version": "1.2.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"sys"
],
"Hash": "e8a22846fff485f0be3770c2da758713"
"Hash": "cad6cf7f1d5f6e906700b9d3e718c796"
},
"bit": {
"Package": "bit",
@@ -78,14 +78,14 @@
},
"cli": {
"Package": "cli",
"Version": "3.6.1",
"Version": "3.6.2",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"utils"
],
"Hash": "89e6d8219950eac806ae0c489052048a"
"Hash": "1216ac65ac55ec0058a6f75d7ca0fd52"
},
"clipr": {
"Package": "clipr",
@@ -99,10 +99,13 @@
},
"cpp11": {
"Package": "cpp11",
"Version": "0.4.4",
"Version": "0.4.7",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "3f7d8664d7324406cd10cd650ad85e5f"
"Repository": "RSPM",
"Requirements": [
"R"
],
"Hash": "5a295d7d963cc5035284dcdbaf334f4e"
},
"crayon": {
"Package": "crayon",
@@ -118,7 +121,7 @@
},
"credentials": {
"Package": "credentials",
"Version": "1.3.2",
"Version": "2.0.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -128,35 +131,34 @@
"openssl",
"sys"
],
"Hash": "93762d0a34d78e6a025efdbfb5c6bb41"
"Hash": "c7844b32098dcbd1c59cbd8dddb4ecc6"
},
"curl": {
"Package": "curl",
"Version": "5.0.1",
"Version": "5.2.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "2118af9cb164c8d2dddc7b89eaf732d9"
"Hash": "411ca2c03b1ce5f548345d2fc2685f7a"
},
"desc": {
"Package": "desc",
"Version": "1.4.2",
"Version": "1.4.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"R6",
"cli",
"rprojroot",
"utils"
],
"Hash": "6b9602c7ebbe87101a9c8edb6e8b6d21"
"Hash": "99b79fcbd6c4d1ce087f5c5c758b384f"
},
"dplyr": {
"Package": "dplyr",
"Version": "1.1.2",
"Version": "1.1.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -175,7 +177,7 @@
"utils",
"vctrs"
],
"Hash": "dea6970ff715ca541c387de363ff405e"
"Hash": "fedd9d00c2944ff00a0e2696ccf048ec"
},
"emoji": {
"Package": "emoji",
@@ -192,26 +194,33 @@
},
"fansi": {
"Package": "fansi",
"Version": "1.0.4",
"Version": "1.0.6",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"grDevices",
"utils"
],
"Hash": "1d9e7ad3c8312a192dea7d3db0274fde"
"Hash": "962174cf2aeb5b9eea581522286a911f"
},
"fastmap": {
"Package": "fastmap",
"Version": "1.1.1",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "f7736a18de97dea803bde0a2daaafb27"
},
"fs": {
"Package": "fs",
"Version": "1.6.2",
"Version": "1.6.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"methods"
],
"Hash": "94af08e0aa9675a16fadbb3aaaa90d2a"
"Hash": "47b5f30c720c23999b913a1a635cf0bb"
},
"generics": {
"Package": "generics",
@@ -226,7 +235,7 @@
},
"gert": {
"Package": "gert",
"Version": "1.9.2",
"Version": "2.0.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -237,7 +246,7 @@
"sys",
"zip"
],
"Hash": "9122b3958e749badb5c939f498038b57"
"Hash": "f70d3fe2d9e7654213a946963d1591eb"
},
"gh": {
"Package": "gh",
@@ -267,14 +276,14 @@
},
"glue": {
"Package": "glue",
"Version": "1.6.2",
"Version": "1.7.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"methods"
],
"Hash": "4f2596dfb05dac67b9dc558e5c6fba2e"
"Hash": "e0b3a53876554bd45879e596cdb10a52"
},
"hms": {
"Package": "hms",
@@ -292,9 +301,9 @@
},
"httpuv": {
"Package": "httpuv",
"Version": "1.6.11",
"Version": "1.6.14",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"R6",
@@ -303,11 +312,11 @@
"promises",
"utils"
],
"Hash": "838602f54e32c1a0f8cc80708cefcefa"
"Hash": "16abeb167dbf511f8cc0552efaf05bab"
},
"httr": {
"Package": "httr",
"Version": "1.4.6",
"Version": "1.4.7",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -318,11 +327,11 @@
"mime",
"openssl"
],
"Hash": "7e5e3cbd2a7bc07880c94e22348fb661"
"Hash": "ac107251d9d9fd72f0ca8049988f1d7f"
},
"httr2": {
"Package": "httr2",
"Version": "0.2.3",
"Version": "1.0.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -331,13 +340,15 @@
"cli",
"curl",
"glue",
"lifecycle",
"magrittr",
"openssl",
"rappdirs",
"rlang",
"vctrs",
"withr"
],
"Hash": "193bb297368afbbb42dc85784a46b36e"
"Hash": "e2b30f1fc039a0bab047dd52bb20ef71"
},
"ini": {
"Package": "ini",
@@ -348,28 +359,28 @@
},
"jsonlite": {
"Package": "jsonlite",
"Version": "1.8.7",
"Version": "1.8.8",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"methods"
],
"Hash": "266a20443ca13c65688b2116d5220f76"
"Hash": "e1b9c55281c5adc4dd113652d9e26768"
},
"later": {
"Package": "later",
"Version": "1.3.1",
"Version": "1.3.2",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"Rcpp",
"rlang"
],
"Hash": "40401c9cf2bc2259dfe83311c9384710"
"Hash": "a3e051d405326b8b0012377434c62b37"
},
"lifecycle": {
"Package": "lifecycle",
"Version": "1.0.3",
"Version": "1.0.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -378,11 +389,11 @@
"glue",
"rlang"
],
"Hash": "001cecbeac1cff9301bdc3775ee46a86"
"Hash": "b8552d117e1b808b09a832f589b79035"
},
"lubridate": {
"Package": "lubridate",
"Version": "1.9.2",
"Version": "1.9.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -391,7 +402,7 @@
"methods",
"timechange"
],
"Hash": "e25f18436e3efd42c7c590a1c4c15390"
"Hash": "680ad542fbcf801442c83a6ac5a2126c"
},
"magrittr": {
"Package": "magrittr",
@@ -415,13 +426,13 @@
},
"openssl": {
"Package": "openssl",
"Version": "2.0.6",
"Version": "2.1.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"askpass"
],
"Hash": "0f7cd2962e3044bb940cca4f4b5cecbe"
"Hash": "2a0dc8c6adfb6f032e4d4af82d258ab5"
},
"pillar": {
"Package": "pillar",
@@ -452,42 +463,47 @@
},
"prettyunits": {
"Package": "prettyunits",
"Version": "1.1.1",
"Version": "1.2.0",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "95ef9167b75dde9d2ccc3c7528393e7e"
"Requirements": [
"R"
],
"Hash": "6b01fc98b1e86c4f705ce9dcfd2f57c7"
},
"progress": {
"Package": "progress",
"Version": "1.2.2",
"Version": "1.2.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"R6",
"crayon",
"hms",
"prettyunits"
],
"Hash": "14dc9f7a3c91ebb14ec5bb9208a07061"
"Hash": "f4625e061cb2865f111b47ff163a5ca6"
},
"promises": {
"Package": "promises",
"Version": "1.2.0.1",
"Version": "1.2.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R6",
"Rcpp",
"fastmap",
"later",
"magrittr",
"rlang",
"stats"
],
"Hash": "4ab2c43adb4d4699cf3690acd378d75d"
"Hash": "0d8a15c9d000970ada1ab21405387dee"
},
"purrr": {
"Package": "purrr",
"Version": "1.0.1",
"Version": "1.0.2",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -498,7 +514,7 @@
"rlang",
"vctrs"
],
"Hash": "d71c815267c640f17ddbf7f16144b4bb"
"Hash": "1cba04a4e9414bdefc9dcaa99649a8dc"
},
"rappdirs": {
"Package": "rappdirs",
@@ -512,7 +528,7 @@
},
"readr": {
"Package": "readr",
"Version": "2.1.4",
"Version": "2.1.5",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -531,7 +547,7 @@
"utils",
"vroom"
],
"Hash": "b5047343b3825f37ad9d3b5d89aa1078"
"Hash": "9de96463d2117f6ac49980577939dfb3"
},
"readxl": {
"Package": "readxl",
@@ -550,41 +566,41 @@
},
"rematch": {
"Package": "rematch",
"Version": "1.0.1",
"Version": "2.0.0",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "c66b930d20bb6d858cd18e1cebcfae5c"
"Hash": "cbff1b666c6fa6d21202f07e2318d4f1"
},
"renv": {
"Package": "renv",
"Version": "1.0.0",
"Version": "1.0.5",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"utils"
],
"Hash": "c321cd99d56443dbffd1c9e673c0c1a2"
"Hash": "32c3f93e8360f667ca5863272ec8ba6a"
},
"rlang": {
"Package": "rlang",
"Version": "1.1.1",
"Version": "1.1.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"utils"
],
"Hash": "a85c767b55f0bf9b7ad16c6d7baee5bb"
"Hash": "42548638fae05fd9a9b5f3f437fbbbe2"
},
"rprojroot": {
"Package": "rprojroot",
"Version": "2.0.3",
"Version": "2.0.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "1de7ab598047a87bba48434ba35d497d"
"Hash": "4c8415e0ec1e29f3f4f6fc108bef0144"
},
"rstudioapi": {
"Package": "rstudioapi",
@@ -595,7 +611,7 @@
},
"rtoot": {
"Package": "rtoot",
"Version": "0.3.2",
"Version": "0.3.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -607,11 +623,11 @@
"jsonlite",
"tibble"
],
"Hash": "89c096c73f2f7d4c5a4993d9162837b3"
"Hash": "41899db9270f1a2311d38399d2a176b0"
},
"rvest": {
"Package": "rvest",
"Version": "1.0.3",
"Version": "1.0.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -624,10 +640,9 @@
"rlang",
"selectr",
"tibble",
"withr",
"xml2"
],
"Hash": "a4a5ac819a467808c60e36e92ddf195e"
"Hash": "0bcf0c6f274e90ea314b812a6d19a519"
},
"selectr": {
"Package": "selectr",
@@ -660,7 +675,7 @@
},
"stringi": {
"Package": "stringi",
"Version": "1.7.12",
"Version": "1.8.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -669,11 +684,11 @@
"tools",
"utils"
],
"Hash": "ca8bd84263c77310739d2cf64d84d7c9"
"Hash": "058aebddea264f4c99401515182e656a"
},
"stringr": {
"Package": "stringr",
"Version": "1.5.0",
"Version": "1.5.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -686,7 +701,7 @@
"stringi",
"vctrs"
],
"Hash": "671a4d384ae9d32fc47a14e98bfa3dc8"
"Hash": "960e2ae9e09656611e0b8214ad543207"
},
"sys": {
"Package": "sys",
@@ -716,7 +731,7 @@
},
"tidyselect": {
"Package": "tidyselect",
"Version": "1.2.0",
"Version": "1.2.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -728,11 +743,11 @@
"vctrs",
"withr"
],
"Hash": "79540e5fcd9e0435af547d885f184fd5"
"Hash": "829f27b9c4919c16b593794a6344d6c0"
},
"tidytuesdayR": {
"Package": "tidytuesdayR",
"Version": "1.0.2",
"Version": "1.0.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -750,18 +765,18 @@
"usethis",
"xml2"
],
"Hash": "a4d0be55cd1dae117000d040df8ebcc0"
"Hash": "927fabc1e4f863f9c18098e119f6db82"
},
"timechange": {
"Package": "timechange",
"Version": "0.2.0",
"Version": "0.3.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"cpp11"
],
"Hash": "8548b44f79a35ba1791308b61e6012d7"
"Hash": "c5f3c201b931cd6474d17d8700ccb1c8"
},
"tzdb": {
"Package": "tzdb",
@@ -776,7 +791,7 @@
},
"usethis": {
"Package": "usethis",
"Version": "2.2.2",
"Version": "2.2.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -803,21 +818,21 @@
"withr",
"yaml"
],
"Hash": "60e51f0b94d0324dc19e44110098fa9f"
"Hash": "d524fd42c517035027f866064417d7e6"
},
"utf8": {
"Package": "utf8",
"Version": "1.2.3",
"Version": "1.2.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "1fe17157424bb09c48a8b3b550c753bc"
"Hash": "62b65c52671e6665f803ff02954446e9"
},
"vctrs": {
"Package": "vctrs",
"Version": "0.6.3",
"Version": "0.6.5",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -827,11 +842,11 @@
"lifecycle",
"rlang"
],
"Hash": "d0ef2856b83dc33ea6e255caf6229ee2"
"Hash": "c03fa420630029418f7e6da3667aac4a"
},
"vroom": {
"Package": "vroom",
"Version": "1.6.3",
"Version": "1.6.5",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
@@ -853,7 +868,7 @@
"vctrs",
"withr"
],
"Hash": "8318e64ffb3a70e652494017ec455561"
"Hash": "390f9315bc0025be03012054103d227c"
},
"whisker": {
"Package": "whisker",
@@ -864,41 +879,42 @@
},
"withr": {
"Package": "withr",
"Version": "2.5.0",
"Version": "3.0.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"grDevices",
"graphics",
"stats"
"graphics"
],
"Hash": "c0e49a9760983e81e55cdd9be92e7182"
"Hash": "d31b6c62c10dcf11ec530ca6b0dd5d35"
},
"xml2": {
"Package": "xml2",
"Version": "1.3.5",
"Version": "1.3.6",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"methods"
"cli",
"methods",
"rlang"
],
"Hash": "6c40e5cfcc6aefd88110666e18c31f40"
"Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61"
},
"yaml": {
"Package": "yaml",
"Version": "2.3.7",
"Version": "2.3.8",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "0d0056cc5383fbc240ccd0cb584bf436"
"Hash": "29240487a071f535f5e5d5a323b7afbd"
},
"zip": {
"Package": "zip",
"Version": "2.3.0",
"Version": "2.3.1",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "d98c94dacb7e0efcf83b0a133a705504"
"Hash": "fcc4bd8e6da2d2011eb64a5e5cc685ab"
}
}
}
106 changes: 63 additions & 43 deletions renv/activate.R
Original file line number Diff line number Diff line change
@@ -2,12 +2,27 @@
local({

# the requested version of renv
version <- "1.0.0"
version <- "1.0.5"
attr(version, "sha") <- NULL

# the project directory
project <- getwd()

# use start-up diagnostics if enabled
diagnostics <- Sys.getenv("RENV_STARTUP_DIAGNOSTICS", unset = "FALSE")
if (diagnostics) {
start <- Sys.time()
profile <- tempfile("renv-startup-", fileext = ".Rprof")
utils::Rprof(profile)
on.exit({
utils::Rprof(NULL)
elapsed <- signif(difftime(Sys.time(), start, units = "auto"), digits = 2L)
writeLines(sprintf("- renv took %s to run the autoloader.", format(elapsed)))
writeLines(sprintf("- Profile: %s", profile))
print(utils::summaryRprof(profile))
}, add = TRUE)
}

# figure out whether the autoloader is enabled
enabled <- local({

@@ -16,6 +31,14 @@ local({
if (!is.null(override))
return(override)

# if we're being run in a context where R_LIBS is already set,
# don't load -- presumably we're being run as a sub-process and
# the parent process has already set up library paths for us
rcmd <- Sys.getenv("R_CMD", unset = NA)
rlibs <- Sys.getenv("R_LIBS", unset = NA)
if (!is.na(rlibs) && !is.na(rcmd))
return(FALSE)

# next, check environment variables
# TODO: prefer using the configuration one in the future
envvars <- c(
@@ -35,9 +58,22 @@ local({

})

if (!enabled)
# bail if we're not enabled
if (!enabled) {

# if we're not enabled, we might still need to manually load
# the user profile here
profile <- Sys.getenv("R_PROFILE_USER", unset = "~/.Rprofile")
if (file.exists(profile)) {
cfg <- Sys.getenv("RENV_CONFIG_USER_PROFILE", unset = "TRUE")
if (tolower(cfg) %in% c("true", "t", "1"))
sys.source(profile, envir = globalenv())
}

return(FALSE)

}

# avoid recursion
if (identical(getOption("renv.autoloader.running"), TRUE)) {
warning("ignoring recursive attempt to run renv autoloader")
@@ -504,7 +540,7 @@ local({

# open the bundle for reading
# We use gzcon for everything because (from ?gzcon)
# > Reading from a connection which does not supply a gzip magic
# > Reading from a connection which does not supply a 'gzip' magic
# > header is equivalent to reading from the original connection
conn <- gzcon(file(bundle, open = "rb", raw = TRUE))
on.exit(close(conn))
@@ -767,10 +803,12 @@ local({
renv_bootstrap_validate_version <- function(version, description = NULL) {

# resolve description file
description <- description %||% {
path <- getNamespaceInfo("renv", "path")
packageDescription("renv", lib.loc = dirname(path))
}
#
# avoid passing lib.loc to `packageDescription()` below, since R will
# use the loaded version of the package by default anyhow. note that
# this function should only be called after 'renv' is loaded
# https://github.com/rstudio/renv/issues/1625
description <- description %||% packageDescription("renv")

# check whether requested version 'version' matches loaded version of renv
sha <- attr(version, "sha", exact = TRUE)
@@ -841,7 +879,7 @@ local({
hooks <- getHook("renv::autoload")
for (hook in hooks)
if (is.function(hook))
tryCatch(hook(), error = warning)
tryCatch(hook(), error = warnify)

# load the project
renv::load(project)
@@ -982,10 +1020,15 @@ local({

}

renv_bootstrap_version_friendly <- function(version, sha = NULL) {
renv_bootstrap_version_friendly <- function(version, shafmt = NULL, sha = NULL) {
sha <- sha %||% attr(version, "sha", exact = TRUE)
parts <- c(version, sprintf("[sha: %s]", substring(sha, 1L, 7L)))
paste(parts, collapse = " ")
parts <- c(version, sprintf(shafmt %||% " [sha: %s]", substring(sha, 1L, 7L)))
paste(parts, collapse = "")
}

renv_bootstrap_exec <- function(project, libpath, version) {
if (!renv_bootstrap_load(project, libpath, version))
renv_bootstrap_run(version, libpath)
}

renv_bootstrap_run <- function(version, libpath) {
@@ -1012,19 +1055,14 @@ local({

}


renv_bootstrap_in_rstudio <- function() {
commandArgs()[[1]] == "RStudio"
}

renv_json_read <- function(file = NULL, text = NULL) {

jlerr <- NULL

# if jsonlite is loaded, use that instead
if ("jsonlite" %in% loadedNamespaces()) {

json <- catch(renv_json_read_jsonlite(file, text))
json <- tryCatch(renv_json_read_jsonlite(file, text), error = identity)
if (!inherits(json, "error"))
return(json)

@@ -1033,7 +1071,7 @@ local({
}

# otherwise, fall back to the default JSON reader
json <- catch(renv_json_read_default(file, text))
json <- tryCatch(renv_json_read_default(file, text), error = identity)
if (!inherits(json, "error"))
return(json)

@@ -1046,14 +1084,14 @@ local({
}

renv_json_read_jsonlite <- function(file = NULL, text = NULL) {
text <- paste(text %||% read(file), collapse = "\n")
text <- paste(text %||% readLines(file, warn = FALSE), collapse = "\n")
jsonlite::fromJSON(txt = text, simplifyVector = FALSE)
}

renv_json_read_default <- function(file = NULL, text = NULL) {

# find strings in the JSON
text <- paste(text %||% read(file), collapse = "\n")
text <- paste(text %||% readLines(file, warn = FALSE), collapse = "\n")
pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
locs <- gregexpr(pattern, text, perl = TRUE)[[1]]

@@ -1101,14 +1139,14 @@ local({
map <- as.list(map)

# remap strings in object
remapped <- renv_json_remap(json, map)
remapped <- renv_json_read_remap(json, map)

# evaluate
eval(remapped, envir = baseenv())

}

renv_json_remap <- function(json, map) {
renv_json_read_remap <- function(json, map) {

# fix names
if (!is.null(names(json))) {
@@ -1135,7 +1173,7 @@ local({
# recurse
if (is.recursive(json)) {
for (i in seq_along(json)) {
json[i] <- list(renv_json_remap(json[[i]], map))
json[i] <- list(renv_json_read_remap(json[[i]], map))
}
}

@@ -1155,26 +1193,8 @@ local({
# construct full libpath
libpath <- file.path(root, prefix)

# attempt to load
if (renv_bootstrap_load(project, libpath, version))
return(TRUE)

if (renv_bootstrap_in_rstudio()) {
setHook("rstudio.sessionInit", function(...) {
renv_bootstrap_run(version, libpath)

# Work around buglet in RStudio if hook uses readline
tryCatch(
{
tools <- as.environment("tools:rstudio")
tools$.rs.api.sendToConsole("", echo = FALSE, focus = FALSE)
},
error = function(cnd) {}
)
})
} else {
renv_bootstrap_run(version, libpath)
}
# run bootstrap code
renv_bootstrap_exec(project, libpath, version)

invisible()

0 comments on commit fe9c5c7

Please sign in to comment.