close #597: ignore renv folders in both the site config and check_con…

…tent()

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: blogdown
 Type: Package
 Title: Create Blogs and Websites with R Markdown
-Version: 1.2.1
+Version: 1.2.2
 Authors@R: c(
     person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666")),
     person("Christophe", "Dervieux", role = "aut", email = "[email protected]", comment = c(ORCID = "0000-0003-4474-2498")),

NEWS.md

@@ -1,11 +1,19 @@
 # CHANGES IN blogdown VERSION 1.3
 
+## NEW FEATURES
+
+- `check_config()` will suggest ignoring the `renv` folder and the `renv.lock` file in the Hugo config if **renv** is used in the project (thanks, @solarchemist, #597).
+
 ## MAJOR CHANGES
 
 - The `method` argument of `build_site()` has been removed (it was defunct in **blogdown** v1.2). Please set the build method in the global option `options(blogdown.method = )` instead.
 
 - The `use_brew` argument of `install_hugo()` has been removed.
 
+## BUG FIXES
+
+- `check_content()` will ignore `renv` folders when looking for Rmd/md files to be checked (thanks, @solarchemist, #597).
+
 # CHANGES IN blogdown VERSION 1.2
 
 ## NEW FEATURES

R/check.R

@@ -47,7 +47,10 @@ check_config = function() {
   }
 
   msg_next('Checking "ignoreFiles" setting for Hugo...')
-  ignore = c('\\.Rmd$', '\\.Rmarkdown$', '_cache$', '\\.knit\\.md$', '\\.utf8\\.md$')
+  ignore = c(
+    '\\.Rmd$', '\\.Rmarkdown$', '_cache$', '\\.knit\\.md$', '\\.utf8\\.md$',
+    if (length(grep('/renv$', list.dirs()))) c('(^|/)renv$', 'renv\\.lock$')
+  )
   if (is.null(s <- config[['ignoreFiles']])) {
     # missing field: add one
     msg_todo('Set "ignoreFiles" to ', xfun::tojson(ignore))

R/render.R

@@ -103,7 +103,7 @@ list_rmds = function(
   # but include _index.Rmd/.md
   files = files[!grepl('^_', basename(files)) | grepl('^_index[.]', basename(files))]
   # exclude Rmd within packrat / renv library
-  files = files[!grepl('/(?:packrat|renv)/', files)]
+  files = files[!grepl('(^|/)(?:packrat|renv)/', files)]
   # do not allow special characters in filenames so dependency names are more
   # predictable, e.g. foo_files/
   if (check) bookdown:::check_special_chars(files)

R/utils.R

@@ -644,11 +644,8 @@ rmd_pattern = '[.][Rr](md|markdown)$'
 md_pattern  = '[.][Rr]?(md|markdown)$'
 
 # scan YAML metadata of all Rmd/md files
-scan_yaml = function(dir = 'content', warn = TRUE) {
-  if (missing(dir)) dir = switch(generator(),
-    hugo = 'content', jekyll = '.', hexo = 'source'
-  )
-  files = list_files(dir, md_pattern)
+scan_yaml = function(warn = TRUE) {
+  files = list_rmds(pattern = md_pattern)
   if (length(files) == 0) return(list())
   res = lapply(files, function(f) {
     yaml = fetch_yaml(f)
@@ -669,10 +666,10 @@ scan_yaml = function(dir = 'content', warn = TRUE) {
 
 # collect specific fields of all YAML metadata
 collect_yaml = function(
-  fields = c('categories', 'tags'), dir, uniq = TRUE, sort = TRUE
+  fields = c('categories', 'tags'), uniq = TRUE, sort = TRUE
 ) {
   res = list()
-  meta = scan_yaml(dir)
+  meta = scan_yaml()
   for (i in fields) {
     res[[i]] = unlist(lapply(meta, `[[`, i))
     if (sort) res[[i]] = sort2(res[[i]])