From 18c275dbe352935eeb1b263947719ff241cc052f Mon Sep 17 00:00:00 2001
From: Ville Lautanala <lautis@gmail.com>
Date: Tue, 10 Jun 2014 00:51:14 +0300
Subject: [PATCH] Run tests against both Rails 4.0 and 4.1

---
 .gitignore                    | 2 +-
 .travis.yml                   | 3 +++
 Appraisals                    | 7 +++++++
 Rakefile                      | 2 ++
 encrypted_form_fields.gemspec | 1 +
 gemfiles/rails_4.0.gemfile    | 7 +++++++
 gemfiles/rails_4.1.gemfile    | 7 +++++++
 7 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 Appraisals
 create mode 100644 gemfiles/rails_4.0.gemfile
 create mode 100644 gemfiles/rails_4.1.gemfile

diff --git a/.gitignore b/.gitignore
index d87d4be..bffd7d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+*emfile.lock
 InstalledFiles
 _yardoc
 coverage
diff --git a/.travis.yml b/.travis.yml
index 222078e..2d21c27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: ruby
+gemfile:
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
 rvm:
   - 1.9.3
   - 2.0.0
diff --git a/Appraisals b/Appraisals
new file mode 100644
index 0000000..361c99b
--- /dev/null
+++ b/Appraisals
@@ -0,0 +1,7 @@
+appraise "rails-4.0" do
+  gem 'rails', '~> 4.0.0'
+end
+
+appraise "rails-4.1" do
+  gem 'rails', '~> 4.1.0'
+end
diff --git a/Rakefile b/Rakefile
index f8526be..3fb8892 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,5 @@
+require "rubygems"
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 
diff --git a/encrypted_form_fields.gemspec b/encrypted_form_fields.gemspec
index 46bcf87..fd3a44f 100644
--- a/encrypted_form_fields.gemspec
+++ b/encrypted_form_fields.gemspec
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "appraisal", "~> 1.0"
 end
diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile
new file mode 100644
index 0000000..c6d0a1f
--- /dev/null
+++ b/gemfiles/rails_4.0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+
+gemspec :path => "../"
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
new file mode 100644
index 0000000..f95005c
--- /dev/null
+++ b/gemfiles/rails_4.1.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+
+gemspec :path => "../"