From 51dfba6f4c33c6410473204b7893184b5e7b2b18 Mon Sep 17 00:00:00 2001 From: Ellis Hughes Date: Wed, 19 Aug 2020 12:13:54 -0700 Subject: [PATCH] Dev (#68) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add delimeter detection * fix documentation * update the documentation vs actual code * cannot access data via `$`for some reason. but now it will only load files called out in the readme, resolving issue #20 * drop show_readme function - redundant to readme function * bump version * improve read speed, and add user ability to pass args to tt_read_data from tt_load * resolve build check errors, make readme exported... * try rolling back and specifying min version of rlang necessary * move up rlang and dplyr version * update min package versions for travis? * update minimum package versions * attempting to make pkgdown site for {tidytuesdayR} * bump version to dev number * add print method and add more tests * update documentation for print method * Add README.Rmd * Make pkgdown work (#32) * try to get pkgdown to use the readme * Add pkgdown to suggests * Update DESCRIPTION bump version number * remove README.Rmd * Gdpr data (#45) * Path replace fix (#43) * update URL path corrections * Improvement on file-finding abilities... * first updates to api * update github calls to add blob and authentication * working on updating file downloading via github api * updates to allow for setting ref repo in options * add documentation * updates to printing tt_available * updates to tests & docs to pass devtools::check * add auth to downloading sha within tt_download * Looking to remove travis/appveyor dep * update to reference full path and stringsAsFactors not being TRUE by default now. * Add token to github_pat function * add GITHUB_PAT as token * add travis and appveyor back in * hopefully this fixes appveyor * remove travis and move code coverage to github actions (#49) * update news, bump major version * add github api limiting feature * Cran release prep v1 (#52) * prepping for CRAN release * Add Cran Comments * Increment version number * Tidytemplates (#61) * Create tidytemplate * update documentation * update for missing imports and partial arg match * complete updates to tidytemplate * wrap tests in tt_ref_test_that and add api check * html encoding error (#62) * unpdate to allow for general encoding * Fix so only specific locale needed updating (CTYPE) * Increment version number * update news * add CRAN comments * spelling * cran release * update func to pass args to parsing funcs * Increment version number * Update github_api.R (#67) malformed check against github api, for some reason worked everywhere but rstudio cloud? #65 * Documentation correction (#70) * Update to make missing delim acceptable (#66) * Update to make missing delim acceptable * Update R-CMD-check.yaml * Update R-CMD-check.yaml undo updates 🙄 * Update tt_download.R Correct documentation * update docs * fix order of link and code --- CRAN-RELEASE | 4 ++-- DESCRIPTION | 2 +- NEWS.md | 2 ++ R/github_api.R | 2 +- R/tt_download.R | 3 +-- R/tt_download_file.R | 2 +- man/tt_download.Rd | 3 +-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CRAN-RELEASE b/CRAN-RELEASE index ad5feef..c8019de 100644 --- a/CRAN-RELEASE +++ b/CRAN-RELEASE @@ -1,2 +1,2 @@ -This package was submitted to CRAN on 2020-06-25. -Once it is accepted, delete this file and tag the release (commit e11af077e1). +This package was submitted to CRAN on 2020-07-09. +Once it is accepted, delete this file and tag the release (commit 042d9a2d32). diff --git a/DESCRIPTION b/DESCRIPTION index 02d8cbc..f41ba40 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: tidytuesdayR Type: Package Title: Access the Weekly 'TidyTuesday' Project Dataset -Version: 1.0.1 +Version: 1.0.1.9000 Authors@R: c( person( diff --git a/NEWS.md b/NEWS.md index 2b6a47e..ec61288 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# tidytuesdayR (development version) + # tidytuesdayR 1.0.1 * [feature] Provide a template Rmd for users, populated with date and proper `tt_load` call diff --git a/R/github_api.R b/R/github_api.R index 48ddd49..6a9c733 100644 --- a/R/github_api.R +++ b/R/github_api.R @@ -492,7 +492,7 @@ check_connectivity <- function(rerun = FALSE){ #if internet connection is not set or is false, lets try again if(!getOption("tidytuesdayR.tt_testing", FALSE)){ if(is.na(internet_connection) | !internet_connection | rerun){ - res <- try(GET("https:/api.github.com"), silent = TRUE) + res <- try(GET("https://api.github.com"), silent = TRUE) if(inherits(res,"try-error")){ options("tidytuesdayR.tt_internet_connectivity" = FALSE) }else{ diff --git a/R/tt_download.R b/R/tt_download.R index d479913..5c18d98 100644 --- a/R/tt_download.R +++ b/R/tt_download.R @@ -2,8 +2,7 @@ #' #' Download all or specific files identified in the tt dataset #' -#' @param tt string representation of the date of data to pull, in YYYY-MM-dd -#' format, or just numeric entry for year +#' @param tt a `tt` object, output from \code{\link{tt_load_gh}} #' @param files List the file names to download. Default to asking. #' @param ... pass methods to the parsing functions. These will be passed to #' ALL files, so be careful. diff --git a/R/tt_download_file.R b/R/tt_download_file.R index 12b9ade..c9dd3c0 100644 --- a/R/tt_download_file.R +++ b/R/tt_download_file.R @@ -80,7 +80,7 @@ tt_download_file.character <- auth = auth ) - tt_parse_blob(blob, file_info = file_info[file_info$data_file == x,]) + tt_parse_blob(blob, file_info = file_info[file_info$data_file == x,], ...) } else { stop(paste0( diff --git a/man/tt_download.Rd b/man/tt_download.Rd index 02dbefc..d48bc74 100644 --- a/man/tt_download.Rd +++ b/man/tt_download.Rd @@ -9,8 +9,7 @@ Download all or specific files identified in the tt dataset} tt_download(tt, files = c("All"), ..., branch = "master", auth = github_pat()) } \arguments{ -\item{tt}{string representation of the date of data to pull, in YYYY-MM-dd -format, or just numeric entry for year} +\item{tt}{a `tt` object, output from \code{\link{tt_load_gh}}} \item{files}{List the file names to download. Default to asking.}