Skip to content

Commit

Permalink
Merge pull request #2431 from ericproulx/drop_appraisals_update_gems
Browse files Browse the repository at this point in the history
Replace Appraisals by eval_gemfile
  • Loading branch information
dblock authored Apr 26, 2024
2 parents 8e2d2fb + 11b12b8 commit 96c2a91
Show file tree
Hide file tree
Showing 25 changed files with 58 additions and 583 deletions.
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,6 @@ RSpec/MultipleMemoizedHelpers:

RSpec/ContextWording:
Enabled: false

RSpecRails/HaveHttpStatus:
Enabled: false
10 changes: 4 additions & 6 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 5000`
# on 2024-04-15 16:22:26 UTC using RuboCop version 1.59.0.
# `rubocop --auto-gen-config`
# on 2024-04-17 16:26:06 UTC using RuboCop version 1.63.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -261,11 +261,9 @@ Style/FormatStringToken:

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: AllowedReceivers.
# AllowedReceivers: Thread.current
Style/HashEachMethods:
Style/MapIntoArray:
Exclude:
- 'lib/grape/middleware/stack.rb'
- 'spec/support/chunks.rb'

# Offense count: 12
# Configuration parameters: AllowedMethods.
Expand Down
60 changes: 0 additions & 60 deletions Appraisals

This file was deleted.

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* [#2363](https://github.com/ruby-grape/grape/pull/2363): Replace autoload by zeitwerk - [@ericproulx](https://github.com/ericproulx).
* [#2425](https://github.com/ruby-grape/grape/pull/2425): Replace `{}` with `Rack::Header` or `Rack::Utils::HeaderHash` - [@dhruvCW](https://github.com/dhruvCW).
* [#2430](https://github.com/ruby-grape/grape/pull/2430): Isolate extensions within specific gemfile - [@ericproulx](https://github.com/ericproulx).
* [#2431](https://github.com/ruby-grape/grape/pull/2431): Drop appraisals in favor of eval_gemfile - [@ericproulx](https://github.com/ericproulx).
* Your contribution here.

#### Fixes
Expand Down
17 changes: 8 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ gemspec
group :development, :test do
gem 'bundler'
gem 'rake'
gem 'rubocop', '1.59.0', require: false
gem 'rubocop-performance', '1.20.1', require: false
gem 'rubocop-rspec', '2.25.0', require: false
gem 'rubocop', '1.63.2', require: false
gem 'rubocop-performance', '1.21.0', require: false
gem 'rubocop-rspec', '2.29.1', require: false
end

group :development do
gem 'appraisal'
gem 'benchmark-ips'
gem 'benchmark-memory'
gem 'guard'
Expand All @@ -25,11 +24,11 @@ end

group :test do
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
gem 'simplecov', '~> 0.21.2'
gem 'simplecov-lcov', '~> 0.8.0'
gem 'rack-test', '~> 2.1'
gem 'rspec', '~> 3.13'
gem 'ruby-grape-danger', '~> 0.2', require: false
gem 'simplecov', '~> 0.21'
gem 'simplecov-lcov', '~> 0.8'
gem 'test-prof', require: false
end

Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ services:
volumes:
- .:/var/grape
- gems:/usr/local/bundle
environment:
GEMFILE: multi_xml
37 changes: 1 addition & 36 deletions gemfiles/dry_validation.gemfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,5 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'https://rubygems.org'
eval_gemfile '../Gemfile'

gem 'dry-validation'

group :development, :test do
gem 'bundler'
gem 'rake'
gem 'rubocop', '1.59.0', require: false
gem 'rubocop-performance', '1.20.1', require: false
gem 'rubocop-rspec', '2.25.0', require: false
end

group :development do
gem 'appraisal'
gem 'benchmark-ips'
gem 'benchmark-memory'
gem 'guard'
gem 'guard-rspec'
gem 'guard-rubocop'
end

group :test do
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
gem 'simplecov', '~> 0.21.2'
gem 'simplecov-lcov', '~> 0.8.0'
gem 'test-prof', require: false
end

platforms :jruby do
gem 'racc'
end

gemspec path: '../'
37 changes: 1 addition & 36 deletions gemfiles/grape_entity.gemfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,5 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'https://rubygems.org'
eval_gemfile '../Gemfile'

gem 'grape-entity'

group :development, :test do
gem 'bundler'
gem 'rake'
gem 'rubocop', '1.59.0', require: false
gem 'rubocop-performance', '1.20.1', require: false
gem 'rubocop-rspec', '2.25.0', require: false
end

group :development do
gem 'appraisal'
gem 'benchmark-ips'
gem 'benchmark-memory'
gem 'guard'
gem 'guard-rspec'
gem 'guard-rubocop'
end

group :test do
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
gem 'simplecov', '~> 0.21.2'
gem 'simplecov-lcov', '~> 0.8.0'
gem 'test-prof', require: false
end

platforms :jruby do
gem 'racc'
end

gemspec path: '../'
37 changes: 1 addition & 36 deletions gemfiles/hashie.gemfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,5 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'https://rubygems.org'
eval_gemfile '../Gemfile'

gem 'hashie'

group :development, :test do
gem 'bundler'
gem 'rake'
gem 'rubocop', '1.59.0', require: false
gem 'rubocop-performance', '1.20.1', require: false
gem 'rubocop-rspec', '2.25.0', require: false
end

group :development do
gem 'appraisal'
gem 'benchmark-ips'
gem 'benchmark-memory'
gem 'guard'
gem 'guard-rspec'
gem 'guard-rubocop'
end

group :test do
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
gem 'simplecov', '~> 0.21.2'
gem 'simplecov-lcov', '~> 0.8.0'
gem 'test-prof', require: false
end

platforms :jruby do
gem 'racc'
end

gemspec path: '../'
39 changes: 2 additions & 37 deletions gemfiles/multi_json.gemfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,5 @@
# frozen_string_literal: true

# This file was generated by Appraisal
gem 'multi_json'

source 'https://rubygems.org'

gem 'multi_json', require: 'multi_json'

group :development, :test do
gem 'bundler'
gem 'rake'
gem 'rubocop', '1.59.0', require: false
gem 'rubocop-performance', '1.20.1', require: false
gem 'rubocop-rspec', '2.25.0', require: false
end

group :development do
gem 'appraisal'
gem 'benchmark-ips'
gem 'benchmark-memory'
gem 'guard'
gem 'guard-rspec'
gem 'guard-rubocop'
end

group :test do
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
gem 'simplecov', '~> 0.21.2'
gem 'simplecov-lcov', '~> 0.8.0'
gem 'test-prof', require: false
end

platforms :jruby do
gem 'racc'
end

gemspec path: '../'
eval_gemfile '../Gemfile'
39 changes: 2 additions & 37 deletions gemfiles/multi_xml.gemfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,5 @@
# frozen_string_literal: true

# This file was generated by Appraisal
gem 'multi_xml'

source 'https://rubygems.org'

gem 'multi_xml', require: 'multi_xml'

group :development, :test do
gem 'bundler'
gem 'rake'
gem 'rubocop', '1.59.0', require: false
gem 'rubocop-performance', '1.20.1', require: false
gem 'rubocop-rspec', '2.25.0', require: false
end

group :development do
gem 'appraisal'
gem 'benchmark-ips'
gem 'benchmark-memory'
gem 'guard'
gem 'guard-rspec'
gem 'guard-rubocop'
end

group :test do
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
gem 'simplecov', '~> 0.21.2'
gem 'simplecov-lcov', '~> 0.8.0'
gem 'test-prof', require: false
end

platforms :jruby do
gem 'racc'
end

gemspec path: '../'
eval_gemfile '../Gemfile'
37 changes: 1 addition & 36 deletions gemfiles/rack_2_0.gemfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,5 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'https://rubygems.org'
eval_gemfile '../Gemfile'

gem 'rack', '~> 2.0'

group :development, :test do
gem 'bundler'
gem 'rake'
gem 'rubocop', '1.59.0', require: false
gem 'rubocop-performance', '1.20.1', require: false
gem 'rubocop-rspec', '2.25.0', require: false
end

group :development do
gem 'appraisal'
gem 'benchmark-ips'
gem 'benchmark-memory'
gem 'guard'
gem 'guard-rspec'
gem 'guard-rubocop'
end

group :test do
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
gem 'simplecov', '~> 0.21.2'
gem 'simplecov-lcov', '~> 0.8.0'
gem 'test-prof', require: false
end

platforms :jruby do
gem 'racc'
end

gemspec path: '../'
Loading

0 comments on commit 96c2a91

Please sign in to comment.