Merge branch 'dev'

Author: andrie

.travis.yml

@@ -1,22 +1,11 @@
-language: c
+language: r
+sudo: required
 
 env: NOT_CRAN="true"
 
-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
-
-after_script:
-  - ./travis-tool.sh dump_logs
+r_binary_packages:
+  - testthat
+  - knitr
 
 branches:
   only:

DESCRIPTION

@@ -16,8 +16,8 @@ Description: The goal of checkpoint is to solve the problem of package
     Immediately after completion of the rsync mirror process, the process takes a
     snapshot, thus creating the archive. Snapshot archives exist starting from
     2014-09-17.
-Version: 0.3.12
-Date: 2015-08-26
+Version: 0.3.13
+Date: 2015-09-01
 Author: Revolution Analytics
 Maintainer: Andrie de Vries <[email protected]>
 Copyright: Revolution Analytics

R/mranUrl.R

@@ -118,7 +118,7 @@ url <- function(url){
   if(getRversion() >= "3.2.0"){
     method <- switch(.Platform$OS.type, 
            "unix" = if(libcurl()) "libcurl" else "default",
-           "windows" = method <- "wininet",
+           "windows" = "wininet",
            "default"
     )
     base::url(url, method = method)
@@ -128,6 +128,14 @@ url <- function(url){
 }
 
 httpsSupported <- function(mran = "https://mran.revolutionanalytics.com/snapshot/"){
+  tf <- tempfile()
+  on.exit(unlink(tf))
+  pdb <- suppressWarnings({
+    tryCatch(download.file(url = paste0(mran, "PACKAGES"), destfile = tf, 
+                         cacheOK = FALSE, quiet = TRUE, 
+                         mode = "wb"), error = function(e)e)
+  })
+  if(inherits(pdb, "error")) return(FALSE)
   con <- suppressWarnings({
     tryCatch(url(mran), 
              error = function(e)e)

tests/testthat/test-0-snapshots.R

@@ -71,25 +71,27 @@ describe("is.404 works with http", {
   })
 })
 
-if(httpsSupported()){
-  describe("is.404 works with https", {
+describe("is.404 works with https", {
+  
+  it("works on https", {
+    if(!httpsSupported()) skip("https not supported")
+    expect_true(is.404("https://mran.revolutionanalytics.com/snapshot/1972-01-01"))
+    expect_false(is.404("https://mran.revolutionanalytics.com/snapshot"))
+    expect_false(is.404("https://mran.revolutionanalytics.com/snapshot/2015-05-01"))
 
-    it("works on https", {
-      expect_true(is.404("https://mran.revolutionanalytics.com/snapshot/1972-01-01"))
-      expect_false(is.404("https://mran.revolutionanalytics.com/snapshot"))
-      expect_false(is.404("https://mran.revolutionanalytics.com/snapshot/2015-05-01"))
-      
-    })
   })
-} else {
-  describe("is.404 gracefully deals with https URLs when https not supported", {
-    
-    it("works on https", {
+})
+
+describe("is.404 gracefully deals with https URLs when https not supported", {
+  
+  it("works even when https is not supported", {
+    with_mock(`checkpoint:::httpsSupported` = function(mran) FALSE, {
+      # if(!httpsSupported()) skip("https not supported")
       expect_true(is.404("https://mran.revolutionanalytics.com/snapshot/1972-01-01"))
       expect_true(is.404("https://mran.revolutionanalytics.com/snapshot"))
       expect_true(is.404("https://mran.revolutionanalytics.com/snapshot/2015-05-01"))
-      
     })
+    
   })
-}
-  
+})
+

tests/testthat/test-1-scan.R

@@ -6,7 +6,6 @@ describe("scanRepoPackages finds dependencies", {
 
   collapse <- function(...) paste(..., sep="\n", collapse="\n")
 
-  require("knitr", quietly = TRUE)
 
   foo <- function(token, insert){
     collapse(sprintf(token, insert))
@@ -37,7 +36,11 @@ describe("scanRepoPackages finds dependencies", {
   })
 
   it("finds packages in Rmarkdown", {
-    
+    if(!suppressWarnings(require("knitr", quietly = TRUE))){
+      skip("knitr not available")
+    }
+    require("knitr", quietly = TRUE)
+
     # Write dummy knitr code file to project
     knit <- sprintf("```{r}\n%s\n```", code)
     knitfile <- file.path(project_root, "knit.Rmd")

tests/testthat/test-2-checkpoint.R

@@ -35,9 +35,7 @@ test_checkpoint <- function(https = FALSE, snap.dates){
 
     describe(paste("checkpoint -", url_prefix, "@", snap_date), {
 
-      
-      
-      packages.to.test = if(require("knitr")) 
+      packages.to.test = if(suppressWarnings(require("knitr", quietly = TRUE)))
         c(packages.to.test.base, packages.to.test.knitr) else 
           packages.to.test.base
 
@@ -88,62 +86,60 @@ test_checkpoint <- function(https = FALSE, snap.dates){
           ))
       })
 
-      pdbMRAN <- available.packages(contriburl = contrib.url(repos = getSnapshotUrl(snap_date)))
-      pdbLocal <- installed.packages(fields = "Date/Publication", noCache = TRUE)
-      
-      pkgNames <- function(pdb)unname(pdb[, "Package"])
-      
-      base.packages <- pkgNames(utils::installed.packages(priority = "base", 
-                                                          lib.loc = .Library,
-                                                          noCache = TRUE))
-      
-      pkgDepends <- function (pkg) {
-        depMtrx <- tools:::getDepMtrx(pkg, instPkgs = pdbMRAN, local = FALSE)
-        if (is.null(depMtrx)){
-          stop(gettextf("package '%s' was not found", pkg), domain = NA)
-        }
-        tools::getDepList(depMtrx, pdbMRAN)
-      }
-      
-      packages.expected <- sort(unique(unlist(
-        sapply(setdiff(packages.to.test, c("checkpoint", base.packages)), function(p){
-          z <- pkgDepends(p)
-          c(z$Depends, z$Imports)
-        }, USE.NAMES = FALSE)
-      )))
-      
-      
-      expected.packages <- setdiff(packages.to.test, c("checkpoint", base.packages))
-      
       it("installs all packages correctly in local lib", {
+        pdbMRAN <- available.packages(contriburl = contrib.url(repos = getSnapshotUrl(snap_date)))
+        pdbLocal <- installed.packages(fields = "Date/Publication", noCache = TRUE)
+        
+        pkgNames <- function(pdb)unname(pdb[, "Package"])
+        
+        base.packages <- pkgNames(utils::installed.packages(priority = "base", 
+                                                            lib.loc = .Library,
+                                                            noCache = TRUE))
+        
+        pkgDepends <- function (pkg) {
+          depMtrx <- tools:::getDepMtrx(pkg, instPkgs = pdbMRAN, local = FALSE)
+          if (is.null(depMtrx)){
+            stop(gettextf("package '%s' was not found", pkg), domain = NA)
+          }
+          tools::getDepList(depMtrx, pdbMRAN)
+        }
+        
+        packages.expected <- sort(unique(unlist(
+          sapply(setdiff(packages.to.test, c("checkpoint", base.packages)), function(p){
+            z <- pkgDepends(p)
+            c(z$Depends, z$Imports)
+          }, USE.NAMES = FALSE)
+        )))
+        
+        
+        expected.packages <- setdiff(packages.to.test, c("checkpoint", base.packages))
+        
         expect_true(
           all(expected.packages %in% pkgNames(pdbLocal))
         )
-      })
-      
-      messageMissingPackages <- function(exp, avail){
-        if(!all(exp %in% avail)) {
-          msg <- paste(
-            "\n",
-            paste0("Expected:", paste(exp, collapse = ", ")),
-            paste0("Actual  :", paste(avail, collapse = ", ")),
-            paste0("Missing :", paste(setdiff(exp, avail), collapse = ", ")),
-            "\n",
-            sep = "\n")
-          cat(msg)
+        
+        messageMissingPackages <- function(exp, avail){
+          if(!all(exp %in% avail)) {
+            msg <- paste(
+              "\n",
+              paste0("Expected:", paste(exp, collapse = ", ")),
+              paste0("Actual  :", paste(avail, collapse = ", ")),
+              paste0("Missing :", paste(setdiff(exp, avail), collapse = ", ")),
+              "\n",
+              sep = "\n")
+            cat(msg)
+          }
         }
-      }
-      messageMissingPackages(expected.packages, pkgNames(pdbLocal))
-      
-      it("all packages have publication dates prior to checkpoint data", {      
+        messageMissingPackages(expected.packages, pkgNames(pdbLocal))
+        
         expect_true(
           all(
             na.omit(
               pdbLocal[, "Date/Publication"]) <=
               as.POSIXct(snap_date, tz="UTC"))
         )
+        
       })
-      
       #       expect_true(
       #         all(
       #           sapply(setdiff(packages.to.test, "checkpoint"), function(x){
@@ -172,7 +168,7 @@ test_checkpoint <- function(https = FALSE, snap.dates){
         )
       })
     })
-
+    
     # cleanup
     cleanCheckpointFolder(snap_date, checkpointLocation = checkpointLocation)
   }