Skip to content

Commit

Permalink
MASS rename
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Mar 14, 2017
1 parent dc75a0e commit ebb771f
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 26 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Expand Up @@ -3,7 +3,7 @@ Type: Package
Title: A Modern and Flexible Web Client for R
Version: 2.3.9000
Authors@R: c(
person("Jeroen", "Ooms", , "jeroen.ooms@stat.ucla.edu", role = c("cre", "aut")),
person("Jeroen", "Ooms", , "jeroen@berkeley.edu", role = c("cre", "aut")),
person("Hadley", "Wickham", , "hadley@rstudio.com", role = "ctb"),
person("RStudio", role = "cph")
)
Expand All @@ -18,8 +18,8 @@ Description: The curl() and curl_download() functions provide highly
specific tools and logic.
License: MIT + file LICENSE
SystemRequirements: libcurl: libcurl-devel (rpm) or libcurl4-openssl-dev (deb).
URL: https://github.com/jeroenooms/curl#readme
BugReports: https://github.com/jeroenooms/curl/issues
URL: https://github.com/jeroen/curl#readme
BugReports: https://github.com/jeroen/curl/issues
Suggests:
testthat (>= 1.0.0),
knitr,
Expand Down
4 changes: 2 additions & 2 deletions R/curl.R
Expand Up @@ -54,14 +54,14 @@
#' readLines(curl("gopher://quux.org/1"))
#'
#' # Streaming data
#' con <- curl("http://jeroenooms.github.io/data/diamonds.json", "r")
#' con <- curl("http://jeroen.github.io/data/diamonds.json", "r")
#' while(length(x <- readLines(con, n = 5))){
#' print(x)
#' }
#'
#' # Stream large dataset over https with gzip
#' library(jsonlite)
#' con <- gzcon(curl("https://jeroenooms.github.io/data/nycflights13.json.gz"))
#' con <- gzcon(curl("https://jeroen.github.io/data/nycflights13.json.gz"))
#' nycflights <- stream_in(con)
#' }
#'
Expand Down
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -2,13 +2,13 @@

##### *A Modern and Flexible Web Client for R*

[![Build Status](https://travis-ci.org/jeroenooms/curl.svg?branch=master)](https://travis-ci.org/jeroenooms/curl)
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/jeroenooms/curl?branch=master&svg=true)](https://ci.appveyor.com/project/jeroenooms/curl)
[![Coverage Status](https://codecov.io/github/jeroenooms/curl/coverage.svg?branch=master)](https://codecov.io/github/jeroenooms/curl?branch=master)
[![Build Status](https://travis-ci.org/jeroen/curl.svg?branch=master)](https://travis-ci.org/jeroen/curl)
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/jeroen/curl?branch=master&svg=true)](https://ci.appveyor.com/project/jeroen/curl)
[![Coverage Status](https://codecov.io/github/jeroen/curl/coverage.svg?branch=master)](https://codecov.io/github/jeroen/curl?branch=master)
[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/curl)](http://cran.r-project.org/package=curl)
[![CRAN RStudio mirror downloads](http://cranlogs.r-pkg.org/badges/curl)](http://cran.r-project.org/web/packages/curl/index.html)
[![Research software impact](http://depsy.org/api/package/cran/curl/badge.svg)](http://depsy.org/package/r/curl)
[![Github Stars](https://img.shields.io/github/stars/jeroenooms/curl.svg?style=social&label=Github)](https://github.com/jeroenooms/curl)
[![Github Stars](https://img.shields.io/github/stars/jeroen/curl.svg?style=social&label=Github)](https://github.com/jeroen/curl)

> The curl() and curl_download() functions provide highly
configurable drop-in replacements for base url() and download.file() with
Expand Down Expand Up @@ -112,7 +112,7 @@ Note that on OS-X you **must** recompile the R package from source after force-l
Because `devtools` and `httr` depend on `curl`, installing with `install_github` does not work well. The easiest way to install the development version of `curl` is a clean R session:

```r
install.packages("https://github.com/jeroenooms/curl/archive/master.tar.gz", repos = NULL)
install.packages("https://github.com/jeroen/curl/archive/master.tar.gz", repos = NULL)
```

Of course windows users need [Rtools](https://cran.r-project.org/bin/windows/Rtools/) to compile from source.
Expand All @@ -129,7 +129,7 @@ brew link curl --force
And then reinstall the `curl` package from source:

```r
install.packages("https://github.com/jeroenooms/curl/archive/master.tar.gz", repos = NULL)
install.packages("https://github.com/jeroen/curl/archive/master.tar.gz", repos = NULL)
```

Check again `curl_version()` to see if HTTP/2 is enabled now.
Expand Down
2 changes: 1 addition & 1 deletion docker/r-devel-san/Dockerfile
Expand Up @@ -8,7 +8,7 @@ RUN apt-get -qq update \
&& apt-get -qq install git pandoc pandoc-citeproc libssl-dev libcurl4-openssl-dev -y \
&& RDscript -e 'install.packages("curl", dependencies = TRUE, quiet = TRUE)'

RUN git clone https://github.com/jeroenooms/curl \
RUN git clone https://github.com/jeroen/curl \
&& RD CMD build curl --no-build-vignettes \
&& RD CMD INSTALL curl_*.tar.gz --install-tests

Expand Down
12 changes: 6 additions & 6 deletions examples/circular.R
Expand Up @@ -4,8 +4,8 @@ test <- function(){
pool <- new_pool()
h2 <- new_handle()
cb <- function(...){}
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool, done = cb, handle = h1)
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool, done = cb, handle = h2)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool, done = cb, handle = h1)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool, done = cb, handle = h2)
return(pool)
}

Expand All @@ -30,8 +30,8 @@ invisible(gc());
test2 <- function(){
pool <- new_pool()
cb <- function(...){}
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool, done = cb)
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool, done = cb)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool, done = cb)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool, done = cb)
}

# Should clean pool and both handles
Expand All @@ -42,8 +42,8 @@ invisible(gc())
# Test3 circular GC problems
test3 <- function(){
pool <- new_pool()
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool)
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool)
return(pool)
}

Expand Down
4 changes: 2 additions & 2 deletions man/curl.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/curl.c
@@ -1,6 +1,6 @@
/* *
* Streaming interface to libcurl for R. (c) 2015 Jeroen Ooms.
* Source: https://github.com/jeroenooms/curl
* Source: https://github.com/jeroen/curl
* Comments and contributions are welcome!
* Helpful libcurl examples:
* - http://curl.haxx.se/libcurl/c/getinmemory.html
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/helper-version.R
Expand Up @@ -6,7 +6,7 @@ find_test_server <- function(){

# Try to download latest test-server list
servers <- tryCatch({
req <- curl_fetch_memory("http://jeroenooms.github.io/curl/servers", handle = h)
req <- curl_fetch_memory("http://jeroen.github.io/curl/servers", handle = h)
strsplit(rawToChar(req$content), "\n", fixed = TRUE)[[1]]
}, error = function(e){
message("Failed to download server list:", e$message)
Expand Down
8 changes: 4 additions & 4 deletions tests/testthat/test-gc.R
Expand Up @@ -5,8 +5,8 @@ test <- function(){
pool <- new_pool()
h2 <- new_handle()
cb <- function(...){}
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool, done = cb, handle = h1)
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool, done = cb, handle = h2)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool, done = cb, handle = h1)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool, done = cb, handle = h2)
return(pool)
}

Expand All @@ -30,8 +30,8 @@ test_that("Garbage collection works", {
test2 <- function(){
pool <- new_pool()
cb <- function(...){}
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool, done = cb)
curl_fetch_multi('http://jeroenooms.github.io/images/frink.png', pool = pool, done = cb)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool, done = cb)
curl_fetch_multi('http://jeroen.github.io/images/frink.png', pool = pool, done = cb)
}

test_that("Clean up pending requets", {
Expand Down

0 comments on commit ebb771f

Please sign in to comment.