Skip to content

Commit

Permalink
Created save_session_info() function for saving sessioninfo::session_…
Browse files Browse the repository at this point in the history
…info() to a text file. Created export_project() for zipping project folders. Improvements to default .Rmd files. Code improvements
  • Loading branch information
Krieger committed May 23, 2019
1 parent 57babb1 commit 426621c
Show file tree
Hide file tree
Showing 58 changed files with 152,611 additions and 353 deletions.
19 changes: 10 additions & 9 deletions .Rbuildignore
@@ -1,9 +1,10 @@
^CRAN-RELEASE$
^LICENSE\.md$
^.*\.Rproj$
^\.Rproj\.user$
^manuscript$
^development_code$
^cran-comments\.md$
^README\.Rmd$
^README-.*\.png$
^CRAN-RELEASE$
^LICENSE\.md$
^.*\.Rproj$
^\.Rproj\.user$
^manuscript$
^development_code$
^cran-comments\.md$
^README\.Rmd$
^README-.*\.png$
^demonstration$
7 changes: 5 additions & 2 deletions DESCRIPTION
@@ -1,6 +1,6 @@
Package: projects
Title: A Project Infrastructure for Researchers
Version: 1.2.0.9000
Version: 1.3.0
Authors@R:
c(person(given = "Nik",
family = "Krieger",
Expand Down Expand Up @@ -29,8 +29,10 @@ Imports:
readr (>= 1.1.1),
rlang (>= 0.3.4),
rstudioapi (>= 0.7),
sessioninfo (>= 1.1.1),
stringr (>= 1.3.1),
tibble (>= 2.0.1)
tibble (>= 2.0.1),
zip (>= 2.0.2)
Suggests:
here (>= 0.1),
tidyverse (>= 1.2.1)
Expand All @@ -48,6 +50,7 @@ Collate:
'header.R'
'metadata_manipulation.R'
'projects.R'
'reproducibility.R'
'setup.R'
'update.R'
'utilities.R'
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Expand Up @@ -29,6 +29,7 @@ export(delete_project)
export(edit_affiliation)
export(edit_author)
export(edit_project)
export(export_project)
export(header)
export(ideas)
export(manuscripts)
Expand All @@ -46,6 +47,7 @@ export(projects_folder)
export(rename_folder)
export(reorder_affiliations)
export(reorder_authors)
export(save_session_info)
export(setup_projects)
export(update_metadata)
importFrom(magrittr,"%>%")
Expand Down
11 changes: 11 additions & 0 deletions NEWS.md
@@ -1,9 +1,20 @@

# projects 1.3.0

## Major updates
- `save_session_info()` function for saving `sessioninfo::session_info()` to a text file.
- `export_project()` for zipping project folders

## Minor updates
- Improvements to default .Rmd files.
- Code improvements

# projects 1.2.0.9000

## Major updates
- Moved all header material to YAML when generating 01_protocol.Rmd and 04_report.Rmd.
- YAML Output options no longer written in function; rather, they are expected to already be in the templates.
- Addition of .docx style template.

## Minor updates
- Other minor tweaks to default .Rmd files.
Expand Down
4 changes: 2 additions & 2 deletions R/class-projects_stage.R
Expand Up @@ -146,13 +146,13 @@ validate_stage <- function(stage, na.ok = TRUE, null.ok = FALSE) {
#' @rdname projects_stage
#' @export
as.integer.projects_stage <- function(x, ...) {
as.integer(substr(unclass(x), 1, 1), ...)
as.integer(substr(unclass(x), 1L, 1L), ...)
}

#' @rdname projects_stage
#' @export
as.double.projects_stage <- function(x, ...) {
as.double(substr(unclass(x), 1, 1), ...)
as.double(substr(unclass(x), 1L, 1L), ...)
}

#' @rdname projects_stage
Expand Down
4 changes: 2 additions & 2 deletions R/file_management.R
Expand Up @@ -470,9 +470,9 @@ open_project <- function(project, new_session = FALSE, archived = FALSE) {
fs::dir_ls() %>%
`[`(fs::path_ext(.) == "Rproj")

if (length(Rproj_path) != 1) {
if (length(Rproj_path) != 1L) {

if (length(Rproj_path) == 0) {
if (length(Rproj_path) == 0L) {

user_prompt(
msg =
Expand Down
4 changes: 2 additions & 2 deletions R/getters.R
Expand Up @@ -13,7 +13,7 @@
#'
#' If it can't find a directory with that path, it returns this string:
#'
#' \code{"projects" folder not found. Please run \link{setup_projects}()}
#' \code{projects folder not found. Please run \link{setup_projects}()}
#'
#' @examples
#' projects_folder()
Expand All @@ -31,7 +31,7 @@ get_p_path <- function(error = TRUE) {
path
}
else {
notice <- '"projects" folder not found. Please run setup_projects()'
notice <- 'projects folder not found. Please run setup_projects()'
if (error) {
stop(notice)
}
Expand Down
1 change: 0 additions & 1 deletion R/metadata_manipulation.R
@@ -1,6 +1,5 @@

make_rds_path <- function(rds_name, p_path = get_p_path()) {

fs::path(p_path, ".metadata", rds_name, ext = "rds")
}

Expand Down

0 comments on commit 426621c

Please sign in to comment.