loosen rails version requirements for gems
fixes: CNVS-12259 test plan: - run unit tests, run bundle, verify app starts up without rails version conflicts Change-Id: Iddd6167bbb8a4cc61ca015fc979236659e24da73 Reviewed-on: https://gerrit.instructure.com/33126 Tested-by: Jenkins <jenkins@instructure.com> Product-Review: Simon Williams <simon@instructure.com> QA-Review: Simon Williams <simon@instructure.com> Reviewed-by: Brian Palmer <brianp@instructure.com>
This commit is contained in:
parent
20dc1ce95a
commit
dea07dc90f
|
@ -1,8 +1,2 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
gemspec
|
gemspec
|
||||||
|
|
||||||
if CANVAS_RAILS3
|
|
||||||
gem 'rails', '3.2.15'
|
|
||||||
else
|
|
||||||
gem 'rails', :github => 'makandra/rails', :branch => '2-3-lts', :ref => 'e86daf8ff727d5efc0040c876ba00c9444a5d915'
|
|
||||||
end
|
|
|
@ -3,7 +3,7 @@ lib = File.expand_path('../lib', __FILE__)
|
||||||
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
||||||
|
|
||||||
unless defined?(CANVAS_RAILS3)
|
unless defined?(CANVAS_RAILS3)
|
||||||
CANVAS_RAILS3 = !!ENV["CANVAS_RAILS3"] || File.exist?(File.expand_path("../../../config/RAILS3", __FILE__))
|
require File.expand_path("../../../config/canvas_rails3", __FILE__)
|
||||||
end
|
end
|
||||||
|
|
||||||
Gem::Specification.new do |spec|
|
Gem::Specification.new do |spec|
|
||||||
|
@ -20,7 +20,11 @@ Gem::Specification.new do |spec|
|
||||||
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
||||||
spec.require_paths = ["lib"]
|
spec.require_paths = ["lib"]
|
||||||
|
|
||||||
spec.add_dependency "rails"
|
if CANVAS_RAILS3
|
||||||
|
spec.add_dependency 'rails', '~>3.2'
|
||||||
|
else
|
||||||
|
spec.add_dependency 'rails', '~>2.3'
|
||||||
|
end
|
||||||
|
|
||||||
spec.add_development_dependency "bundler", "~> 1.5"
|
spec.add_development_dependency "bundler", "~> 1.5"
|
||||||
spec.add_development_dependency "sqlite3"
|
spec.add_development_dependency "sqlite3"
|
||||||
|
|
|
@ -4,10 +4,3 @@ source 'https://rubygems.org'
|
||||||
gemspec
|
gemspec
|
||||||
gem 'simplecov', '0.8.2', :require => false
|
gem 'simplecov', '0.8.2', :require => false
|
||||||
gem 'simplecov-rcov', '0.2.3', :require => false
|
gem 'simplecov-rcov', '0.2.3', :require => false
|
||||||
require File.expand_path("../../../config/canvas_rails3", __FILE__)
|
|
||||||
|
|
||||||
if CANVAS_RAILS3
|
|
||||||
gem 'rails', '3.2.15'
|
|
||||||
else
|
|
||||||
gem 'rails', :github => 'makandra/rails', :branch => '2-3-lts', :ref => 'e86daf8ff727d5efc0040c876ba00c9444a5d915'
|
|
||||||
end
|
|
|
@ -2,6 +2,10 @@
|
||||||
lib = File.expand_path('../lib', __FILE__)
|
lib = File.expand_path('../lib', __FILE__)
|
||||||
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
||||||
|
|
||||||
|
unless defined?(CANVAS_RAILS3)
|
||||||
|
require File.expand_path("../../../config/canvas_rails3", __FILE__)
|
||||||
|
end
|
||||||
|
|
||||||
Gem::Specification.new do |spec|
|
Gem::Specification.new do |spec|
|
||||||
spec.name = "adheres_to_policy"
|
spec.name = "adheres_to_policy"
|
||||||
spec.version = '0.0.1'
|
spec.version = '0.0.1'
|
||||||
|
@ -14,7 +18,11 @@ Gem::Specification.new do |spec|
|
||||||
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
||||||
spec.require_paths = ["lib"]
|
spec.require_paths = ["lib"]
|
||||||
|
|
||||||
spec.add_dependency "rails"
|
if CANVAS_RAILS3
|
||||||
|
spec.add_dependency 'rails', '~>3.2'
|
||||||
|
else
|
||||||
|
spec.add_dependency 'rails', '~>2.3'
|
||||||
|
end
|
||||||
|
|
||||||
spec.add_development_dependency "bundler", "~> 1.5"
|
spec.add_development_dependency "bundler", "~> 1.5"
|
||||||
spec.add_development_dependency "rake"
|
spec.add_development_dependency "rake"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
result=0
|
result=0
|
||||||
|
|
||||||
echo "################ Running tests against Rails 2 ################"
|
echo "################ Running tests against Rails 2 ################"
|
||||||
unset CANVAS_RAILS3
|
export CANVAS_RAILS3=0
|
||||||
bundle install
|
bundle install
|
||||||
bundle exec rspec spec
|
bundle exec rspec spec
|
||||||
let result=$result+$?
|
let result=$result+$?
|
||||||
|
|
|
@ -4,11 +4,6 @@ gemspec
|
||||||
gem 'simplecov', '0.8.2', :require => false
|
gem 'simplecov', '0.8.2', :require => false
|
||||||
gem 'simplecov-rcov', '0.2.3', :require => false
|
gem 'simplecov-rcov', '0.2.3', :require => false
|
||||||
|
|
||||||
if CANVAS_RAILS3
|
|
||||||
gem 'rails', '3.2.15'
|
|
||||||
else
|
|
||||||
gem 'rails', :github => 'makandra/rails', :branch => '2-3-lts', :ref => 'e86daf8ff727d5efc0040c876ba00c9444a5d915'
|
|
||||||
end
|
|
||||||
|
|
||||||
platforms :ruby_20, :ruby_21 do
|
platforms :ruby_20, :ruby_21 do
|
||||||
gem 'syck', '1.0.1'
|
gem 'syck', '1.0.1'
|
||||||
|
|
|
@ -18,8 +18,11 @@ Gem::Specification.new do |spec|
|
||||||
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
||||||
spec.require_paths = ["lib"]
|
spec.require_paths = ["lib"]
|
||||||
|
|
||||||
unless CANVAS_RAILS3
|
if CANVAS_RAILS3
|
||||||
|
spec.add_dependency 'rails', '~>3.2'
|
||||||
|
else
|
||||||
spec.add_dependency 'fake_arel', '~> 1.5'
|
spec.add_dependency 'fake_arel', '~> 1.5'
|
||||||
|
spec.add_dependency 'rails', '~>2.3'
|
||||||
end
|
end
|
||||||
|
|
||||||
spec.add_development_dependency "activerecord"
|
spec.add_development_dependency "activerecord"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
result=0
|
result=0
|
||||||
|
|
||||||
echo "################ Running tests against Rails 2 ################"
|
echo "################ Running tests against Rails 2 ################"
|
||||||
unset CANVAS_RAILS3
|
export CANVAS_RAILS3=0
|
||||||
bundle install
|
bundle install
|
||||||
bundle exec rspec spec
|
bundle exec rspec spec
|
||||||
let result=$result+$?
|
let result=$result+$?
|
||||||
|
|
|
@ -4,11 +4,3 @@ source 'https://rubygems.org'
|
||||||
gemspec
|
gemspec
|
||||||
gem 'simplecov', '0.8.2', :require => false
|
gem 'simplecov', '0.8.2', :require => false
|
||||||
gem 'simplecov-rcov', '0.2.3', :require => false
|
gem 'simplecov-rcov', '0.2.3', :require => false
|
||||||
|
|
||||||
require File.expand_path("../../../config/canvas_rails3", __FILE__)
|
|
||||||
|
|
||||||
if CANVAS_RAILS3
|
|
||||||
gem 'rails', '3.2.15'
|
|
||||||
else
|
|
||||||
gem 'rails', :github => 'makandra/rails', :branch => '2-3-lts', :ref => 'e86daf8ff727d5efc0040c876ba00c9444a5d915'
|
|
||||||
end
|
|
|
@ -2,6 +2,10 @@
|
||||||
lib = File.expand_path('../lib', __FILE__)
|
lib = File.expand_path('../lib', __FILE__)
|
||||||
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
||||||
|
|
||||||
|
unless defined?(CANVAS_RAILS3)
|
||||||
|
require File.expand_path("../../../config/canvas_rails3", __FILE__)
|
||||||
|
end
|
||||||
|
|
||||||
Gem::Specification.new do |spec|
|
Gem::Specification.new do |spec|
|
||||||
spec.name = "html_text_helper"
|
spec.name = "html_text_helper"
|
||||||
spec.version = '0.0.1'
|
spec.version = '0.0.1'
|
||||||
|
@ -15,9 +19,14 @@ Gem::Specification.new do |spec|
|
||||||
spec.require_paths = ["lib"]
|
spec.require_paths = ["lib"]
|
||||||
|
|
||||||
spec.add_dependency 'nokogiri', '1.5.6'
|
spec.add_dependency 'nokogiri', '1.5.6'
|
||||||
spec.add_dependency 'rails'
|
|
||||||
spec.add_dependency 'sanitize', '2.0.3'
|
spec.add_dependency 'sanitize', '2.0.3'
|
||||||
|
|
||||||
|
if CANVAS_RAILS3
|
||||||
|
spec.add_dependency 'rails', '~>3.2'
|
||||||
|
else
|
||||||
|
spec.add_dependency 'rails', '~>2.3'
|
||||||
|
end
|
||||||
|
|
||||||
spec.add_development_dependency "bundler", "~> 1.5"
|
spec.add_development_dependency "bundler", "~> 1.5"
|
||||||
spec.add_development_dependency "rake"
|
spec.add_development_dependency "rake"
|
||||||
spec.add_development_dependency "rspec", "2.14.1"
|
spec.add_development_dependency "rspec", "2.14.1"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
result=0
|
result=0
|
||||||
|
|
||||||
echo "################ Running tests against Rails 2 ################"
|
echo "################ Running tests against Rails 2 ################"
|
||||||
unset CANVAS_RAILS3
|
export CANVAS_RAILS3=0
|
||||||
bundle install
|
bundle install
|
||||||
bundle exec rspec spec
|
bundle exec rspec spec
|
||||||
let result=$result+$?
|
let result=$result+$?
|
||||||
|
|
|
@ -2,11 +2,3 @@ source 'https://rubygems.org'
|
||||||
|
|
||||||
# Specify your gem's dependencies in canvas_workflow.gemspec
|
# Specify your gem's dependencies in canvas_workflow.gemspec
|
||||||
gemspec
|
gemspec
|
||||||
|
|
||||||
require File.expand_path("../../../config/canvas_rails3", __FILE__)
|
|
||||||
|
|
||||||
if CANVAS_RAILS3
|
|
||||||
gem 'rails', '3.2.15'
|
|
||||||
else
|
|
||||||
gem 'rails', :github => 'makandra/rails', :branch => '2-3-lts', :ref => 'e86daf8ff727d5efc0040c876ba00c9444a5d915'
|
|
||||||
end
|
|
||||||
|
|
|
@ -2,6 +2,10 @@
|
||||||
lib = File.expand_path('../lib', __FILE__)
|
lib = File.expand_path('../lib', __FILE__)
|
||||||
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
||||||
|
|
||||||
|
unless defined?(CANVAS_RAILS3)
|
||||||
|
require File.expand_path("../../../config/canvas_rails3", __FILE__)
|
||||||
|
end
|
||||||
|
|
||||||
Gem::Specification.new do |spec|
|
Gem::Specification.new do |spec|
|
||||||
spec.name = "workflow"
|
spec.name = "workflow"
|
||||||
spec.version = '0.0.1'
|
spec.version = '0.0.1'
|
||||||
|
@ -14,7 +18,11 @@ Gem::Specification.new do |spec|
|
||||||
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
||||||
spec.require_paths = ["lib"]
|
spec.require_paths = ["lib"]
|
||||||
|
|
||||||
spec.add_dependency 'rails'
|
if CANVAS_RAILS3
|
||||||
|
spec.add_dependency 'rails', '~>3.2'
|
||||||
|
else
|
||||||
|
spec.add_dependency 'rails', '~>2.3'
|
||||||
|
end
|
||||||
|
|
||||||
spec.add_development_dependency "bundler", "~> 1.5"
|
spec.add_development_dependency "bundler", "~> 1.5"
|
||||||
spec.add_development_dependency "rake"
|
spec.add_development_dependency "rake"
|
||||||
|
|
Loading…
Reference in New Issue