close #393

Author: ColinFay

NAMESPACE

@@ -98,6 +98,7 @@ importFrom(shiny,getShinyOption)
 importFrom(shiny,includeScript)
 importFrom(testthat,expect)
 importFrom(testthat,expect_equal)
+importFrom(testthat,expect_true)
 importFrom(testthat,quasi_label)
 importFrom(testthat,skip_on_appveyor)
 importFrom(testthat,skip_on_cran)

NEWS.md

@@ -18,6 +18,8 @@
 
 ## Bug fix
 
++ `add_` functions no longer append to file if it already exists (#393)
+
 + `config::get()` is no longer exported to prevent clashing with `base::get()`
 
 + fixed issue with favicon when package is built (#387)

R/add_deploy_helpers.R

@@ -10,39 +10,49 @@ add_rstudio_files <- function(
 ){
   service <- match.arg(service)
   where <- path(pkg, "app.R")
-  file_create( where )
 
-  write_there <- function(..., here = where){
-    write(..., here, append = TRUE)
-  }
 
-  use_build_ignore( path_file(where) )
-  use_build_ignore("rsconnect")
-  write_there("# Launch the ShinyApp (Do not remove this comment)")
-  write_there("# To deploy, run: rsconnect::deployApp()")
-  write_there("# Or use the blue button on top of this file")
-  write_there("")
-  write_there("pkgload::load_all(export_all = FALSE,helpers = FALSE,attach_testthat = FALSE)")
-  write_there("options( \"golem.app.prod\" = TRUE)")
-  write_there(
-    sprintf(
-      "%s::run_app() # add parameters here (if any)", 
-      getOption("golem.app.name", pkg_name())
+  if (!file_exists(where)){
+    file_create( where )
+    
+    write_there <- function(..., here = where){
+      write(..., here, append = TRUE)
+    }
+    
+    use_build_ignore( path_file(where) )
+    use_build_ignore("rsconnect")
+    write_there("# Launch the ShinyApp (Do not remove this comment)")
+    write_there("# To deploy, run: rsconnect::deployApp()")
+    write_there("# Or use the blue button on top of this file")
+    write_there("")
+    write_there("pkgload::load_all(export_all = FALSE,helpers = FALSE,attach_testthat = FALSE)")
+    write_there("options( \"golem.app.prod\" = TRUE)")
+    write_there(
+      sprintf(
+        "%s::run_app() # add parameters here (if any)", 
+        get_golem_name()
+      )
     )
-  )
-  #use_build_ignore(where)
-  x <- capture.output(use_package("pkgload"))
-  cat_created(where)
-  cat_line("To deploy, run:")
-  cat_bullet(darkgrey("rsconnect::deployApp()\n"))
-  cat_red_bullet(
-    sprintf(
-      "Note that you'll need to upload the whole package to %s",
-      service
+    
+    x <- capture.output(use_package("pkgload"))
+    cat_created(where)
+    cat_line("To deploy, run:")
+    cat_bullet(darkgrey("rsconnect::deployApp()\n"))
+    cat_red_bullet(
+      sprintf(
+        "Note that you'll need to upload the whole package to %s",
+        service
+      )
     )
-  )
+    
+    open_or_go_to(where, open)
+  } else {
+    file_already_there_dance(
+      where = where, 
+      open_file = open
+    )
+  }
 
-  open_or_go_to(where, open)
 }
 
 #' Add an app.R at the root of your package to deploy on RStudio Connect

R/add_files.R

@@ -46,26 +46,32 @@ add_js_file <- function(
     dir, sprintf("%s.js", name)
   )
 
-  file_create(where)
-  
-  if (with_doc_ready){
-    write_there <- function(...){
-      write(..., file = where, append = TRUE)
-    }
-    write_there("$( document ).ready(function() {")
-    write_there("  ")
-    write_there("});")
+  if (!file.exists(where)){
+    file_create(where)
+    
+    if (with_doc_ready){
+      write_there <- function(...){
+        write(..., file = where, append = TRUE)
+      }
+      write_there("$( document ).ready(function() {")
+      write_there("  ")
+      write_there("});")
+    } 
+    file_created_dance(
+      where, 
+      after_creation_message_js, 
+      pkg, 
+      dir, 
+      name,
+      open
+    )
+  } else {
+    file_already_there_dance(
+     where = where, 
+      open_file = open
+    )
   }
 
-  file_created_dance(
-    where, 
-    after_creation_message_js, 
-    pkg, 
-    dir, 
-    name,
-    open
-  )
-  
 }
 
 #' @export
@@ -105,26 +111,35 @@ add_js_handler <- function(
     dir, sprintf("%s.js", name)
   )
 
-  file_create(where)
-  
-  write_there <- function(...){
-    write(..., file = where, append = TRUE)
+  if (!file.exists(where)){
+    
+    file_create(where)
+    
+    write_there <- function(...){
+      write(..., file = where, append = TRUE)
+    }
+    
+    write_there("$( document ).ready(function() {")
+    write_there("  Shiny.addCustomMessageHandler('fun', function(arg) {")
+    write_there("  ")
+    write_there("  })")
+    write_there("});")
+    file_created_dance(
+      where, 
+      after_creation_message_js, 
+      pkg, 
+      dir, 
+      name,
+      open_file = open
+    )
+  } else {
+    file_already_there_dance(
+      where, 
+      open_file = open
+    )
   }
 
-  write_there("$( document ).ready(function() {")
-  write_there("  Shiny.addCustomMessageHandler('fun', function(arg) {")
-  write_there("  ")
-  write_there("  })")
-  write_there("});")
-  
-  file_created_dance(
-    where, 
-    after_creation_message_js, 
-    pkg, 
-    dir, 
-    name,
-    open
-  )
+  
 
 }
 
@@ -168,15 +183,23 @@ add_css_file <- function(
     )
   )
 
-  file_create(where)
-  file_created_dance(
-    where, 
-    after_creation_message_css, 
-    pkg, 
-    dir, 
-    name,
-    open
-  )
+  if (!file_exists(where)){
+    file_create(where)
+    file_created_dance(
+      where, 
+      after_creation_message_css, 
+      pkg, 
+      dir, 
+      name,
+      open
+    )
+  } else {
+    file_already_there_dance(
+      where = where, 
+      open_file = open
+    )
+  }
+  
 }
 
 
@@ -209,37 +232,42 @@ add_ui_server_files <- function(
   # UI
   where <- path( dir, "ui.R")
 
-  file_create(where)
-  
-  write_there <- function(...) write(..., file = where, append = TRUE)
-  
-  if (is.null(getOption('golem.pkg.name'))){
-    pkg <- pkgload::pkg_name()
+  if (!file_exists(where)){
+    file_create(where)
+    
+    write_there <- function(...) write(..., file = where, append = TRUE)
+    
+    pkg <- get_golem_name()
+    
+    write_there(
+      sprintf( "%s:::app_ui()", pkg )
+    )
+    
+    cat_created(where, "ui file")
   } else {
-    pkg <- getOption('golem.pkg.name')
+    cat_green_tick("UI file already exists.")
   }
 
-  write_there(
-    sprintf( "%s:::app_ui()", pkg )
-  )
-  
-  cat_created(where, "ui file")
-  
   # server
   where <- file.path(
     dir, "server.R"
   )
 
-  file_create(where)
-  
-  write_there <- function(...) write(..., file = where, append = TRUE)
 
-  write_there(
-    sprintf(
-      "%s:::app_server",
-      pkg
+  if (!file_exists(where)){
+    file_create(where)
+    
+    write_there <- function(...) write(..., file = where, append = TRUE)
+    
+    write_there(
+      sprintf(
+        "%s:::app_server",
+        pkg
+      )
     )
-  )
-  cat_created(where, "server file")
+    cat_created(where, "server file")
+  } else {
+    cat_green_tick("server file already exists.")
+  }
 
 }