merge changes from master

Merge branch 'master' of https://github.com/s-fleck/rotor

# Conflicts:
#	DESCRIPTION
#	NEWS.md

Author: Stefan Fleck

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: rotor
 Title: Log Rotation and Conditional Backups
-Version: 0.3.2.9000
+Version: 0.3.4.9000
 Authors@R: 
     person(given = "Stefan",
            family = "Fleck",
@@ -27,6 +27,7 @@ Suggests:
     rmarkdown,
     testthat,
     uuid,
+    ulid,
     zip
 Encoding: UTF-8
 LazyData: true

NEWS.md

@@ -3,6 +3,11 @@
 * Backups now retain their original timestamp (created, last modified) where
   possible (even when zipped)
 
+# rotor 0.3.4
+
+* Hotfix for some tests related to the `Cache` R6 class that fail on systems
+  with low-precision file system timestamps (such as ext3 and old Windows
+  file systems)
 
 # rotor 0.3.2
 

R/Cache.R

@@ -162,8 +162,7 @@ Cache <- R6::R6Class(
 
       if (!is.null(max_size) && !is.infinite(max_size)){
         max_size  <- parse_size(max_size)
-        files <- files[order(files$mtime, decreasing = TRUE), ]
-        files$cumsize <- cumsum(files$size)
+        files$cumsize <- rev(cumsum(rev(files$size)))
         rem$size <- files[files$cumsize > max_size, ]
       }
 

cran-comments.md

@@ -10,12 +10,5 @@
 
 0 errors | 0 warnings | 0 notes
 
-Sorry for the many resubmissions. This package currently has an issue that
-only to occur on macOS. It does not occur on the same macOS version available
-on Rhub. 
-
-My current theory is that the error is caused by the accuracy of the
-'mtime' filestamp, which is linked to the file system the machine uses. 
-I implemented a workaround under that assumption, but I cannot be 100% sure 
-that this fixes that error. If the error still persists... could you please
-inform me which file system you use on r-release-macos-x86_64?
+More fixes for file-system timestamp related bugs that I could not reproduce on
+my test systems. Sorry again for all the trouble.

man/Cache.Rd

@@ -458,6 +458,7 @@ test_that("BackupQueueIndex$push() can push to different directory", {
 
 
 test_that("BackupQueueIndex dry run doesnt modify file system", {
+  try({unlink(td, recursive = TRUE)})
   dir.create(td, recursive = TRUE)
   on.exit(unlink(td, recursive = TRUE))
 

tests/testthat/test_BackupQueue.R

@@ -60,14 +60,14 @@ test_that("setting hash functions work", {
   expect_identical(cache_hash$n, 0L)
 
 
-  # To override this behaviour use a generate for unique ids, such as
+  # To override this behaviour use a function that generates globally unique ids instead of hashes
   cache_uid <- Cache$new(td, hashfun = function(x) ascending_id())
   cache_uid$push(iris)
   cache_uid$push(iris)
   expect_identical(cache_hash$n, 2L)
   cache_hash$purge()
 
-  # ensure hashfun allways returns a scalar
+  # fail if hashfun does not returns a scalar
   cache_err <- Cache$new(td, hashfun = function(x) c(ascending_id(),  ascending_id()))
   expect_error(cache_err$push(iris), class = "ValueError")
 })
@@ -86,6 +86,7 @@ test_that("pruning works by number of files works", {
   k3 <- cache$push(cars)
   expect_identical(cache$n, 3L)
 
+  # cached files are sorted in the order of their creation
   expect_identical(cache$files$key[[1]], k1)
   expect_identical(cache$files$key[[2]], k2)
   expect_identical(cache$files$key[[3]], k3)
@@ -98,7 +99,7 @@ test_that("pruning works by number of files works", {
 
 
 
-test_that("pruning works by number of files sorts by key if timestamp are identical", {
+test_that("$files is ordered by key if timestamps are identical", {
   td <- file.path(tempdir(), "cache-test")
   on.exit(unlink(td, recursive = TRUE))
 
@@ -125,26 +126,22 @@ test_that("pruning works by number of files sorts by key if timestamp are identi
 
 
 
-test_that("pruning by size works", {
+test_that("pruning by size works, even if timestamps are identical", {
   td <- file.path(tempdir(), "cache-test")
   on.exit(unlink(td, recursive = TRUE))
 
   # When using a real hash function as hashfun, identical objects will only
   # be added to the cache once
   cache <- Cache$new(td, hashfun = function(x) ascending_id())
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
+  for (i in 1:5)  cache$push(iris)
   cache$push(cars)
   expect_identical(cache$n, 6L)
 
+
+  for (p in cache$files$path){  # loop necessary for compat with R < 3.6.0
+    Sys.setFileTime(p, "1999-01-01 00:00:00")
+  }
+
   expect_true(cache$size > 2048)
   cache$prune(max_size = "2kb")
   expect_true(cache$size <= 2048)
@@ -164,16 +161,7 @@ test_that("Inf max_* do not prunes", {
   # When using a real hash function as hashfun, identical objects will only
   # be added to the cache once
   cache <- Cache$new(td, hashfun = function(x) ascending_id())
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
+  for (i in 1:5)  cache$push(iris)
   cache$push(cars)
   expect_identical(cache$n, 6L)
 
@@ -231,16 +219,7 @@ test_that("pruning by age works", {
 
   cache <- MockCache$new(dir = td, hashfun = function(x) ascending_id())
   on.exit(cache$purge(), add = TRUE)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
-  cache$push(iris)
-  Sys.sleep(0.1)
+  for (i in 1:5)  cache$push(iris)
 
   expect_identical(nrow(cache$files), 5L)