Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jrdnbradford committed Aug 31, 2024
2 parents 967975d + 38c8065 commit 574bca6
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 16 deletions.
61 changes: 61 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: test-coverage.yaml

permissions: read-all

jobs:
test-coverage:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr, any::xml2
needs: coverage

- name: Test coverage
run: |
cov <- covr::package_coverage(
quiet = FALSE,
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
covr::to_cobertura(cov)
shell: Rscript {0}

- uses: codecov/codecov-action@v4
with:
fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
file: ./cobertura.xml
plugin: noop
disable_search: true
token: ${{ secrets.CODECOV_TOKEN }}

- 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@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
6 changes: 5 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ Title: A 'robots.txt' Parser and 'Webbot'/'Spider'/'Crawler' Permissions Checker
Version: 0.7.15
Authors@R: c(
person(
"Pedro", "Baltazar", role = c("aut", "cre"),
"Pedro", "Baltazar", role = c("ctb"),
email = "pedrobtz@gmail.com"
),
person(
"Jordan", "Bradford", role = c("cre"),
email = "jrdnbradford@gmail.com"
),
person(
"Peter", "Meissner", role = c("aut"),
Expand Down
1 change: 1 addition & 0 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ knitr::opts_chunk$set(
[![Total Downloads](https://cranlogs.r-pkg.org/badges/grand-total/robotstxt)](https://cran.r-project.org/web/packages/robotstxt/index.html)
[![Cran Checks](https://badges.cranchecks.info/summary/robotstxt.svg)](https://cran.r-project.org/web/checks/check_results_robotstxt.html)
[![Lifecycle: Stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
[![Codecov test coverage](https://codecov.io/gh/ropensci/robotstxt/graph/badge.svg)](https://app.codecov.io/gh/ropensci/robotstxt)
<!-- badges: end -->

```{r, echo=FALSE, include=FALSE}
Expand Down
33 changes: 18 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Downloads](https://cranlogs.r-pkg.org/badges/grand-total/robotstxt)](https://cra
Checks](https://badges.cranchecks.info/summary/robotstxt.svg)](https://cran.r-project.org/web/checks/check_results_robotstxt.html)
[![Lifecycle:
Stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
[![Codecov test
coverage](https://codecov.io/gh/ropensci/robotstxt/graph/badge.svg)](https://app.codecov.io/gh/ropensci/robotstxt)
<!-- badges: end -->

A ‘robots.txt’ Parser and ‘Webbot’/‘Spider’/‘Crawler’ Permissions
Expand All @@ -37,28 +39,29 @@ devtools::install_github("ropensci/robotstxt")

## License

MIT + file LICENSE <br>c( person( “Pedro”, “Baltazar”, role = c(“aut”,
“cre”), email = “<pedrobtz@gmail.com>” ), person( “Peter”, “Meissner”,
role = c(“aut”), email = “<retep.meissner@gmail.com>” ), person( “Kun”,
“Ren”, email = “<mail@renkun.me>”, role = c(“aut”, “cph”), comment =
“Author and copyright holder of list_merge.R.” ), person(“Oliver”,
“Keys”, role = “ctb”, comment = “original release code review”),
person(“Rich”, “Fitz John”, role = “ctb”, comment = “original release
code review”) )
MIT + file LICENSE <br>c( person( “Pedro”, “Baltazar”, role = c(“ctb”),
email = “<pedrobtz@gmail.com>” ), person( “Jordan”, “Bradford”, role =
c(“cre”), email = “<jrdnbradford@gmail.com>” ), person( “Peter”,
“Meissner”, role = c(“aut”), email = “<retep.meissner@gmail.com>” ),
person( “Kun”, “Ren”, email = “<mail@renkun.me>”, role = c(“aut”,
“cph”), comment = “Author and copyright holder of list_merge.R.” ),
person(“Oliver”, “Keys”, role = “ctb”, comment = “original release code
review”), person(“Rich”, “Fitz John”, role = “ctb”, comment = “original
release code review”) )

## Citation

To cite package 'robotstxt' in publications use:

Baltazar P, Meissner P, Ren K (2024). _robotstxt: A 'robots.txt' Parser and
Meissner P, Ren K (2024). _robotstxt: A 'robots.txt' Parser and
'Webbot'/'Spider'/'Crawler' Permissions Checker_. R package version 0.7.15,
https://github.com/ropensci/robotstxt, <https://docs.ropensci.org/robotstxt/>.

A BibTeX entry for LaTeX users is

@Manual{,
title = {robotstxt: A 'robots.txt' Parser and 'Webbot'/'Spider'/'Crawler' Permissions Checker},
author = {Pedro Baltazar and Peter Meissner and Kun Ren},
author = {Peter Meissner and Kun Ren},
year = {2024},
note = {R package version 0.7.15, https://github.com/ropensci/robotstxt},
url = {https://docs.ropensci.org/robotstxt/},
Expand Down Expand Up @@ -427,7 +430,7 @@ The last HTTP request is stored in an object
``` r
rt_last_http$request
## Response [https://petermeissner.de/robots.txt]
## Date: 2024-08-27 19:20
## Date: 2024-08-31 17:33
## Status: 200
## Content-Type: text/plain
## Size: 20 B
Expand Down Expand Up @@ -469,7 +472,7 @@ was going on in the client-server exchange.
``` r
attr(rt, "request")
## Response [https://petermeissner.de/robots.txt]
## Date: 2024-08-27 19:20
## Date: 2024-08-31 17:33
## Status: 200
## Content-Type: text/plain
## Size: 20 B
Expand Down Expand Up @@ -521,7 +524,7 @@ rt_req$all_headers
## [1] "nginx/1.10.3 (Ubuntu)"
##
## $date
## [1] "Tue, 27 Aug 2024 19:20:05 GMT"
## [1] "Sat, 31 Aug 2024 17:33:06 GMT"
##
## $`content-type`
## [1] "text/html"
Expand Down Expand Up @@ -551,7 +554,7 @@ rt_req$all_headers
## [1] "nginx/1.10.3 (Ubuntu)"
##
## $date
## [1] "Tue, 27 Aug 2024 19:20:05 GMT"
## [1] "Sat, 31 Aug 2024 17:33:06 GMT"
##
## $`content-type`
## [1] "text/plain"
Expand Down Expand Up @@ -610,7 +613,7 @@ as.list(rt)
##
## $request
## Response [https://petermeissner.de/robots.txt]
## Date: 2024-08-27 19:20
## Date: 2024-08-31 17:33
## Status: 200
## Content-Type: text/plain
## Size: 20 B
Expand Down
4 changes: 4 additions & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
url: https://docs.ropensci.org/robotstxt
template:
bootstrap: 5
light-switch: true

0 comments on commit 574bca6

Please sign in to comment.