Merge @jjallaire's attributes fix re: working directory (closes #101)

kevinushey · kevinushey · commit de8d3a7445b4 · 2014-01-31T14:32:35.000-08:00
diff --git a/R/Attributes.R b/R/Attributes.R
@@ -6,12 +6,16 @@ sourceCpp <- function(file = "",
                       showOutput = verbose,
                       verbose = getOption("verbose")) {
 
-    # resolve code into a file if necessary
+    # resolve code into a file if necessary. also track the working
+    # directory to source the R embedded code chunk within
     if (!missing(code)) {
+        rWorkingDir <- getwd() 
         file <- tempfile(fileext = ".cpp")
         con <- file(file, open = "w")
         writeLines(code, con)
         close(con)
+    } else {
+        rWorkingDir <- dirname(file)
     }
 
     # resolve the file path
@@ -148,6 +152,7 @@ sourceCpp <- function(file = "",
     # source the embeddedR
     if (length(context$embeddedR) > 0) {
         srcConn <- textConnection(context$embeddedR)
+        setwd(rWorkingDir) # will be reset by previous on.exit handler
         source(file=srcConn, echo=TRUE)
     }
 
