Fix #918

DESCRIPTION

@@ -89,37 +89,39 @@ Imports:
   storr (>= 1.1.0),
   utils
 Suggests:
-    abind,
-    bindr,
-    callr,
-    cli (>= 1.1.0),
-    clustermq (>= 0.8.8),
-    crayon,
-    curl (>= 2.7),
-    datasets,
-    downloader,
-    future,
-    ggplot2,
-    ggraph,
-    grDevices,
-    knitr,
-    lubridate,
-    networkD3,
-    parallel,
-    prettycode,
-    Rcpp,
-    rmarkdown,
-    rstudioapi,
-    stats,
-    styler,
-    testthat (>= 2.1.0),
-    tibble,
-    tidyselect (>= 0.2.4),
-    txtq (>= 0.1.2),
-    txtplot,
-    usethis,
-    visNetwork,
-    webshot
+  abind,
+  bindr,
+  callr,
+  cli (>= 1.1.0),
+  clustermq (>= 0.8.8),
+  crayon,
+  curl (>= 2.7),
+  datasets,
+  downloader,
+  future,
+  ggplot2,
+  ggraph,
+  grDevices,
+  knitr,
+  lubridate,
+  networkD3,
+  parallel,
+  prettycode,
+  Rcpp,
+  rmarkdown,
+  rstudioapi,
+  stats,
+  styler,
+  testthat (>= 2.1.0),
+  tibble,
+  tidyselect (>= 0.2.4),
+  txtq (>= 0.1.3),
+  txtplot,
+  usethis,
+  visNetwork,
+  webshot
+Remotes:
+  wlandau/txtq
 VignetteBuilder: knitr
 Encoding: UTF-8
 Language: en-US

R/api-history.R

@@ -33,7 +33,7 @@
 #'   d$x2 <- d$x ^ 3
 #'   lm(y ~ x2, data = d)
 #' }
-#' Sys.sleep(1.1)
+#' Sys.sleep(0.01)
 #' make(my_plan, history = TRUE, verbose = 0L)
 #' # The history is a data frame about all the recorded runs of your targets.
 #' out <- drake_history(analyze = TRUE)
@@ -88,9 +88,8 @@ drake_history <- function(
     command = out$command,
     runtime = out$runtime
   )
-  ref <- as.POSIXct("0000-01-01", origin = "0000-01-01")
-  out <- out[order(out$target, ref - out$time), ]
-  out$latest <- !duplicated(out$target)
+  out <- out[order(out$target, out$time), ]
+  out$latest <- !duplicated(out$target, fromLast = TRUE)
   if (analyze) {
     args <- lapply(out$command, find_args)
     args <- do.call(drake_bind_rows, args)

R/utils-utils.R

@@ -451,6 +451,6 @@ make_unique <- function(x) {
   y[order(ord)]
 }
 
-microtimestamp <- function() {
-  format(Sys.time(), "%Y-%m-%d %H:%M:%OS9")
+microtime <- function() {
+  format(Sys.time(), "%Y-%m-%d %H:%M:%OS9 %z GMT")
 }

R/vis-console.R

@@ -35,7 +35,7 @@ drake_log <- function(..., target = character(0), config) {
     "|",
     Sys.getpid(),
     "|",
-    microtimestamp(),
+    microtime(),
     "|",
     target,
     "|",

tests/testthat/test-history.R

@@ -5,7 +5,6 @@ test_with_dir("history with no cache", {
 })
 
 test_with_dir("basic history", {
-  skip_on_cran()
   skip_if_not_installed("txtq")
   # Iterate.
   load_mtcars_example()
@@ -15,7 +14,7 @@ test_with_dir("basic history", {
     d$x2 <- d$x ^ 3
     lm(y ~ x2, data = d)
   }
-  Sys.sleep(1.1)
+  Sys.sleep(0.01)
   make(my_plan, history = TRUE, cache = cache, session_info = FALSE)
 
   # Get and inspect the history.
@@ -59,3 +58,19 @@ test_with_dir("basic history", {
   expect_na <- out$target == "small" | !out$latest
   expect_equal(is.na(out$hash), expect_na)
 })
+
+test_with_dir("complicated history commands", {
+  skip_if_not_installed("txtq")
+  plan <- drake_plan(
+    a = identity(
+      x = list(a = "x", 2, b = list(y = 3L, z = sqrt(4), w = "5"))
+    )
+  )
+  cache <- storr::storr_environment()
+  make(plan, cache = cache, session_info = FALSE, history = TRUE)
+  out <- drake_history(cache = cache, analyze = TRUE)
+  expect_equal(ncol(out), 10L)
+  expect_equal(out$a, "x")
+  expect_equal(out$w, "5")
+  expect_equal(out$y, 3L)
+})