diff --git a/renv.lock b/renv.lock index 9612bda42..8d30ce136 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.1.0", + "Version": "4.2.1", "Repositories": [ { "Name": "CRAN", @@ -9,139 +9,24 @@ ] }, "Packages": { - "R.cache": { - "Package": "R.cache", - "Version": "0.15.0", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "e92a8ea8388c47c82ed8aa435ed3be50", - "Requirements": [ - "R.methodsS3", - "R.oo", - "R.utils", - "digest" - ] - }, - "R.methodsS3": { - "Package": "R.methodsS3", - "Version": "1.8.1", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "4bf6453323755202d5909697b6f7c109", - "Requirements": [] - }, - "R.oo": { - "Package": "R.oo", - "Version": "1.24.0", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "5709328352717e2f0a9c012be8a97554", - "Requirements": [ - "R.methodsS3" - ] - }, - "R.utils": { - "Package": "R.utils", - "Version": "2.11.0", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "a7ecb8e60815c7a18648e84cd121b23a", - "Requirements": [ - "R.methodsS3", - "R.oo" - ] - }, "R6": { "Package": "R6", "Version": "2.5.1", "Source": "Repository", - "Repository": "CRAN", - "Hash": "470851b6d5d0ac559e9d01bb352b4021", - "Requirements": [] - }, - "Rcpp": { - "Package": "Rcpp", - "Version": "1.0.8.3", - "Source": "Repository", "Repository": "RSPM", - "Hash": "32e79b908fda56ee57fe518a8d37b864", - "Requirements": [] - }, - "brew": { - "Package": "brew", - "Version": "1.0-7", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "38875ea52350ff4b4c03849fc69736c8", + "Hash": "470851b6d5d0ac559e9d01bb352b4021", "Requirements": [] }, - "callr": { - "Package": "callr", - "Version": "3.7.0", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "461aa75a11ce2400245190ef5d3995df", - "Requirements": [ - "R6", - "processx" - ] - }, "cli": { "Package": "cli", - "Version": "3.2.0", + "Version": "3.3.0", "Source": "Repository", "Repository": "RSPM", - "Hash": "1bdb126893e9ce6aae50ad1d6fc32faf", + "Hash": "23abf173c2b783dcc43379ab9bba00ee", "Requirements": [ "glue" ] }, - "codetools": { - "Package": "codetools", - "Version": "0.2-18", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "019388fc48e48b3da0d3a76ff94608a8", - "Requirements": [] - }, - "commonmark": { - "Package": "commonmark", - "Version": "1.8.0", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "2ba81b120c1655ab696c935ef33ea716", - "Requirements": [] - }, - "cpp11": { - "Package": "cpp11", - "Version": "0.4.2", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "fa53ce256cd280f468c080a58ea5ba8c", - "Requirements": [] - }, - "crayon": { - "Package": "crayon", - "Version": "1.5.1", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "8dc45fd8a1ee067a92b85ef274e66d6a", - "Requirements": [] - }, - "cyclocomp": { - "Package": "cyclocomp", - "Version": "1.1.0", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "53cbed70a2f7472d48fb6aef08442f25", - "Requirements": [ - "callr", - "crayon", - "desc", - "remotes", - "withr" - ] - }, "desc": { "Package": "desc", "Version": "1.4.1", @@ -154,64 +39,6 @@ "rprojroot" ] }, - "digest": { - "Package": "digest", - "Version": "0.6.29", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "cf6b206a045a684728c3267ef7596190", - "Requirements": [] - }, - "docopt": { - "Package": "docopt", - "Version": "0.7.1", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "e9eeef7931ee99ca0093f3f20b88e09b", - "Requirements": [] - }, - "ellipsis": { - "Package": "ellipsis", - "Version": "0.3.2", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077", - "Requirements": [ - "rlang" - ] - }, - "evaluate": { - "Package": "evaluate", - "Version": "0.15", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "699a7a93d08c962d9f8950b2d7a227f1", - "Requirements": [] - }, - "fansi": { - "Package": "fansi", - "Version": "1.0.3", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "83a8afdbe71839506baa9f90eebad7ec", - "Requirements": [] - }, - "fs": { - "Package": "fs", - "Version": "1.5.2", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "7c89603d81793f0d5486d91ab1fc6f1d", - "Requirements": [] - }, - "git2r": { - "Package": "git2r", - "Version": "0.30.1", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "e0c6a04a3e7b90e64213d09128f74f1b", - "Requirements": [] - }, "glue": { "Package": "glue", "Version": "1.6.2", @@ -220,240 +47,6 @@ "Hash": "4f2596dfb05dac67b9dc558e5c6fba2e", "Requirements": [] }, - "here": { - "Package": "here", - "Version": "1.0.1", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "24b224366f9c2e7534d2344d10d59211", - "Requirements": [ - "rprojroot" - ] - }, - "highr": { - "Package": "highr", - "Version": "0.9", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "8eb36c8125038e648e5d111c0d7b2ed4", - "Requirements": [ - "xfun" - ] - }, - "hunspell": { - "Package": "hunspell", - "Version": "3.0.1", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "3987784c19192ad0f2261c456d936df1", - "Requirements": [ - "Rcpp", - "digest" - ] - }, - "jsonlite": { - "Package": "jsonlite", - "Version": "1.8.0", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "d07e729b27b372429d42d24d503613a0", - "Requirements": [] - }, - "knitr": { - "Package": "knitr", - "Version": "1.38", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "10b3dc3c6acb925910edda5d0543b3a2", - "Requirements": [ - "evaluate", - "highr", - "stringr", - "xfun", - "yaml" - ] - }, - "lazyeval": { - "Package": "lazyeval", - "Version": "0.2.2", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "d908914ae53b04d4c0c0fd72ecc35370", - "Requirements": [] - }, - "lifecycle": { - "Package": "lifecycle", - "Version": "1.0.1", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "a6b6d352e3ed897373ab19d8395c98d0", - "Requirements": [ - "glue", - "rlang" - ] - }, - "lintr": { - "Package": "lintr", - "Version": "2.0.1.9000", - "Source": "GitHub", - "RemoteType": "github", - "RemoteUsername": "jimhester", - "RemoteRepo": "lintr", - "RemoteRef": "HEAD", - "RemoteSha": "f1643b7430a769947a862c4cd37d0e930bd32f50", - "RemoteHost": "api.github.com", - "Hash": "f6d145857522ca89bfd8e3ca87139b60", - "Requirements": [ - "codetools", - "crayon", - "cyclocomp", - "digest", - "glue", - "jsonlite", - "knitr", - "rex", - "xml2", - "xmlparsedata" - ] - }, - "magrittr": { - "Package": "magrittr", - "Version": "2.0.3", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "7ce2733a9826b3aeb1775d56fd305472", - "Requirements": [] - }, - "pillar": { - "Package": "pillar", - "Version": "1.7.0", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "51dfc97e1b7069e9f7e6f83f3589c22e", - "Requirements": [ - "cli", - "crayon", - "ellipsis", - "fansi", - "glue", - "lifecycle", - "rlang", - "utf8", - "vctrs" - ] - }, - "pkgconfig": { - "Package": "pkgconfig", - "Version": "2.0.3", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "01f28d4278f15c76cddbea05899c5d6f", - "Requirements": [] - }, - "pkgload": { - "Package": "pkgload", - "Version": "1.2.4", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "7533cd805940821bf23eaf3c8d4c1735", - "Requirements": [ - "cli", - "crayon", - "desc", - "rlang", - "rprojroot", - "rstudioapi", - "withr" - ] - }, - "processx": { - "Package": "processx", - "Version": "3.5.3", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "8bbae1a548d0d3fdf6647bdd9d35bf6d", - "Requirements": [ - "R6", - "ps" - ] - }, - "ps": { - "Package": "ps", - "Version": "1.6.0", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "32620e2001c1dce1af49c49dccbb9420", - "Requirements": [] - }, - "purrr": { - "Package": "purrr", - "Version": "0.3.4", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "97def703420c8ab10d8f0e6c72101e02", - "Requirements": [ - "magrittr", - "rlang" - ] - }, - "rematch2": { - "Package": "rematch2", - "Version": "2.1.2", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "76c9e04c712a05848ae7a23d2f170a40", - "Requirements": [ - "tibble" - ] - }, - "remotes": { - "Package": "remotes", - "Version": "2.4.2", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "227045be9aee47e6dda9bb38ac870d67", - "Requirements": [] - }, - "rex": { - "Package": "rex", - "Version": "1.2.1", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "ae34cd56890607370665bee5bd17812f", - "Requirements": [ - "lazyeval" - ] - }, - "rlang": { - "Package": "rlang", - "Version": "1.0.2", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "04884d9a75d778aca22c7154b8333ec9", - "Requirements": [] - }, - "roxygen2": { - "Package": "roxygen2", - "Version": "7.1.2", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "eb9849556c4250305106e82edae35b72", - "Requirements": [ - "R6", - "brew", - "commonmark", - "cpp11", - "desc", - "digest", - "knitr", - "pkgload", - "purrr", - "rlang", - "stringi", - "stringr", - "xml2" - ] - }, "rprojroot": { "Package": "rprojroot", "Version": "2.0.3", @@ -461,147 +54,6 @@ "Repository": "RSPM", "Hash": "1de7ab598047a87bba48434ba35d497d", "Requirements": [] - }, - "rstudioapi": { - "Package": "rstudioapi", - "Version": "0.13", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "06c85365a03fdaf699966cc1d3cf53ea", - "Requirements": [] - }, - "spelling": { - "Package": "spelling", - "Version": "2.2", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "b8c899a5c83f0d897286550481c91798", - "Requirements": [ - "commonmark", - "hunspell", - "knitr", - "xml2" - ] - }, - "stringi": { - "Package": "stringi", - "Version": "1.7.6", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "bba431031d30789535745a9627ac9271", - "Requirements": [] - }, - "stringr": { - "Package": "stringr", - "Version": "1.4.0", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "0759e6b6c0957edb1311028a49a35e76", - "Requirements": [ - "glue", - "magrittr", - "stringi" - ] - }, - "styler": { - "Package": "styler", - "Version": "1.7.0.9001", - "Source": "GitHub", - "RemoteType": "github", - "RemoteUsername": "r-lib", - "RemoteRepo": "styler", - "RemoteRef": "HEAD", - "RemoteSha": "ee4731481490616631a25ffd0b0c82f63804cd87", - "RemoteHost": "api.github.com", - "Hash": "c4c1c243a8668365dd436be9139636b6", - "Requirements": [ - "R.cache", - "cli", - "magrittr", - "purrr", - "rematch2", - "rlang", - "rprojroot", - "tibble", - "withr" - ] - }, - "tibble": { - "Package": "tibble", - "Version": "3.1.6", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "8a8f02d1934dfd6431c671361510dd0b", - "Requirements": [ - "ellipsis", - "fansi", - "lifecycle", - "magrittr", - "pillar", - "pkgconfig", - "rlang", - "vctrs" - ] - }, - "utf8": { - "Package": "utf8", - "Version": "1.2.2", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "c9c462b759a5cc844ae25b5942654d13", - "Requirements": [] - }, - "vctrs": { - "Package": "vctrs", - "Version": "0.4.0", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "95c2573b232eac82df562f9e300f9790", - "Requirements": [ - "cli", - "glue", - "rlang" - ] - }, - "withr": { - "Package": "withr", - "Version": "2.5.0", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "c0e49a9760983e81e55cdd9be92e7182", - "Requirements": [] - }, - "xfun": { - "Package": "xfun", - "Version": "0.30", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "e83f48136b041845e50a6658feffb197", - "Requirements": [] - }, - "xml2": { - "Package": "xml2", - "Version": "1.3.3", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "40682ed6a969ea5abfd351eb67833adc", - "Requirements": [] - }, - "xmlparsedata": { - "Package": "xmlparsedata", - "Version": "1.0.5", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "45e4bf3c46476896e821fc0a408fb4fc", - "Requirements": [] - }, - "yaml": { - "Package": "yaml", - "Version": "2.3.5", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "458bb38374d73bf83b1bb85e353da200", - "Requirements": [] } } } diff --git a/renv/activate.R b/renv/activate.R index 99b70024f..f958df789 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -54,7 +54,7 @@ local({ # mask 'utils' packages, will come first on the search path library(utils, lib.loc = .Library) - # unload renv if it's already been laoded + # unload renv if it's already been loaded if ("renv" %in% loadedNamespaces()) unloadNamespace("renv") @@ -314,9 +314,18 @@ local({ } # bail if it doesn't exist - if (!file.exists(tarball)) + if (!file.exists(tarball)) { + + # let the user know we weren't able to honour their request + fmt <- "* RENV_BOOTSTRAP_TARBALL is set (%s) but does not exist." + msg <- sprintf(fmt, tarball) + warning(msg) + + # bail return() + } + fmt <- "* Bootstrapping with tarball at path '%s'." msg <- sprintf(fmt, tarball) message(msg) @@ -800,7 +809,7 @@ local({ # find strings in the JSON pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' - locs <- gregexpr(pattern, text)[[1]] + locs <- gregexpr(pattern, text, perl = TRUE)[[1]] # if any are found, replace them with placeholders replaced <- text