Merge pull request #157 from carpentries/frog-tinkr-1

Fix Episode and tests for tinkr show argument changes
carpentries · Jun 25, 2024 · 89d244f · 89d244f
2 parents a32a783 + 4781a7f
commit 89d244f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -27,8 +27,7 @@ jobs:
           - {os: macos-latest,   r: 'release'}
 
           - {os: windows-latest, r: 'release'}
-          # Use 3.6 to trigger usage of RTools35
-          - {os: windows-latest, r: '3.6'}
+
           # use 4.1 to check with rtools40's older compiler
           - {os: windows-latest, r: '4.1'}
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,10 +1,20 @@
 Package: pegboard
 Title: Explore and Manipulate Markdown Curricula from the Carpentries
-Version: 0.7.5
+Version: 0.7.6
 Authors@R: c(
+    person(given = "Robert",
+           family = "Davey",
+           role = c("aut", "cre"),
+           email = "robertdavey@carpentries.org",
+           comment = c(ORCID = "0000-0002-5589-7754")),
+    person(given = "Erin",
+           family = "Becker",
+           role = c("aut"),
+           email = "erinbecker@carpentries.org",
+           comment = c(ORCID = "0000-0002-6832-0233")),
     person(given = "Zhian N.",
            family = "Kamvar",
-           role = c("aut", "cre"),
+           role = c("aut"),
            email = "zkamvar@carpentries.org",
            comment = c(ORCID = "0000-0003-1458-7108")),
     person(given = "Toby",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,12 @@
+# pegboard 0.7.6 (2024-06-25)
+
+## BUGFIX
+
+* Hotfix for {tinkr} bump to 0.3.0 that changes yarn$show() arguments:
+  https://github.com/ropensci/tinkr/pull/108. (reported @froggleston
+  https://github.com/carpentries/pegboard/issues/156, fixed: @froggleston)
+
+
 # pegboard 0.7.5 (2024-04-10)
 
 ## NEW FEATURES

diff --git a/R/Episode.R b/R/Episode.R
@@ -359,14 +359,15 @@ Episode <- R6::R6Class("Episode",
       purrr::map_dfr(self$challenges, feature_graph, recurse = recurse, .id = "Block")
     },
     #' @description show the markdown contents on the screen
+    #' @param n a subset of elements to show, default TRUE for all lines
     #' @return a character vector with one line for each line of output
     #' @examples
     #' scope <- Episode$new(file.path(lesson_fragment(), "_episodes", "17-scope.md"))
     #' scope$head()
     #' scope$tail()
     #' scope$show()
-    show = function() {
-      super$show(get_stylesheet())
+    show = function(n = TRUE) {
+      super$show(n, get_stylesheet())
     },
     #' @description show the first n lines of markdown contents on the screen
     #' @param n the number of lines to show from the top