Merge branch 'develop' of github.com:HenrikBengtsson/progressr into develop

Author: HenrikBengtsson

.Rbuildignore

@@ -61,3 +61,4 @@ Rplots.pdf$
 ^last.dump*
 ^imgs
 ^.*.bob$
+^\.github$

.github/.gitignore

@@ -0,0 +1 @@
+*.html

.github/workflows/R-CMD-check.yaml

@@ -12,26 +12,26 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - { os: windows-latest, r: '3.5'}
-        - { os: windows-latest, r: '3.6'}
-        - { os: windows-latest, r: '4.0'}
-        - { os: windows-latest, r: 'devel'}
-        - { os: macOS-latest, r: '3.5'}
-        - { os: macOS-latest, r: '3.6'}
-        - { os: macOS-latest, r: '4.0'}
-        - { os: macOS-latest, r: 'devel'}
-        - { os: ubuntu-16.04, r: '3.4', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
-        - { os: ubuntu-16.04, r: '3.5', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
-        - { os: ubuntu-16.04, r: '3.6', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
-        - { os: ubuntu-16.04, r: '4.0', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
+          - { os: windows-latest, r: '3.5'}
+          - { os: windows-latest, r: '3.6'}
+          - { os: windows-latest, r: '4.0'}
+          - { os: windows-latest, r: 'devel'}
+          - { os: macOS-latest, r: '3.5'}
+          - { os: macOS-latest, r: '3.6'}
+          - { os: macOS-latest, r: '4.0'}
+          - { os: macOS-latest, r: 'devel'}
+          - { os: ubuntu-16.04, r: '3.4', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
+          - { os: ubuntu-16.04, r: '3.5', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
+          - { os: ubuntu-16.04, r: '3.6', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
+          - { os: ubuntu-16.04, r: '4.0', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       CRAN: ${{ matrix.config.cran }}
 
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - uses: r-lib/actions/setup-r@master
         with:
@@ -40,14 +40,18 @@ jobs:
       - uses: r-lib/actions/setup-pandoc@master
 
       - name: Query dependencies
-        run: Rscript -e "install.packages('remotes')" -e "saveRDS(remotes::dev_package_deps(dependencies = TRUE), 'depends.Rds', version = 2)"
+        run: |
+          install.packages('remotes')
+          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
+          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
+        shell: Rscript {0}
 
       - name: Cache R packages
         if: runner.os != 'Windows'
         uses: actions/cache@v1
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
+          key: ${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('.github/depends.Rds') }}
           restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-
 
       - name: Install system dependencies
@@ -61,11 +65,21 @@ jobs:
 
       - name: Install dependencies
         run: |
-          Rscript -e "library(remotes)" -e "update(readRDS('depends.Rds'))" -e "remotes::install_cran('rcmdcheck')"
-          Rscript -e "install.packages('progressr')"  ## 'self' vignette engine
+          remotes::install_deps(dependencies = TRUE)
+          remotes::install_cran("rcmdcheck")
+          install.packages("progressr")  ## 'self' vignette engine
+        shell: Rscript {0}
 
+      - name: Session info
+        run: |
+          options(width = 100)
+          pkgs <- installed.packages()[, "Package"]
+          sessioninfo::session_info(pkgs, include_base = TRUE)
+        shell: Rscript {0}
+        
       - name: Check
-        run: Rscript -e "rcmdcheck::rcmdcheck(args = '--no-manual', error_on = 'warning', check_dir = 'check')"
+        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
+        shell: Rscript {0}
 
       - name: Upload check results
         if: failure()

R/handler_progress.R

@@ -66,7 +66,7 @@ handler_progress <- function(format = "[:bar] :percent :message", show_after = 0
       )
     )
     erase_progress_bar <- function(pb) NULL
-    redraw_progress_bar <- function(pb, ...) NULL
+    redraw_progress_bar <- function(pb, tokens = list()) NULL
   }
 
   reporter <- local({