Skip to content

Commit 124fbe9

Browse files
authored
Update gemfiles; ignore gemfile.lock files (#179)
It seems that following a previous merge, the generated appraisal gemfiles are now out of sync with the `Appraisals` file. Namely, the version of RSpec in the "< 3.10" gemfiles are not set to `~> 3.9.0` and `pry-byebug` and `pry-nav` are not located in the correct groups. Also, the lockfiles aren't being properly ignored. Finally, unrelated to the appraisals changes, for some reason a Bundler config file exists, presumably added in a previous commit. This has all been addressed in this commit. Note that due to updating the development Ruby version to 3.2.0 in a recent commit, it is only possible to regenerate all of the gemfiles, and thus reveal any issues with appraisals, by switching to Ruby 2.7 locally before running `bundle exec appraisal generate` and/or `bundle exec appraisal install`. This is an unfortunate problem that will be addressed in a future commit.
1 parent c073b91 commit 124fbe9

File tree

7 files changed

+12
-15
lines changed

7 files changed

+12
-15
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
Gemfile.lock
3+
gemfiles/*.gemfile.lock
34
pkg
45
spec/examples.txt
56
tmp

Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ appraisals = {
5151
},
5252
no_rails: proc {},
5353
rspec_lt_3_10: proc { |with_rails|
54-
version = "< 3.10"
54+
version = "~> 3.9.0"
5555

5656
gem "rspec", version
5757

gemfiles/.bundle/config

Lines changed: 0 additions & 2 deletions
This file was deleted.

gemfiles/no_rails_rspec_lt_3_10.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ gem "pry-nav", platform: :jruby
1010
gem "rake"
1111
gem "rubocop"
1212
gem "warnings_logger"
13-
gem "rspec", "< 3.10"
13+
gem "rspec", "~> 3.9.0"
1414

1515
gemspec path: "../"

gemfiles/rails_6_0_rspec_lt_3_10.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ gem "rubocop"
1212
gem "warnings_logger"
1313
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1414
gem "jdbc-sqlite3", platform: :jruby
15-
gem "activerecord", "~> 6.0"
16-
gem "railties", "~> 6.0"
15+
gem "activerecord", "~> 6.0.0"
16+
gem "railties", "~> 6.0.0"
1717
gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
1818
gem "rspec", "~> 3.9.0"
1919
gem "rspec-rails"

gemfiles/rails_6_1_rspec_gte_3_10.gemfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
source "https://rubygems.org"
44

5-
gem "appraisal"
5+
gem "appraisal", ref: "2f5be65b8e127bd602fd149f395f2f8fa50616a8", git: "https://github.com/thoughtbot/appraisal"
66
gem "childprocess"
77
gem "climate_control"
8+
gem "pry-byebug", platform: :mri
9+
gem "pry-nav", platform: :jruby
810
gem "rake"
911
gem "rubocop"
1012
gem "warnings_logger"
@@ -16,9 +18,8 @@ gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
1618
gem "rspec", ">= 3.10", "< 4"
1719
gem "rspec-rails"
1820

19-
install_if -> { Gem::Requirement.new("< 3.2").satisfied_by?(Gem::Version.new(RUBY_VERSION)) } do
20-
gem "pry-byebug", platform: :mri
21-
gem "pry-nav", platform: :jruby
21+
install_if -> { Gem::Requirement.new(">= 2.6.0").satisfied_by?(Gem::Version.new(RUBY_VERSION)) } do
22+
gem "net-ftp"
2223
end
2324

2425
gemspec path: "../"

gemfiles/rails_7_0_rspec_gte_3_10.gemfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ source "https://rubygems.org"
55
gem "appraisal", ref: "2f5be65b8e127bd602fd149f395f2f8fa50616a8", git: "https://github.com/thoughtbot/appraisal"
66
gem "childprocess"
77
gem "climate_control"
8+
gem "pry-byebug", platform: :mri
9+
gem "pry-nav", platform: :jruby
810
gem "rake"
911
gem "rubocop"
1012
gem "warnings_logger"
@@ -20,9 +22,4 @@ install_if -> { Gem::Requirement.new(">= 2.6.0").satisfied_by?(Gem::Version.new(
2022
gem "net-ftp"
2123
end
2224

23-
install_if -> { Gem::Requirement.new("< 3.2").satisfied_by?(Gem::Version.new(RUBY_VERSION)) } do
24-
gem "pry-byebug", platform: :mri
25-
gem "pry-nav", platform: :jruby
26-
end
27-
2825
gemspec path: "../"

0 commit comments

Comments
 (0)