jabenninghoff · jabenninghoff · May 8, 2024 · May 8, 2024 · May 8, 2024 · May 8, 2024
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rdev
 Title: R Development Tools
-Version: 1.10.9
+Version: 1.10.10
 Authors@R:
     person("John", "Benninghoff", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-6230-4742"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# rdev 1.10.10
+
+* Bug fixes
+
 # rdev 1.10.9
 
 * Add support for single URL in DESCRIPTION

diff --git a/R/setup.R b/R/setup.R
@@ -591,7 +591,7 @@ use_analysis_package <- function(use_quarto = TRUE, prompt = FALSE) {
     fields <- list(
       repo = github_repo$repo,
       description = desc::desc_get_field("Description"),
-      site_url = ifelse(!is.na(urls[2]), urls[1], "~"),
+      site_url = ifelse(!is.na(urls[2]), urls[1], "."),
       repo_url = ifelse(!is.na(urls[2]), urls[2], urls[1]),
       year = format(Sys.Date(), "%Y"),
       author = paste(desc::desc_get_author()$given, desc::desc_get_author()$family)
@@ -604,7 +604,7 @@ use_analysis_package <- function(use_quarto = TRUE, prompt = FALSE) {
   } else {
     if (!fs::file_exists("pkgdown/_base.yml")) {
       yaml::write_yaml(
-        list(url = ifelse(!is.na(urls[2]), urls[1], "~"), template = list(bootstrap = 5L)),
+        list(url = ifelse(!is.na(urls[2]), urls[1], "."), template = list(bootstrap = 5L)),
         "pkgdown/_base.yml"
       )
     }
@@ -661,7 +661,7 @@ use_rdev_pkgdown <- function(config_file = "_pkgdown.yml", destdir = "docs") {
   usethis::use_template("extra.css", save_as = "pkgdown/extra.css", package = "rdev")
   pkg <- yaml::read_yaml(config_file)
   urls <- desc::desc_get_urls()
-  pkg$url <- ifelse(!is.na(urls[2]), urls[1], "~")
+  pkg$url <- ifelse(!is.na(urls[2]), urls[1], ".")
   # workaround for RStudio race condition
   if (rlang::is_interactive()) {
     writeLines(paste0("\nupdating ", config_file, "..."), sep = "")

diff --git a/R/to_document.R b/R/to_document.R
@@ -142,14 +142,21 @@
   urls <- desc::desc_get_urls()
   if (length(urls) < 1) {
     stop("no URL found in DESCRIPTION")
+  } else if (length(urls) == 1) {
+    # assume urls[1] is repository URL, no GitHub Pages URL
+    base_url <- "."
+    ext <- ".Rmd"
+  } else {
+    # assume urls[1] is GitHub Pages URL, urls[2] is repository URL
+    base_url <- urls[1]
+    ext <- ".html"
   }
-  base_url <- ifelse(!is.na(urls[2]), urls[1], "~")
   # set separator to "/" only if first URL doesn't end with "/"
   sep <- ifelse(endsWith(base_url, "/"), "", "/")
-  # add analysis to path if using Quarto
-  sep <- ifelse(quarto, paste0(sep, "analysis/"), sep)
+  # add analysis to path if using Quarto or no GitHub Pages URL
+  sep <- ifelse(quarto || length(urls) == 1, paste0(sep, "analysis/"), sep)
   gh_url <- paste0(
-    base_url, sep, fs::path_ext_remove(fs::path_file(file_path)), ".html"
+    base_url, sep, fs::path_ext_remove(fs::path_file(file_path)), ext
   )
 
   list(title = yaml$title, url = gh_url, date = yaml$date, description = notebook[desc_line])

diff --git a/README.md b/README.md
@@ -230,10 +230,10 @@ ci()
 #> * creating vignettes ... OK
 #> * checking for LF line-endings in source and make files and shell scripts
 #> * checking for empty or unneeded directories
-#> * building ‘rdev_1.10.9.tar.gz’
+#> * building ‘rdev_1.10.10.tar.gz’
 #> 
 #> ── R CMD check ─────────────────────────────────────────────────────────────────
-#> * using log directory ‘/private/var/folders/vn/cw5f9gws42v9m8mdsds_zbl00000gp/T/Rtmp9PKibi/file10b015c59645a/rdev.Rcheck’
+#> * using log directory ‘/private/var/folders/vn/cw5f9gws42v9m8mdsds_zbl00000gp/T/RtmpLddd7C/file16ec935d24789/rdev.Rcheck’
 #> * using R version 4.4.0 (2024-04-24)
 #> * using platform: aarch64-apple-darwin20
 #> * R was compiled by
@@ -243,7 +243,7 @@ ci()
 #> * using session charset: UTF-8
 #> * using option ‘--no-manual’
 #> * checking for file ‘rdev/DESCRIPTION’ ... OK
-#> * this is package ‘rdev’ version ‘1.10.9’
+#> * this is package ‘rdev’ version ‘1.10.10’
 #> * package encoding: UTF-8
 #> * checking package namespace information ... OK
 #> * checking package dependencies ... OK
@@ -298,8 +298,8 @@ ci()
 #> * DONE
 #> 
 #> Status: OK
-#> ── R CMD check results ──────────────────────────────────────── rdev 1.10.9 ────
-#> Duration: 33.5s
+#> ── R CMD check results ─────────────────────────────────────── rdev 1.10.10 ────
+#> Duration: 32.8s
 #> 
 #> 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 ```
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/TODO.html b/docs/TODO.html
diff --git a/docs/articles/analysis-package-layout.html b/docs/articles/analysis-package-layout.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/rdev.html b/docs/articles/rdev.html
diff --git a/docs/articles/style-guide.html b/docs/articles/style-guide.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -5,7 +5,7 @@ articles:
   analysis-package-layout: analysis-package-layout.html
   rdev: rdev.html
   style-guide: style-guide.html
-last_built: 2024-05-08T19:30Z
+last_built: 2024-05-08T21:05Z
 urls:
   reference: https://jabenninghoff.github.io/rdev/reference
   article: https://jabenninghoff.github.io/rdev/articles

diff --git a/docs/reference/build_analysis_site.html b/docs/reference/build_analysis_site.html
diff --git a/docs/reference/build_quarto_site.html b/docs/reference/build_quarto_site.html
diff --git a/docs/reference/build_rdev_site.html b/docs/reference/build_rdev_site.html
diff --git a/docs/reference/check_renv.html b/docs/reference/check_renv.html
diff --git a/docs/reference/ci.html b/docs/reference/ci.html
diff --git a/docs/reference/create_github_repo.html b/docs/reference/create_github_repo.html
diff --git a/docs/reference/deps_check.html b/docs/reference/deps_check.html
diff --git a/docs/reference/get_license.html b/docs/reference/get_license.html
diff --git a/docs/reference/get_release.html b/docs/reference/get_release.html
diff --git a/docs/reference/html_url_check.html b/docs/reference/html_url_check.html