master is now the new "dev" branch

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: golem
 Title: A Framework for Robust Shiny Applications
-Version: 0.5.1
+Version: 0.5.1.9005
 Authors@R: c(
     person("Colin", "Fay", , "contact@colinfay.me", role = c("cre", "aut"),
            comment = c(ORCID = "0000-0001-7343-1846")),
@@ -28,7 +28,6 @@ Depends:
 Imports:
     attempt (>= 0.3.0),
     config,
-    here,
     htmltools,
     rlang (>= 1.0.0),
     shiny (>= 1.5.0),
@@ -69,7 +68,6 @@ Suggests:
 VignetteBuilder:
     knitr
 Config/testthat/edition: 3
-Config/testthat/parallel: true
 Encoding: UTF-8
 Language: en-US
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -1,5 +1,26 @@
 > Notes: the # between parenthesis refers to the related issue on GitHub, and the @ refers to an external contributor solving this issue.
 
+
+# golem 0.5.1 to 0.6.0
+
+## Breaking change
+
+- Creating a `golem` doesn't call `set_here()` nor `usethis::create_project()` anymore. It used to be because we wanted to be able to use `here::here()`, but the function should be able to find its way based using `DESCRIPTION`. It gives a lighter implementation of golem projects creation as it doesn't mess up with where `here()` is anymore.
+
+- The `add_*_files` and `use_*_files` now fail when:
+  - The directory where the user tries to add the file doesn't exist. `{golem}` used to try to create the directory but that's not the function job — use_*_file functions should only be there to add file (Singe responsabily  )
+  - The file that the user tries to create already exists
+
+- Creating a golem with `create_golem(overwrite = TRUE)` will now __delete the old folder__ and replace with the golem skeleton.
+
+## Bug fix
+
+- Removing the comments on golem creation didn't work fully, this has been fixed.
+
+## Internal changes
+
+- Full refactoring of the `add_*_files` and `use_*_files` functions that now all share the same behavior
+
 # golem 0.5.1
 
 * Hotfixing a bug with utils_download_file (#1168)

R/add_dockerfiles.R

@@ -83,25 +83,26 @@ talk_once <- function(.f, msg = "") {
 #' }
 #' @return The `{dockerfiler}` object, invisibly.
 add_dockerfile <- function(
-    path = "DESCRIPTION",
-    output = "Dockerfile",
-    pkg = get_golem_wd(),
-    from = paste0(
-      "rocker/verse:",
-      R.Version()$major,
-      ".",
-      R.Version()$minor
-    ),
-    as = NULL,
-    port = 80,
-    host = "0.0.0.0",
-    sysreqs = TRUE,
-    repos = c(CRAN = "https://cran.rstudio.com/"),
-    expand = FALSE,
-    open = TRUE,
-    update_tar_gz = TRUE,
-    build_golem_from_source = TRUE,
-    extra_sysreqs = NULL) {
+  path = "DESCRIPTION",
+  output = "Dockerfile",
+  pkg = get_golem_wd(),
+  from = paste0(
+    "rocker/verse:",
+    R.Version()$major,
+    ".",
+    R.Version()$minor
+  ),
+  as = NULL,
+  port = 80,
+  host = "0.0.0.0",
+  sysreqs = TRUE,
+  repos = c(CRAN = "https://cran.rstudio.com/"),
+  expand = FALSE,
+  open = TRUE,
+  update_tar_gz = TRUE,
+  build_golem_from_source = TRUE,
+  extra_sysreqs = NULL
+) {
   add_dockerfile_(
     path = path,
     output = output,
@@ -122,26 +123,26 @@ add_dockerfile <- function(
 
 add_dockerfile_ <- talk_once(
   function(
-      path = "DESCRIPTION",
-      output = "Dockerfile",
-      pkg = get_golem_wd(),
-      from = paste0(
-        "rocker/verse:",
-        R.Version()$major,
-        ".",
-        R.Version()$minor
-      ),
-      as = NULL,
-      port = 80,
-      host = "0.0.0.0",
-      sysreqs = TRUE,
-      repos = c(CRAN = "https://cran.rstudio.com/"),
-      expand = FALSE,
-      open = TRUE,
-      update_tar_gz = TRUE,
-      build_golem_from_source = TRUE,
-      extra_sysreqs = NULL
-) {
+  path = "DESCRIPTION",
+  output = "Dockerfile",
+  pkg = get_golem_wd(),
+  from = paste0(
+    "rocker/verse:",
+    R.Version()$major,
+    ".",
+    R.Version()$minor
+  ),
+  as = NULL,
+  port = 80,
+  host = "0.0.0.0",
+  sysreqs = TRUE,
+  repos = c(CRAN = "https://cran.rstudio.com/"),
+  expand = FALSE,
+  open = TRUE,
+  update_tar_gz = TRUE,
+  build_golem_from_source = TRUE,
+  extra_sysreqs = NULL
+  ) {
     where <- fs_path(pkg, output)
 
     usethis_use_build_ignore(
@@ -190,23 +191,24 @@ add_dockerfile_ <- talk_once(
 #' @export
 #' @rdname dockerfiles
 add_dockerfile_shinyproxy <- function(
-    path = "DESCRIPTION",
-    output = "Dockerfile",
-    pkg = get_golem_wd(),
-    from = paste0(
-      "rocker/verse:",
-      R.Version()$major,
-      ".",
-      R.Version()$minor
-    ),
-    as = NULL,
-    sysreqs = TRUE,
-    repos = c(CRAN = "https://cran.rstudio.com/"),
-    expand = FALSE,
-    open = TRUE,
-    update_tar_gz = TRUE,
-    build_golem_from_source = TRUE,
-    extra_sysreqs = NULL) {
+  path = "DESCRIPTION",
+  output = "Dockerfile",
+  pkg = get_golem_wd(),
+  from = paste0(
+    "rocker/verse:",
+    R.Version()$major,
+    ".",
+    R.Version()$minor
+  ),
+  as = NULL,
+  sysreqs = TRUE,
+  repos = c(CRAN = "https://cran.rstudio.com/"),
+  expand = FALSE,
+  open = TRUE,
+  update_tar_gz = TRUE,
+  build_golem_from_source = TRUE,
+  extra_sysreqs = NULL
+) {
   add_dockerfile_shinyproxy_(
     path = path,
     output = output,
@@ -225,23 +227,24 @@ add_dockerfile_shinyproxy <- function(
 
 add_dockerfile_shinyproxy_ <- talk_once(
   function(
-      path = "DESCRIPTION",
-      output = "Dockerfile",
-      pkg = get_golem_wd(),
-      from = paste0(
-        "rocker/verse:",
-        R.Version()$major,
-        ".",
-        R.Version()$minor
-      ),
-      as = NULL,
-      sysreqs = TRUE,
-      repos = c(CRAN = "https://cran.rstudio.com/"),
-      expand = FALSE,
-      open = TRUE,
-      update_tar_gz = TRUE,
-      build_golem_from_source = TRUE,
-      extra_sysreqs = NULL) {
+  path = "DESCRIPTION",
+  output = "Dockerfile",
+  pkg = get_golem_wd(),
+  from = paste0(
+    "rocker/verse:",
+    R.Version()$major,
+    ".",
+    R.Version()$minor
+  ),
+  as = NULL,
+  sysreqs = TRUE,
+  repos = c(CRAN = "https://cran.rstudio.com/"),
+  expand = FALSE,
+  open = TRUE,
+  update_tar_gz = TRUE,
+  build_golem_from_source = TRUE,
+  extra_sysreqs = NULL
+  ) {
     where <- fs_path(pkg, output)
 
     usethis_use_build_ignore(output)
@@ -282,23 +285,24 @@ add_dockerfile_shinyproxy_ <- talk_once(
 #' @export
 #' @rdname dockerfiles
 add_dockerfile_heroku <- function(
-    path = "DESCRIPTION",
-    output = "Dockerfile",
-    pkg = get_golem_wd(),
-    from = paste0(
-      "rocker/verse:",
-      R.Version()$major,
-      ".",
-      R.Version()$minor
-    ),
-    as = NULL,
-    sysreqs = TRUE,
-    repos = c(CRAN = "https://cran.rstudio.com/"),
-    expand = FALSE,
-    open = TRUE,
-    update_tar_gz = TRUE,
-    build_golem_from_source = TRUE,
-    extra_sysreqs = NULL) {
+  path = "DESCRIPTION",
+  output = "Dockerfile",
+  pkg = get_golem_wd(),
+  from = paste0(
+    "rocker/verse:",
+    R.Version()$major,
+    ".",
+    R.Version()$minor
+  ),
+  as = NULL,
+  sysreqs = TRUE,
+  repos = c(CRAN = "https://cran.rstudio.com/"),
+  expand = FALSE,
+  open = TRUE,
+  update_tar_gz = TRUE,
+  build_golem_from_source = TRUE,
+  extra_sysreqs = NULL
+) {
   add_dockerfile_heroku_(
     path = path,
     output = output,
@@ -317,23 +321,24 @@ add_dockerfile_heroku <- function(
 
 add_dockerfile_heroku_ <- talk_once(
   function(
-      path = "DESCRIPTION",
-      output = "Dockerfile",
-      pkg = get_golem_wd(),
-      from = paste0(
-        "rocker/verse:",
-        R.Version()$major,
-        ".",
-        R.Version()$minor
-      ),
-      as = NULL,
-      sysreqs = TRUE,
-      repos = c(CRAN = "https://cran.rstudio.com/"),
-      expand = FALSE,
-      open = TRUE,
-      update_tar_gz = TRUE,
-      build_golem_from_source = TRUE,
-      extra_sysreqs = NULL) {
+  path = "DESCRIPTION",
+  output = "Dockerfile",
+  pkg = get_golem_wd(),
+  from = paste0(
+    "rocker/verse:",
+    R.Version()$major,
+    ".",
+    R.Version()$minor
+  ),
+  as = NULL,
+  sysreqs = TRUE,
+  repos = c(CRAN = "https://cran.rstudio.com/"),
+  expand = FALSE,
+  open = TRUE,
+  update_tar_gz = TRUE,
+  build_golem_from_source = TRUE,
+  extra_sysreqs = NULL
+  ) {
     where <- fs_path(pkg, output)
 
     usethis_use_build_ignore(output)

R/add_dockerfiles_renv.R

@@ -416,9 +416,7 @@ add_dockerfile_with_renv_heroku <- function(
     "README"
   )
 
-  write_there <- function(...) {
-    write(..., file = readme_output, append = TRUE)
-  }
+  write_there <- write_there_builder(readme_output)
 
   write_there("From your command line, run:\n")