Merge 3a4c51c into 14f7477

Author: weshinsley

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: orderly
 Title: Lightweight Reproducible Reporting
-Version: 1.5.1
+Version: 1.5.2
 Description: Order, create and store reports from R.  By defining a
     lightweight interface around the inputs and outputs of an
     analysis, a lot of the repetitive work for reproducible research

NEWS.md

@@ -1,3 +1,7 @@
+# orderly 1.5.2
+
+* Fix issue writing failure data from a failed orderly bundle.
+
 # orderly 1.5.0
 
 * Add `prepare_git_example_from_source` which can be used to generate a git controlled orderly directory

R/orderly_version.R

@@ -537,6 +537,7 @@ orderly_version <- R6::R6Class(
         private[[v]] <- info[[v]]
       }
 
+      currentwd <- getwd()
       withCallingHandlers({
         ## Refetch the preflight info here: we want to keep git but
         ## replace everything else I think.  We might save the random
@@ -548,6 +549,7 @@ orderly_version <- R6::R6Class(
         self$run_execute(echo)
         self$run_cleanup()
       }, error = function(e) {
+        setwd(currentwd)
         self$run_failed_cleanup(e)
       })
     },

tests/testthat/test-bundle.R

@@ -321,6 +321,32 @@ test_that("failed bundle run writes out failed rds", {
                'stop\\("some error"\\)')
 })
 
+test_that("Failure output written if a bundle fails", {
+  path <- test_prepare_orderly_example("demo")
+  on.exit(unlink(path, recursive = TRUE))
+
+  # Make parameter less than zero cause a crash
+
+  test_script <- file.path(path, "src", "other", "script.R")
+  script <- readLines(test_script)
+  script <- c("if (nmin < 0) stop('Invalid parameter')", script)
+  writeLines(script, test_script)
+
+  # Run a failing bundle
+
+  path_bundles <- file.path(path, "bundles")
+  bundle <- orderly::orderly_bundle_pack(path_bundles, "other",
+                                         parameters = list(nmin = -1),
+                                         root = path)
+
+
+  bundle_path <- file.path(path, "bundles", basename(bundle$path))
+
+  expect_error(orderly::orderly_bundle_run(bundle_path, "output"))
+
+  expect_true(file.exists(file.path(getwd(), "output", bundle$id, "pack",
+                                    "orderly_fail.rds")))
+})
 
 test_that("zip list helper safely lists", {
   skip_on_cran()