Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/rostools/prodigenr
Browse files Browse the repository at this point in the history
  • Loading branch information
lwjohnst86 committed Nov 9, 2024
2 parents 7c7ca0e + 1512c62 commit af46f97
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ Imports:
withr,
rlang,
cli,
whisker
whisker,
gert
Suggests:
testthat,
knitr,
gert
knitr
VignetteBuilder: knitr
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.1
RoxygenNote: 7.3.2
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
- It isn't always useful to have the report created when the project
is setup, so adding the report via `create_report()` is removed from
`project_setup()` (#142).
- Move `gert` to imports, since it makes more sense that it should be
a hard dependency as the project is an opinionated project creator (#145).

# prodigenr 0.6.2

Expand Down
10 changes: 1 addition & 9 deletions R/setup_project.R
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,6 @@ setup_project <-
#' @seealso [setup_project()] for starting the project.
#'
setup_with_git <- function() {
if (!requireNamespace("gert", quietly = TRUE)) {
cli::cli_abort(c(
"This function relies on the gert package, please install it and then run the function again.",
"i" = "Install with: {.code install.packages('gert')}"
)
)
}

if (!is_rproj_folder()) {
cli::cli_abort(c("The folder does not contain an {.val .Rproj} file.",
"i" = "Please use this function while in the project created from {.code prodigenr::setup_project().}"
Expand All @@ -81,7 +73,7 @@ setup_with_git <- function() {

gert::git_init()
set_git_ignore_files()
cli::cli_alert_info("You'll need to restart RStudio to see the Git pane.")
cli::cli_alert_info("You might need to restart RStudio to see the Git pane.")
return(invisible(NULL))
}

Expand Down
2 changes: 1 addition & 1 deletion man/setup_with_git.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit af46f97

Please sign in to comment.