Skip to content

Commit fa4a86b

Browse files
committed
🎨 Improve structure of dependencies in CI
1 parent 30fa41d commit fa4a86b

6 files changed

+23
-22
lines changed

.rubocop_gradual.lock

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
"lib/rots/server_app.rb:4029472662": [
33
[66, 7, 44, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3155555354]
44
],
5-
"rots.gemspec:3447014975": [
5+
"rots.gemspec:1296023203": [
66
[55, 3, 27, "Gemspec/DependencyVersion: Dependency version specification is required.", 3231645354],
7-
[56, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 2029420852],
87
[57, 3, 30, "Gemspec/DependencyVersion: Dependency version specification is required.", 2950165766],
98
[58, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 856856768],
109
[63, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 4231415917],

Gemfile

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1+
# frozen_string_literal: true
2+
3+
#### IMPORTANT #######################################################
4+
# Gemfile is for local development ONLY; Gemfile is NOT loaded in CI #
5+
####################################################### IMPORTANT ####
6+
17
source "https://rubygems.org"
28

9+
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
10+
311
# Specify your gem's dependencies in ranked-model.gemspec
412
gemspec
513

6-
gem "byebug", ">= 2.0.3"
7-
gem "rack-openid2" # , path: "/Users/pboling/src/forks/rack-openid"
8-
gem "ruby-openid2" # , path: "/Users/pboling/src/forks/ruby-openid"
9-
gem "minitest"
10-
gem "rack-test"
14+
platform :mri do
15+
# Debugging
16+
gem "byebug", ">= 11"
17+
end

Gemfile.lock

+4-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
rots (1.0.0)
55
date
6-
net-http
6+
net-http (~> 0.4, >= 0.4.1)
77
openssl
88
optparse
99
psych (~> 5.1)
@@ -59,8 +59,6 @@ GEM
5959
version_gem (~> 1.1, >= 1.1.4)
6060
rack-session (2.0.0)
6161
rack (>= 3.0.0)
62-
rack-test (2.1.0)
63-
rack (>= 1.3)
6462
rackup (2.1.0)
6563
rack (>= 3)
6664
webrick (~> 1.8)
@@ -188,20 +186,18 @@ PLATFORMS
188186
ruby
189187

190188
DEPENDENCIES
191-
byebug (>= 2.0.3)
189+
byebug (>= 11)
192190
kettle-soup-cover (~> 1.0, >= 1.0.2)
193-
minitest
194-
rack-openid2
191+
minitest (>= 5, < 6)
192+
rack-openid2 (>= 2)
195193
rack-session (>= 1)
196-
rack-test
197194
rake (>= 10)
198195
rots!
199196
rspec (~> 3.13)
200197
rspec-block_is_expected (~> 1.0, >= 1.0.6)
201198
rubocop-lts (~> 10.1)
202199
rubocop-packaging (~> 0.5, >= 0.5.2)
203200
rubocop-rspec (~> 3.0)
204-
ruby-openid2
205201
standard (~> 1.40)
206202
yard (~> 0.9, >= 0.9.34)
207203
yard-junk (~> 0.0.10)

gemfiles/ancient.gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ source "https://rubygems.org"
66
# On CI we only need the gemspecs' dependencies (including development dependencies).
77
# Exceptions, if any, will be found in gemfiles/*.gemfile
88

9-
# In the ancient gemfile we also do not load the gemspec's dependencies
10-
# because they target Ruby 2.7+
11-
# Thus we load the runtime dependencies of the gem here.
12-
gem "version_gem", "~> 1.1", ">= 1.1.4"
9+
# In the ancient gemfile we only load the gemspec's runtime dependencies
10+
# i.e. we do not load the gemspec's development dependencies,
11+
# because they target Ruby 3.0+
12+
# Thus we load the necessary development dependencies of the gem here.
1313
gem "rack-openid2", ">= 2"
1414
gem "rack-session", ">= 1"
1515

gemfiles/ancient.gemfile.lock

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
rots (1.0.0)
55
date
6-
net-http
6+
net-http (~> 0.4, >= 0.4.1)
77
openssl
88
optparse
99
psych (~> 5.1)
@@ -78,7 +78,6 @@ DEPENDENCIES
7878
rots!
7979
rspec
8080
rspec-block_is_expected
81-
version_gem (~> 1.1, >= 1.1.4)
8281

8382
BUNDLED WITH
8483
2.4.22

rots.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Gem::Specification.new do |spec|
5353
spec.required_ruby_version = ">= 2.7.0"
5454

5555
spec.add_dependency("date")
56-
spec.add_dependency("net-http")
56+
spec.add_dependency("net-http", "~> 0.4", ">= 0.4.1")
5757
spec.add_dependency("openssl")
5858
spec.add_dependency("optparse")
5959
spec.add_dependency("psych", "~> 5.1")

0 commit comments

Comments
 (0)