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

Dev #1077

Closed
wants to merge 119 commits into from
Closed

Dev #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
2637ab1
deploy: CRAN submission
ColinFay Mar 10, 2023
0301565
feat: is_golem tries to guess if current folder is a golem based app
ColinFay Mar 14, 2023
1439d56
test: adding a test to is_golem
ColinFay Mar 15, 2023
6b764eb
chore: version bump & news update
ColinFay Mar 15, 2023
60ec1f4
fix: rule number 1, it's always a typo
ColinFay Mar 15, 2023
487dedf
deploy: forgot to add the new fun to pkgdown
ColinFay Mar 17, 2023
7917d2b
Fix 987
ilyaZar Mar 24, 2023
c9dbc80
Add function body upon call to add_fct
ilyaZar Mar 24, 2023
97b31e6
Change to lean function body
ilyaZar Mar 24, 2023
00d6327
hotfix: no param on function when calling add_fct
ColinFay Mar 29, 2023
22a896a
chore: version bump & news update
ColinFay Mar 29, 2023
c99bbb2
fix: stick to tidyverse style for new modules
ni2scmn Mar 31, 2023
6d44c61
Add -it flag when run docker so ^C still works
ivokwee Mar 12, 2023
08520c2
chore: version bump & news update
ColinFay Apr 4, 2023
aa87e62
feat: add script for what to do after merge
ColinFay Apr 4, 2023
c5fbc5c
Add use_readme_rmd()
ilyaZar Mar 29, 2023
11eeea2
Run grkstyle::grk_style_file("R/use_readme.R") on the file
ilyaZar Mar 29, 2023
d92d6f3
feat: implement use_readme_rmd
ColinFay Apr 4, 2023
446b149
fix: typo in doc
ColinFay Apr 4, 2023
7fba280
chore: version bump & news update
ColinFay Apr 4, 2023
b44502c
Merge branch 'dev' into master
ColinFay Apr 4, 2023
29d15c1
Merge branch 'ni2scmn-master' into dev
ColinFay Apr 4, 2023
7ec50d0
chore: version bump & news update
ColinFay Apr 4, 2023
49de774
docs: improve explanation comments in 01_start
ilyaZar Apr 2, 2023
c318e24
chore: version bump & news update
ColinFay Apr 4, 2023
4386a7c
refactor: add use_git_remote to() to dev/01_start.R
ilyaZar Apr 4, 2023
415f505
chore: script for bumping version and all
ColinFay Apr 4, 2023
879ebdf
style: indentation
ColinFay Apr 4, 2023
73a3a17
chore: version bump & news update
ColinFay Apr 4, 2023
3cb6494
fix: improve code coverage for R/golem_utils_ui.R
ilyaZar Apr 2, 2023
e609c52
fix: make code coverage of R/golem_utils_ui.R 100%
ilyaZar Apr 2, 2023
4c6885a
fix: make code coverage of R/golem_utils_server.R 100%
ilyaZar Apr 2, 2023
9cfa0c6
style: formatting
ColinFay Apr 4, 2023
90c09d9
chore: version bump & news update
ColinFay Apr 4, 2023
5ad4e21
Fix 997 in two ways
ilyaZar Mar 24, 2023
886e9f9
feat: adding an alert info
ColinFay May 16, 2023
bea0407
feat: correct use of the mod_remove in add_module
ColinFay May 16, 2023
72efe62
chore: version bump & news update
ColinFay May 16, 2023
72ee972
fix: set_golem_name updates name for ./tests content
ilyaZar Apr 5, 2023
8e23a43
fix: set_golem_name updates name for ./vignettes content
ilyaZar Apr 5, 2023
61e1556
feat: message and path
ColinFay May 16, 2023
0255f45
hofix: changing to sprintf
ColinFay May 16, 2023
ed7e0b9
test: unlinking the README files in test
ColinFay May 16, 2023
b72e98f
doc: missing doc in the entry
ColinFay May 16, 2023
e2428c9
chore: version bump & news update
ColinFay May 16, 2023
b97bbe7
fix: allow golem to use person vector
ilyaZar Apr 5, 2023
d93fdb8
merge interface changes into dev/01_start.R
ilyaZar Apr 5, 2023
a807104
docs: update vignette
ilyaZar Apr 5, 2023
0a529ca
refactor: update tests for fill_desc()
ilyaZar Apr 5, 2023
7fe0915
refactor: update inst/mantests/build.R
ilyaZar Apr 5, 2023
9e21f41
test: fix tests by adding authors + expect warning
ColinFay May 17, 2023
5b9767c
fix: only alert if named has changed
ColinFay May 17, 2023
090a6fc
fix: keep the old params for backward compatibility
ColinFay May 17, 2023
c7533e4
Revert "Add -it flag when run docker so ^C still works"
ColinFay Apr 4, 2023
aa9bfb2
ci: code coverage
ColinFay May 17, 2023
f730550
Fix 987
ilyaZar Mar 24, 2023
d458270
hotfix: remove a warning and a note from devtools::check()
ilyaZar May 20, 2023
3e925b1
fix: add missing 'role = c("aut", "cre")
ilyaZar May 24, 2023
c60f1a0
fix typo in filename
ilyaZar May 20, 2023
0766998
ci: simpler pkgdown action
ColinFay May 17, 2023
a50aa88
ci: installing thinkridentity in the pkgdown site
ColinFay May 24, 2023
f556ba2
fix: add missing argument open to usethis_use_readme_rmd()
ilyaZar May 24, 2023
402506b
chore: version bump & news update
ColinFay May 24, 2023
169713d
refactor: add logical flag to run set_golem_options() inside fill_desc()
ilyaZar May 20, 2023
1a69d24
docs: inform user about changes to fill_desc()
ilyaZar May 20, 2023
faacdf1
refactor: set_options defaults to TRUE
ilyaZar May 25, 2023
6a1c859
Update inst/shinyexample/dev/01_start.R
ColinFay May 26, 2023
e36d404
Update inst/shinyexample/dev/01_start.R
ColinFay May 26, 2023
3872db3
Update vignettes/a_start.Rmd
ColinFay May 26, 2023
e6d0823
Update vignettes/a_start.Rmd
ColinFay May 26, 2023
147e1be
refactor: file R/{config,add_dockerfiles_renv}.R use golem_wd
ilyaZar Mar 30, 2023
cd28ecd
refactor: file R/pkg_tools.R
ilyaZar Apr 5, 2023
716dd62
docs: update doc to dockerfile-funcs arg. 'sourcefolder'
ilyaZar Apr 5, 2023
82d07ac
Update R/config.R
ColinFay May 26, 2023
ce1bbf9
Update R/config.R
ColinFay May 26, 2023
7673b68
ci: add R-CMD-CHECK to dev
ColinFay May 26, 2023
66e403f
hotfix: test in dir
ColinFay May 26, 2023
50e3e4d
doc: roxygenized
ColinFay May 26, 2023
58a30e5
chore: version bump & news update
ColinFay May 26, 2023
f36fe96
refactor:
ilyaZar May 26, 2023
57fc72c
docs: update 01_start.R
ilyaZar May 26, 2023
8900fbb
docs: re-work vignette for 'a_start.Rmd'
ilyaZar May 26, 2023
5acafc8
Update vignettes/a_start.Rmd
ColinFay May 26, 2023
b2a596c
docs: :rocket: add myself as contributor :rocket:
ilyaZar Jun 5, 2023
8949354
test: skip on CRAN deploy tests
ColinFay Jun 5, 2023
91069f8
chore: redoc
ColinFay Jun 5, 2023
127c856
avoid title warning in roxygen checks
pachadotdev Jun 15, 2023
ac5211a
refactor: rename from rstudioconnect to positconnect (#1017)
ilyaZar Aug 2, 2023
215b338
fix Ci
VincentGuyader Aug 8, 2023
3d409ca
fix dockerfiler deps (#1072)
VincentGuyader Aug 8, 2023
bc08911
chore : triger ci, add new french video on README (#1076)
VincentGuyader Aug 8, 2023
7fed26f
Dev 887 (#1078)
VincentGuyader Aug 8, 2023
f468b76
Dev 1074 (#1079)
VincentGuyader Aug 8, 2023
d17e0d5
Fix 1065 to improve code coverage for `with_opt.R` to 100% (#1066) (#…
VincentGuyader Aug 8, 2023
ebcfe13
Dev 1026 (#1081)
VincentGuyader Aug 8, 2023
7ba820b
Dev 1059 (#1082)
VincentGuyader Aug 8, 2023
65d3d29
Dev 1050 (#1083)
VincentGuyader Aug 8, 2023
9698f00
hotfix: fix path on MAC-OS to pass CI for Dev1077 (#1084)
ilyaZar Aug 9, 2023
f33fd35
style: `NEWS.md` reflects all changes to the user (#1085)
ilyaZar Aug 9, 2023
9456fd5
Merge pull request #1057 from pachadotdev/master
VincentGuyader Aug 9, 2023
1971f72
Dev 1028 (#1088)
VincentGuyader Aug 9, 2023
c5c14c2
hotfix: remove `return(invisible(file))` (#1091)
ilyaZar Aug 10, 2023
0bd05c5
feat: create a add_any_file function
ArthurData Oct 21, 2022
b5be561
test: fix broken tests
ColinFay Oct 10, 2023
f66c837
feat: adding add_empty_file
ColinFay Oct 10, 2023
af00f4d
chore: version bump & news update
ColinFay Oct 11, 2023
9ad9775
test: make tests pass
ColinFay Oct 11, 2023
fbd35ec
feat: add support for git backed posit deployment
ilyaZar Jul 5, 2023
6f34998
docs: update docs + markdown style updates
ilyaZar Jul 5, 2023
4542924
chore: version bump & news update
ColinFay Oct 11, 2023
9ea8dc5
fix: increase minimal attachment version in Suggests
ilyaZar Sep 7, 2023
892b64e
chore: version bump & news update
ColinFay Oct 11, 2023
6d2323f
feat: adding min version in bootstraped attachement & pkgload
ColinFay Oct 11, 2023
bdc43a6
chore: version bump & news update
ColinFay Oct 11, 2023
495b94d
Add pkgdown link to description
olivroy Sep 6, 2023
a2e1168
refactor: move git calls in 01_start to bottom
ilyaZar Oct 11, 2023
748d655
docs: update NEWS.md
ilyaZar Oct 11, 2023
0aba700
style: remove redundant whitespace
ilyaZar Aug 10, 2023
79c3517
doc: redoc
ColinFay Nov 17, 2023
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: 3 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@
^Meta$
^\.github$
^revdep$
README.html
README.html
^CRAN-SUBMISSION$
^dev$
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
branches: [main, master, dev]
pull_request:
branches: [main, master]
branches: [main, master, dev]

name: R-CMD-check

Expand Down
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.4.0
Date: 2023-03-10 13:02:19 UTC
SHA: ce67fa5e76d40f1ca68b6dda10064bae37fbcb6e
27 changes: 16 additions & 11 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: golem
Title: A Framework for Robust Shiny Applications
Version: 0.4.0
Version: 0.4.17
Authors@R: c(
person("Colin", "Fay", , "[email protected]", role = c("cre", "aut"),
comment = c(ORCID = "0000-0001-7343-1846")),
Expand All @@ -14,13 +14,14 @@ Authors@R: c(
person("David", "Granjon", , "[email protected]", role = "ctb"),
person("Arthur", "Bréant", , "[email protected]", role = "ctb"),
person("Antoine", "Languillaume", , "[email protected]", role = "ctb"),
person("Ilya", "Zarubin", , "[email protected]", role = "ctb"),
person("ThinkR", role = "cph")
)
Description: An opinionated framework for building a production-ready
'Shiny' application. This package contains a series of tools for
building a robust 'Shiny' application from start to finish.
License: MIT + file LICENSE
URL: https://github.com/ThinkR-open/golem
URL: https://thinkr-open.github.io/golem/, https://github.com/ThinkR-open/golem
BugReports: https://github.com/ThinkR-open/golem/issues
Depends:
R (>= 3.0)
Expand All @@ -34,32 +35,36 @@ Imports:
utils,
yaml
Suggests:
covr,
attachment (>= 0.3.2),
cli (>= 2.0.0),
covr,
crayon,
desc,
devtools,
dockerfiler (>= 0.2.0),
fs,
httpuv,
knitr,
pkgload,
mockery,
pkgbuild,
pkgdown,
pkgload (>= 1.3.0),
processx,
purrr,
rcmdcheck,
roxygen2,
remotes,
renv,
rmarkdown,
roxygen2,
rsconnect,
rstudioapi,
sass,
spelling,
stringr,
testthat,
tools,
withr,
attachment (>= 0.2.5),
renv,
usethis (>= 1.6.0),
fs,
rstudioapi,
desc
withr
VignetteBuilder:
knitr
Config/testthat/edition: 3
Expand Down
7 changes: 7 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export(add_dockerfile_shinyproxy)
export(add_dockerfile_with_renv)
export(add_dockerfile_with_renv_heroku)
export(add_dockerfile_with_renv_shinyproxy)
export(add_empty_file)
export(add_fct)
export(add_html_template)
export(add_js_file)
Expand All @@ -16,6 +17,7 @@ export(add_js_input_binding)
export(add_js_output_binding)
export(add_module)
export(add_partial_html_template)
export(add_positconnect_file)
export(add_resource_path)
export(add_rstudioconnect_file)
export(add_sass_file)
Expand All @@ -35,6 +37,7 @@ export(css_template)
export(detach_all_attached)
export(disable_autoload)
export(document_and_reload)
export(empty_template)
export(expect_html_equal)
export(expect_running)
export(expect_shinytag)
Expand All @@ -49,6 +52,7 @@ export(get_golem_wd)
export(get_sysreqs)
export(install_dev_deps)
export(invoke_js)
export(is_golem)
export(is_running)
export(js_handler_template)
export(js_template)
Expand Down Expand Up @@ -79,6 +83,7 @@ export(use_internal_file)
export(use_internal_html_template)
export(use_internal_js_file)
export(use_module_test)
export(use_readme_rmd)
export(use_recommended_deps)
export(use_recommended_tests)
export(use_utils_server)
Expand All @@ -99,11 +104,13 @@ importFrom(shiny,getShinyOption)
importFrom(shiny,htmlTemplate)
importFrom(shiny,includeScript)
importFrom(shiny,tags)
importFrom(tools,file_ext)
importFrom(utils,capture.output)
importFrom(utils,file.edit)
importFrom(utils,getFromNamespace)
importFrom(utils,menu)
importFrom(utils,modifyList)
importFrom(utils,person)
importFrom(utils,sessionInfo)
importFrom(yaml,read_yaml)
importFrom(yaml,write_yaml)
92 changes: 80 additions & 12 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,76 @@
> Notes: the # between parenthesis referes to the related issue on GitHub, and the @ refers to an external contributor solving this issue.

# 0.4.2 to 0.5.0

## New functions

* `is_golem()` tries to guess if the current folder is a `{golem}`-based app (#836)

* `use_readme_rmd()` adds a `{golem}` specific `README.Rmd` (@ilyaZar, #1011)

* rename `add_rstudioconnect_file()` to `add_positconnect_file()` (@ilyaZar, #1017)

* `add_empty_file` creates an empty file in the www directory (#837)

## New features / user visible changes

+ sourcing `dev/01_start.R` leaves the file in a clean state with all files added to the initial commit (#1094, @ilyaZar)

+ allow for user supplied `run_dev`-files (#886, @ilyaZar)

+ `README` is re-styled and links to various external resources of the `golemverse` (#1064, @ilyaZar)

+ `a_start`-vignette has updated documentation (#1046, @ilyaZar)

+ `fill_desc()` automatically calls `set_options()`; see `dev/01_start.R` as well (#1040, @ilyaZar)

+ `fill_desc()` now uses a `person` vector (#1027, @jmeyer2482, @ColinFay and @ilyaZar)

+ `use_{internal,external}_XXX_file()` function family has improved error handling for non-interactive usage (#1062, @ilyaZar)

+ `add_fct()` now adds the skeleton for a function (#1004, @ilyaZar)

+ The module skeleton now stick to tidyverse style (#1019, @ni2scmn)

+ Better comments to `fill_desc()` in `01_start.R` (#1021, @ilyaZar)

+ `01_start.R` now has a call to `usethis::use_git_remote()` (#1015, @ilyaZar)

+ Tests for `R/golem_utils_server.R` and `R/golem_utils_ui.R` now have full code coverage (#1020, @ilyaZar)

+ When setting a new name, `{golem}` now browses tests & vignettes (#805, @ilyaZar)

+ Adding `writeManifest()` to `deploy.R` (#1063, @ilyaZar)

+ `use_git()` is now at the bottom of 01_dev.R ((#1094, @ilyaZar))

## Bug fix

+ `use_{internal,external}_XXX_file()` function family works with default missing `name` argument (#1060, @ilyaZar)

+ `run_dev()` now install needed dependencies to source `dev/run_dev.R` if needed (#942, @ilyaZar, @vincentGuyader)

+ `use_readme_rmd()` does not pop up when argument `open=FALSE` is set (#1044, @ilyaZar)

+ Docker commands now take the `-it` flag so it can be killed with `^C` (#1002, @ivokwee)

+ `add_module()` now behaves correctly when trying to use `mod_mod_XXX` (#997, @ilyaZar)

+ `{attachment}` now has a minimum version requirement (#1104, @ilyaZar)

+ `{pkgload}` now has a minimum version requirement (#1106)

## Internal changes

+ Add tests for (under/un)-tested files and functions and improve code coverage of `{golem}` (#1043, #1050, #1059, #1066, #1075, @ilyaZar)
+ `guess_where_config()` now finds the user config-yaml by reading its new location from user changes in "R/app_config.R" (#887, @ilyaZar)
+ All functions that require to get a path now rely on `get_golem_wd()` (#1016, @ilyaZar)


# 0.4.1

This is an intermediate release after CRAN feedback.

# 0.4.0

## New functions
Expand All @@ -15,27 +86,24 @@
- Functions that print to the console are now quiet if `options("golem.quiet" = TRUE)`, #793
- Small documentation update in dockerfile related functions (#939)
- `fill_desc()` now allows to set the version (#877)
- Setting the Environment variable `GOLEM_MAINTENANCE_ACTIVE` to `TRUE` active the maintenance mode of your app
- Setting the Environment variable `GOLEM_MAINTENANCE_ACTIVE` to `TRUE` activates the maintenance mode of your app
- `golem::run_dev()` now save all open documents before sourcing the `dev/run_dev.R` file
- When creating an app, you'll get a message if the dev deps are not all installed (#915)
- 03_deploy now contains an example of sending the app to PositConnect or Shinyapps.io (#923)
- `03_deploy` now contains an example of sending the app to PositConnect or Shinyapps.io (#923)

## Bug fix

- The message after htmlTemplate creation now suggests to add in the UI, not only in app_ui.R (#861)
- The message after htmlTemplate creation now suggests to add in the UI, not only in `app_ui.R` (#861)
- The Deprecation message for `use_recommended_deps` no longer suggest to user `use_recommended_deps` (#900)
- The setting of the config file has been unified so that we are sure to keep the !expr in `golem_set_wd()`, and the codebase has been simplified for this (#709).
- The functions adding files can no longer take a `name` argument that has length() > 1. This used to cause some bugs (#781)
- The typo in `install.packages()` in 02_dev.R has been corrected (@asiripanich)
- The setting of the config file has been unified so that we are sure to keep the `!expr` in `golem_set_wd()`, and the codebase has been simplified for this (#709).
- The functions adding files can no longer take a `name` argument that has `length() > 1`. This used to cause some bugs (#781)
- The typo in `install.packages()` in `02_dev.R` has been corrected (@asiripanich)
- `add_dockerfile_with_renv()` now works well with uppercase in package name
- improve `get_golem_options()` documentation

## Internal changes

add_dockerfile_with_renv now works well with uppercase in package name

add_dockerfile_with_renv now works well with uppercase in package name

+ `add_dockerfile_with_renv` now works well with uppercase in package name

# golem 0.3.5

Expand All @@ -55,7 +123,7 @@ Update in the tests for CRAN (skip not installed + examples).

- `add_dockerfile`, `add_dockerfile_shinyproxy()` and `add_dockerfile_heroku()` now recommend to switch to their `_with_renv_` counterpart

# golem 0.3.2 (CRAN VERSION)
# golem 0.3.2

### Soft deprecated

Expand Down Expand Up @@ -131,7 +199,7 @@ Update in the tests for CRAN (skip not installed + examples).

- `{testthat}` and `{rlang}` are no longer hard dependencies (#742)

# golem 0.3.1 (CRAN Version)
# golem 0.3.1

## New functions

Expand Down
Loading