Merge branch 'main' into tinytest

.Rbuildignore

@@ -7,6 +7,7 @@
 man-roxygen
 ^cran-comments\.md$
 ^README\.Rmd$
+^README\.md$
 ^.*\.yml
 ^.*\.log
 Makefile
@@ -17,5 +18,8 @@ inst/ignore
 ^revdep$
 ^notes.R$
 ^notes_matchers.md$
+^notes-redirects.R$
 ^use_vcr_notes.txt$
 ^docs$
+^make_readme.R$
+^LICENSE\.md$

.github/CONTRIBUTING.md

@@ -7,7 +7,7 @@
 ### Code contributions
 
 * Fork this repo to your Github account
-* Clone your version on your account down to your machine from your account, e.g,. `git clone https://github.com/<yourgithubusername>/vcr.git`
+* Clone your version on your account down to your machine from your account, e.g., `git clone https://github.com/<yourgithubusername>/vcr.git`
 * Make sure to track progress upstream (i.e., on our version of `vcr` at `ropensci/vcr`) by doing `git remote add upstream https://github.com/ropensci/vcr.git`. Before making changes make sure to pull changes in from upstream by doing either `git fetch upstream` then merge later or `git pull upstream` to fetch and merge in one step
 * Make your changes (bonus points for making changes on a new feature branch)
 * Please do write a test(s) for your changes if they affect code and not just docs

.github/workflows/R-check.yaml

@@ -0,0 +1,50 @@
+on: [push, pull_request]
+
+name: R-check
+
+jobs:
+  R-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+        - { os: windows-latest, r: 'release'}
+        - { os: macOS-latest, r: 'release'}
+        - { os: ubuntu-22.04, r: 'release'}
+        - { os: ubuntu-22.04, r: 'devel'}
+
+    env:
+      R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
+      CRAN: ${{ matrix.config.rspm }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.config.r }}
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2
+        with:
+          upload-snapshots: true
+
+      - name: Show testthat output
+        if: always()
+        run: find check -name 'test-all.Rout*' -exec cat '{}' \; || true
+        shell: bash
+
+      - name: Test coverage
+        if: matrix.config.os == 'ubuntu-22.04' && matrix.config.r == 'release'
+        run: |
+          Rscript -e 'install.packages("covr")' -e 'covr::codecov(token = "${{secrets.CODECOV_TOKEN}}")'

.github/workflows/revdep-check.yaml

@@ -0,0 +1,34 @@
+on: push
+name: revdep
+
+jobs:
+  revdep:
+    runs-on: ubuntu-22.04
+    if: startsWith(github.event.head_commit.message, 'REVDEPCHECK')
+    name: ubuntu-22.04 (release)
+    strategy:
+      fail-fast: false
+
+    env:
+      R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
+      GITHUB_PAT: ${{ secrets.GH_PAT }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: release
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+
+      - name: Revdepcheck
+        run: Rscript -e "install.packages('remotes')" -e "remotes::install_github('r-lib/revdepcheck')" -e "revdepcheck::revdep_reset()" -e "revdepcheck::revdep_check(num_workers=4)"
+
+      - name: Upload revdepcheck results
+        uses: actions/upload-artifact@v3
+        with:
+          name: ubuntu-22-04-r-release-results
+          path: revdep/*.md

.gitignore

@@ -7,6 +7,7 @@ scott_notes.md
 revdep/checks.noindex
 revdep/data.sqlite
 revdep/library.noindex
-notes.R
-notes_matchers.md
+notes*
 use_vcr_notes.txt
+inst/doc
+notes-redirects.R

DESCRIPTION

@@ -8,14 +8,20 @@ Description: Record test suite 'HTTP' requests and replays them during
     real 'HTTP' responses on disk in 'cassettes'. Subsequent 'HTTP' requests
     matching any previous requests in the same 'cassette' use a cached
     'HTTP' response.
-Version: 0.5.0
+Version: 1.6.0.91
 Authors@R: c(person("Scott", "Chamberlain", role = c("aut", "cre"),
     email = "sckott@protonmail.com", 
     comment = c(ORCID="0000-0003-1444-9135")),
-    person("Aaron", "Wolen", role = "ctb",
-    comment = c(ORCID="0000-0003-2542-2202")))
-URL: https://github.com/ropensci/vcr/ (devel)
-    https://books.ropensci.org/http-testing/ (user manual)
+    person("Aaron", "Wolen", role = "aut",
+    comment = c(ORCID="0000-0003-2542-2202")),
+    person("Maëlle", "Salmon", role = "aut",
+    comment = c(ORCID="0000-0002-2815-0399")),
+    person("Daniel", "Possenriede", role = "aut",
+    comment = c(ORCID="0000-0002-6738-9845")),
+    person("rOpenSci", role = "fnd", comment = "https://ropensci.org"))
+URL: https://github.com/ropensci/vcr/,
+    https://books.ropensci.org/http-testing/,
+    https://docs.ropensci.org/vcr/
 BugReports: https://github.com/ropensci/vcr/issues
 License: MIT + file LICENSE
 Encoding: UTF-8
@@ -26,23 +32,26 @@ Roxygen: list(markdown = TRUE)
 Imports:
     crul (>= 0.8.4),
     httr,
-    webmockr (>= 0.6.0),
+    httr2,
+    webmockr (>= 0.8.0),
     urltools,
     yaml,
     R6,
-    lazyeval,
-    base64enc
+    base64enc,
+    rprojroot
 Suggests:
-    roxygen2 (>= 7.0.2),
+    roxygen2 (>= 7.2.1),
     jsonlite,
     testthat,
     knitr,
     rmarkdown,
     desc,
     crayon,
     cli,
-    curl
-RoxygenNote: 7.0.2
+    curl,
+    withr,
+    webfakes
 X-schema.org-applicationCategory: Web
 X-schema.org-keywords: http, https, API, web-services, curl, mock, mocking, http-mocking, testing, testing-tools, tdd
 X-schema.org-isPartOf: https://ropensci.org
+RoxygenNote: 7.3.2

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2020
+YEAR: 2022
 COPYRIGHT HOLDER: Scott Chamberlain

LICENSE.md

@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2022 Scott Chamberlain
+
+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.

Makefile

@@ -16,13 +16,13 @@ install: doc build
 	R CMD INSTALL . && rm *.tar.gz
 
 build:
-	R CMD build .
+	R CMD build --no-build-vignettes .
 
 doc:
 	${RSCRIPT} -e "devtools::document()"
 
 eg:
-	${RSCRIPT} -e "devtools::run_examples()"
+	${RSCRIPT} -e "devtools::run_examples(run_dontrun=TRUE)"
 
 test:
 	${RSCRIPT} -e "devtools::test()"
@@ -36,4 +36,7 @@ check_windows:
 	${RSCRIPT} -e "devtools::check_win_devel(); devtools::check_win_release()"
 
 readme:
-	${RSCRIPT} -e "knitr::knit('README.Rmd')"
+	${RSCRIPT} -e "source('make_readme.R')"
+
+clean:
+	rm -f src/*.o src/*.so

NAMESPACE

@@ -16,6 +16,7 @@ export(Request)
 export(RequestHandler)
 export(RequestHandlerCrul)
 export(RequestHandlerHttr)
+export(RequestHandlerHttr2)
 export(RequestMatcherRegistry)
 export(Serializers)
 export(UnhandledHTTPRequestError)
@@ -33,6 +34,7 @@ export(real_http_connections_allowed)
 export(request_summary)
 export(response_summary)
 export(serializer_fetch)
+export(skip_if_vcr_off)
 export(turn_off)
 export(turn_on)
 export(turned_off)
@@ -43,17 +45,19 @@ export(vcr_config_defaults)
 export(vcr_configuration)
 export(vcr_configure)
 export(vcr_configure_reset)
+export(vcr_last_error)
 export(vcr_log_file)
 export(vcr_log_info)
+export(vcr_test_path)
 importFrom(R6,R6Class)
 importFrom(base64enc,base64decode)
 importFrom(base64enc,base64encode)
 importFrom(crul,HttpClient)
 importFrom(crul,mock)
 importFrom(httr,content)
 importFrom(httr,http_status)
-importFrom(lazyeval,lazy_dots)
-importFrom(lazyeval,lazy_eval)
+importFrom(httr2,req_perform)
+importFrom(httr2,resp_status_desc)
 importFrom(urltools,url_compose)
 importFrom(urltools,url_parse)
 importFrom(utils,getParseData)