Merge pull request #41 from swirldev/dev

fix errors on CRAN

Author: seankross

.travis.yml

@@ -1,4 +1,11 @@
-language: R
+language: r
+
+matrix:
+  include:
+  - r: release
+  - r: oldrel
+  - r: devel
+
 cache: packages
 sudo: false
 

DESCRIPTION

@@ -3,7 +3,7 @@ Title: A Toolbox for Writing 'swirl' Courses
 Description: A set of tools for writing and sharing interactive courses
     to be used with swirl.
 URL: http://swirlstats.com
-Version: 0.5.0
+Version: 0.5.2
 License: MIT + file LICENSE
 Authors@R: c(
     person("Sean", "Kross", , "sean@seankross.com", c("aut", "cre")),
@@ -21,10 +21,11 @@ Imports:
     whisker,
     shiny,
     shinyAce,
-    base64enc
+    base64enc,
+    readr
 Encoding: UTF-8
 Roxygen: list(wrap = FALSE)
 Suggests:
     testthat,
     digest
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2016
+YEAR: 2018
 COPYRIGHT HOLDER: Team swirl

NAMESPACE

@@ -8,9 +8,11 @@ export(find_questions)
 export(get_current_lesson)
 export(google_form_decode)
 export(lesson_to_html)
+export(make_pathname)
 export(new_lesson)
 export(pack_course)
 export(set_lesson)
+export(swirl_courses_dir)
 export(swirlify)
 export(test_course)
 export(test_lesson)
@@ -28,6 +30,7 @@ import(shiny)
 import(shinyAce)
 import(swirl)
 importFrom(base64enc,base64decode)
+importFrom(readr,read_csv)
 importFrom(rmarkdown,render)
 importFrom(stringr,str_detect)
 importFrom(stringr,str_split)

NEWS.md

@@ -1,3 +1,15 @@
+# swirlify 0.5.2
+
+* Fixed failing tests by integrating new features in testthat 2.0.
+
+# swirlify 0.5.1
+
+* Fixed issue where Ace editor was not working on Windows.
+
+* Added `make_pathname()`.
+
+* Added `swirl_courses_dir()`.
+
 # swirlify 0.5.0
 
 * Removed `lp()`.

R/google_form_decode.R

@@ -4,6 +4,7 @@
 #' Google Sheets which contains student's encoded responses.
 #' @return A data frame containing each student's results.
 #' @importFrom base64enc base64decode
+#' @importFrom readr read_csv
 #' @export
 #' @examples 
 #' \dontrun{
@@ -16,16 +17,19 @@
 #' 
 #' }
 google_form_decode <- function(path = file.choose()){
-  encoded <- suppressWarnings(read.csv(path, header = TRUE, stringsAsFactors = FALSE))
+  encoded <- suppressMessages(suppressWarnings(read_csv(path)))
   decoded <- list()
 
   for(i in 1:nrow(encoded)){
-    temp_write <- tempfile()
-    writeChar(encoded[i,2], temp_write)
-    temp_log <- tempfile()
-    base64decode(file = temp_write, output = temp_log)
-    decoded[[i]] <- read.csv(temp_log, header = TRUE, stringsAsFactors = FALSE)
+    decoded[[i]] <- suppressMessages(
+                      read_csv(
+                        rawToChar(
+                          base64decode(
+                            as.character(encoded[i,2])))))
   }
 
-  do.call("rbind", decoded)
+  result <- as.data.frame(do.call("rbind", decoded))
+  attributes(result)$spec <- NULL
+  attributes(result)$row.names <- 1:nrow(result)
+  result
 }

R/swirlify.R

@@ -35,7 +35,7 @@ make_skeleton <- function() {
   return(lessonPath)
 }
 
-#' Lauch a Shiny application for writing swirl lessons
+#' Launch a Shiny application for writing swirl lessons
 #' 
 #' This function launches a user interface for writing
 #' swirl lessons.

R/tools.R

@@ -158,3 +158,35 @@ ensure_file_ends_with_newline <- function(path){
     cat("\n", file = path, append = TRUE)
   }
 }
+
+#' Find the directory where swirl courses are stored
+#'
+#' @export
+#' @return A string with the path to where swirl is searching for courses.
+swirl_courses_dir <- function(){
+  scd <- getOption("swirl_courses_dir")
+  if (is.null(scd)) {
+    file.path(find.package("swirl"), "Courses")
+  }
+  else {
+    scd
+  }
+}
+
+#' Replace spaces in strings with underscores
+#' 
+#' Useful for creating paths to a particular swirl course, as you might want
+#' to do in files like \code{initLesson.R}.
+#' @importFrom stringr str_trim
+#' @param name A vector of strings.
+#' @export
+#' @return A string vector where spaces are replaced with underscores.
+#' @examples 
+#' make_pathname("Developing Data Products")
+#' # "Developing_Data_Products"
+#' 
+#' make_pathname(c("R Programming", "Exploratory Data Analysis"))
+#' # "R_Programming" "Exploratory_Data_Analysis"
+make_pathname <- function(name){
+  gsub(" ", "_", str_trim(name))
+}

R/wq.R

@@ -177,7 +177,7 @@ wq_video <- function(output = "Would you like to watch a short video about ___?"
 #' @param output Text that is displayed to the user.
 #' @param figure An R script that produces a figure that is displayed in the R
 #' plotting window.
-#' @param figure_type Either \code{"new"} or \code{"add"}. \code{"new"} idicates
+#' @param figure_type Either \code{"new"} or \code{"add"}. \code{"new"} indicates
 #' that a new plot should be displayed, while \code{"add"} indicates that
 #' features are being added to a plot that is already displayed.
 #' @importFrom whisker whisker.render

cran-comments.md

@@ -1,12 +1,12 @@
 ## Release summary
 
-This is the first attempted CRAN release of swirlify 0.5.0.
+This is the first attempted CRAN release of swirlify 0.5.2.
 
 ## Test environments
 
-* local OSX Yosemite install, R 3.3.1
-* Ubuntu 12.04 (on travis-ci), R 3.3.1
-* win-builder (devel and release)
+* local macOS Sierra install, R 3.4.3
+* Ubuntu 14.04 (on travis-ci), R 3.4.2, R 3.3.3, R-devel.
+* win-builder (devel)
 
 ## R CMD check results