Skip to content

Commit

Permalink
done with fixes for issue 119
Browse files Browse the repository at this point in the history
  • Loading branch information
dicook committed Apr 19, 2024
1 parent a58562b commit 6da36ca
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: rjtools
Title: Preparing, Checking, and Submitting Articles to the 'R Journal'
Version: 1.0.13
Version: 1.0.14
Authors@R:
c(person(given = "Mitchell",
family = "O'Hara-Wild",
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# rjtools 1.0.14

* additional issues with checks fixed to completely address issue #119

# rjtools 1.0.13

* fix error reported by CRAN, occurring on linux, related to test code
Expand Down
6 changes: 3 additions & 3 deletions R/check.R
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,9 @@ check_filenames <- function(path) {
#' @export
check_structure <- function(path) {
all <- list.files(path, all.files=TRUE, include.dirs=TRUE, recursive=TRUE)
all <- all[!grepl(".Rproj", all)]
depth <- nchar(gsub("[^/]+", "", all))
if (max(depth) > 2)
if (max(depth) > 3)
return(log_error("There are nested subdirectories. Please use at most two directory levels for the article."))
if (length(dot <- grep("^\\.", gsub(".*/", "", all))))
log_warning("The archive contains hidden files which will be removed: ", paste(all[dot], collapse=", "))
Expand Down Expand Up @@ -200,8 +201,7 @@ check_folder_structure <- function(path){
Scripts should be organised in the scripts/ folder.
The master R file generated from rendering should still be in the main directory.")
} else if (str_length(log_aux) != 0){
log_error("Auxiliary log and aux files detected: {log_aux}.
They should be removed.")
log_note("Remove .log, .aux and .out files before submitting.")
} else if (str_length(motivation) != 0){
log_error("Possible motivation or cover letters detected in main folder: {motivation}.
They should be placed in the motivation-letter/ folder.")
Expand Down
4 changes: 2 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
This revision has small updates, and fixes as requested by CRAN maintainers.
This revision has small fixes addressing recently posted issue on the Github repo.

## Test environment

* R version 4.3.3 (2024-02-29 ucrt)

── R CMD check results ───────────────── rjtools 1.0.13 ────
── R CMD check results ───────────────── rjtools 1.0.14 ────
Duration: 24.2s

0 errors ✔ | 0 warnings ✔ | 0 notes ✔
Expand Down
Binary file removed inst/tex/Rlogo-5.png
Binary file not shown.

0 comments on commit 6da36ca

Please sign in to comment.