Skip to content

Commit

Permalink
Extract sinatra appraisal group
Browse files Browse the repository at this point in the history
  • Loading branch information
@TonyCTHsu
TonyCTHsu committed Nov 9, 2022
1 parent 97885d7 commit 0a33915
Show file tree
Hide file tree
Showing 3 changed files with 298 additions and 10 deletions.
90 changes: 81 additions & 9 deletions Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,21 @@ if ruby_version?('2.1')
gem 'sequel', '~> 4.0', '< 4.37'
gem 'shoryuken'
gem 'sidekiq', '~> 3.5.4'
gem 'sinatra', '1.4.5'
gem 'sqlite3', '~> 1.3.6'
gem 'sucker_punch'
gem 'timers', '< 4.2'
gem 'typhoeus'
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'core-old' do
gem 'dogstatsd-ruby', '~> 4'
end
Expand Down Expand Up @@ -301,14 +309,22 @@ elsif ruby_version?('2.2')
gem 'sequel'
gem 'shoryuken'
gem 'sidekiq'
gem 'sinatra'
gem 'sneakers', '>= 2.12.0'
gem 'sqlite3', '~> 1.3.6'
gem 'sucker_punch'
gem 'typhoeus'
gem 'que', '>= 1.0.0'
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'core-old' do
gem 'dogstatsd-ruby', '~> 4'
end
Expand Down Expand Up @@ -492,14 +508,22 @@ elsif ruby_version?('2.3')
gem 'sequel'
gem 'shoryuken'
gem 'sidekiq'
gem 'sinatra'
gem 'sneakers', '>= 2.12.0'
gem 'sqlite3', '~> 1.3.6'
gem 'sucker_punch'
gem 'typhoeus'
gem 'que', '>= 1.0.0'
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'contrib-old' do
gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0
gem 'faraday', '0.17'
Expand Down Expand Up @@ -617,14 +641,22 @@ elsif ruby_version?('2.4')
gem 'sequel'
gem 'shoryuken'
gem 'sidekiq'
gem 'sinatra'
gem 'sneakers', '>= 2.12.0'
gem 'sqlite3', '~> 1.3.6'
gem 'sucker_punch'
gem 'typhoeus'
gem 'que', '>= 1.0.0'
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'contrib-old' do
gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0
gem 'faraday', '0.17'
Expand Down Expand Up @@ -872,7 +904,6 @@ elsif ruby_version?('2.5')
gem 'sequel'
gem 'shoryuken'
gem 'sidekiq'
gem 'sinatra', '>= 1.4'
gem 'sneakers', '>= 2.12.0'
gem 'sqlite3', '~> 1.4.1', platform: :ruby
gem 'jdbc-sqlite3', '>= 3.28', platform: :jruby
Expand All @@ -881,6 +912,15 @@ elsif ruby_version?('2.5')
gem 'que', '>= 1.0.0'
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'contrib-old' do
gem 'dalli', '< 3.0.0'
gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0
Expand Down Expand Up @@ -1103,7 +1143,6 @@ elsif ruby_version?('2.6')
gem 'sequel'
gem 'shoryuken'
gem 'sidekiq'
gem 'sinatra', '>= 1.4'
gem 'sneakers', '>= 2.12.0'
gem 'sqlite3', '~> 1.4.1', platform: :ruby
gem 'jdbc-sqlite3', '>= 3.28', platform: :jruby
Expand All @@ -1112,6 +1151,15 @@ elsif ruby_version?('2.6')
gem 'que', '>= 1.0.0'
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'contrib-old' do
gem 'dalli', '< 3.0.0'
gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0
Expand Down Expand Up @@ -1314,14 +1362,22 @@ elsif ruby_version?('2.7')
gem 'semantic_logger', '~> 4.0'
gem 'shoryuken'
gem 'sidekiq'
gem 'sinatra'
gem 'sneakers', '>= 2.12.0'
gem 'sqlite3', '~> 1.4.1'
gem 'sucker_punch'
gem 'typhoeus'
gem 'que', '>= 1.0.0'
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'contrib-old' do
gem 'dalli', '< 3.0.0'
gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0
Expand Down Expand Up @@ -1430,7 +1486,6 @@ elsif ruby_version?('3.0') || ruby_version?('3.1')
gem 'sequel'
gem 'shoryuken'
gem 'sidekiq'
gem 'sinatra'
gem 'sneakers', '>= 2.12.0'
gem 'sqlite3', '>= 1.4.2'
gem 'sucker_punch'
Expand All @@ -1439,6 +1494,15 @@ elsif ruby_version?('3.0') || ruby_version?('3.1')
gem 'net-smtp'
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'contrib-old' do
gem 'dalli', '< 3.0.0'
gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0
Expand Down Expand Up @@ -1546,7 +1610,6 @@ elsif ruby_version?('3.2')
gem 'sequel'
gem 'shoryuken'
gem 'sidekiq'
gem 'sinatra'
gem 'sneakers', '>= 2.12.0'
gem 'sqlite3', '>= 1.4.2'
gem 'sucker_punch'
Expand All @@ -1556,6 +1619,15 @@ elsif ruby_version?('3.2')
gem 'nokogiri', platform: :ruby # TODO: binary gem has max ruby version constraint excluding previews, switch to using minimum version constraint once a non-3.2-excluding binary gem is released
end

appraise 'sinatra' do
gem 'sinatra'
gem 'rack-test'

# For spec/datadog/tracing/contrib/sinatra/activerecord_spec.rb
gem 'activerecord'
gem 'sqlite3'
end

appraise 'contrib-old' do
gem 'dalli', '< 3.0.0'
gem 'elasticsearch', '< 8.0.0' # Dependency elasticsearch-transport renamed to elastic-transport in >= 8.0
Expand Down
5 changes: 4 additions & 1 deletion Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ task :ci do
declare '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib rake spec:sequel'
declare '❌ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib rake spec:shoryuken'
declare '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib rake spec:sidekiq'
declare '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib rake spec:sinatra'
declare '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal sinatra rake spec:sinatra'
declare '❌ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib rake spec:sneakers'
declare '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib rake spec:sucker_punch'
declare '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal contrib rake spec:suite'
Expand Down Expand Up @@ -376,6 +376,9 @@ task :ci do
# explicitly test Hanami compatability
declare '❌ 2.1 / ❌ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ jruby' => 'bundle exec appraisal hanami-1 rake spec:hanami'

# explicitly test Sinatra compatability
declare '✅ 2.1 / ✅ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal sinatra rake spec:sinatra'

# explicitly test resque-2x compatability
declare '❌ 2.1 / ❌ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal resque2-redis3 rake spec:resque'
declare '❌ 2.1 / ❌ 2.2 / ✅ 2.3 / ✅ 2.4 / ✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby' => 'bundle exec appraisal resque2-redis4 rake spec:resque'
Expand Down
Loading

0 comments on commit 0a33915

Please sign in to comment.