1 files changed, 47 insertions, 50 deletions

diff --git a/Gemfile b/Gemfile
index f63260a260..ac835936ca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,104 +1,101 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
 if ENV['AREL']
-  gem "arel", :path => ENV['AREL']
+  gem 'arel', path: ENV['AREL']
+else
+  gem 'arel'
 end
 
-gem "bcrypt-ruby", "~> 3.0.0"
-gem "jquery-rails"
+gem 'rack-test', github: "brynary/rack-test"
+gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'jquery-rails'
+gem 'minitest', '~> 3.0.0'
 
 if ENV['JOURNEY']
-  gem "journey", :path => ENV['JOURNEY']
+  gem 'journey', path: ENV['JOURNEY']
 else
-  gem "journey", :git => "git://github.com/rails/journey"
+  gem 'journey', github: "rails/journey"
+end
+
+if ENV['AR_DEPRECATED_FINDERS']
+  gem 'active_record_deprecated_finders', path: ENV['AR_DEPRECATED_FINDERS']
+else
+  gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'
 end
 
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
-gem "uglifier", ">= 1.0.3", :require => false
+gem 'uglifier', '>= 1.0.3', require: false
 
-# Temp fix until rake 0.9.3 is out
-if RUBY_VERSION >= "1.9.3"
-  gem "rake", "0.9.3.beta.1"
-else
-  gem "rake", ">= 0.8.7"
-end
-gem "mocha", ">= 0.9.8"
+gem 'rake', '>= 0.8.7'
+gem 'mocha', '>= 0.11.2'
 
 group :doc do
-  gem "rdoc",  "~> 3.4"
-  gem "sdoc",  "~> 0.3"
-  gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
-  gem "w3c_validators"
+  # The current sdoc cannot generate GitHub links due
+  # to a bug, but the PR that fixes it has been there
+  # for some weeks unapplied. As a temporary solution
+  # this is our own fork with the fix.
+  gem 'sdoc',  github: 'fxn/sdoc'
+  gem 'RedCloth', '~> 4.2'
+  gem 'w3c_validators'
 end
 
 # AS
-gem "memcache-client", ">= 1.8.5"
+gem 'memcache-client', '>= 1.8.5'
 
-platforms :mri_18 do
-  gem "system_timer"
-  gem "ruby-debug", ">= 0.10.3" unless ENV['TRAVIS']
-  gem "json"
-end
-
-platforms :mri_19 do
-  # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
-  gem "ruby-debug19", :require => "ruby-debug" unless RUBY_VERSION > "1.9.2" || ENV['TRAVIS']
-end
+# Add your own local bundler stuff
+local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
+instance_eval File.read local_gemfile if File.exists? local_gemfile
 
 platforms :mri do
   group :test do
-    gem "ruby-prof" if RUBY_VERSION < "1.9.3"
+    gem 'ruby-prof', '~> 0.11.2'
   end
 end
 
 platforms :ruby do
-  if ENV["RB_FSEVENT"]
-    gem "rb-fsevent"
-  end
-  gem "json"
-  gem "yajl-ruby"
-  gem "nokogiri", ">= 1.4.5"
+  gem 'json'
+  gem 'yajl-ruby'
+  gem 'nokogiri', '>= 1.4.5'
 
   # AR
-  gem "sqlite3", "~> 1.3.4"
+  gem 'sqlite3', '~> 1.3.6'
 
   group :db do
-    gem "pg", ">= 0.11.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed
-    gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.3.6"
+    gem 'pg', '>= 0.11.0'
+    gem 'mysql', '>= 2.8.1'
+    gem 'mysql2', '>= 0.3.10'
   end
 end
 
 platforms :jruby do
-  gem "ruby-debug", ">= 0.10.3"
-  gem "json"
-  gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0"
+  gem 'json'
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.0'
 
   # This is needed by now to let tests work on JRuby
   # TODO: When the JRuby guys merge jruby-openssl in
   # jruby this will be removed
-  gem "jruby-openssl"
+  gem 'jruby-openssl'
 
   group :db do
-    gem "activerecord-jdbcmysql-adapter", ">= 1.2.0"
-    gem "activerecord-jdbcpostgresql-adapter", ">= 1.2.0"
+    gem 'activerecord-jdbcmysql-adapter', '>= 1.2.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.0'
   end
 end
 
 # gems that are necessary for ActiveRecord tests with Oracle database
 if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
   platforms :ruby do
-    gem "ruby-oci8", ">= 2.0.4"
+    gem 'ruby-oci8', '>= 2.0.4'
   end
   if ENV['ORACLE_ENHANCED_PATH']
-    gem "activerecord-oracle_enhanced-adapter", :path => ENV['ORACLE_ENHANCED_PATH']
+    gem 'activerecord-oracle_enhanced-adapter', path: ENV['ORACLE_ENHANCED_PATH']
   else
-    gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git"
+    gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced'
   end
 end
 
 # A gem necessary for ActiveRecord tests with IBM DB
-gem "ibm_db" if ENV['IBM_DB']
+gem 'ibm_db' if ENV['IBM_DB']