Skip to content

Commit c2c36b7

Browse files
committed
Merge branch 'master' of https://github.com/s-fleck/lgr
2 parents 2c66dce + 379b47d commit c2c36b7

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ matrix:
1111
- Rscript -e 'covr::codecov()'
1212
deploy:
1313
provider: script
14-
script: Rscript -e 'pkgdown::deploy_site_github(ssh_id = Sys.getenv("TRAVIS_DEPLOY_KEY", ""))'
14+
script: Rscript -e 'remotes::install_cran("pkgdown");pkgdown::deploy_site_github(ssh_id = Sys.getenv("TRAVIS_DEPLOY_KEY", ""))'
1515
skip_cleanup: true
1616
- r: 3.5
1717
- r: 3.4

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: lgr
33
Title: A Fully Featured Logging Framework
4-
Version: 0.3.4.9004
4+
Version: 0.4.0
55
Authors@R:
66
person(given = "Stefan",
77
family = "Fleck",

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444

4545
* Most errors now have appropriate subclasses
4646

47-
* Logger$log() dispatches to all appenders, even if some throw an error
47+
* Logger$log() dispatches to all appenders, even if some throw an error (instead
48+
of aborting after the first Appender that throws an error)
4849

4950

5051
# lgr 0.3.4

R/Logger.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ is_Logger <- function(x){
10101010
#'
10111011
#'
10121012
#' @param x any \R Object
1013-
#' @param color `TRUE` or `FALSE`: Output with color? Requi<- the Package
1013+
#' @param color `TRUE` or `FALSE`: Output with color? Requires the package
10141014
#' **crayon**
10151015
#' @param ... ignored
10161016
#'

cran-comments.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Test environments
2-
* ubuntu 18.04, R 3.6.1
3-
* ubuntu 14.04 (on travis-ci), R 3.5.2
4-
* ubuntu 14.04 (remote RStudio server), R 3.6.1
2+
* ubuntu 18.04, R 4.0.2
3+
* ubuntu 16.04 (on travis-ci), R 3.5.2
4+
* ubuntu 18.04 (remote RStudio server), R 3.6.1
55
* win-builder (devel and release)
66
* rhub (rhub::check_for_cran())
77

man/print.Appender.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/print.Logger.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test_Logger.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ test_that("Exceptions are cought and turned into warnings", {
185185
)
186186
)
187187

188-
expect_warning(ml$fatal(stop("blubb")), "Error.*blubb")
189-
expect_warning(ml$fatal(), "Error")
188+
expect_warning(ml$fatal(stop("blubb")), "error.*blubb")
189+
expect_warning(ml$fatal(), "error")
190190
})
191191

192192

0 commit comments

Comments
 (0)