[pull] master from daroczig:master

.Rbuildignore

@@ -17,4 +17,5 @@ dev-resources
 ^pkgdown$
 ^\.github$
 revdep
+^codecov\.yml$
 ^README\.Rmd$

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

@@ -1,12 +1,18 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
+# 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
+#
+# NOTE: This workflow is overkill for most R packages and
+# check-standard.yaml is likely a better choice.
+# usethis::use_github_action("check-standard") will install it.
 on:
   push:
     branches: [main, master]
   pull_request:
     branches: [main, master]
 
-name: R-CMD-check
+name: R-CMD-check.yaml
+
+permissions: read-all
 
 jobs:
   R-CMD-check:
@@ -18,18 +24,25 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          # - {os: macos-latest,    r: 'release'}
-          # - {os: windows-latest,  r: 'release'}
-          # - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          # - {os: ubuntu-latest,   r: 'oldrel-1'}
+          - {os: macos-latest,   r: 'release'}
+
+          - {os: windows-latest, r: 'release'}
+          # use 4.0 or 4.1 to check with rtools40's older compiler
+          - {os: windows-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@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -43,7 +56,9 @@ jobs:
         with:
           extra-packages: any::rcmdcheck
           needs: check
+          pak-version: devel # can remove once pak 0.7.3 is released
 
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/lint.yaml

@@ -0,0 +1,34 @@
+# 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: lint.yaml
+
+permissions: read-all
+
+jobs:
+  lint:
+    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::lintr, local::.
+          needs: lint
+
+      - name: Lint
+        run: lintr::lint_package()
+        shell: Rscript {0}
+        env:
+          LINTR_ERROR_ON_LINT: true

.github/workflows/pkgdown.yaml

@@ -1,21 +1,30 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
+# 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]
-    tags: ['*']
+  pull_request:
+    branches: [main, master]
+  release:
+    types: [published]
+  workflow_dispatch:
+
+name: pkgdown.yaml
 
-name: pkgdown
+permissions: read-all
 
 jobs:
   pkgdown:
     runs-on: ubuntu-latest
+    # Only restrict concurrency for non-PR jobs
+    concurrency:
+      group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -33,7 +42,8 @@ jobs:
         shell: Rscript {0}
 
       - name: Deploy to GitHub pages 🚀
-        uses: JamesIves/[email protected]
+        if: github.event_name != 'pull_request'
+        uses: JamesIves/[email protected]
         with:
           clean: false
           branch: gh-pages

.github/workflows/test-coverage.yaml

@@ -1,12 +1,14 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
+# 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
+name: test-coverage.yaml
+
+permissions: read-all
 
 jobs:
   test-coverage:
@@ -15,36 +17,45 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - 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
+          extra-packages: any::covr, any::xml2
           needs: coverage
 
       - name: Test coverage
         run: |
-          covr::codecov(
+          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
+          find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
         shell: bash
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-test-failures
           path: ${{ runner.temp }}/package

.lintr

@@ -0,0 +1,12 @@
+linters: linters_with_defaults(
+    line_length_linter(120),
+    object_usage_linter(interpret_glue = TRUE),
+    object_name_linter(styles = c("snake_case", "symbols", "UPPERCASE"))
+  )
+exclude: '# nolint'
+exclude_start: '# nolint start'
+exclude_end: '# nolint end'
+exclusions: list(
+    "inst/demo-packages/logger-tester-package/R/tester.R",
+    "vignettes/migration.Rmd"
+  )

DESCRIPTION

@@ -1,49 +1,54 @@
 Type: Package
 Package: logger
-Authors@R: c(
-    person("Gergely", "Daróczi", , "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-3149-8537")),
-    person("System1", role = c("fnd"))
-    )
 Title: A Lightweight, Modern and Flexible Logging Utility
-Description: Inspired by the the 'futile.logger' R package and 'logging' Python module, this utility provides a flexible and extensible way of formatting and delivering log messages with low overhead.
 Version: 0.3.0.9000
 Date: 2024-03-03
+Authors@R: c(
+    person("Gergely", "Daróczi", , "[email protected]", role = c("aut", "cre"),
+           comment = c(ORCID = "0000-0003-3149-8537")),
+    person("System1", role = "fnd")
+  )
+Description: Inspired by the the 'futile.logger' R package and 'logging'
+    Python module, this utility provides a flexible and extensible way of
+    formatting and delivering log messages with low overhead.
+License: AGPL-3
 URL: https://daroczig.github.io/logger/
 BugReports: https://github.com/daroczig/logger/issues
-Encoding: UTF-8
-RoxygenNote: 7.3.2
-License: AGPL-3
+Depends: 
+    R (>= 4.0.0)
 Imports:
-  utils
-Depends: R (>= 4.0.0)
+    utils
 Suggests:
-  glue,
-  pander,
-  jsonlite,
-  crayon,
-  slackr (>= 1.4.1),
-  RPushbullet,
-  telegram,
-  testthat (>= 3.0.0),
-  covr,
-  knitr,
-  rmarkdown,
-  devtools,
-  roxygen2,
-  parallel,
-  rsyslog,
-  shiny,
-  callr,
-  txtq,
-  botor,
-  R.utils,
-  syslognet,
-  withr
+    botor,
+    callr,
+    covr,
+    crayon,
+    devtools,
+    glue,
+    jsonlite,
+    knitr,
+    pander,
+    parallel,
+    R.utils,
+    rmarkdown,
+    roxygen2,
+    RPushbullet,
+    rsyslog,
+    shiny,
+    slackr (>= 1.4.1),
+    syslognet,
+    telegram,
+    testthat (>= 3.0.0),
+    txtq,
+    withr
 Enhances:
-  logging,
-  futile.logger,
-  log4r
-VignetteBuilder: knitr
+    futile.logger,
+    log4r,
+    logging
+VignetteBuilder: 
+    knitr
 Config/testthat/edition: 3
 Config/testthat/parallel: TRUE
+Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.3.2

NEWS.md

@@ -1,5 +1,7 @@
 # logger (development version)
 
+* `log_appender()`, `log_layout()` and `log_formatter()` now check that you are calling them with a function, and return the previously set value.
+
 # logger 0.3.0 (2024-03-03)
 
 Many unrelated small features, fixes and documentation updates collected over 2+ years.