Merge branch 'master' of https://github.com/ThinkR-open/shinytemplate

Author: ColinFay

.Rbuildignore

@@ -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$

README.Rmd

@@ -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>
@@ -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
 
@@ -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.

README.md

@@ -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)
 
@@ -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
 

appveyor.yml

@@ -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

inst/shinyexample/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shinyexample
 Title: An Amazing Shiny App
 Version: 0.0.0.9000
-Authors@R: person("Vincent", "Guyader", email = "vincent@thinkr.fr", role = c("aut", "cre"))
+Authors@R: person("firstname", "lastname", email = "your@email.com", role = c("aut", "cre"))
 Description: What the package does (one paragraph).
 License: What license is it under?
 Encoding: UTF-8

inst/shinyexample/NAMESPACE

@@ -2,5 +2,5 @@
 
 export(run_app)
 import(shiny)
-importFrom(shiny,addResourcePath)
-importFrom(shiny,runApp)
+importFrom(golem,with_golem_options)
+importFrom(shiny,shinyApp)

tests/testthat/test-zreload.R

@@ -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
@@ -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)