Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ Suggests:
knitr,
covr
VignetteBuilder: knitr
RoxygenNote: 7.1.0
RoxygenNote: 7.1.1
22 changes: 19 additions & 3 deletions R/assignr.R
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ generate_hw_pkg = function(x,
type,
output_dir = paste0(name, "-", type),
render_files = TRUE,
zip_files = TRUE) {
zip_files = TRUE,
file_dependencies = NULL) {

if (length(remove_indexes) > 0) {
# create assignment output lines
Expand All @@ -69,6 +70,12 @@ generate_hw_pkg = function(x,
# Make the directory
dir.create(output_path, recursive = TRUE)

# Fill directory
if(length(file_dependencies) >= 1) {
file.copy(file_dependencies,
file.path(output_path, basename(file_dependencies)))
}

# Name of Rmd file to build
rmd_material_name = file.path(output_path,
paste0(output_name, ".Rmd"))
Expand Down Expand Up @@ -105,6 +112,11 @@ extract_hw_name = function(x) {

}

hw_dir_dependencies = function(x) {
main_dir_files = list.files(dirname(x), full.names = TRUE)
grep(main_dir_files, pattern='-(main|assign|sol)', invert=TRUE, value=TRUE)
}

#' Retrieve example file path
#'
#' Obtains the file path for the example Rmd in the package.
Expand Down Expand Up @@ -181,6 +193,8 @@ assignr = function(file,

hw_name = extract_hw_name(file)

hw_dependency_files = hw_dir_dependencies(file)

input_lines = readLines(file)

chunk_tick_lines = detect_positions(input_lines, "```")
Expand Down Expand Up @@ -220,7 +234,8 @@ assignr = function(file,
type = "assign",
output_dir = output_dir,
render_files = render_files,
zip_files = zip_files
zip_files = zip_files,
file_dependencies = hw_dependency_files
)
}

Expand All @@ -232,7 +247,8 @@ assignr = function(file,
type = "soln",
output_dir = output_dir,
render_files = render_files,
zip_files = zip_files
zip_files = zip_files,
file_dependencies = hw_dependency_files
)
}

Expand Down
1 change: 1 addition & 0 deletions man/assignr-package.Rd

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