Merge pull request #953 from beanieboi/update-mime-types-dependency

Update mime types dependency

.travis.yml

@@ -6,6 +6,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.2.3
+  - 2.3.0
   - ruby-head
   - jruby
   - jruby-head
@@ -17,7 +19,13 @@ gemfile:
   - gemfiles/mime_types_2.1.gemfile
   - gemfiles/mime_types_2.2.gemfile
   - gemfiles/mime_types_2.3.gemfile
+  - gemfiles/mime_types_2.4.gemfile
+  - gemfiles/mime_types_2.5.gemfile
+  - gemfiles/mime_types_2.6.gemfile
+  - gemfiles/mime_types_2.6_columnar.gemfile
+  - gemfiles/mime_types_2.99.gemfile
   - gemfiles/mime_types_2.latest.gemfile
+  - gemfiles/mime_types_3.0.gemfile
   - gemfiles/mime_types_edge.gemfile
 
 sudo: false
@@ -42,9 +50,33 @@ matrix:
       gemfile: gemfiles/mime_types_2.2.gemfile
     - rvm: 1.8.7
       gemfile: gemfiles/mime_types_2.3.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mime_types_2.4.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mime_types_2.5.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mime_types_2.6.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mime_types_2.6_columnar.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mime_types_2.99.gemfile
     - rvm: 1.8.7
       gemfile: gemfiles/mime_types_2.latest.gemfile
     - rvm: 1.8.7
+      gemfile: gemfiles/mime_types_3.0.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/mime_types_3.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/mime_types_3.0.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/mime_types_3.0.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/mime_types_edge.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/mime_types_edge.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/mime_types_edge.gemfile
+    - rvm: jruby
       gemfile: gemfiles/mime_types_edge.gemfile
   allow_failures:
     - rvm: ruby-head    # green, but unstable

Appraisals

@@ -18,10 +18,30 @@ appraise "mime-types-2.3" do
   gem "mime-types", "~> 2.3.0"
 end
 
-appraise "mime-types-2.latest" do
-  gem "mime-types", "~> 2.3"
+appraise "mime-types-2.4" do
+  gem "mime-types", "~> 2.4.0"
+end
+
+appraise "mime-types-2.5" do
+  gem "mime-types", "~> 2.5.0"
+end
+
+appraise "mime-types-2.6" do
+  gem "mime-types", "~> 2.6.0"
+end
+
+appraise "mime-types-2.6-columnar" do
+  gem "mime-types", "~> 2.6.0", :require => 'mime/types/columnar'
+end
+
+appraise "mime-types-2.99" do
+  gem "mime-types", "~> 2.99.0"
+end
+
+appraise "mime-types-3.0" do
+  gem "mime-types", "~> 3.0.0"
 end
 
 appraise "mime-types-edge" do
-  gem "mime-types", :github => "halostatue/mime-types"
+  gem "mime-types", :github => "mime-types/ruby-mime-types"
 end

Gemfile

@@ -8,5 +8,4 @@ gem "jruby-openssl", :platforms => :jruby
 # For gems not required to run tests
 group :local_development, :test do
   gem "appraisal", "~> 1.0" unless RUBY_VERSION <= "1.8.7"
-  gem "ruby-debug", :platforms => :mri_18
 end

gemfiles/mime_types_1.16.gemfile

@@ -7,7 +7,6 @@ gem "mime-types", "~> 1.16"
 
 group :local_development, :test do
   gem "appraisal", "~> 1.0"
-  gem "ruby-debug", :platforms => :mri_18
 end
 
 gemspec :path => "../"

gemfiles/mime_types_2.0.gemfile

@@ -7,7 +7,6 @@ gem "mime-types", "~> 2.0.0"
 
 group :local_development, :test do
   gem "appraisal", "~> 1.0"
-  gem "ruby-debug", :platforms => :mri_18
 end
 
 gemspec :path => "../"

gemfiles/mime_types_2.1.gemfile

@@ -7,7 +7,6 @@ gem "mime-types", "~> 2.1.0"
 
 group :local_development, :test do
   gem "appraisal", "~> 1.0"
-  gem "ruby-debug", :platforms => :mri_18
 end
 
 gemspec :path => "../"

gemfiles/mime_types_2.2.gemfile

@@ -7,7 +7,6 @@ gem "mime-types", "~> 2.2.0"
 
 group :local_development, :test do
   gem "appraisal", "~> 1.0"
-  gem "ruby-debug", :platforms => :mri_18
 end
 
 gemspec :path => "../"

gemfiles/mime_types_2.3.gemfile

@@ -7,7 +7,6 @@ gem "mime-types", "~> 2.3.0"
 
 group :local_development, :test do
   gem "appraisal", "~> 1.0"
-  gem "ruby-debug", :platforms => :mri_18
 end
 
 gemspec :path => "../"

gemfiles/mime_types_2.4.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jruby-openssl", :platforms => :jruby
+gem "mime-types", "~> 2.4.0"
+
+group :local_development, :test do
+  gem "appraisal", "~> 1.0"
+end
+
+gemspec :path => "../"

gemfiles/mime_types_2.5.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jruby-openssl", :platforms => :jruby
+gem "mime-types", "~> 2.5.0"
+
+group :local_development, :test do
+  gem "appraisal", "~> 1.0"
+end
+
+gemspec :path => "../"

gemfiles/mime_types_2.6.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jruby-openssl", :platforms => :jruby
+gem "mime-types", "~> 2.6.0"
+
+group :local_development, :test do
+  gem "appraisal", "~> 1.0"
+end
+
+gemspec :path => "../"

gemfiles/mime_types_2.6_columnar.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jruby-openssl", :platforms => :jruby
+gem "mime-types", "~> 2.6.0", :require => 'mime/types/columnar'
+
+group :local_development, :test do
+  gem "appraisal", "~> 1.0"
+end
+
+gemspec :path => "../"

gemfiles/mime_types_2.99.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jruby-openssl", :platforms => :jruby
+gem "mime-types", "~> 2.99.0"
+
+group :local_development, :test do
+  gem "appraisal", "~> 1.0"
+end
+
+gemspec :path => "../"

gemfiles/mime_types_2.latest.gemfile

@@ -7,7 +7,6 @@ gem "mime-types", "~> 2.3"
 
 group :local_development, :test do
   gem "appraisal", "~> 1.0"
-  gem "ruby-debug", :platforms => :mri_18
 end
 
 gemspec :path => "../"

gemfiles/mime_types_3.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jruby-openssl", :platforms => :jruby
+gem "mime-types", "~> 3.0.0"
+
+group :local_development, :test do
+  gem "appraisal", "~> 1.0"
+end
+
+gemspec :path => "../"

gemfiles/mime_types_edge.gemfile

@@ -3,11 +3,10 @@
 source "https://rubygems.org"
 
 gem "jruby-openssl", :platforms => :jruby
-gem "mime-types", :github => "halostatue/mime-types"
+gem "mime-types", :github => "mime-types/ruby-mime-types"
 
 group :local_development, :test do
   gem "appraisal", "~> 1.0"
-  gem "ruby-debug", :platforms => :mri_18
 end
 
 gemspec :path => "../"

mail.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md", "CONTRIBUTING.md", "CHANGELOG.rdoc", "TODO.rdoc"]
   s.rdoc_options << '--exclude' << 'lib/mail/values/unicode_tables.dat'
 
-  s.add_dependency('mime-types', [">= 1.16", "< 3"])
+  s.add_dependency('mime-types', [">= 1.16", "< 4"])
 
   s.add_development_dependency('bundler', '>= 1.0.3')
   s.add_development_dependency('rake', '> 0.8.7')

test.rb

@@ -1,10 +1,5 @@
 require 'rubygems'
 require 'mail'
-begin
-  require 'ruby-debug'
-rescue LoadError
-  STDERR.puts "Continuing without ruby-debug"
-end
 
 smtp = { :address => 'mail.fiendz.org', :port => 587, :domain => 'fiendz.org', :user_name => 'test@fiendz.org', :password => 'foobar', :enable_starttls_auto => true, :openssl_verify_mode => 'none' }
 Mail.defaults { delivery_method :smtp, smtp }