diff --git a/.Rbuildignore b/.Rbuildignore index 45e5762..48016d4 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,7 +1,7 @@ ^.*\.Rproj$ ^\.Rproj\.user$ ^\.travis\.yml$ -^README\.*md$ +^README\.Rmd$ ^README\.*html$ ^NOTES\.*Rmd$ ^NOTES\.*html$ diff --git a/.travis.yml b/.travis.yml index d465915..debc0fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,7 @@ warnings_are_errors: true sudo: required apt_packages: - - binutils - - libproj-dev - - gdal-bin + - libmagic-dev env: global: diff --git a/DESCRIPTION b/DESCRIPTION index 23169a7..fbfec74 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,12 +16,13 @@ Suggests: testthat, tibble, magrittr, - dplyr, - rappdirs + dplyr Depends: R (>= 3.0.0) Imports: purrr, - Rcpp + Rcpp, + rappdirs, + utils LinkingTo: Rcpp RoxygenNote: 5.0.1 diff --git a/NAMESPACE b/NAMESPACE index 37aa86d..c0e7d1e 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -3,6 +3,7 @@ export(incant) export(magic_wand_file) import(purrr) -import(rappdirs) importFrom(Rcpp,sourceCpp) +importFrom(rappdirs,user_cache_dir) +importFrom(utils,unzip) useDynLib(wand) diff --git a/R/wand-package.R b/R/wand-package.R index 55c463e..d373cf6 100644 --- a/R/wand-package.R +++ b/R/wand-package.R @@ -4,7 +4,8 @@ #' @docType package #' @author Bob Rudis (@@hrbrmstr) #' @import purrr -#' @import rappdirs +#' @importFrom rappdirs user_cache_dir #' @useDynLib wand #' @importFrom Rcpp sourceCpp +#' @importFrom utils unzip NULL diff --git a/R/zzz.r b/R/zzz.r index 4d12342..b3583ef 100644 --- a/R/zzz.r +++ b/R/zzz.r @@ -12,8 +12,8 @@ #' database is used. #' @export #' @examples -# ' library(magrittr) -# ' library(dplyr) +#' library(magrittr) +#' library(dplyr) #' #' system.file("img", package="filemagic") %>% #' list.files(full.names=TRUE) %>% diff --git a/man/magic_wand_file.Rd b/man/magic_wand_file.Rd index 608e3de..19798ec 100644 --- a/man/magic_wand_file.Rd +++ b/man/magic_wand_file.Rd @@ -20,6 +20,8 @@ perform the decompression unless \code{force} is \code{TRUE} or the cache directory has been cleared. } \examples{ +library(magrittr) +library(dplyr) system.file("img", package="filemagic") \%>\% list.files(full.names=TRUE) \%>\% diff --git a/src/Makevars b/src/Makevars index 0575d35..6fecd53 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,3 +1 @@ -CPPFLAGS = -CXXFLAGS = -std=gnu99 -Wall -Wextra -O2 -g -fstack-protector PKG_LIBS = -lmagic \ No newline at end of file