Merged origin/main into MichaelChirico-patch-1

Author: gaborcsardi

.Rbuildignore

@@ -10,3 +10,4 @@
 ^pkgdown$
 ^codecov\.yml$
 ^revdep$
+^LICENSE\.md$

.github/CODE_OF_CONDUCT.md

@@ -59,7 +59,7 @@ representative at an online or offline event.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at codeofconduct@rstudio.com. 
+reported to the community leaders responsible for enforcement at codeofconduct@posit.co. 
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/workflows/R-CMD-check.yaml

@@ -22,40 +22,30 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release'}
+          - {os: macos-latest,   r: 'release'}
 
           - {os: windows-latest, r: 'release'}
           # Use 3.6 to trigger usage of RTools35
           - {os: windows-latest, r: '3.6'}
+          # use 4.1 to check with rtools40's older compiler
+          - {os: windows-latest, r: '4.1'}
 
-          # Use older ubuntu to maximise backward compatibility
-          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,  r: 'release'}
-          - {os: ubuntu-latest,  r: 'oldrel-1'}
-          - {os: ubuntu-latest,  r: 'oldrel-2'}
-          - {os: ubuntu-latest,  r: 'oldrel-3'}
-          - {os: ubuntu-latest,  r: 'oldrel-4'}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          - {os: ubuntu-latest,   r: 'oldrel-2'}
+          - {os: ubuntu-latest,   r: 'oldrel-3'}
+          - {os: ubuntu-latest,   r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-pandoc@v2
 
-      - name: Install latest git, Windows
-        if: runner.os == 'Windows'
-        run: choco upgrade -y git.install
-
-      - name: Install latest git, macOS
-        if: runner.os == 'macOS'
-        run: |
-          brew upgrade git
-          brew tap microsoft/git
-          brew install --cask git-credential-manager-core
-
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}

.github/workflows/pkgdown.yaml

@@ -19,8 +19,10 @@ jobs:
       group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -39,7 +41,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/[email protected].4
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
         with:
           clean: false
           branch: gh-pages

.github/workflows/pr-commands.yaml

@@ -14,7 +14,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
@@ -51,7 +51,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/pr-fetch@v2
         with:

.github/workflows/test-coverage.yaml

@@ -23,18 +23,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Install latest git, Windows
-        if: runner.os == 'Windows'
-        run: choco upgrade -y git.install
-
-      - name: Install latest git, macOS
-        if: runner.os == 'macOS'
-        run: |
-          brew upgrade git
-          brew tap microsoft/git
-          brew install --cask git-credential-manager-core
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-r@v2
         with:
@@ -46,5 +35,24 @@ jobs:
           needs: coverage
 
       - name: Test coverage
-        run: covr::codecov(quiet = FALSE)
+        run: |
+          covr::codecov(
+            quiet = FALSE,
+            clean = FALSE,
+            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
+          )
         shell: Rscript {0}
+
+      - name: Show testthat output
+        if: always()
+        run: |
+          ## --------------------------------------------------------------------
+          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+        shell: bash
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-test-failures
+          path: ${{ runner.temp }}/package

DESCRIPTION

@@ -3,7 +3,7 @@ Title: Query 'git' Credentials from 'R'
 Version: 0.1.2.9000
 Authors@R: c(
     person("Gábor", "Csárdi", , "[email protected]", role = c("aut", "cre")),
-    person("RStudio", role = c("cph", "fnd"))
+    person("Posit Software, PBC", role = c("cph", "fnd"))
   )
 Description: Query, set, delete credentials from the 'git' credential
     store. Manage 'GitHub' tokens and other 'git' credentials. This
@@ -12,7 +12,8 @@ Description: Query, set, delete credentials from the 'git' credential
 License: MIT + file LICENSE
 URL: https://gitcreds.r-lib.org/, https://github.com/r-lib/gitcreds
 BugReports: https://github.com/r-lib/gitcreds/issues
-Depends: R (>= 3.4)
+Depends: 
+    R (>= 3.4)
 Suggests:
     codetools,
     covr,
@@ -25,8 +26,8 @@ Suggests:
 VignetteBuilder: 
     knitr
 Config/Needs/website: tidyverse/tidytemplate
+Config/testthat/edition: 3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1.9000
+RoxygenNote: 7.3.2
 SystemRequirements: git
-Config/testthat/edition: 3

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2020
-COPYRIGHT HOLDER: Gábor Csárdi
+YEAR: 2023
+COPYRIGHT HOLDER: gitcreds authors

LICENSE.md

@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2023 gitcreds authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

R/aaa-doc.R

@@ -57,7 +57,8 @@
 #'
 #' To set up password-less authentication to GitHub:
 #' 1. Create a personal access token (PAT). See
-#'    https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token.
+#'    <https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token>.
+#'    Note that personal access tokens can expire, and the default expiration time is 30 days.
 #' 2. Call `gitcreds_set()` and give this token as the password.
 #' 3. Run `gitcreds_get(use_cache = FALSE)` to check that the new
 #'    PAT is set up. To see the token, you can run

README.Rmd

@@ -47,6 +47,12 @@ Install the package from CRAN:
 install.packages("gitcreds")
 ```
 
+Install the development version from GitHub:
+
+```{r eval = FALSE}
+pak::pak("r-lib/gitcreds")
+```
+
 ## Usage
 
 gitcreds is typically used upstream, in R packages that need to

README.md

@@ -14,22 +14,21 @@ coverage](https://codecov.io/gh/r-lib/gitcreds/branch/main/graph/badge.svg)](htt
 
 ## Features
 
--   (Re)use the same credentials in command line git, R and the RStudio
-    IDE., etc. Users can set their GitHub token once and use it
-    everywhere.
+- (Re)use the same credentials in command line git, R and the RStudio
+  IDE., etc. Users can set their GitHub token once and use it
+  everywhere.
 
--   Typically more secure than storing passwords and tokens in
-    `.Renviron` files.
+- Typically more secure than storing passwords and tokens in `.Renviron`
+  files.
 
--   gitcreds has a cache that makes credential lookup very fast.
+- gitcreds has a cache that makes credential lookup very fast.
 
--   gitcreds supports multiple users and multiple hosts, including
-    Enterprise GitHub installations.
+- gitcreds supports multiple users and multiple hosts, including
+  Enterprise GitHub installations.
 
--   If git or git credential helpers are not available, e.g. typically
-    on a Linux server, or a CI, then gitcreds can fall back to use
-    environment variables, and it still supports multiple users and
-    hosts.
+- If git or git credential helpers are not available, e.g. typically on
+  a Linux server, or a CI, then gitcreds can fall back to use
+  environment variables, and it still supports multiple users and hosts.
 
 ## Installation
 
@@ -39,6 +38,12 @@ Install the package from CRAN:
 install.packages("gitcreds")
 ```
 
+Install the development version from GitHub:
+
+``` r
+pak::pak("r-lib/gitcreds")
+```
+
 ## Usage
 
 gitcreds is typically used upstream, in R packages that need to