From 25c036c08ef517d8a3b7d8a599a5087c80c7a1d0 Mon Sep 17 00:00:00 2001 From: Mark Edmondson Date: Tue, 9 Aug 2016 22:12:11 +0200 Subject: [PATCH] pass CRAN checks, change dependencies --- DESCRIPTION | 6 +++--- R/downloadData.R | 2 +- R/jobs.R | 2 +- man/bqr_download_extract.Rd | 2 +- man/bqr_wait_for_job.Rd | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b517e21..c99d92e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,13 +16,13 @@ LazyData: TRUE Depends: R (>= 3.2.0) Imports: - googleAuthR (>= 0.2.0) + googleAuthR (>= 0.2.0), + googleCloudStorageR (>= 0.1.0) Suggests: shiny (>= 0.12.1), jsonlite (>= 0.9.21), httr (>= 1.1.0), knitr, - rmarkdown, - googleCloudStorageR + rmarkdown RoxygenNote: 5.0.1 VignetteBuilder: knitr diff --git a/R/downloadData.R b/R/downloadData.R index 0a3de9b..55165cf 100644 --- a/R/downloadData.R +++ b/R/downloadData.R @@ -151,7 +151,7 @@ bqr_extract_data <- function(projectId, #' If more than 1GB, will save multiple .csv files with prefix "N_" to filename. #' #' @param extractJob An extract job from \link{bqr_extract_data} -#' @param fileName Where to save the csv file. If NULL then uses objectname. +#' @param filename Where to save the csv file. If NULL then uses objectname. #' #' @return TRUE if successfully downloaded #' @import googleCloudStorageR diff --git a/R/jobs.R b/R/jobs.R index c0da340..247faff 100644 --- a/R/jobs.R +++ b/R/jobs.R @@ -2,7 +2,7 @@ #' #' Wait for a bigQuery job to finish. #' -#' @param jobObject A job object +#' @param job A job object #' @param wait The number of seconds to wait between checks #' #' Use this function to do a loop to check progress of a job running diff --git a/man/bqr_download_extract.Rd b/man/bqr_download_extract.Rd index 4ac6cf6..adaacef 100644 --- a/man/bqr_download_extract.Rd +++ b/man/bqr_download_extract.Rd @@ -9,7 +9,7 @@ bqr_download_extract(extractJob, filename = NULL) \arguments{ \item{extractJob}{An extract job from \link{bqr_extract_data}} -\item{fileName}{Where to save the csv file. If NULL then uses objectname.} +\item{filename}{Where to save the csv file. If NULL then uses objectname.} } \value{ TRUE if successfully downloaded diff --git a/man/bqr_wait_for_job.Rd b/man/bqr_wait_for_job.Rd index c0ac7a3..65ac537 100644 --- a/man/bqr_wait_for_job.Rd +++ b/man/bqr_wait_for_job.Rd @@ -7,11 +7,11 @@ bqr_wait_for_job(job, wait = 5) } \arguments{ +\item{job}{A job object} + \item{wait}{The number of seconds to wait between checks Use this function to do a loop to check progress of a job running} - -\item{jobObject}{A job object} } \value{ After a while, a completed job