Merge a21cce0 into e7c62f3

.ruby-version

@@ -1 +1 @@
-ruby-2.2.3
+ruby-2.3.1

.travis.yml

@@ -2,26 +2,67 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
+#  - 1.9
   - 2.0
   - 2.1
   - 2.2
-  - ruby-head
+  - 2.3.1
+#  - ruby-head
 gemfile:
-  - gemfiles/Gemfile.rails-3.2.x
-  - gemfiles/Gemfile.rails-4.0.x
-  - gemfiles/Gemfile.rails-4.1.x
-  - gemfiles/Gemfile.rails-4.2.x
+  - gemfiles/rails_3_0.gemfile
+  - gemfiles/rails_3_1.gemfile
+  - gemfiles/rails_3_2.gemfile
+  - gemfiles/rails_4_0.gemfile
+  - gemfiles/rails_4_1.gemfile
+  - gemfiles/rails_4_2.gemfile
+  - gemfiles/rails_5_0.gemfile
 matrix:
   allow_failures:
-    - rvm: ruby-head
-    - rvm: 1.9
+#    - rvm: ruby-head
+#    - rvm: 1.9
   exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/Gemfile.rails-4.2.x
-    - rvm: 2.1
-      gemfile: gemfiles/Gemfile.rails-4.2.x
-  include:
     - rvm: 1.9
-      gemfile: gemfiles/Gemfile.rails-3.0.x
+      gemfile: gemfiles/rails_3_2.gemfile
+    - rvm: 1.9
+      gemfile: gemfiles/rails_4_0.gemfile
     - rvm: 1.9
-      gemfile: gemfiles/Gemfile.rails-3.1.x
+      gemfile: gemfiles/rails_4_1.gemfile
+    - rvm: 1.9
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: 1.9
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_3_0.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_3_1.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_3_0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_3_1.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.2
+      gemfile: gemfiles/rails_3_0.gemfile
+    - rvm: 2.2
+      gemfile: gemfiles/rails_3_1.gemfile
+    - rvm: 2.2
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 2.3.1
+      gemfile: gemfiles/rails_3_0.gemfile
+    - rvm: 2.3.1
+      gemfile: gemfiles/rails_3_1.gemfile
+#    - rvm: ruby-head
+#      gemfile: gemfiles/rails_5_0.gemfile
+#  include:
+#    - rvm: 1.9
+#      gemfile: gemfiles/rails_3_0.gemfile
+#    - rvm: 1.9
+#      gemfile: gemfiles/rails_3_1.gemfile
+install:
+  - bundle install

Appraisals

@@ -0,0 +1,55 @@
+appraise "rails-3-0" do
+    gem "rails", "~> 3.0.0"
+    gem "reek", "~> 2.0" # for Ruby < 2.0
+    gem "tins", "~> 1.6.0" # for Ruby < 2.0
+    gem "json", "~> 1.8.3"
+    gem "rake", "~> 11.2.2"
+    gem "rest-client", "~> 1.8.0"
+end
+appraise "rails-3-1" do
+    gem "actionmailer", "~> 3.1.0"
+    gem "railties", "~> 3.1.0"
+    gem "reek", "~> 2.0" # for Ruby < 2.0
+    gem "tins", "~> 1.6.0" # for Ruby < 2.0
+    gem "json", "~> 1.8.3"
+    gem "rake", "~> 11.2.2"
+    gem "rest-client", "~> 1.8.0"
+end
+appraise "rails-3-2" do
+    gem "actionmailer", "~> 3.2.0"
+    gem "railties", "~> 3.2.0"
+    # reek >= 4.0 requires Ruby 2.1 minimum
+    gem "reek", "~>3.11.0"
+    gem "json", "~> 1.8.3"
+    gem "rake", "~> 11.2.2"
+end
+
+appraise "rails-4-0" do
+    gem "actionmailer", "~> 4.0.0"
+    gem "railties", "~> 4.0.0"
+    # reek >= 4.0 requires Ruby 2.1 minimum
+    gem "reek", "~>3.11.0"
+    gem "json", "~> 1.8.3"
+    gem "rake", "~> 11.2.2"
+end
+appraise "rails-4-1" do
+    gem "actionmailer", "~> 4.1.0"
+    gem "railties", "~> 4.1.0"
+    # reek >= 4.0 requires Ruby 2.1 minimum
+    gem "reek", "~>3.11.0"
+    gem "json", "~> 1.8.3"
+    gem "rake", "~> 11.2.2"
+end
+appraise "rails-4-2" do
+    gem "actionmailer", "~> 4.2.0"
+    gem "railties", "~> 4.2.0"
+    gem "json", "~> 1.8.3"
+    gem "rake", "~> 11.2.2"
+end
+
+appraise "rails-5-0" do
+    gem "actionmailer", "~> 5.0.0"
+    gem "railties", "~> 5.0.0"
+    gem "json", "~> 2.0.2"
+    gem "rake", "~> 11.2.2"
+end

README.md

@@ -338,6 +338,25 @@ Follow the instructions for "Contributing" below.
 5. Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 6. Create new Pull Request
 
+## Running Specs
+
+The basic compatibility matrix:
+```
+appraisal install
+appraisal rake test
+```
+
+Run the whole travis compatibility matrix:
+```
+rake wwtd:bundle
+rake wwtd
+```
+
+Sometimes also:
+```
+appraisal update
+```
+
 ## Versioning
 
 This library aims to adhere to [Semantic Versioning 2.0.0][semver].
@@ -353,7 +372,7 @@ dependency on this gem using the [Pessimistic Version Constraint][pvc] with two
 For example:
 
 ```ruby
-spec.add_dependency 'sanitize_email', '~> 1.1'
+spec.add_dependency 'sanitize_email', '~> 1.3'
 ```
 
 ## References

Rakefile

@@ -1,13 +1,18 @@
 # encoding: utf-8
 #!/usr/bin/env rake
+require "rubygems"
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake"
 
 begin
+  require "wwtd/tasks"
   require "rspec/core/rake_task"
   RSpec::Core::RakeTask.new(:spec)
   task :default => :spec
+  task :test => :spec
 rescue LoadError
+  warn "Failed to load rspec or wwtd"
 end
 
 require "reek/rake/task"
@@ -23,44 +28,6 @@ RoodiTask.new do |t|
   t.verbose = false
 end
 
-namespace :test do
-  desc "Test against all supported Rails versions"
-  task :all do
-    %w(3.0.x 3.1.x 3.2.x 4.0.x).each do |version|
-      system(<<-EOS
-          bash -i -c "rvm use 1.9.3"
-          BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle --quiet
-          BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle exec rspec spec
-      EOS
-      )
-    end
-    %w(3.2.x 4.0.x 4.1.x).each do |version|
-      system(<<-EOS
-          bash -i -c "rvm use 2.0.0"
-          BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle --quiet
-          BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle exec rspec spec
-        EOS
-      )
-    end
-    %w(3.2.x 4.0.x 4.1.x).each do |version|
-      system(<<-EOS
-          bash -i -c "rvm use 2.1.7"
-          BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle --quiet
-          BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle exec rspec spec
-      EOS
-      )
-    end
-    %w(3.2.x 4.0.x 4.1.x 4.2.x).each do |version|
-      system(<<-EOS
-          bash -i -c "rvm use 2.2.3"
-          BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle --quiet
-          BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle exec rspec spec
-      EOS
-      )
-    end
-  end
-end
-
 require File.expand_path("../lib/sanitize_email/version", __FILE__)
 require "rdoc"
 require "rdoc/task"

gemfiles/rails_3_0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.0.0"
+gem "reek", "~> 2.0"
+gem "tins", "~> 1.6.0"
+gem "json", "~> 1.8.3"
+gem "rake", "~> 11.2.2"
+gem "rest-client", "~> 1.8.0"
+
+gemspec :path => "../"

gemfiles/rails_3_1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "actionmailer", "~> 3.1.0"
+gem "railties", "~> 3.1.0"
+gem "reek", "~> 2.0"
+gem "tins", "~> 1.6.0"
+gem "json", "~> 1.8.3"
+gem "rake", "~> 11.2.2"
+gem "rest-client", "~> 1.8.0"
+
+gemspec :path => "../"

gemfiles/rails_3_2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "actionmailer", "~> 3.2.0"
+gem "railties", "~> 3.2.0"
+gem "reek", "~>3.11.0"
+gem "json", "~> 1.8.3"
+gem "rake", "~> 11.2.2"
+
+gemspec :path => "../"

gemfiles/rails_4_0.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "actionmailer", "~> 4.0.0"
+gem "railties", "~> 4.0.0"
+gem "reek", "~>3.11.0"
+gem "json", "~> 1.8.3"
+gem "rake", "~> 11.2.2"
+
+gemspec :path => "../"

gemfiles/rails_4_1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "actionmailer", "~> 4.1.0"
+gem "railties", "~> 4.1.0"
+gem "reek", "~>3.11.0"
+gem "json", "~> 1.8.3"
+gem "rake", "~> 11.2.2"
+
+gemspec :path => "../"

gemfiles/rails_4_2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "actionmailer", "~> 4.2.0"
+gem "railties", "~> 4.2.0"
+gem "json", "~> 1.8.3"
+gem "rake", "~> 11.2.2"
+
+gemspec :path => "../"

gemfiles/rails_5_0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "actionmailer", "~> 5.0.0"
+gem "railties", "~> 5.0.0"
+gem "json", "~> 2.0.2"
+gem "rake", "~> 11.2.2"
+
+gemspec :path => "../"

init.rb

@@ -1,2 +1,2 @@
-require 'sanitize_email'
+require "sanitize_email"