Update test suite and ci (#160)

* Bump vcr version requirement to >= 2.0.0
- Replace rprojroot-based cassette_dir() with vcr::vcr_test_path()
- Remove filter_sensitive_data: vcr 2.x auto-strips Authorization headers
  from cassettes
- Replace log/log_opts config with vcr_configure_log()
* Fix Waterbutler conflict error detection
Waterbutler no longer includes a 'code' key in conflict (409) error
responses. The response body now contains only 'message' and 'data'
(flat file attributes). Update .process_wb_response() to detect errors
by the presence of a 'message' key in addition to the previous 'code'
key check.
* Re-record all 75 vcr cassettes against test.osf.io
* Add dev version
* Update NEWS.md
* Update actions/checkout to v4
* Impose read-all permissions on gha workflow
* Specify build args in check-r-package
* Stop using deprecated testthat patterns
- context() is long gone
- Replace setup/teardown w/ modern withr functions
- Replace use_cassette() with vcr::local_cassette()
* Add withr to suggests
* Specify winslash for consistent file seps on windows

Author: aaronwolen

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

@@ -6,7 +6,9 @@ on:
   pull_request:
     branches: [main, master]
 
-name: R-CMD-check
+name: R-CMD-check.yaml
+
+permissions: read-all
 
 jobs:
   R-CMD-check:
@@ -18,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release'}
+          - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
@@ -31,7 +33,7 @@ jobs:
       OSF_PAT: ${{ secrets.OSF_PAT }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -49,3 +51,4 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: osfr
 Title: Interface to the 'Open Science Framework' ('OSF')
-Version: 0.2.9
+Version: 0.2.9.9000
 Authors@R: c(
     person("Aaron", "Wolen",, "aaron@wolen.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-2542-2202")),
@@ -46,7 +46,8 @@ Suggests:
     lintr (>= 2.0),
     covr,
     spelling,
-    vcr (>= 0.5)
+    vcr (>= 2.0.0),
+    withr
 Encoding: UTF-8
 Language: en-US
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -1,3 +1,14 @@
+# osfr (development version)
+
+## Fixes
+
+* Fixed `osf_mv()` and `osf_cp()` failing with an uninformative error when a conflict is encountered. Waterbutler dropped the `code` field from conflict (409) responses, which prevented the error message from being extracted and surfaced correctly.
+
+## Build and test infrastructure
+
+* Updated vcr dependency to 2.0 and leverage new helpers: `vcr::vcr_test_path()` and `vcr::vcr_configure_log()`.
+* Removed `filter_sensitive_data` since vcr 2.x auto-strips `Authorization` headers from cassettes.
+
 # osfr 0.2.9
 
 ## Minor changes

R/utils-api-responses.R

@@ -58,19 +58,18 @@ process_response <- function(res) {
 
 .process_wb_response <- function(x) {
 
-  # waterbutler errors contain a key code with the http status code and a key
-  # message with the error message
-  if (is.null(x$code)) {
-    # waterbutler returns modified and modified_utc, to be consistent with osf
-    # responses we store the `modified_utc` value in the `modified`
-    x$data$attributes$modified <- parse_datetime(x$data$attributes$modified_utc)
-    x$data$attributes$modified_utc <- NULL
-
-  } else {
+  # Waterbutler errors contain a `message` key. Older versions also included a
+  # `code` key with the HTTP status code, but current versions omit it.
+  if (!is.null(x$code) || !is.null(x$message)) {
     # reformat waterbutler's error response to be consistent with OSF's
     x <- list(
       errors = list(list(detail = x$message))
     )
+  } else {
+    # waterbutler returns modified and modified_utc, to be consistent with osf
+    # responses we store the `modified_utc` value in the `modified`
+    x$data$attributes$modified <- parse_datetime(x$data$attributes$modified_utc)
+    x$data$attributes$modified_utc <- NULL
   }
   x
 }