Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rdev 1.9.6 #182

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: rdev
Title: R Development Tools
Version: 1.9.5
Version: 1.9.6
Authors@R:
person("John", "Benninghoff", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-6230-4742"))
Expand Down Expand Up @@ -58,4 +58,4 @@ Config/testthat/edition: 3
Encoding: UTF-8
Language: en-US
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.0
RoxygenNote: 7.3.1
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# rdev 1.9.6

* Add new rdev hex sticker logo from [stickers](https://jabenninghoff.github.io/stickers/) to `man/figures/logo.png` per [roxygen2](https://github.com/r-lib/roxygen2/blob/db4dd9a4de2ce6817c17441d481cf5d03ef220e2/R/object-defaults.R#L43) and to `README.Rmd` per [pkgdown](https://github.com/r-lib/pkgdown/blob/548a9493b72ff93d3ed8392d4ad30b77d8b15fa5/README.Rmd#L15)

* Fixed bugs in `quickstart` functions

# rdev 1.9.5

* Updated TODO
Expand Down
16 changes: 12 additions & 4 deletions R/init.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#' 1. Manually update the Title and Description fields in the `DESCRIPTION` file without committing
#' 1. Run [setup_analysis()] or [setup_rdev()] to configure the package as an analysis package or
#' rdev package respectively.
#' 1. Manually update `.gitignore`: remove the `docs/` exclusion and add line breaks
#'
#' After this, the package configuration is complete and ready for development.
#' @name quickstart
Expand Down Expand Up @@ -57,10 +58,11 @@
#' `setup_analysis()` will stop if [rlang::is_interactive()] is `FALSE`, and will run [open_files()]
#' if running in RStudio.
#'
#' @inheritParams use_analysis_package
#' @seealso [quickstart]
#'
#' @export
setup_analysis <- function() {
setup_analysis <- function(use_quarto = TRUE) {
if (!rlang::is_interactive()) stop("setup_analysis() must be run interactively")

continue <- utils::askYesNo(
Expand All @@ -79,12 +81,18 @@
# update documentation since quickstart directs user to manually update Title and Description
devtools::document()

writeLines("use_analysis_package()...")
use_analysis_package()
if (use_quarto) {
use_msg <- "use_analysis_package()"
} else {
use_msg <- "use_analysis_package(use_quarto = FALSE)"

Check warning on line 87 in R/init.R

View check run for this annotation

Codecov / codecov/patch

R/init.R#L87

Added line #L87 was not covered by tests
}

writeLines(paste0(use_msg, "..."))
use_analysis_package(use_quarto = use_quarto)

writeLines("Committing...")
gert::git_add(".")
gert::git_commit("rdev::use_analysis_package()")
gert::git_commit(paste0("rdev::", use_msg))

writeLines("use_spelling()...")
use_spelling()
Expand Down
3 changes: 2 additions & 1 deletion R/setup.R
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,8 @@ use_rdev_package <- function(quiet = TRUE) {
sort_rbuildignore()

# run renv::init() last to restart the session
renv::init()
# specify repos to use CRAN mirror instead of Posit Public Package Manager
renv::init(repos = "https://cloud.r-project.org")
}

#' Use Analysis Package Layout
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ knitr::opts_chunk$set(
)
```

# rdev
# rdev <img src="man/figures/logo.png" align="right" alt="logo" width="120" />

<!-- badges: start -->
[![R-CMD-check](https://github.com/jabenninghoff/rdev/workflows/R-CMD-check/badge.svg)](https://github.com/jabenninghoff/rdev/actions)
Expand Down
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

<!-- README.md is generated from README.Rmd. Please edit that file -->

# rdev
# rdev <img src="man/figures/logo.png" align="right" alt="logo" width="120" />

<!-- badges: start -->

Expand Down Expand Up @@ -219,20 +219,20 @@ ci()
#> * creating vignettes ... OK
#> * checking for LF line-endings in source and make files and shell scripts
#> * checking for empty or unneeded directories
#> * building ‘rdev_1.9.5.tar.gz’
#> * building ‘rdev_1.9.6.tar.gz’
#>
#> ── R CMD check ─────────────────────────────────────────────────────────────────
#> * using log directory ‘/private/var/folders/vn/cw5f9gws42v9m8mdsds_zbl00000gp/T/RtmptpvjbW/filef82a1a8ae8ce/rdev.Rcheck’
#> * using log directory ‘/private/var/folders/vn/cw5f9gws42v9m8mdsds_zbl00000gp/T/RtmpKYDJCt/filecf3c2d154b54/rdev.Rcheck’
#> * using R version 4.3.2 (2023-10-31)
#> * using platform: aarch64-apple-darwin20 (64-bit)
#> * R was compiled by
#> Apple clang version 14.0.0 (clang-1400.0.29.202)
#> GNU Fortran (GCC) 12.2.0
#> * running under: macOS Ventura 13.6.3
#> * running under: macOS Ventura 13.6.4
#> * using session charset: UTF-8
#> * using option ‘--no-manual’
#> * checking for file ‘rdev/DESCRIPTION’ ... OK
#> * this is package ‘rdev’ version ‘1.9.5
#> * this is package ‘rdev’ version ‘1.9.6
#> * package encoding: UTF-8
#> * checking package namespace information ... OK
#> * checking package dependencies ... OK
Expand Down Expand Up @@ -290,10 +290,9 @@ ci()
#> NONE
#> * checking re-building of vignette outputs ... OK
#> * DONE
#>
#> Status: OK
#> ── R CMD check results ───────────────────────────────────────── rdev 1.9.5 ────
#> Duration: 32s
#> ── R CMD check results ───────────────────────────────────────── rdev 1.9.6 ────
#> Duration: 30s
#>
#> 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
```
11 changes: 9 additions & 2 deletions docs/404.html

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

6 changes: 3 additions & 3 deletions docs/LICENSE-text.html

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

Loading
Loading