Skip to content

Commit 839e633

Browse files
committed
refactor: move setup functions from _deps to _setup
1 parent 9bfe679 commit 839e633

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

scripts/_functions_deps.R

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,3 @@
1-
assert_npm_is_installed <- function() {
2-
if (Sys.which("npm")[["npm"]] == "") {
3-
cli::cli_abort(c(
4-
"{.strong {npm}} is required to install JavaScript dependenceis.",
5-
i = "Please install {.url https://nodejs.org}."
6-
))
7-
}
8-
9-
cli::cli_alert_success("{.strong npm} is installed")
10-
invisible(TRUE)
11-
}
12-
13-
pkg_source_version <- function(pkg) {
14-
desc <- suppressWarnings(utils::packageDescription(pkg))
15-
if (!inherits(desc, "packageDescription")) {
16-
return("[not installed]")
17-
}
18-
version <- desc[["Version"]]
19-
if (is.null(desc[["GithubRepo"]])) {
20-
return(version)
21-
}
22-
23-
sprintf(
24-
"%s (%s/%s@%s)",
25-
version,
26-
desc[["GithubUsername"]],
27-
desc[["GithubRepo"]],
28-
desc[["GithubSHA1"]]
29-
)
30-
}
31-
321
write_json <- function(
332
file,
343
x,

scripts/_functions_setup.R

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ ensure_base_packages <- function() {
77
}
88
}
99

10+
assert_npm_is_installed <- function() {
11+
if (Sys.which("npm")[["npm"]] == "") {
12+
cli::cli_abort(c(
13+
"{.strong {npm}} is required to install JavaScript dependenceis.",
14+
i = "Please install {.url https://nodejs.org}."
15+
))
16+
}
17+
18+
cli::cli_alert_success("{.strong npm} is installed")
19+
invisible(TRUE)
20+
}
21+
1022
pak_install <- function(...) {
1123
ensure_base_packages()
1224
pkgs <- c(...)
@@ -39,3 +51,22 @@ bs_version_full <- function(version) {
3951
bs_v <- bslib::versions()
4052
names(bs_v)[bs_v == version]
4153
}
54+
55+
pkg_source_version <- function(pkg) {
56+
desc <- suppressWarnings(utils::packageDescription(pkg))
57+
if (!inherits(desc, "packageDescription")) {
58+
return("[not installed]")
59+
}
60+
version <- desc[["Version"]]
61+
if (is.null(desc[["GithubRepo"]])) {
62+
return(version)
63+
}
64+
65+
sprintf(
66+
"%s (%s/%s@%s)",
67+
version,
68+
desc[["GithubUsername"]],
69+
desc[["GithubRepo"]],
70+
desc[["GithubSHA1"]]
71+
)
72+
}

0 commit comments

Comments
 (0)