gemfile fixed to handle ruby2.0 for test

Change-Id: I4ebbaec7107859a882d8f64e1b4c4521c5b4e6ef
Reviewed-on: https://gerrit.instructure.com/24551
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Shawn Meredith 2013-09-19 15:55:34 -06:00
parent 51dcfd8410
commit 7a019889fa
1 changed files with 66 additions and 66 deletions

132
Gemfile
View File

@ -1,6 +1,6 @@
source 'https://rubygems.org/'
if RUBY_VERSION < "1.9.3" || RUBY_VERSION >= "2.0"
if ENV['RAILS_ENV'] != 'test' && (RUBY_VERSION < "1.9.3" || RUBY_VERSION >= "2.0")
raise "Canvas requires Ruby 1.9.3"
end
@ -10,8 +10,8 @@ if CANVAS_RAILS3
# 3.0.20 is transitional, we will be on 3.2.x before support is complete
# that's also why some gems below have to be downgraded, 3.0.20 relies on old versions of some gems
# just to be clear, Canvas is NOT READY to run under Rails 3 in production
gem 'rails', '3.0.20'
gem 'authlogic', '3.2.0'
gem 'rails', '3.0.20'
gem 'authlogic', '3.2.0'
else
# If you have a license to rails lts, you can create a vendor/plugins/*/RAILS_LTS yaml file
# with the Gemfile `gem` command to use (pointing to the private repo with your username/password).
@ -22,78 +22,78 @@ else
else
gem 'rails', :git => 'https://github.com/makandra/rails.git', :branch => '2-3-lts', :ref => 'e86daf8ff727d5efc0040c876ba00c9444a5d915'
end
gem 'authlogic', '2.1.3'
gem 'authlogic', '2.1.3'
end
gem "aws-sdk", '1.8.3.1'
gem 'barby', '0.5.0'
gem 'bcrypt-ruby', '3.0.1'
gem 'builder', '2.1.2'
gem "aws-sdk", '1.8.3.1'
gem 'barby', '0.5.0'
gem 'bcrypt-ruby', '3.0.1'
gem 'builder', '2.1.2'
if !CANVAS_RAILS3
gem 'canvas_connect', '0.1.1'
end
gem 'daemons', '1.1.0'
gem 'diff-lcs', '1.1.3', :require => 'diff/lcs'
gem 'daemons', '1.1.0'
gem 'diff-lcs', '1.1.3', :require => 'diff/lcs'
if !CANVAS_RAILS3
gem 'encrypted_cookie_store-instructure', '1.0.4', :require => 'encrypted_cookie_store'
end
gem 'erubis', CANVAS_RAILS3 ? '2.6.6' : '2.7.0'
gem 'erubis', CANVAS_RAILS3 ? '2.6.6' : '2.7.0'
if !CANVAS_RAILS3
gem 'fake_arel', '1.0.0'
gem 'fake_arel', '1.0.0'
end
gem 'fake_rails3_routes', '1.0.4'
gem 'ffi', '1.1.5'
gem 'hairtrigger', '0.2.3'
gem 'sass', '3.2.3'
gem 'hashery', '1.3.0', :require => 'hashery/dictionary'
gem 'highline', '1.6.1'
gem 'i18n', CANVAS_RAILS3 ? '0.5.0' : '0.6.0'
gem 'ffi', '1.1.5'
gem 'hairtrigger', '0.2.3'
gem 'sass', '3.2.3'
gem 'hashery', '1.3.0', :require => 'hashery/dictionary'
gem 'highline', '1.6.1'
gem 'i18n', CANVAS_RAILS3 ? '0.5.0' : '0.6.0'
if !CANVAS_RAILS3
gem 'i18nema', '0.0.7'
gem 'i18nema', '0.0.7'
end
gem 'icalendar', '1.1.5'
gem 'jammit', '0.6.6'
gem 'json', '1.8.0'
gem 'icalendar', '1.1.5'
gem 'jammit', '0.6.6'
gem 'json', '1.8.0'
# native xml parsing, diigo
gem 'libxml-ruby', '2.6.0', :require => 'xml/libxml'
gem 'macaddr', '1.0.0' # macaddr 1.2.0 tries to require 'systemu' which isn't a dependency
gem 'libxml-ruby', '2.6.0', :require => 'xml/libxml'
gem 'macaddr', '1.0.0' # macaddr 1.2.0 tries to require 'systemu' which isn't a dependency
gem 'mail', CANVAS_RAILS3 ? '2.2.19' : '2.5.3'
# using this forked gem until https://github.com/37signals/marginalia/pull/15 is in the source gem
gem 'instructure-marginalia', '1.1.3', :require => false
gem 'mime-types', '1.17.2', :require => 'mime/types'
gem 'instructure-marginalia', '1.1.3', :require => false
gem 'mime-types', '1.17.2', :require => 'mime/types'
# attachment_fu (even the current technoweenie one on github) does not work
# with mini_magick 3.1
gem 'mini_magick', '1.3.2'
gem 'netaddr', '1.5.0'
gem 'nokogiri', '1.5.6'
gem 'mini_magick', '1.3.2'
gem 'netaddr', '1.5.0'
gem 'nokogiri', '1.5.6'
# oauth gem, with rails3 fixes rolled in
gem 'oauth-instructure', '0.4.9', :require => 'oauth'
gem 'rack', CANVAS_RAILS3 ? '1.2.5' : '1.1.3'
gem 'rake', '10.1.0'
gem 'rdoc', '3.12'
gem 'rack', CANVAS_RAILS3 ? '1.2.5' : '1.1.3'
gem 'rake', '10.1.0'
gem 'rdoc', '3.12'
gem 'ratom-instructure', '0.6.9', :require => "atom" # custom gem until necessary changes are merged into mainstream
gem 'rdiscount', '1.6.8'
gem 'ritex', '1.0.1'
gem 'rdiscount', '1.6.8'
gem 'ritex', '1.0.1'
if CANVAS_RAILS3
gem 'routing_concerns', '0.1.0'
end
gem 'rotp', '1.4.1'
gem 'rqrcode', '0.4.2'
gem 'rscribd', '1.2.0'
gem 'net-ldap', '0.3.1', :require => 'net/ldap'
gem 'ruby-saml-mod', '0.1.22'
gem 'rotp', '1.4.1'
gem 'rqrcode', '0.4.2'
gem 'rscribd', '1.2.0'
gem 'net-ldap', '0.3.1', :require => 'net/ldap'
gem 'ruby-saml-mod', '0.1.22'
gem 'rubycas-client', '2.2.1'
gem 'rubyzip', '0.9.5', :require => 'zip/zip'
gem 'safe_yaml-instructure', '0.8.0', :require => false
gem 'sanitize', '2.0.3'
gem 'shackles', '1.0.0'
gem 'tzinfo', '0.3.35'
gem 'useragent', '0.4.16'
gem 'uuid', '2.3.2'
gem 'will_paginate', '2.3.15'
gem 'xml-simple', '1.0.12', :require => 'xmlsimple'
gem 'foreigner', '0.9.2'
gem 'crocodoc-ruby', '0.0.1', :require => 'crocodoc'
gem 'rubyzip', '0.9.5', :require => 'zip/zip'
gem 'safe_yaml-instructure', '0.8.0', :require => false
gem 'sanitize', '2.0.3'
gem 'shackles', '1.0.0'
gem 'tzinfo', '0.3.35'
gem 'useragent', '0.4.16'
gem 'uuid', '2.3.2'
gem 'will_paginate', '2.3.15'
gem 'xml-simple', '1.0.12', :require => 'xmlsimple'
gem 'foreigner', '0.9.2'
gem 'crocodoc-ruby', '0.0.1', :require => 'crocodoc'
# needs https://github.com/regru/premailer/commit/8d3ae698eff135011b19e1587a68c399ec97b185
# we can go back to the gem once 1.7.8 is released
gem 'regru-premailer', :require => 'premailer', :git => "https://github.com/regru/premailer.git", :ref => "08a73c70701f5d81bc4a5cf6c959a45ad94db88e"
@ -104,11 +104,11 @@ group :assets do
end
group :mysql do
gem 'mysql2', '0.2.18'
gem 'mysql2', '0.2.18'
end
group :postgres do
gem 'pg', '0.15.0'
gem 'pg', '0.15.0'
end
group :sqlite do
@ -117,22 +117,22 @@ end
group :test do
gem 'simplecov', '0.7.1' if ENV['COVERAGE'] != nil && ENV['COVERAGE'] == "1" # for coverage reporting
gem 'bluecloth', '2.0.10' # for generating api docs
gem 'mocha', :git => 'git://github.com/ccutrer/mocha.git', :require => false
gem 'bluecloth', '2.0.10' # for generating api docs
gem 'mocha', :git => 'git://github.com/ccutrer/mocha.git', :require => false
gem 'parallelized_specs', '0.4.64'
gem 'thin', '1.5.1'
if CANVAS_RAILS3
gem 'rspec-rails', '2.13.0'
gem 'rspec-rails', '2.13.0'
else
gem 'rspec', '1.3.2'
gem 'rspec-rails', '1.3.4'
gem 'rspec', '1.3.2'
gem 'rspec-rails', '1.3.4'
end
gem 'selenium-webdriver', '2.35.0'
gem 'webrat', '0.7.3'
gem 'yard', '0.8.0'
gem 'yard-appendix', '>=0.1.8'
gem 'timecop', '0.6.3'
gem 'test-unit', '1.2.3'
gem 'webrat', '0.7.3'
gem 'yard', '0.8.0'
gem 'yard-appendix', '>=0.1.8'
gem 'timecop', '0.6.3'
gem 'test-unit', '1.2.3'
end
group :development do
@ -145,15 +145,15 @@ group :development do
# The ruby debug gems conflict with the IDE-based debugger gem.
# Set this option in your dev environment to disable.
unless ENV['DISABLE_RUBY_DEBUGGING']
gem 'debugger', '1.5.0'
gem 'debugger', '1.5.0'
end
end
group :development, :test do
gem 'coffee-script'
gem 'coffee-script-source', '1.6.2' #pinned so everyone's compiled output matches
gem 'coffee-script-source', '1.6.2' #pinned so everyone's compiled output matches
gem 'execjs', '1.4.0'
gem 'parallel', '0.5.16'
gem 'parallel', '0.5.16'
end
group :i18n_tools do
@ -186,6 +186,6 @@ end
# Non-standard Canvas extension to Bundler behavior -- load the Gemfiles from
# plugins.
Dir[File.join(File.dirname(__FILE__),'vendor/plugins/*/Gemfile')].each do |g|
Dir[File.join(File.dirname(__FILE__), 'vendor/plugins/*/Gemfile')].each do |g|
eval(File.read(g))
end