Skip to content

Commit

Permalink
prep for release
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/s-fleck/rotor

# Conflicts:
#	DESCRIPTION
  • Loading branch information
Stefan Fleck committed Oct 16, 2020
2 parents 863c9df + d3ede29 commit 6b0727b
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 14 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: rotor
Title: Log Rotation and Conditional Backups
Version: 0.2.5
Version: 0.3.0
Authors@R:
person(given = "Stefan",
family = "Fleck",
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# rotor 0.2.5
# rotor 0.3.0

* Improved some error messages
* Added `rotate_rds()`, `rotate_rds_time()`, and `rotate_rds_date()` as a
Expand Down
6 changes: 3 additions & 3 deletions R/BackupQueue.R
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ BackupQueueDateTime <- R6::R6Class(

#' @description Create a new time-stamped backup (e.g. \file{logfile.2020-07-22_12-26-29.log})
#' @param overwrite `logical` scalar. Overwrite backups with the same
#' fielename (i.e timestamp)?
#' @param now `POSIXct` scalar. Can be used as an override meachanism for
#' filename (i.e timestamp)?
#' @param now `POSIXct` scalar. Can be used as an override mechanism for
#' the current system time if necessary.
push = function(
overwrite = FALSE,
Expand Down Expand Up @@ -701,7 +701,7 @@ BackupQueueDateTime <- R6::R6Class(
#' Caching brings a significant speedup for checking whether to rotate or
#' not based on the `age` of the last backup, but is only safe if there are
#' no other programs/functions interacting with the backups. This is only
#' advantagous for high frequency file rotation (i.e. several times per
#' advantageous for high frequency file rotation (i.e. several times per
#' second)
cache_backups = function(){
get(".cache_backups", envir = private, mode = "logical")
Expand Down
4 changes: 2 additions & 2 deletions R/Cache.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#'
#' @description
#' `Cache` provides an [R6][R6::R6Class] API for managing an on-disk key-value
#' store for \R objects. The objects are serialzed to a single folder as
#' store for \R objects. The objects are serialized to a single folder as
#' [.rds][readRDS()] files and the key of the object equals the name of the file.
#' `Cache` supports automatic removal of old files if the cache folder exceeds a
#' predetermined number of files, total size, or if the individual files exceed
Expand Down Expand Up @@ -68,7 +68,7 @@ Cache <- R6::R6Class(
#'
#' @param x any \R object
#' @param key a `character` scalar. Key under which to store the cached
#' object. Must be a valid filename. Defaults to beeing generated by
#' object. Must be a valid filename. Defaults to being generated by
#' `$hashfun()` but may also be supplied manually.
#'
#' @return a `character` scalar: the key of the newly added object
Expand Down
4 changes: 2 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Test environments
* ubuntu 14.04 (via RStudio Server), R 3.6.1
* ubuntu 18.04 (via RStudio Server), R 4.0.2
* ubuntu 16.04 (via travis), R 3.6.1
* win-builder (devel)
* rhub::check_for_cran()
Expand All @@ -8,4 +8,4 @@

0 errors | 0 warnings | 0 notes

fixes system-time dependent unit tests that broke due to year change
added new functionality (see NEWS.md)
7 changes: 7 additions & 0 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@ TiB
Codecov
covr
BackupQueue
BackupQueueIndex
BackupQueueDate
BackupQueueDateTime
DateTime
appender
IEC
getters
datestamped
uuid
UID
's
ORCID
infos
6 changes: 3 additions & 3 deletions man/BackupQueueDateTime.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/Cache.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6b0727b

Please sign in to comment.