could not load dplyr

.Rbuildignore

@@ -2,6 +2,6 @@
 ^\.Rproj\.user$
 ^.*.html$
 user_data/
-^NEWS.md$
 ^\.travis\.yml$
 ^cran-comments\.md$
+^revdep$

.travis.yml

@@ -1,21 +1,15 @@
-# Sample .travis.yml for R projects from https://github.com/craigcitro/r-travis
+language: r
 
-language: c
+matrix:
+  include:
+  - r: release
+  - r: oldrel
+  - r: devel
 
-before_install:
-  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-  - chmod 755 ./travis-tool.sh
-  - ./travis-tool.sh bootstrap
-
-install:
-  - ./travis-tool.sh install_deps
-
-script: ./travis-tool.sh run_tests
-
-on_failure:
-  - ./travis-tool.sh dump_logs
+cache: packages
+sudo: false
 
 notifications:
   email:
-    on_success: change
-    on_failure: change
+    on_success: always
+    on_failure: always

DESCRIPTION

@@ -1,26 +1,32 @@
 Package: swirl
-Title: Learn R, in R.
-Description: swirl turns the R console into an interactive learning
+Title: Learn R, in R
+Description: Use the R console as an interactive learning
     environment. Users receive immediate feedback as they are guided through
     self-paced lessons in data science and R programming.
 URL: http://swirlstats.com
-Version: 2.2.15
-License: GPL-3
+Version: 2.4.5
+License: MIT + file LICENSE
 Authors@R: c(
-    person("Nick", "Carchedi", email = "nick.carchedi@gmail.com",
-    role = c("aut", "cre")),
+    person("Sean", "Kross", email = "sean@seankross.com", role = c("aut", "cre")),
+    person("Nick", "Carchedi", role = "aut"),
     person("Bill", "Bauer", role = "aut"),
     person("Gina", "Grdina", role = "aut"),
-    person("Sean", "Kross", role = "aut")
+    person("Filip", "Schouwenaars", role = "ctb"),
+    person("Wush", "Wu", role = "ctb")
     )
 Depends:
-    R (>= 3.0.2)
+    R (>= 3.1.0)
 Imports:
     stringr,
-    testthat,
-    httr,
+    testthat (>= 1.0.2),
+    httr (>= 1.1.0),
     yaml,
     RCurl,
     digest,
-    tools
-Roxygen: list(wrap = FALSE)
+    tools,
+    methods
+Suggests:
+    stringi
+Encoding: UTF-8
+LazyData: true
+RoxygenNote: 7.0.2

LICENSE

@@ -0,0 +1,2 @@
+YEAR: 2017
+COPYRIGHT HOLDER: Team swirl

NAMESPACE

@@ -1,22 +1,30 @@
-# Generated by roxygen2 (4.0.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(bye)
+export(delete_progress)
 export(email_admin)
 export(info)
+export(install_course)
 export(install_course_directory)
 export(install_course_dropbox)
 export(install_course_github)
 export(install_course_google_drive)
 export(install_course_url)
 export(install_course_zip)
 export(install_from_swirl)
+export(is_robust_match)
 export(main)
 export(nxt)
 export(play)
 export(reset)
+export(restart)
+export(rmatch_calls)
+export(select_language)
 export(skip)
 export(submit)
 export(swirl)
+export(swirl_options)
+export(uninstall_all_courses)
 export(uninstall_course)
 export(zip_course)
 importFrom(RCurl,base64)
@@ -25,22 +33,19 @@ importFrom(RCurl,postForm)
 importFrom(digest,digest)
 importFrom(httr,GET)
 importFrom(httr,content)
+importFrom(httr,progress)
+importFrom(methods,is)
 importFrom(stringr,fixed)
-importFrom(stringr,perl)
 importFrom(stringr,str_c)
 importFrom(stringr,str_detect)
 importFrom(stringr,str_extract)
 importFrom(stringr,str_length)
 importFrom(stringr,str_locate)
+importFrom(stringr,str_match)
 importFrom(stringr,str_split)
 importFrom(stringr,str_split_fixed)
 importFrom(stringr,str_trim)
-importFrom(testthat,equals)
-importFrom(testthat,expectation)
-importFrom(testthat,is_a)
-importFrom(testthat,is_equivalent_to)
-importFrom(testthat,is_identical_to)
-importFrom(testthat,matches)
+importFrom(testthat,compare)
 importFrom(tools,file_ext)
 importFrom(tools,file_path_sans_ext)
 importFrom(yaml,yaml.load)

NEWS.md

@@ -1,3 +1,91 @@
+# swirl 2.4.5
+
+* Thank you @HenrikBengtsson for fixing a warning when 
+`warnPartialMatchArgs=TRUE`. (#779)
+
+# swirl 2.4.4
+
+* Fixed encoding test which was failing on CRAN (debian-clang-devel).
+
+# swirl 2.4.3
+
+* Added "swirl_is_fun" option to `swirl_options()`.
+
+* Added Portuguese menu translations.
+
+# swirl 2.4.2
+
+* Script questions behave more appropriately in RStudio. (#434, thank you @jimhester)
+
+# swirl 2.4.1
+
+* Added new answer test: `calculates_same_value()`.
+
+* Now compatible with versions of testthat later than 0.11.0.
+
+# swirl 2.4.0
+
+* Added support for multiple languages, including Spanish, French, German,
+Turkish, Simplified Chinese, and Korean. The default language can be changed
+using the function `select_language()`.
+
+* Added `install_course()` in order to install swirl courses that are
+distributed in the .swc format.
+
+* The directories where swirl courses and where user data is stored can now be
+explicitly specified. These options can be set using the function 
+`swirl_options()`.
+
+* It's now possible to log and collect a student's progression
+through a swirl course. Enable logging with `swirl_options()`.
+
+* Improved support for displaying non-ASCII character sets
+through UTF-8 encoding.
+
+* Now compatible with `swirlify::demo_lesson()`.
+
+# swirl 2.3.1
+
+* Add progress bar to track download progress of a course.
+
+# swirl 2.3.0
+
+* Add basic developer API to swirl, courtesy of @filipsch and @seankross.
+
+* Change license to MIT, which is slightly less restrictive than GPL-3 and will make it easy for developers to tap into the new API.
+
+# swirl 2.2.21
+
+* Add `mirror` argument to `install_from_swirl()` to accommodate installing courses from the Bitbucket mirror of our swirl-courses GitHub repository. (Prompted by India's blocking of GitHub.)
+
+* Check for existence of variable in swirl.R to address issue with using `rm()` command.
+
+# swirl 2.2.20
+
+* Fix troublesome bug in `omnitest` due to typo (thanks to @reginaastri).
+
+# swirl 2.2.19
+
+* Add `uninstall_all_courses` function.
+
+# swirl 2.2.18
+
+* Fix small bug in `omnitest` due to missing exclamation point (thanks to @wilcrofter).
+
+* Add `delete_progress` function (thanks to @seankross).
+
+# swirl 2.2.17
+
+* Use of `partner.coursera.org` websites for Coursera submission is enabled. 
+
+* `Omnitest` uses `rmatch_calls` (recursive `match.call`) to deal with legitimate variations of function and S3 method calls.
+
+# swirl 2.2.16
+
+* Fix bug in `install_from_swirl()` that was causing `install_from_swirl("R Programming")` to install both `R Programming` and `R Programming Alt`.
+
+* Fix troublesome links to the swirl_courses repo.
+
 # swirl 2.2.15
 
 * Fix annoying typo in one of the "praise" messages.

R/actions.R

@@ -0,0 +1,52 @@
+do_nxt <- function(e)UseMethod("do_nxt")
+do_reset <- function(e)UseMethod("do_rst")
+do_submit <- function(e)UseMethod("do_submit")
+do_play <- function(e)UseMethod("do_play")
+do_main <- function(e)UseMethod("do_main")
+do_restart <- function(e)UseMethod("do_restart")
+
+do_nxt.default <- function(e) {
+  ## Using the stored list of "official" swirl variables and values,
+  #  assign variables of the same names in the global environment
+  #  their "official" values, in case the user has changed them
+  #  while playing.
+  if(length(e$snapshot)>0)xfer(as.environment(e$snapshot), globalenv())
+  swirl_out(s()%N%"Resuming lesson...")
+  e$playing <- FALSE
+  e$iptr <- 1  
+}
+
+do_reset.default <- function(e) {
+  e$playing <- FALSE
+  e$reset <- TRUE
+  e$iptr <- 2
+  swirl_out(s()%N%"I just reset the script to its original state. If it doesn't refresh immediately, you may need to click on it.", 
+            skip_after = TRUE)
+}
+
+do_submit.default <- function(e) {
+  e$playing <- FALSE
+  # Get contents from user's submitted script
+  e$script_contents <- readLines(e$script_temp_path, warn = FALSE)
+  # Save expr to e
+  e$expr <- try(parse(text = e$script_contents), silent = TRUE)
+  swirl_out(s()%N%"Sourcing your script...", skip_after = TRUE)
+  try(source(e$script_temp_path, encoding = "UTF-8"))
+}
+
+do_play.default <- function(e) {
+  swirl_out(s()%N%"Entering play mode. Experiment as you please, then type nxt() when you are ready to resume the lesson.", skip_after=TRUE)
+  e$playing <- TRUE
+}
+
+do_main.default <- function(e) {
+  swirl_out(s()%N%"Returning to the main menu...")
+  # Remove the current lesson. Progress has been saved already.
+  if(exists("les", e, inherits=FALSE)){
+    rm("les", envir=e, inherits=FALSE)
+  }
+}
+
+do_restart.default <- function(e) {
+  swirl_out(s()%N%"This feature is not implemented yet for Swirl.")
+}

R/answerTests.R

@@ -153,10 +153,10 @@ runTest.newcmd <- function(keyphrase,e){
   correct.expr <- parse(text=rightside(keyphrase))[[1]]
   correct.ans  <- eval(correct.expr)
   ansResults <- expectThat(e$val,
-                               equals(correct.ans,label=correct.ans),
+                               equals_legacy(correct.ans,label=correct.ans),
                                label=e$val)
   callResults <- expectThat(as.expression(e$expr)[[1]],
-                                is_identical_to(correct.expr,label=deparse(correct.expr)),
+                                is_identical_to_legacy(correct.expr,label=deparse(correct.expr)),
                                 label=deparse(e$expr))
 
  #   identical(as.expression(e$expr)[[1]], as.expression(correct.expr)[[1]])
@@ -221,7 +221,7 @@ runTest.is_a <- function(keyphrase, e) {
     val <- e$val
   }
   label <- val
-  results <- expectThat(val, is_a(class), label=label)
+  results <- expectThat(val, is_a_legacy(class), label=label)
   if(is(e,"dev") && !results$passed)swirl_out(results$message)
   return(results$passed)
 }
@@ -245,7 +245,7 @@ runTest.matches <- function(keyphrase, e) {
   correctVal <- tolower(str_trim(rightside(keyphrase)))
   userVal <- str_trim(as.character(e$val))
   results <- expectThat(tolower(userVal), 
-                        matches(correctVal), 
+                        matches_legacy(correctVal), 
                         label=userVal)
   if(is(e,"dev") && !results$passed)swirl_out(results$message)
   return(results$passed)
@@ -264,12 +264,12 @@ runTest.creates_var <- function(keyphrase, e){
   }
   correctName <- rightside(keyphrase)
   if(is.na(correctName)){
-    results <- expectThat(length(delta), equals(1), 
+    results <- expectThat(length(delta), equals_legacy(1), 
                           label=paste(deparse(e$expr), 
                                       "does not create a variable."))
   } else {
     results <- expectThat(names(delta), 
-                          is_equivalent_to(correctName, label=correctName), 
+                          is_equivalent_to_legacy(correctName, label=correctName), 
                           label=paste(deparse(e$expr),
                                       "does not create a variable named",
                                       correctName))
@@ -295,7 +295,7 @@ runTest.equals <- function(keyphrase, e){
   correctAns <- safeEval(parse(text=correctExpr))
   if(length(correctAns) != 1)return(FALSE)
   results <- expectThat(e$var, 
-                        equals(correctAns[[1]], 
+                        equals_legacy(correctAns[[1]], 
                                label=correctExprLabel), 
                         label=deparse(e$expr))
   if(is(e, "dev") && !results$passed)swirl_out(results$message)
@@ -310,7 +310,7 @@ runTest.equivalent <- function(keyphrase,e) {
   correctExpr <- as.list(parse(text=rightside(keyphrase)))
   userExpr <- as.list(as.expression(e$expr))
   results <- expectThat(userExpr,
-                        is_equivalent_to(correctExpr,deparse(correctExpr)),
+                        is_equivalent_to_legacy(correctExpr,deparse(correctExpr)),
                         label=deparse(userExpr))
 
   if(is(e,"dev") && !results$passed)swirl_out(results$message)
@@ -345,7 +345,7 @@ runTest.expr_identical <- function(keyphrase, e){
   expr <- e$expr
   if(is.expression(expr))expr <- expr[[1]]
   results <- expectThat(expr, 
-                        is_identical_to(correct, label=rightside(keyphrase)),
+                        is_identical_to_legacy(correct, label=rightside(keyphrase)),
                         label=deparse(expr))
   if( is(e, "dev") && !results$passed)swirl_out(results$message) 
   return(results$passed)
@@ -359,7 +359,7 @@ runTest.val_length <- function(keyphrase, e){
     stop(message=paste("BUG: right side of", keyphrase,
                                  "is not an integer."))
   }
-  results <- expectThat(length(e$val), equals(n, label=n), 
+  results <- expectThat(length(e$val), equals_legacy(n, label=n), 
                         label=paste0("length(c(", toString(e$val), "))"))                                                   
   if( is(e, "dev") && !results$passed)swirl_out(results$message) 
   return(results$passed)
@@ -435,7 +435,7 @@ uses_func <- function(expected, label = NULL, ...){
   function(expr){
     uses <- (is.call(expr) || is.expression(expr)) && 
       expected %in% flatten(expr)
-    expectation(identical(uses, TRUE),
+    expectation_legacy(identical(uses, TRUE),
                 str_c("does not use ", label))
   }
 }
@@ -446,12 +446,7 @@ in_range <- function(range, label=NULL){
     isOK <- is.numeric(number) && 
       isTRUE(number >= range[1]) && 
       isTRUE(number <= range[2])
-    expectation(identical(isOK, TRUE), 
+    expectation_legacy(identical(isOK, TRUE), 
                 str_c("is not between ", range[1], " and ", range[2]))
   }
 }
-
-
-
-
-