Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
ColinFay committed Jul 30, 2019
2 parents 3822780 + 634f610 commit aaf88a3
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 25 deletions.
37 changes: 19 additions & 18 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
^codecov\.yml$
^\./app\.R$
^reference$
^docs$
^_pkgdown\.yml$
^\.travis\.yml$
^Dockerfile$
^data-raw$
^.*\.Rproj$
^\.Rproj\.user$
^devtools_history\.R$
^README\.Rmd$
^readme_figures$
^LICENSE\.md$
^CODE_OF_CONDUCT\.md$
^app\.R$
^cran-comments\.md$
^CRAN-RELEASE$
^codecov\.yml$
^\./app\.R$
^reference$
^docs$
^_pkgdown\.yml$
^\.travis\.yml$
^Dockerfile$
^data-raw$
^.*\.Rproj$
^\.Rproj\.user$
^devtools_history\.R$
^README\.Rmd$
^readme_figures$
^LICENSE\.md$
^CODE_OF_CONDUCT\.md$
^app\.R$
^cran-comments\.md$
^CRAN-RELEASE$
^appveyor\.yml$
4 changes: 3 additions & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ knitr::opts_chunk$set(

[![lifecycle](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental)
[![Travis build status](https://travis-ci.org/ThinkR-open/golem.svg?branch=master)](https://travis-ci.org/ThinkR-open/golem)
[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/github/ThinkR-open/golem?branch=master&svg=true)](https://ci.appveyor.com/project/ThinkR-open/golem)
[![Coverage status](https://codecov.io/gh/ThinkR-open/golem/branch/master/graph/badge.svg)](https://codecov.io/github/ThinkR-open/golem?branch=master)

<img src="https://raw.githubusercontent.com/ThinkR-open/golem/master/inst/rstudio/templates/project/golem.png" width=250px>
Expand Down Expand Up @@ -54,6 +55,7 @@ _Building Big Shiny Apps_
### Video

- [{golem} and Effective Shiny Development Methods](https://www.youtube.com/watch?v=OU1-CkSVdTI)
- [Hands-on demonstration of {golem}](https://shinydevseries.com/post/golem-demo/)

## Installation

Expand Down Expand Up @@ -95,4 +97,4 @@ Read [Deploying Apps with {golem}](https://thinkr-open.github.io/golem/articles/
## CoC

Please note that this project is released with a [Contributor Code of Conduct](https://www.contributor-covenant.org/version/1/0/0/code-of-conduct.html).
By participating in this project you agree to abide by its terms.
By participating in this project you agree to abide by its terms.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
[![lifecycle](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental)
[![Travis build
status](https://travis-ci.org/ThinkR-open/golem.svg?branch=master)](https://travis-ci.org/ThinkR-open/golem)
[![AppVeyor build
status](https://ci.appveyor.com/api/projects/status/github/ThinkR-open/golem?branch=master&svg=true)](https://ci.appveyor.com/project/ThinkR-open/golem)
[![Coverage
status](https://codecov.io/gh/ThinkR-open/golem/branch/master/graph/badge.svg)](https://codecov.io/github/ThinkR-open/golem?branch=master)

Expand Down Expand Up @@ -47,6 +49,8 @@ This package is part of a series of tools for Shiny, which includes:

- [{golem} and Effective Shiny Development
Methods](https://www.youtube.com/watch?v=OU1-CkSVdTI)
- [Hands-on demonstration of
{golem}](https://shinydevseries.com/post/golem-demo/)

## Installation

Expand Down
52 changes: 52 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# DO NOT CHANGE the "init" and "install" sections below

# Download script file from GitHub
init:
ps: |
$ErrorActionPreference = "Stop"
Invoke-WebRequest http://raw.github.com/krlmlr/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "..\appveyor-tool.ps1"
Import-Module '..\appveyor-tool.ps1'
install:
ps: Bootstrap

cache:
- C:\RLibrary

environment:
NOT_CRAN: true
# env vars that may need to be set, at least temporarily, from time to time
# see https://github.com/krlmlr/r-appveyor#readme for details
# USE_RTOOLS: true
# R_REMOTES_STANDALONE: true

# Adapt as necessary starting from here

build_script:
- travis-tool.sh install_deps

test_script:
- travis-tool.sh run_tests

on_failure:
- 7z a failure.zip *.Rcheck\*
- appveyor PushArtifact failure.zip

artifacts:
- path: '*.Rcheck\**\*.log'
name: Logs

- path: '*.Rcheck\**\*.out'
name: Logs

- path: '*.Rcheck\**\*.fail'
name: Logs

- path: '*.Rcheck\**\*.Rout'
name: Logs

- path: '\*_*.tar.gz'
name: Bits

- path: '\*_*.zip'
name: Bits
2 changes: 1 addition & 1 deletion inst/shinyexample/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: shinyexample
Title: An Amazing Shiny App
Version: 0.0.0.9000
Authors@R: person("Vincent", "Guyader", email = "[email protected]", role = c("aut", "cre"))
Authors@R: person("firstname", "lastname", email = "[email protected]", role = c("aut", "cre"))
Description: What the package does (one paragraph).
License: What license is it under?
Encoding: UTF-8
Expand Down
4 changes: 2 additions & 2 deletions inst/shinyexample/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

export(run_app)
import(shiny)
importFrom(shiny,addResourcePath)
importFrom(shiny,runApp)
importFrom(golem,with_golem_options)
importFrom(shiny,shinyApp)
12 changes: 9 additions & 3 deletions tests/testthat/test-zreload.R
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
context("tests reload")


## fake package
fakename <- paste0(sample(letters, 10, TRUE), collapse = "")
tpdir <- tempdir()
if(!dir.exists(file.path(tpdir,fakename))){
create_golem(file.path(tpdir, fakename), open = FALSE)
}
pkg_reload <- file.path(tpdir, fakename)

test_that("test document_and_reload",{
with_dir(pkg,{
with_dir(pkg_reload,{
file.create("R/sum.R")
cat(
"#' @export
Expand All @@ -14,7 +20,7 @@ test_that("test document_and_reload",{
})

test_that("test detach_all_attached",{
with_dir(pkg,{
with_dir(pkg_reload,{
test <- detach_all_attached()
ok <- all(purrr::map_lgl(test,~ is.null(.x)))
testthat::expect_true(ok)
Expand Down

0 comments on commit aaf88a3

Please sign in to comment.