Skip to content

Commit

Permalink
fix #207
Browse files Browse the repository at this point in the history
  • Loading branch information
wlandau committed Dec 20, 2024
1 parent efd0e6b commit 083ca89
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Description: Function-oriented Make-like declarative pipelines for
reproducible pipelines concisely and compactly.
The methods in this package were influenced by the 'targets' R package.
by Will Landau (2018) <doi:10.21105/joss.00550>.
Version: 0.11.0.9001
Version: 0.11.0.9002
License: MIT + file LICENSE
URL: https://docs.ropensci.org/tarchetypes/, https://github.com/ropensci/tarchetypes
BugReports: https://github.com/ropensci/tarchetypes/issues
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# tarchetypes 0.11.0.9001
# tarchetypes 0.11.0.9002

* Fix `tar_combine()` help file examples (#206, @weberse2).
* Account for project-level `output_dir` in non-project `tar_quarto()` calls (#207, @brndngrhm).

# tarchetypes 0.11.0

Expand Down
8 changes: 6 additions & 2 deletions R/tar_quarto_files.R
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,15 @@ tar_quarto_files_document <- function(path, quiet) {
# Collect data about source files.
out$sources <- tar_quarto_files_get_source_files(info$fileInformation)
# Collect data about output files.
output_dir <- info$project$config$project$`output-dir`
for (format in info$formats) {
out$output <- c(
out$output,
file.path(dirname(path), format$pandoc$`output-file`)
if_any(
is.null(output_dir),
file.path(dirname(path), format$pandoc$`output-file`),
file.path(output_dir, dirname(path), format$pandoc$`output-file`)
)
)
}
# Collect data about input files. As this is not a project, there doesn't
Expand Down Expand Up @@ -115,7 +120,6 @@ tar_quarto_files_get_source_files <- function(file_information) {
# Collect relevant source files. The files in `includeMap$target` are always
# relative to the main entry point of the report. Thus, we need to add the
# corresponding paths to the entries.
#
# We don't need to include the `source` column as all files are also present
# in `target` or are `myfile`.
out <- c(
Expand Down

0 comments on commit 083ca89

Please sign in to comment.