From e6dd9d5a46f84aeb4ed0a6db06b86bea09392fd5 Mon Sep 17 00:00:00 2001 From: Alexis Mousset Date: Sun, 25 Oct 2015 23:40:59 +0100 Subject: [PATCH] Install complete openssl on windows --- .appveyor.yml | 5 ++--- src/transport/file/mod.rs | 11 ++++++----- tests/transport_file.rs | 7 ++++++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 518892a..b530bb0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,11 +1,10 @@ environment: matrix: - TARGET: x86_64-pc-windows-msvc - - TARGET: i686-pc-windows-msvc - TARGET: x86_64-pc-windows-gnu - - TARGET: i686-pc-windows-gnu install: - - cinst openssl.light + - ps: Start-FileDownload 'http://slproweb.com/download/Win64OpenSSL-1_0_2d.exe' + - ps: Start-Process "Win64OpenSSL-1_0_2d.exe" -ArgumentList "/silent /verysilent /sp- /suppressmsgboxes" -Wait - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe" -FileName "rust-nightly.exe" - ps: .\rust-nightly.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null - ps: $env:PATH="$env:PATH;C:\rust\bin" diff --git a/src/transport/file/mod.rs b/src/transport/file/mod.rs index ef3f1a3..73adaac 100644 --- a/src/transport/file/mod.rs +++ b/src/transport/file/mod.rs @@ -21,7 +21,7 @@ impl FileEmailTransport { pub fn new>(path: P) -> FileEmailTransport { let mut path_buf = PathBuf::new(); path_buf.push(path); - FileEmailTransport {path: path_buf} + FileEmailTransport { path: path_buf } } } @@ -33,9 +33,9 @@ impl EmailTransport for FileEmailTransport { let mut f = try!(File::create(file.as_path())); let log_line = format!("{}: from=<{}> to=<{}>\n", - email.message_id(), - email.from_address(), - email.to_addresses().join("> to=<")); + email.message_id(), + email.from_address(), + email.to_addresses().join("> to=<")); try!(f.write_all(log_line.as_bytes())); try!(f.write_all(format!("{}", email.message()).as_bytes())); @@ -43,7 +43,8 @@ impl EmailTransport for FileEmailTransport { info!("{} status=", log_line); Ok(Response::new(Code::new(Severity::PositiveCompletion, Category::MailSystem, 0), - vec![format!("Ok: email written to {}", file.to_str().unwrap_or("non-UTF-8 path"))])) + vec![format!("Ok: email written to {}", + file.to_str().unwrap_or("non-UTF-8 path"))])) } fn close(&mut self) { diff --git a/tests/transport_file.rs b/tests/transport_file.rs index eeb2219..889fd79 100644 --- a/tests/transport_file.rs +++ b/tests/transport_file.rs @@ -1,12 +1,14 @@ extern crate lettre; +use std::env::temp_dir; + use lettre::transport::file::FileEmailTransport; use lettre::transport::EmailTransport; use lettre::email::EmailBuilder; #[test] fn file_transport() { - let mut sender = FileEmailTransport::new("/tmp/"); + let mut sender = FileEmailTransport::new(temp_dir()); let email = EmailBuilder::new() .to("root@localhost") .from("user@localhost") @@ -16,4 +18,7 @@ fn file_transport() { .unwrap(); let result = sender.send(email); assert!(result.is_ok()); + + message_id = email.message_id(); + }