1 files changed, 76 insertions, 35 deletions
diff --git a/Gemfile b/Gemfile
index 35bcb68fb2..a021f77417 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,84 +2,125 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'arel', github: 'rails/arel', branch: 'master'
+# We need a newish Rake since Active Job sets its test tasks' descriptions.
+gem 'rake', '>= 10.3'
+
+# This needs to be with require false as it is
+# loaded after loading the test library to
+# ensure correct loading order
+gem 'mocha', '~> 0.14', require: false
 
-gem 'mocha', '~> 0.13.0', require: false
-gem 'rack-test', github: 'brynary/rack-test'
 gem 'rack-cache', '~> 1.2'
-gem 'bcrypt-ruby', '~> 3.0.0'
-gem 'jquery-rails', '~> 2.1.4', github: 'rails/jquery-rails'
+gem 'jquery-rails', github: 'rails/jquery-rails'
+gem 'coffee-rails', '~> 4.1.0'
 gem 'turbolinks'
-gem 'coffee-rails', github: 'rails/coffee-rails'
-
-gem 'journey', github: 'rails/journey', branch: 'master'
+gem 'arel', github: 'rails/arel'
 
-gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders', branch: 'master'
+# require: false so bcrypt is loaded only when has_secure_password is used.
+# This is to avoid ActiveModel (and by extension the entire framework)
+# being dependent on a binary library.
+gem 'bcrypt', '~> 3.1.7', require: false
 
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
-gem 'uglifier', require: false
-
-gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
+gem 'uglifier', '>= 1.3.0', require: false
 
 group :doc do
-  gem 'sdoc',  github: 'voloko/sdoc'
-  gem 'redcarpet', '~> 2.2.2', platforms: :ruby
+  gem 'sdoc', '~> 0.4.0'
+  gem 'redcarpet', '~> 3.1.2', platforms: :ruby
   gem 'w3c_validators'
+  gem 'kindlerb'
 end
 
 # AS
 gem 'dalli', '>= 2.2.1'
 
+# ActiveJob
+group :job do
+  gem 'resque', require: false
+  gem 'resque-scheduler', require: false
+  gem 'sidekiq', require: false
+  gem 'sucker_punch', require: false
+  gem 'delayed_job', require: false
+  gem 'queue_classic', "< 3.0.0", require: false, platforms: :ruby
+  gem 'sneakers', '0.1.1.pre', require: false
+  gem 'que', require: false
+  gem 'backburner', require: false
+  gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
+  gem 'qu-redis', require: false
+  # gem 'delayed_job_active_record', require: false
+  gem 'sequel', require: false
+end
+
 # Add your own local bundler stuff
 local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
-instance_eval File.read local_gemfile if File.exists? local_gemfile
+instance_eval File.read local_gemfile if File.exist? local_gemfile
 
-platforms :mri do
-  group :test do
-    gem 'ruby-prof', '~> 0.11.2' if RUBY_VERSION < '2.0'
-    gem 'debugger' if !ENV['TRAVIS'] && RUBY_VERSION < '2.0'
+group :test do
+  # FIX: Our test suite isn't ready to run in random order yet
+  gem 'minitest', '< 5.3.4'
+
+  platforms :mri_19 do
+    gem 'ruby-prof', '~> 0.11.2'
+  end
+
+  platforms :mri_21 do
+    gem 'stackprof'
   end
+
+  # platforms :mri_19, :mri_20 do
+  #   gem 'debugger'
+  # end
+
+  gem 'benchmark-ips'
 end
 
 platforms :ruby do
-  gem 'yajl-ruby'
   gem 'nokogiri', '>= 1.4.5'
 
+  # Needed for compiling the ActionDispatch::Journey parser
+  gem 'racc', '>=1.4.6', require: false
+
   # AR
   gem 'sqlite3', '~> 1.3.6'
 
   group :db do
-    gem 'pg', '>= 0.11.0'
+    gem 'pg', '>= 0.15.0'
     gem 'mysql', '>= 2.9.0'
-    gem 'mysql2', '>= 0.3.10'
+    gem 'mysql2', '>= 0.3.13'
   end
 end
 
 platforms :jruby do
   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'
-
-  group :db do
-    gem 'activerecord-jdbcmysql-adapter', '>= 1.2.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.0'
+  if ENV['AR_JDBC']
+    gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+    group :db do
+      gem 'activerecord-jdbcmysql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+      gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+    end
+  else
+    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+    group :db do
+      gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
+      gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+    end
   end
 end
 
+platforms :rbx do
+  # The rubysl-yaml gem doesn't ship with Psych by default
+  # as it needs libyaml that isn't always available.
+  gem 'psych', '~> 2.0'
+end
+
 # gems that are necessary for ActiveRecord tests with Oracle database
 if ENV['ORACLE_ENHANCED']
   platforms :ruby do
-    gem 'ruby-oci8', '>= 2.0.4'
+    gem 'ruby-oci8', '~> 2.1'
   end
   gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced', branch: 'master'
 end
 
 # A gem necessary for ActiveRecord tests with IBM DB
 gem 'ibm_db' if ENV['IBM_DB']
-
-gem 'benchmark-ips'