Skip to content

Commit cf90db4

Browse files
committed
Improve Appraisal config
1 parent ed2d71e commit cf90db4

8 files changed

+20
-9
lines changed

Appraisals

+12
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ end
2525
appraise 'rails_7.0.8_with_sqlite3' do
2626
gem 'rails', '7.0.8'
2727
gem 'sqlite3', '~> 1.5.0'
28+
remove_gem 'pg'
2829

2930
# Fix:
3031
# warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
@@ -43,6 +44,7 @@ end
4344
appraise 'rails_7.0.8_with_mysql2' do
4445
gem 'rails', '7.0.8'
4546
gem 'mysql2'
47+
remove_gem 'pg'
4648

4749
# Fix:
4850
# warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
@@ -61,6 +63,7 @@ end
6163
appraise 'rails_7.0.8_with_trilogy' do
6264
gem 'rails', '7.0.8'
6365
gem 'activerecord-trilogy-adapter'
66+
remove_gem 'pg'
6467

6568
# Fix:
6669
# warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
@@ -80,6 +83,7 @@ appraise 'rails_7.0.8_with_oracle_enhanced' do
8083
gem 'rails', '7.0.8'
8184
gem 'ruby-oci8'
8285
gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0'
86+
remove_gem 'pg'
8387

8488
# Fix:
8589
# warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
@@ -126,22 +130,26 @@ end
126130
appraise 'rails_7.1.0_with_sqlite3' do
127131
gem 'rails', '7.1.0'
128132
gem 'sqlite3', '~> 1.5.0'
133+
remove_gem 'pg'
129134
end
130135

131136
appraise 'rails_7.1.0_with_mysql2' do
132137
gem 'rails', '7.1.0'
133138
gem 'mysql2'
139+
remove_gem 'pg'
134140
end
135141

136142
appraise 'rails_7.1.0_with_trilogy' do
137143
gem 'rails', '7.1.0'
138144
gem 'activerecord-trilogy-adapter'
145+
remove_gem 'pg'
139146
end
140147

141148
appraise 'rails_7.1.0_with_oracle_enhanced' do
142149
gem 'rails', '7.1.0'
143150
gem 'ruby-oci8'
144151
gem 'activerecord-oracle_enhanced-adapter', git: 'https://github.com/rsim/oracle-enhanced.git'
152+
remove_gem 'pg'
145153
end
146154

147155
appraise 'rails_7.1.0_with_postgis' do
@@ -162,22 +170,26 @@ end
162170
appraise 'rails_7.2.0_with_sqlite3' do
163171
gem 'rails', '7.2.0'
164172
gem 'sqlite3', '~> 1.5.0'
173+
remove_gem 'pg'
165174
end
166175

167176
appraise 'rails_7.2.0_with_mysql2' do
168177
gem 'rails', '7.2.0'
169178
gem 'mysql2'
179+
remove_gem 'pg'
170180
end
171181

172182
appraise 'rails_7.2.0_with_trilogy' do
173183
gem 'rails', '7.2.0'
174184
gem 'activerecord-trilogy-adapter'
185+
remove_gem 'pg'
175186
end
176187

177188
appraise 'rails_7.2.0_with_oracle_enhanced' do
178189
gem 'rails', '7.2.0'
179190
gem 'ruby-oci8'
180191
gem 'activerecord-oracle_enhanced-adapter', git: 'https://github.com/rsim/oracle-enhanced.git'
192+
remove_gem 'pg'
181193
end
182194

183195
appraise 'rails_7.2.0_with_postgis' do

Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ gem 'rubocop-rake'
2424
gem 'rubocop-rspec'
2525
gem 'simplecov'
2626

27-
# Fallback to pg if DB_ADAPTER is not set (like in dev/local environment)
28-
# so we can still call bin/rspec
29-
gem 'pg' if $PROGRAM_NAME == 'bin/rspec' && ENV['DB_ADAPTER'].nil?
27+
# Fallback to pg in dev/local environment
28+
gem 'pg'

gemfiles/rails_7.0.8_with_postgis.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ gem "rubocop-performance"
2020
gem "rubocop-rake"
2121
gem "rubocop-rspec"
2222
gem "simplecov"
23-
gem "rails", "7.0.8"
2423
gem "pg"
24+
gem "rails", "7.0.8"
2525
gem "activerecord-postgis-adapter"
2626

2727
install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do

gemfiles/rails_7.0.8_with_postgresql.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ gem "rubocop-performance"
2020
gem "rubocop-rake"
2121
gem "rubocop-rspec"
2222
gem "simplecov"
23-
gem "rails", "7.0.8"
2423
gem "pg"
24+
gem "rails", "7.0.8"
2525

2626
install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
2727
gem "base64"

gemfiles/rails_7.1.0_with_postgis.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ gem "rubocop-performance"
2020
gem "rubocop-rake"
2121
gem "rubocop-rspec"
2222
gem "simplecov"
23-
gem "rails", "7.1.0"
2423
gem "pg"
24+
gem "rails", "7.1.0"
2525
gem "activerecord-postgis-adapter"
2626

2727
gemspec path: "../"

gemfiles/rails_7.1.0_with_postgresql.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gem "rubocop-performance"
2020
gem "rubocop-rake"
2121
gem "rubocop-rspec"
2222
gem "simplecov"
23-
gem "rails", "7.1.0"
2423
gem "pg"
24+
gem "rails", "7.1.0"
2525

2626
gemspec path: "../"

gemfiles/rails_7.2.0_with_postgis.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ gem "rubocop-performance"
2020
gem "rubocop-rake"
2121
gem "rubocop-rspec"
2222
gem "simplecov"
23-
gem "rails", "7.2.0"
2423
gem "pg"
24+
gem "rails", "7.2.0"
2525
gem "activerecord-postgis-adapter", git: "https://github.com/rgeo/activerecord-postgis-adapter.git"
2626

2727
gemspec path: "../"

gemfiles/rails_7.2.0_with_postgresql.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gem "rubocop-performance"
2020
gem "rubocop-rake"
2121
gem "rubocop-rspec"
2222
gem "simplecov"
23-
gem "rails", "7.2.0"
2423
gem "pg"
24+
gem "rails", "7.2.0"
2525

2626
gemspec path: "../"

0 commit comments

Comments
 (0)