From 90d89fbccf560ef06cd5f2d9efa2b3b2ada9db6b Mon Sep 17 00:00:00 2001
From: John Griffiths <john@uxgent.co>
Date: Fri, 25 Aug 2017 11:19:55 -0400
Subject: [PATCH 1/2] Update dependency on railties and coffee-rails to allow
 rails 4.

---
 lib/mercury/version.rb | 2 +-
 mercury-rails.gemspec  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/mercury/version.rb b/lib/mercury/version.rb
index 57b5666d4..5b8fb9b4f 100644
--- a/lib/mercury/version.rb
+++ b/lib/mercury/version.rb
@@ -1,3 +1,3 @@
 module Mercury
-  VERSION = '0.9.0'
+  VERSION = '0.9.0.1'
 end
diff --git a/mercury-rails.gemspec b/mercury-rails.gemspec
index 21d762356..b13c177d2 100644
--- a/mercury-rails.gemspec
+++ b/mercury-rails.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   # General Gem Information
   s.name        = 'mercury-rails'
-  s.date        = '2012-10-19'
+  s.date        = '2017-08-25'
   s.version     = Mercury::VERSION
   s.authors     = ['Jeremy Jackson']
   s.email       = ['jejacks0n@gmail.com']
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.licenses    = ['MIT']
 
   # Runtime Dependencies
-  s.add_dependency 'railties', '>= 3.0'
-  s.add_dependency 'coffee-rails', '>= 3.2.2'
+  s.add_dependency 'railties', '>= 4.1.0'
+  s.add_dependency 'coffee-rails', '>= 4.2.2'
 
   # Gem Files
   s.extra_rdoc_files  = %w(LICENSE POST_INSTALL)

From bd174ddb54a117ae6a0517f15e3ede083f76becb Mon Sep 17 00:00:00 2001
From: John Griffiths <john@uxgent.co>
Date: Fri, 25 Aug 2017 16:45:02 -0400
Subject: [PATCH 2/2] Switch to ruby 2.1.10 and lock gems to try and get Travis
 to pass.

---
 .ruby-version.example |  1 +
 .rvmrc.example        |  2 +-
 .travis.yml           |  5 ++---
 Gemfile               | 17 +++++++++--------
 mercury-rails.gemspec |  4 ++--
 5 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 .ruby-version.example

diff --git a/.ruby-version.example b/.ruby-version.example
new file mode 100644
index 000000000..8dbb0f26b
--- /dev/null
+++ b/.ruby-version.example
@@ -0,0 +1 @@
+2.1.10
diff --git a/.rvmrc.example b/.rvmrc.example
index 9250a4a12..3fa141ff0 100644
--- a/.rvmrc.example
+++ b/.rvmrc.example
@@ -1 +1 @@
-rvm use --create 1.9.3@mercury-rails
+rvm use --create 2.1.10@mercury-rails
diff --git a/.travis.yml b/.travis.yml
index 032a60947..8018517a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 rvm:
-  - 1.9.3
+  - 2.1.10
 #before_script:
 #  - 'sh -e /etc/init.d/xvfb start'
 #env:
+
 #  - DISPLAY=':99.0' CUCUMBER_OPTS='-f progress'
 script: bundle exec rake --trace
-
-
diff --git a/Gemfile b/Gemfile
index ef1cfb61a..b9ae8d9e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
 # dependencies for the dummy app
-gem 'rails', '>= 3.2.8'
+gem 'rails', '3.2.8'
 gem 'jquery-rails'
 gem 'sqlite3'
-gem 'teabag'
+gem 'teabag', '0.3.2'
 
 group :assets do
   gem 'sass-rails'
@@ -16,13 +16,14 @@ end
 
 group :development, :test do
   gem 'rspec-core'
+  gem 'cucumber', '~> 1.3.20'
   gem 'cucumber-rails'
   gem 'capybara-firebug'
-  gem 'aruba'
+  gem 'aruba', '0.14.2'
   gem 'database_cleaner'
-
-  # required for travis-ci and linux environments
-  gem "phantomjs-linux" if  RUBY_PLATFORM =~ /linux/
 end
 
-
+gem 'phantomjs-linux', :git => 'https://github.com/bandzoogle/phantomjs-linux.git'
+# if RUBY_PLATFORM =~ /linux/
+#   gem 'phantomjs-linux'
+# end
diff --git a/mercury-rails.gemspec b/mercury-rails.gemspec
index b13c177d2..04da98d31 100644
--- a/mercury-rails.gemspec
+++ b/mercury-rails.gemspec
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.licenses    = ['MIT']
 
   # Runtime Dependencies
-  s.add_dependency 'railties', '>= 4.1.0'
-  s.add_dependency 'coffee-rails', '>= 4.2.2'
+  s.add_dependency 'railties'
+  s.add_dependency 'coffee-rails'
 
   # Gem Files
   s.extra_rdoc_files  = %w(LICENSE POST_INSTALL)