Skip to content

Commit

Permalink
Specify which version of public_suffix to use
Browse files Browse the repository at this point in the history
In the tests we often trip over which version of public_suffix bundler
wants to use. In the 3.x release they dropped support for Ruby < 2.1, so
specify an older version of the gem when we test on a Ruby lower than
2.1.
  • Loading branch information
tombruijn committed Mar 28, 2019
1 parent d2565ad commit 03e413d
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 0 deletions.
5 changes: 5 additions & 0 deletions gemfiles/capistrano2.gemfile
Expand Up @@ -3,5 +3,10 @@ source 'https://rubygems.org'
gem 'capistrano', '< 3.0'
gem 'net-ssh', '2.9.2'
gem 'rack', '~> 1.6'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/capistrano3.gemfile
Expand Up @@ -4,5 +4,10 @@ gem 'capistrano', '~> 3.0'
gem 'i18n', '~> 1.2.0'
gem 'net-ssh', '2.9.2'
gem 'rack', '~> 1.6'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/grape.gemfile
Expand Up @@ -3,5 +3,10 @@ source 'https://rubygems.org'
gem 'grape', '0.14.0'
gem 'rack', '~> 1.6'
gem 'activesupport', '~> 4.2'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/no_dependencies.gemfile
@@ -1,5 +1,10 @@
source 'https://rubygems.org'

gem 'rack', '~> 1.6'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/padrino.gemfile
Expand Up @@ -3,5 +3,10 @@ source 'https://rubygems.org'
gem 'padrino', '~> 0.13.0'
gem 'rack', '~> 1.6'
gem 'activesupport', '~> 4.2'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/que.gemfile
@@ -1,5 +1,10 @@
source 'https://rubygems.org'

gem 'que'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/rails-3.2.gemfile
Expand Up @@ -2,5 +2,10 @@ source 'https://rubygems.org'

gem 'rails', '~> 3.2.14'
gem 'test-unit'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/rails-4.0.gemfile
Expand Up @@ -2,5 +2,10 @@ source 'https://rubygems.org'

gem 'rails', '~> 4.0.0'
gem 'mime-types', '~> 2.6'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/rails-4.1.gemfile
Expand Up @@ -2,5 +2,10 @@ source 'https://rubygems.org'

gem 'rails', '~> 4.1.0'
gem 'mime-types', '~> 2.6'
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

gemspec :path => '../'
5 changes: 5 additions & 0 deletions gemfiles/rails-4.2.gemfile
Expand Up @@ -8,3 +8,8 @@ gemspec :path => '../'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
gem 'nokogiri', '~> 1.6.0'
end
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end
5 changes: 5 additions & 0 deletions gemfiles/resque.gemfile
Expand Up @@ -10,3 +10,8 @@ gemspec :path => '../'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
gem 'nokogiri', '~> 1.6.0'
end
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
gem 'public_suffix', "~> 2.0.0"
else
gem 'public_suffix'
end

0 comments on commit 03e413d

Please sign in to comment.