Merge pull request #21 from jasenfinch/devel

v0.5.6
jasenfinch · Nov 16, 2021 · fc8b6a0 · fc8b6a0
2 parents 3075db0 + 612c1b8
commit fc8b6a0
Show file tree

Hide file tree

Showing 30 changed files with 64 additions and 39 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: projecttemplates
 Title: Project Templates for Reproducible Research and Analyses
-Version: 0.5.5
+Version: 0.5.6
 Authors@R: 
     person(given = "Jasen",
            family = "Finch",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+# projecttemplates 0.5.6
+
+* `.dockerignore` file is now added to output project to ignore the `_targets` directory if present.
+
+* Target build time and object size are now added to the output pipeline graph in `run.R`.
+
+* `targets` package options set by `tar_options_set()` now moved to `utils.R`.
+
 # projecttemplates 0.5.5
 
 * Fixed the use of user `renv` settings during initialisation to ensure that the user cache is used.

diff --git a/R/docker.R b/R/docker.R
@@ -84,4 +84,7 @@ docker run -v $(pwd):/home/{project_name_directory} {str_to_lower(project_name_d
 ```
        ") %>%
     write(file = str_c(project_directory,'/README.md'),append = TRUE)
+
+  '_targets' %>% 
+    write(file = str_c(project_directory,'/.dockerignore'))
 }
diff --git a/R/targets.R b/R/targets.R
@@ -58,11 +58,8 @@ targetsScript <- function(project_directory,type = projectTypes()){
 source("R/utils.R")
 
 "R/functions/" %>%
-  list.files(full.names = T) %>%
+  list.files(full.names = TRUE) %>%
   walk(source)                   
-
-tar_option_set(error = "continue")
-
 ')
 
   writeLines(template,str_c(project_directory,'_targets.R',sep = '/'))
@@ -159,7 +156,7 @@ targetsRun <- function(project_directory,renv = TRUE){
 {restore}
 targets::tar_make()
 
-pipeline_graph <- targets::tar_visnetwork()
+pipeline_graph <- targets::tar_visnetwork(label = c("time", "size"))
 visNetwork::visSave(pipeline_graph,
                     file = "exports/pipeline_graph.html")
 ')

diff --git a/R/utils.R b/R/utils.R
@@ -1,5 +1,5 @@
-#' Add R package loading utilities
-#' @description Add package utilites to a project directory.
+#' Add R package settings
+#' @description Add package utilities to a project directory such as package loading and settings.
 #' @param project_directory the project directory file path
 #' @param cran character vector of cran R package dependencies
 #' @param bioc character vector of bioconductor R package dependencies
@@ -52,6 +52,9 @@ utils <- function(project_directory = '.',
 ## Resolve conflicts
 # conflict_prefer(quiet = TRUE)
 
+## Targets options
+tar_option_set(error = "continue")
+
 ')
   writeLines(script,glue('{project_directory}/utils.R'))
 }

diff --git a/README.md b/README.md
@@ -1,9 +1,12 @@
 # projecttemplates
 
+<!-- badges: start -->
+[![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
 [![R build status](https://github.com/jasenfinch/projecttemplates/workflows/R-CMD-check/badge.svg)](https://github.com/jasenfinch/projecttemplates/actions)
 [![Codecov test coverage](https://codecov.io/gh/jasenfinch/projecttemplates/branch/master/graph/badge.svg)](https://codecov.io/gh/jasenfinch/projecttemplates?branch=master)
 [![license](https://img.shields.io/badge/license-GNU%20GPL%20v3.0-blue.svg)](https://github.com/jasenfinch/projecttemplates/blob/master/DESCRIPTION)
 [![GitHub release](https://img.shields.io/github/release/jasenfinch/projecttemplates.svg)](https://GitHub.com/jasenfinch/projecttemplates/releases/)
+<!-- badges: end -->
 
 Quick and simple generation of [targets](https://docs.ropensci.org/targets/)  and [renv](https://rstudio.github.io/renv/index.html) powered project templates for reproducible research and analyses.
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.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
@@ -2,7 +2,7 @@ pandoc: 2.11.4
 pkgdown: 1.6.1
 pkgdown_sha: ~
 articles: {}
-last_built: 2021-11-09T09:24Z
+last_built: 2021-11-16T09:26Z
 urls:
   reference: https://jasenfinch.github.io/projecttemplates//reference
   article: https://jasenfinch.github.io/projecttemplates//articles

diff --git a/docs/reference/createGit.html b/docs/reference/createGit.html
diff --git a/docs/reference/createGithub.html b/docs/reference/createGithub.html
diff --git a/docs/reference/docker.html b/docs/reference/docker.html
diff --git a/docs/reference/githubActions.html b/docs/reference/githubActions.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/output.html b/docs/reference/output.html
diff --git a/docs/reference/projectDirectory.html b/docs/reference/projectDirectory.html
diff --git a/docs/reference/projectSkeleton.html b/docs/reference/projectSkeleton.html
diff --git a/docs/reference/projectTypes.html b/docs/reference/projectTypes.html
diff --git a/docs/reference/readme.html b/docs/reference/readme.html
diff --git a/docs/reference/renvInitialise.html b/docs/reference/renvInitialise.html
diff --git a/docs/reference/targets.html b/docs/reference/targets.html
diff --git a/docs/reference/targetsPipeline.html b/docs/reference/targetsPipeline.html
diff --git a/docs/reference/targetsRun.html b/docs/reference/targetsRun.html
diff --git a/docs/reference/targetsScript.html b/docs/reference/targetsScript.html
diff --git a/docs/reference/template.html b/docs/reference/template.html
diff --git a/docs/reference/utils.html b/docs/reference/utils.html
diff --git a/man/utils.Rd b/man/utils.Rd