Rewrite the API to more closely bind libcurl

.travis.yml

@@ -1,10 +1,54 @@
 language: rust
+matrix:
+  include:
+    - os: linux
+      rust: beta
+      env: TARGET=x86_64-unknown-linux-gnu
+    - os: linux
+      rust: beta
+      env: TARGET=i686-unknown-linux-gnu
+      addons:
+        apt:
+          packages:
+            - gcc-multilib
+            - libssl-dev:i386
+    - os: linux
+      rust: beta
+      env: TARGET=x86_64-unknown-linux-gnu LIBCURL_NO_PKG_CONFIG=1
+    - os: linux
+      rust: beta
+      env: TARGET=i686-unknown-linux-gnu LIBCURL_NO_PKG_CONFIG=1
+      addons:
+        apt:
+          packages:
+            - gcc-multilib
+            - libssl-dev:i386
+    - os: osx
+      rust: beta
+      env: TARGET=x86_64-apple-darwin
+    - os: osx
+      rust: beta
+      env: TARGET=i686-apple-darwin
+    # - os: linux
+    #   rust: beta
+    #   env: TARGET=x86_64-unknown-linux-gnu
+    - os: linux
+      rust: nightly
+      env: TARGET=x86_64-unknown-linux-gnu
 sudo: false
-rust:
-  - stable
-
-os:
-  - linux
-
+before_script:
+  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
+  - curl https://static.rust-lang.org/rustup.sh |
+    sh -s -- --add-target=$TARGET --disable-sudo -y --prefix=`rustc --print sysroot`
 script:
-  - cargo test
+  - export CARGO_TARGET_DIR=`pwd`/target
+  - curl --version
+  - cargo test --target $TARGET
+  - cargo run --manifest-path systest/Cargo.toml --target $TARGET
+  - cargo doc --no-deps --target $TARGET
+  - cargo doc --no-deps -p curl-sys --target $TARGET
+after_success:
+  - travis-cargo --only nightly doc-upload
+notifications:
+  email:
+    on_success: never

Cargo.toml

@@ -1,61 +1,17 @@
 [package]
 
 name = "curl"
-version = "0.2.19"
-authors = ["Carl Lerche <me@carllerche.com>"]
+version = "0.3.0"
+authors = ["Carl Lerche <me@carllerche.com>",
+           "Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT"
 repository = "https://github.com/carllerche/curl-rust"
 description = "Rust bindings to libcurl for making HTTP requests"
 
 [dependencies]
-url = ">= 0.5, < 2.0"
-log = "0.3.0"
 libc = "0.2"
-curl-sys = { path = "curl-sys", version = "0.1.0" }
-
-[dev-dependencies]
-env_logger = "0.3.0"
+curl-sys = { path = "curl-sys", version = "0.2.0" }
 
 # Unix platforms use OpenSSL for now to provide SSL functionality
 [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
 openssl-sys = "0.7.0"
-
-[target.i686-unknown-linux-gnu.dependencies]
-openssl-sys = "0.7.0"
-[target.i586-unknown-linux-gnu.dependencies]
-openssl-sys = "0.7.0"
-[target.i686-linux-android.dependencies]
-openssl-sys = "0.7.0"
-[target.x86_64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.7.0"
-[target.x86_64-unknown-linux-musl.dependencies]
-openssl-sys = "0.7.0"
-[target.arm-unknown-linux-gnueabihf.dependencies]
-openssl-sys = "0.7.0"
-[target.armv7-unknown-linux-gnueabihf.dependencies]
-openssl-sys = "0.7.0"
-[target.arm-linux-androideabi.dependencies]
-openssl-sys = "0.7.0"
-[target.aarch64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.7.0"
-[target.powerpc-unknown-linux-gnu.dependencies]
-openssl-sys = "0.7.0"
-[target.powerpc64-unknown-linux-gnu.dependencies]
-openssl-sys = "0.7.0"
-[target.powerpc64le-unknown-linux-gnu.dependencies]
-openssl-sys = "0.7.0"
-[target.i686-unknown-freebsd.dependencies]
-openssl-sys = "0.7.0"
-[target.x86_64-unknown-freebsd.dependencies]
-openssl-sys = "0.7.0"
-[target.x86_64-unknown-bitrig.dependencies]
-openssl-sys = "0.7.0"
-[target.x86_64-unknown-openbsd.dependencies]
-openssl-sys = "0.7.0"
-[target.x86_64-unknown-dragonfly.dependencies]
-openssl-sys = "0.7.0"
-
-[[test]]
-
-name = "test"
-path = "test/test.rs"

README.md

@@ -1,66 +1,120 @@
-# Curl-Rust
+# curl-rust
 
-libcurl bindings for Rust. **This project is in active development and
-could (will probably) break API compatibility at any time**.
+libcurl bindings for Rust
 
-[![Build Status](https://travis-ci.org/carllerche/curl-rust.svg?branch=master)](https://travis-ci.org/carllerche/curl-rust)
-[![crates.io](http://meritbadge.herokuapp.com/mio)](https://crates.io/crates/curl)
+[![Build Status](https://travis-ci.org/alexcrichton/curl-rust.svg?branch=master)](https://travis-ci.org/alexcrichton/curl-rust)
+[![Build status](https://ci.appveyor.com/api/projects/status/lx98wtbxhhhajpr9?svg=true)](https://ci.appveyor.com/project/alexcrichton/curl-rust)
+
+[Documentation](http://alexcrichton.com/curl-rust)
 
 ## Quick Start
 
 ```rust
 extern crate curl;
 
-use curl::http;
+use curl::easy::Easy;
 
-pub fn main() {
-  let resp = http::handle()
-    .get("http://www.example.com")
-    .exec().unwrap();
+// Print a web page onto stdout
+fn main() {
+    let mut easy = Easy::new();
+    easy.url("https://www.rust-lang.org/").unwrap();
+    easy.perform().unwrap();
 
-  println!("code={}; headers={:?}; body={:?}",
-    resp.get_code(), resp.get_headers(), resp.get_body());
+    println!("{}", easy.response_code().unwrap());
 }
 ```
 
-Response header names are automatically lower cased.
+```rust
+extern crate curl;
+
+use curl::easy::Easy;
+
+// Capture output into a local `Vec`.
+fn main() {
+    let mut dst = Vec::new();
+    let mut write = |data: &[u8]| {
+        dst.extend_from_slice(data);
+        data.len()
+    };
+    let mut easy = Easy::new();
+    easy.url("https://www.rust-lang.org/").unwrap();
+    easy.write_function(&mut write).unwrap();
+    easy.perform().unwrap();
+}
+```
 
 ## Post / Put requests
 
 Both of these methods expect that a request body is provided. A request
 body can be a `&[u8]`, `&str`, or `&Reader`. For example:
 
-```rust
-let resp = http::handle()
-  .post("http://www.example.com/upload", "this is the body")
-  .exec().unwrap();
+```rust,no_run
+extern crate curl;
+
+use std::io::Read;
+use curl::easy::Easy;
+
+fn main() {
+    let mut data = "this is the body".as_bytes();
+
+    let mut easy = Easy::new();
+    easy.url("http://www.example.com/upload").unwrap();
+    easy.read_function(|buf| {
+        data.read(buf).unwrap_or(0)
+    }).unwrap();
+    easy.post(true).unwrap();
+    easy.perform().unwrap();
+}
 ```
 
 ## Custom headers
 
 Custom headers can be specified as part of the request:
 
-```rust
-http::handle()
-  .get("http://www.example.com")
-  .header("Authorization", "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==")
-  .exec();
+```rust,no_run
+extern crate curl;
+
+use curl::easy::{Easy, List};
+
+fn main() {
+    let mut list = List::new();
+    list.append("Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==").unwrap();
+
+    let mut easy = Easy::new();
+    easy.url("http://www.example.com").unwrap();
+    easy.http_headers(list).unwrap();
+    easy.perform().unwrap();
+}
 ```
 
 ## Keep alive
 
 The handle can be re-used across multiple requests. Curl will attempt to
 keep the connections alive.
 
-```rust
-let handle = http::handle();
+```rust,no_run
+extern crate curl;
 
-let resp1 = handle.get("http://www.example.com/foo").exec().unwrap();
-let resp2 = handle.get("http://www.example.com/bar").exec().unwrap();
+use curl::easy::Easy;
+
+fn main() {
+    let mut handle = Easy::new();
+
+    handle.url("http://www.example.com/foo").unwrap();
+    handle.perform().unwrap();
+
+    handle.url("http://www.example.com/bar").unwrap();
+    handle.perform().unwrap();
+}
 ```
 
 ## Version Support
 
 The bindings have been developed using curl version 7.24.0. They should
 work with any newer version of curl and possibly with older versions,
 but this has not been tested.
+
+## License
+
+The `curl-rust` crate is licensed under the MIT license, see `LICENSE` for more
+details.

appveyor.yml

@@ -0,0 +1,41 @@
+environment:
+  matrix:
+  - TARGET: i686-pc-windows-gnu
+    MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z/download
+    MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
+    MINGW_DIR: mingw32
+  - TARGET: x86_64-pc-windows-gnu
+    MSYS_BITS: 64
+  - TARGET: i686-pc-windows-msvc
+  - TARGET: x86_64-pc-windows-msvc
+
+install:
+  # Install rust, x86_64-pc-windows-msvc host
+  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+  - rustup-init.exe -y
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - rustup update beta-x86_64-pc-windows-msvc
+  - rustup default beta-x86_64-pc-windows-msvc
+
+  # Install the target we're compiling for
+  - if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
+
+  # Use the system msys if we can
+  - if defined MSYS_BITS set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
+
+  # download a custom compiler otherwise
+  - if defined MINGW_ARCHIVE appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%"
+  - if defined MINGW_ARCHIVE 7z x -y "%MINGW_ARCHIVE%" > nul
+  - if defined MINGW_ARCHIVE set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
+
+  # let's see what we got
+  - where gcc rustc cargo
+  - rustc -vV
+  - cargo -vV
+  - set CARGO_TARGET_DIR=%CD%\target
+
+build: false
+
+test_script:
+  - cargo test --target %TARGET%
+  - cargo run --manifest-path systest/Cargo.toml --target %TARGET%

curl-sys/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "curl-sys"
-version = "0.1.34"
-authors = ["Carl Lerche <me@carllerche.com"]
+version = "0.2.0"
+authors = ["Carl Lerche <me@carllerche.com>",
+           "Alex Crichton <alex@alexcrichton.com>"]
 links = "curl"
 build = "build.rs"
 license = "MIT"
@@ -22,39 +23,3 @@ libc = "0.2"
 
 [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
 openssl-sys = ">= 0"
-
-# Unix platforms use OpenSSL for now to provide SSL functionality
-[target.i686-unknown-linux-gnu.dependencies]
-openssl-sys = ">= 0"
-[target.i586-unknown-linux-gnu.dependencies]
-openssl-sys = ">= 0"
-[target.i686-linux-android.dependencies]
-openssl-sys = ">= 0"
-[target.x86_64-unknown-linux-gnu.dependencies]
-openssl-sys = ">= 0"
-[target.x86_64-unknown-linux-musl.dependencies]
-openssl-sys = ">= 0"
-[target.arm-unknown-linux-gnueabihf.dependencies]
-openssl-sys = ">= 0"
-[target.armv7-unknown-linux-gnueabihf.dependencies]
-openssl-sys = "0.7.0"
-[target.arm-linux-androideabi.dependencies]
-openssl-sys = ">= 0"
-[target.aarch64-unknown-linux-gnu.dependencies]
-openssl-sys = ">= 0"
-[target.powerpc-unknown-linux-gnu.dependencies]
-openssl-sys = ">= 0"
-[target.powerpc64-unknown-linux-gnu.dependencies]
-openssl-sys = ">= 0"
-[target.powerpc64le-unknown-linux-gnu.dependencies]
-openssl-sys = ">= 0"
-[target.i686-unknown-freebsd.dependencies]
-openssl-sys = ">= 0"
-[target.x86_64-unknown-freebsd.dependencies]
-openssl-sys = ">= 0"
-[target.x86_64-unknown-bitrig.dependencies]
-openssl-sys = ">= 0"
-[target.x86_64-unknown-openbsd.dependencies]
-openssl-sys = ">= 0"
-[target.x86_64-unknown-dragonfly.dependencies]
-openssl-sys = ">= 0"