Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/pakPublic

Commit63cfd35

Browse files
committed
Use released keyring
1 parentc5111ab commit63cfd35

File tree

9 files changed

+23
-17
lines changed

9 files changed

+23
-17
lines changed

‎src/library/keyring/DESCRIPTION‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: keyring
22
Title: Access the System Credential Store from R
3-
Version: 1.3.2.9000
3+
Version: 1.4.0
44
Authors@R: c(
55
person("Gábor", "Csárdi", , "csardi.gabor@gmail.com", role = c("aut", "cre")),
66
person("Alec", "Wong", role = "ctb"),
@@ -24,13 +24,14 @@ Config/Needs/website: tidyverse/tidytemplate
2424
Config/testthat/edition: 3
2525
Config/usethis/last-upkeep: 2025-04-30
2626
Encoding: UTF-8
27-
Roxygen: list(markdown = TRUE, r6 = FALSE)
28-
RoxygenNote: 7.3.2
27+
RoxygenNote: 7.3.2.9000
2928
SystemRequirements: Optional: libsecret on Linux (libsecret-1-dev on
3029
Debian/Ubuntu, libsecret-devel on Fedora/CentOS)
3130
NeedsCompilation: yes
32-
Packaged: 2025-05-13 08:39:20 UTC; gaborcsardi
31+
Packaged: 2025-05-26 17:42:51 UTC; gaborcsardi
3332
Author: Gábor Csárdi [aut, cre],
3433
Alec Wong [ctb],
3534
Posit Software, PBC [cph, fnd] (ROR: <https://ror.org/03wc8by49>)
3635
Maintainer: Gábor Csárdi <csardi.gabor@gmail.com>
36+
Repository: CRAN
37+
Date/Publication: 2025-05-26 18:30:02 UTC

‎src/library/keyring/NEWS.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
#keyring (development version)
1+
#keyring 1.4.0
2+
3+
* Now the "file" backend will only be selected as the default backend
4+
(via`default_backend()`) if the system keyring exists for this backend.
5+
If you want to use the "file" backend without a system keyring, then
6+
you'll need to select it explicitly. See`?default_backend`.
27

38
* keyring now does not depend on the assertthat, openssl, rappdirs and
49
sodium packages.

‎src/library/keyring/R/backend-env.R‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#'
1818
#' @family keyring backends
1919
#' @export
20-
#' @include backend-class.R
2120
#' @examples
2221
#' \dontrun{
2322
#' env <- backend_env$new()

‎src/library/keyring/R/backend-file.R‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ b_file_keyrings <- new.env(parent = emptyenv())
1111
#'
1212
#' @family keyring backends
1313
#' @export
14-
#' @include backend-class.R
1514
#' @examples
1615
#' \dontrun{
1716
#' kb <- backend_file$new()

‎src/library/keyring/R/backend-macos.R‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#' See [backend] for the documentation of the individual methods.
99
#'
1010
#' @family keyring backends
11-
#' @include backend-class.R
1211
#' @export
1312
#' @examples
1413
#' \dontrun{

‎src/library/keyring/R/backend-secret-service.R‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#'
2121
#' @family keyring backends
2222
#' @export
23-
#' @include backend-class.R
2423
#' @examples
2524
#' \dontrun{
2625
#' ## This only works on Linux, typically desktop Linux

‎src/library/keyring/R/default_backend.R‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,16 @@ default_backend_auto <- function() {
8787
}elseif ("file"%in% names(known_backends)&& file_backend_works()) {
8888
backend_file
8989
}else {
90-
if (getOption("keyring_warn_for_env_fallback",TRUE)) {
91-
warning(
92-
"Selecting",
93-
sQuote("env"),
94-
" backend.",
95-
"Secrets are stored in environment variables"
96-
)
90+
# silly workaround
91+
if (Sys.getenv("TESTTHAT_PKG")!="air") {
92+
if (getOption("keyring_warn_for_env_fallback",TRUE)) {
93+
warning(
94+
"Selecting",
95+
sQuote("env"),
96+
" backend.",
97+
"Secrets are stored in environment variables"
98+
)
99+
}
97100
}
98101
backend_env
99102
}

‎src/library/keyring/R/keyring-package.R‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#' @keywords internal
2+
#' @aliases keyring
23
"_PACKAGE"
34

45
## usethis namespace: start

‎src/library/keyring/configure‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ echo "PKG_CPPFLAGS=-DMBEDTLS_AES_C -DMBEDTLS_ALLOW_PRIVATE_ACCESS -DMBEDTLS_PLAT
88
if ["$UNAME"="Darwin" ];then
99
echo"PKG_LIBS=-framework Security">> src/Makevars
1010

11-
elif [-n"$LIBSECRET_CFLAGS"-a-n"$LIBSECRET_LIBS" ];then
11+
elif [-n"$LIBSECRET_CFLAGS"]&& [-n"$LIBSECRET_LIBS" ];then
1212
echo"Found libsecret from LIBSECRET_CFLAGS and LIBSECRET_LIBS."
1313
echo"PKG_CFLAGS=-DHAS_LIBSECRET$LIBSECRET_CFLAGS">> src/Makevars
1414
echo"PKG_LIBS=$LIBSECRET_LIBS">> src/Makevars

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp