Merge pull request #23 from jasenfinch/devel

v0.5.8
jasenfinch · Jan 7, 2022 · 4ad7bea · 4ad7bea
2 parents 617107e + aedd732
commit 4ad7bea
Show file tree

Hide file tree

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

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+# projecttemplates 0.5.8
+
+* The `renv` directory is now included in the generated `.dockerignore` file if argument `renv = TRUE`.
+
+* The RStudio project file is now created even if the project template is generated outside of RStudio.
+
+* Errors encountered during the retrieval of the git signature are now reported during git initialisation.
+
 # projecttemplates 0.5.7
 
 * Script header added to generated `R/utils.R` file.

diff --git a/R/docker.R b/R/docker.R
@@ -85,8 +85,21 @@ 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
-data
-exports' %>% 
+  dockerIgnore(project_directory,
+               renv)
+}
+
+dockerIgnore <- function(project_directory,renv = TRUE){
+
+  ignores <- c('_targets',
+               'data',
+               'exports')
+
+  if (isTRUE(renv)){
+    ignores <- c(ignores,
+                 'renv')
+  }
+
+  ignores %>% 
     write(file = str_c(project_directory,'/.dockerignore'))
 }
diff --git a/R/git.R b/R/git.R
@@ -27,9 +27,11 @@ createGit <- function(project_directory,type,ignore = c('.Rhistory','.Rproj.user
   git_add('.*',repo = project_directory)
   git_add('*',repo = project_directory)
 
-  git_signature_status <- try(git_signature_default(),silent = TRUE)
+  git_signature_status <- try(git_signature_default(repo = project_directory))
 
-  if (class(git_signature_status) == 'character') {
+  if (class(git_signature_status) == 'try-error') {
+    message('Errors encountered retrieving git credentials. Skipping initial commit.')
+  } else {
     git_commit('Initial commit',repo = project_directory) 
   }
 }
diff --git a/R/skeleton.R b/R/skeleton.R
@@ -40,9 +40,7 @@ projectSkeleton <- function(project_directory,force = FALSE){
 
   dir.create(project_directory,recursive = TRUE)
 
-  if (isAvailable()) {
-    initializeProject(project_directory)
-  }
+  rsProject(project_directory)
 
   dir.create(str_c(project_directory,'R','functions',sep = '/'),recursive = TRUE)
 
@@ -52,4 +50,28 @@ projectSkeleton <- function(project_directory,force = FALSE){
 
   dir.create(str_c(project_directory,'exports',sep = '/'))
 
+}
+
+rsProject <- function(project_directory){
+  if (isAvailable()) {
+    initializeProject(project_directory)
+  } else {
+    'Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX' %>% 
+      write(file = str_c(project_directory,
+                       '/',
+                       basename(project_directory),
+                       '.Rproj'))
+  }
 }
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: 2.0.1
 pkgdown_sha: ~
 articles: {}
-last_built: 2021-12-17T12:11Z
+last_built: 2022-01-07T15:55Z
 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