Merge fff9771 into 688cfe1

kiwiroy · Jul 5, 2019 · 08195bf · 08195bf
2 parents 688cfe1 + fff9771
commit 08195bf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: perlbrewr
 Title: Integrates Perlbrew With R, Specifically (knitr & rmarkdown)
-Version: 0.0.0.9000
+Version: 0.0.1.9000
 Authors@R: c(
   person("Roy", "Storey", email = "kiwiroy@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-1375-7136")))
 Description: The goal of perlbrewr is to assist the loading of a perlbrew 

diff --git a/R/knitr-shellwords.R b/R/knitr-shellwords.R
@@ -80,7 +80,9 @@ shellwords <- function(x) {
    )
   )"
   xo <- str_match_all(string = x, pattern = shellwords_re)
-
+  if (length(xo) == 0) {
+    return(character(0))
+  }
   for (i in seq_along(xo[[1]][,1])) {
     xo[[1]][i,7] <- NA
     if(!is.na(xo[[1]][i,6]) && xo[[1]][i,6] != "") {

diff --git a/tests/testthat/test-90-regression.R b/tests/testthat/test-90-regression.R
@@ -0,0 +1,6 @@
+context("regression tests")
+
+test_that("regression - handle NULL from knitr::opts_chunk$get('engine.opts')$perl ", {
+  words <- perlbrewr:::shellwords(x = NULL)
+  expect_equal(words, character(0))
+})