mail 2.5.5.rc1 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80272f9450b9b4e8fda722e90b035af0571714a7
-  data.tar.gz: 4ccdee5a66dcb916988af7e26fa5aa40ca0486ca
+  metadata.gz: 483ee321c6ec26a7fb20deb57c50254f916c5055
+  data.tar.gz: 49bbe456db7b901b8f9a17cc404ed6cdd4ac84f2
 SHA512:
-  metadata.gz: 306abdee9ff345ecdf15fc1bbcf3b894d3becfc3aaf4c254931ad088dda67a5043762d263de6dec3f432146d44d1a595aa23d534cb345736dc435738bff3e682
-  data.tar.gz: bb33d18fdbdc381e4c6b0d7aef3c2495dc4d1205bea210f5118bb18c0e6d4bfe5a87df5330a103fa0b8d4fdac62511b264b21f22d50c59599585c0a631731243
+  metadata.gz: bc79fcc391b2358f8aecd403453c934399a561bd2cf0c3cb32bf850815a6c99086c47104e0680a7d77a62585453bef8ca27d885f0345d102e0191a1f5354973d
+  data.tar.gz: cd1ea707e1b61aa29bb452d3b2eaa7a245721b28d17448061cef63beff93c794f3a05d0c104afa79a9cb7026f0b20376f422b76747170d35fe72a59ed64e40e6

data/CHANGELOG.rdoc

@@ -1,10 +1,11 @@
-== Version 2.5.5 - unreleased
+== Version 2.5.5 - 2017-06-09 Jeremy Daer <jeremydaer@gmail.com>
 
 Security:
 * #1097 – SMTP security: prevent command injection via To/From addresses. (jeremy)
 
 Bugs:
 * #633 – Cope with message parts that have an empty Content-Type (ThomasKoppensteiner, zeepeeare)
+* #689 - Fix Exim delivery method broken by #477 in 2.5.4. (jethrogb)
 
 == Version 2.5.4 - Tue May 14 14:45:00 +1100 2013 Mikel Lindsaar <mikel@lindsaar.net>
 

data/Gemfile

@@ -2,14 +2,31 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "rake", "< 11.0" if RUBY_VERSION < '1.9.3'
-
-gem "treetop", "~> 1.4.10"
-gem "mime-types", "~> 1.16"
+if RUBY_VERSION < '1.9.3'
+  gem 'activesupport', '< 4'
+elsif RUBY_VERSION < '2.2.2'
+  gem 'activesupport', '< 5'
+end
+gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3'
 gem "tlsmail" if RUBY_VERSION <= '1.8.6'
+gem "mime-types", "~> 1.16"
+gem "treetop", "~> 1.4.10"
 
 gem 'jruby-openssl', :platform => :jruby
 
 # For gems not required to run tests
 group :local_development, :test do
+  gem 'rake', '> 0.8.7', '< 11.0.1'
+  gem 'rdoc', '< 4.3' if RUBY_VERSION < '1.9.3'
+  gem "rspec",      "~> 2.8.0"
+  case
+  when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    # Skip it
+  when RUBY_PLATFORM == 'java'
+    # Skip it
+  when RUBY_VERSION < '1.9'
+    gem "ruby-debug"
+  else
+    # Skip it
+  end
 end

data/README.md

@@ -42,17 +42,15 @@ me a nice email :)
 Compatibility
 -------------
 
-Every Mail commit is tested by Travis on the [following platforms](https://github.com/mikel/mail/blob/master/.travis.yml)
-
-* ruby-1.8.7 [ i686 ]
-* ruby-1.9.2 [ x86_64 ]
-* ruby-1.9.3 [ x86_64 ]
-* ruby-2.0.0 [ x86_64 ]
-* ruby-2.1.2 [ x86_64 ]
-* ruby-head [ x86_64 ]
-* jruby [ x86_64 ]
-* jruby-head [ x86_64 ]
-* rbx-2 [ x86_64 ]
+Mail supports Ruby 1.8.7+, including JRuby and Rubinius.
+
+Every Mail commit is tested by Travis on [all supported Ruby versions](https://github.com/mikel/mail/blob/master/.travis.yml).
+
+Testing a specific version of mime-types (needed for Ruby 1.8.7, for example) can be done manually with:
+
+```sh
+BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile bundle && rake
+```
 
 Discussion
 ----------

data/lib/VERSION

@@ -1,4 +1,4 @@
 major:2
 minor:5
 patch:5
-build:rc1
+build:

data/lib/mail/network/delivery_methods/exim.rb

@@ -36,17 +36,13 @@ module Mail
   #
   #   mail.deliver!
   class Exim < Sendmail
-    def initialize(values)
-      self.settings = { :location       => '/usr/sbin/exim',
-                        :arguments      => '-i -t' }.merge(values)
-    end
+    DEFAULTS = {
+      :location   => '/usr/sbin/exim',
+      :arguments  => '-i -t'
+    }
 
-    def self.call(path, arguments, destinations, mail)
-      popen "#{path} #{arguments}" do |io|
-        io.puts mail.encoded.to_lf
-        io.flush
-      end
+    def self.call(path, arguments, destinations, encoded_message)
+      super path, arguments, nil, encoded_message
     end
-
   end
 end

data/lib/mail/network/delivery_methods/sendmail.rb

@@ -37,11 +37,15 @@ module Mail
   #
   #   mail.deliver!
   class Sendmail
+    DEFAULTS = {
+      :location   => '/usr/sbin/sendmail',
+      :arguments  => '-i'
+    }
+
     attr_accessor :settings
 
     def initialize(values)
-      self.settings = { :location       => '/usr/sbin/sendmail',
-                        :arguments      => '-i' }.merge(values)
+      self.settings = self.class::DEFAULTS.merge(values)
     end
 
     def deliver!(mail)

data/lib/mail/network/delivery_methods/smtp.rb

@@ -129,15 +129,11 @@ module Mail
         openssl_verify_mode = "OpenSSL::SSL::VERIFY_#{openssl_verify_mode.upcase}".constantize
       end
 
-      if RUBY_VERSION < '1.9.0'
-        openssl_verify_mode
-      else
-        context = Net::SMTP.default_ssl_context
-        context.verify_mode = openssl_verify_mode
-        context.ca_path = settings[:ca_path] if settings[:ca_path]
-        context.ca_file = settings[:ca_file] if settings[:ca_file]
-        context
-      end
+      context = Net::SMTP.default_ssl_context
+      context.verify_mode = openssl_verify_mode
+      context.ca_path = settings[:ca_path] if settings[:ca_path]
+      context.ca_file = settings[:ca_file] if settings[:ca_file]
+      context
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.5.5.rc1
+  version: 2.5.5
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -261,12 +261,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.