diff -Nru r-cran-askpass-1.1/debian/changelog r-cran-askpass-1.2.0/debian/changelog --- r-cran-askpass-1.1/debian/changelog 2020-09-02 11:58:21.000000000 +0000 +++ r-cran-askpass-1.2.0/debian/changelog 2023-09-10 16:02:56.000000000 +0000 @@ -1,3 +1,11 @@ +r-cran-askpass (1.2.0-1) unstable; urgency=medium + + * New upstream version + * Standards-Version: 4.6.2 (routine-update) + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse. + + -- Andreas Tille Sun, 10 Sep 2023 18:02:56 +0200 + r-cran-askpass (1.1-2) unstable; urgency=medium * Standards-Version: 4.5.0 (routine-update) diff -Nru r-cran-askpass-1.1/debian/control r-cran-askpass-1.2.0/debian/control --- r-cran-askpass-1.1/debian/control 2020-09-02 11:58:21.000000000 +0000 +++ r-cran-askpass-1.2.0/debian/control 2023-09-10 16:02:56.000000000 +0000 @@ -8,7 +8,7 @@ dh-r, r-base-dev, r-cran-sys -Standards-Version: 4.5.0 +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/r-pkg-team/r-cran-askpass Vcs-Git: https://salsa.debian.org/r-pkg-team/r-cran-askpass.git Homepage: https://cran.r-project.org/package=askpass diff -Nru r-cran-askpass-1.1/debian/tests/control r-cran-askpass-1.2.0/debian/tests/control --- r-cran-askpass-1.1/debian/tests/control 2020-09-02 11:58:21.000000000 +0000 +++ r-cran-askpass-1.2.0/debian/tests/control 2023-09-10 16:02:56.000000000 +0000 @@ -1,5 +1,4 @@ Tests: run-unit-test -Depends: @, r-cran-testthat, +Depends: @, + r-cran-testthat Restrictions: allow-stderr - - diff -Nru r-cran-askpass-1.1/debian/upstream/metadata r-cran-askpass-1.2.0/debian/upstream/metadata --- r-cran-askpass-1.1/debian/upstream/metadata 2020-09-02 11:58:21.000000000 +0000 +++ r-cran-askpass-1.2.0/debian/upstream/metadata 2023-09-10 16:02:56.000000000 +0000 @@ -1,6 +1,6 @@ --- Archive: CRAN -Bug-Database: https://github.com/jeroen/askpass/issues -Bug-Submit: https://github.com/jeroen/askpass/issues/new +Bug-Database: https://github.com/r-lib/askpass/issues +Bug-Submit: https://github.com/r-lib/askpass/issues/new Repository: https://github.com/jeroen/askpass.git -Repository-Browse: https://github.com/jeroen/askpass +Repository-Browse: https://github.com/r-lib/askpass diff -Nru r-cran-askpass-1.1/DESCRIPTION r-cran-askpass-1.2.0/DESCRIPTION --- r-cran-askpass-1.1/DESCRIPTION 2019-01-13 12:50:03.000000000 +0000 +++ r-cran-askpass-1.2.0/DESCRIPTION 2023-09-03 20:00:02.000000000 +0000 @@ -1,7 +1,7 @@ Package: askpass Type: Package -Title: Safe Password Entry for R, Git, and SSH -Version: 1.1 +Title: Password Entry Utilities for R, Git, and SSH +Version: 1.2.0 Authors@R: person("Jeroen", "Ooms", role = c("aut", "cre"), email = "jeroen@berkeley.edu", comment = c(ORCID = "0000-0002-4035-0289")) Description: Cross-platform utilities for prompting the user for credentials or a @@ -13,17 +13,16 @@ Thereby the user can be prompted for credentials or a passphrase if needed when R calls out to git or ssh. License: MIT + file LICENSE -URL: https://github.com/jeroen/askpass#readme -BugReports: https://github.com/jeroen/askpass/issues +URL: https://github.com/r-lib/askpass +BugReports: https://github.com/r-lib/askpass/issues Encoding: UTF-8 -LazyData: true Imports: sys (>= 2.1) -RoxygenNote: 6.1.1 +RoxygenNote: 7.2.3 Suggests: testthat Language: en-US NeedsCompilation: yes -Packaged: 2019-01-13 12:08:17 UTC; jeroen +Packaged: 2023-09-03 19:16:12 UTC; jeroen Author: Jeroen Ooms [aut, cre] () Maintainer: Jeroen Ooms Repository: CRAN -Date/Publication: 2019-01-13 12:50:03 UTC +Date/Publication: 2023-09-03 20:00:02 UTC diff -Nru r-cran-askpass-1.1/man/askpass.Rd r-cran-askpass-1.2.0/man/askpass.Rd --- r-cran-askpass-1.1/man/askpass.Rd 2018-11-28 11:14:30.000000000 +0000 +++ r-cran-askpass-1.2.0/man/askpass.Rd 2023-09-03 17:43:29.000000000 +0000 @@ -15,6 +15,15 @@ based on the user platform and front-end. Users or IDEs can override this and set a custom password entry function via the \code{askpass} option. } +\details{ +By default \code{askpass()} returns \code{NULL} in non-interactive sessions. +(These include knitr runs and testthat tests.) +If you want to force a password prompt in non-interactive sessions, +set the \code{rlib_interactive} option to \code{TRUE}: + +\if{html}{\out{
}}\preformatted{options(rlib_interactive = TRUE) +}\if{html}{\out{
}} +} \examples{ \donttest{ # Prompt user for passwd diff -Nru r-cran-askpass-1.1/MD5 r-cran-askpass-1.2.0/MD5 --- r-cran-askpass-1.1/MD5 2019-01-13 12:50:03.000000000 +0000 +++ r-cran-askpass-1.2.0/MD5 2023-09-03 20:00:02.000000000 +0000 @@ -1,16 +1,17 @@ -eb6f4d0b9cc61dfa08b3804779591d5f *DESCRIPTION +615f4f965b7a1ebad2f25f51d6b9e63f *DESCRIPTION 98c71b5eae0ac8dabb055bd8883b8398 *LICENSE ad7ca63fdfe698661be582601697c491 *NAMESPACE -53a778139c44afbdf7a33ef6f5df8705 *NEWS -35412ba699bd625370487aa6a3e462c4 *R/askpass.R +2281326fb2937aaffb03822ae70f4c7a *NEWS +00d594b6178fe8ea2e56ac8f8c188284 *R/askpass.R +e0e98bb6ad99cc66b8d117e7e68916cc *R/interactive.R 97259f0bad2d259cc87ad38a01dbf02e *R/onload.R a1624267f9c82ed814f980de8c5fbc66 *R/ssh.R 1f9f6a06b0543cf62931f42ad291db6b *inst/WORDLIST a34602417af1b0c9ad06fc93df828c71 *inst/mac-askpass e0651808479eb9c747ffbd785441912b *inst/mac-simplepass -0eb1bcf4a9936ace5ae19d962a2a56a7 *man/askpass.Rd +a0f97770d4be15c46a6ce502e4d274db *man/askpass.Rd 20d01a60d6cef576ee14420f207d90d1 *man/ssh_askpass.Rd -dce2a57c7c4f360319f3beaec3245444 *src/Makevars.win +2adeae71bea50e397971f3243e7c61e6 *src/Makevars.win ff322a40812325235977b54323b67c91 *src/askpass.c b0e65f1a2fd9237f0cb01f9e2e6f64a4 *src/win32/win-askpass.c 203e4bb2a5fd4caccb9a07d14bf48a90 *tests/testthat.R diff -Nru r-cran-askpass-1.1/NEWS r-cran-askpass-1.2.0/NEWS --- r-cran-askpass-1.1/NEWS 2019-01-13 11:55:43.000000000 +0000 +++ r-cran-askpass-1.2.0/NEWS 2023-09-03 16:42:40.000000000 +0000 @@ -1,3 +1,6 @@ +1.2.0 + - Fix package for experimental arm builds + 1.1 - Fix build on R 3.3 and older - Fix compiler warning on Solaris diff -Nru r-cran-askpass-1.1/R/askpass.R r-cran-askpass-1.2.0/R/askpass.R --- r-cran-askpass-1.1/R/askpass.R 2018-11-28 11:14:24.000000000 +0000 +++ r-cran-askpass-1.2.0/R/askpass.R 2023-09-03 16:29:34.000000000 +0000 @@ -5,6 +5,14 @@ #' based on the user platform and front-end. Users or IDEs can override this #' and set a custom password entry function via the `askpass` option. #' +#' By default `askpass()` returns `NULL` in non-interactive sessions. +#' (These include knitr runs and testthat tests.) +#' If you want to force a password prompt in non-interactive sessions, +#' set the `rlib_interactive` option to `TRUE`: +#' ```r +#' options(rlib_interactive = TRUE) +#' ``` +#' #' @export #' @param prompt the string printed when prompting the user for input. #' @examples \donttest{ @@ -17,7 +25,7 @@ } ask_password_default <- function(prompt){ - if(!interactive()) + if(!is_interactive()) return(NULL) if(is_windows()){ askpass_windows(prompt) @@ -30,8 +38,8 @@ askpass_path <- function(simple = TRUE){ if(is_windows()){ - arch <- .Machine$sizeof.pointer * 8; - system.file(sprintf('win-askpass%d.exe', arch), + arch <- ifelse(identical(.Machine$sizeof.pointer, 4L), "32", "") + system.file(sprintf('win-askpass%s.exe', arch), package = 'askpass', mustWork = TRUE) } else if(is_macos()){ prog <- ifelse(isTRUE(simple), 'mac-simplepass', 'mac-askpass') diff -Nru r-cran-askpass-1.1/R/interactive.R r-cran-askpass-1.2.0/R/interactive.R --- r-cran-askpass-1.1/R/interactive.R 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-askpass-1.2.0/R/interactive.R 2023-09-03 16:29:34.000000000 +0000 @@ -0,0 +1,15 @@ + +is_interactive <- function() { + opt <- getOption("rlib_interactive") + if (isTRUE(opt)) { + TRUE + } else if (identical(opt, FALSE)) { + FALSE + } else if (tolower(getOption("knitr.in.progress", "false")) == "true") { + FALSE + } else if (identical(Sys.getenv("TESTTHAT"), "true")) { + FALSE + } else { + interactive() + } +} diff -Nru r-cran-askpass-1.1/src/Makevars.win r-cran-askpass-1.2.0/src/Makevars.win --- r-cran-askpass-1.1/src/Makevars.win 2019-01-13 12:08:17.000000000 +0000 +++ r-cran-askpass-1.2.0/src/Makevars.win 2023-09-03 16:32:00.000000000 +0000 @@ -1,4 +1,4 @@ -ASKPASS=../inst/win-askpass$(WIN).exe +ASKPASS=../inst/win-askpass$(subst 64,,$(WIN)).exe ASKPASSOBJ=win32/win-askpass.o all: clean $(ASKPASS)