.Rbuildignore can contain empty lines #570
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hadley
reviewed
Jan 31, 2017
R/utils.R
Outdated
| @@ -113,7 +113,7 @@ ignore_files <- function(rfiles, path) { | |||
| rfiles_relative <- sub("^[/]*", "", rfiles_relative) | |||
|
|
|||
| # Remove any files that match any perl-compatible regexp | |||
| patterns <- readLines(rbuildignore, warn = FALSE) | |||
| patterns <- scan(rbuildignore, what = "", sep = "\n", blank.lines.skip = TRUE, quiet = TRUE) | |||
There was a problem hiding this comment.
Rather than switching to scan(), which is extremely complex, could you please just filter "" out of patterns?
hadley
reviewed
Jan 31, 2017
tests/testthat/test-Rbuildignore.R
Outdated
| @@ -7,6 +7,6 @@ test_that("roxygen ignores files with matching pattern in .Rbuildignore", { | |||
| expect_equal(basename(package_files(test_pkg)), c("a.R", "ignore_me.R")) | |||
|
|
|||
| #writeLines("^R/ignore_me.R$", file.path(test_pkg, ".Rbuildignore")) | |||
| writeChar("^R/ignore_me.R$\n", file.path(test_pkg, ".Rbuildignore"), eos = NULL) | |||
| writeChar("^R/ignore_me.R$\n\n.nonexistentfile", file.path(test_pkg, ".Rbuildignore"), eos = NULL) | |||
There was a problem hiding this comment.
Please make this a separate test with a clear name.
There was a problem hiding this comment.
A separate test file or is a separate test_that enough?
|
Looks good - can you please add a bullet to NEWS? |
|
Done. |
hadley
reviewed
Feb 1, 2017
NEWS.md
Outdated
| @@ -2,6 +2,7 @@ | |||
|
|
|||
| * Automatically generating a usage section for an infix function containing "<-" | |||
| no longer removes "<-" from the function name (#554). | |||
| * Allowing empty lines in .Rbuildignore. Previously, empty lines caused all files being ignored. | |||
There was a problem hiding this comment.
Can you please add a blank line before and add your github username. And mention issue #572 which this PR fixes
|
Hopefully everything is fine now 😉 |
|
Thanks! |
|
Doesn't this bug warrant an urgent submission of roxygen2 6.0.1 to CRAN? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Empty lines in the .Rbuildignore file caused roxygen2 6.0 to ignore all files because
""matches everything.I also extended the test to cover that case.