Skip to content

Commit

Permalink
🎨 Improve structure of dependencies in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
pboling committed Sep 24, 2024
1 parent 30fa41d commit 23dd78f
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 20 deletions.
3 changes: 1 addition & 2 deletions .rubocop_gradual.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
"lib/rots/server_app.rb:4029472662": [
[66, 7, 44, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3155555354]
],
"rots.gemspec:3447014975": [
"rots.gemspec:1296023203": [
[55, 3, 27, "Gemspec/DependencyVersion: Dependency version specification is required.", 3231645354],
[56, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 2029420852],
[57, 3, 30, "Gemspec/DependencyVersion: Dependency version specification is required.", 2950165766],
[58, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 856856768],
[63, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 4231415917],
Expand Down
17 changes: 12 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
# frozen_string_literal: true

#### IMPORTANT #######################################################
# Gemfile is for local development ONLY; Gemfile is NOT loaded in CI #
####################################################### IMPORTANT ####

source "https://rubygems.org"

git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

# Specify your gem's dependencies in ranked-model.gemspec
gemspec

gem "byebug", ">= 2.0.3"
gem "rack-openid2" # , path: "/Users/pboling/src/forks/rack-openid"
gem "ruby-openid2" # , path: "/Users/pboling/src/forks/ruby-openid"
gem "minitest"
gem "rack-test"
platform :mri do
# Debugging
gem "byebug", ">= 11"
end
12 changes: 4 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PATH
specs:
rots (1.0.0)
date
net-http
net-http (~> 0.4, >= 0.4.1)
openssl
optparse
psych (~> 5.1)
Expand Down Expand Up @@ -59,8 +59,6 @@ GEM
version_gem (~> 1.1, >= 1.1.4)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
Expand Down Expand Up @@ -188,20 +186,18 @@ PLATFORMS
ruby

DEPENDENCIES
byebug (>= 2.0.3)
byebug (>= 11)
kettle-soup-cover (~> 1.0, >= 1.0.2)
minitest
rack-openid2
minitest (>= 5, < 6)
rack-openid2 (>= 2)
rack-session (>= 1)
rack-test
rake (>= 10)
rots!
rspec (~> 3.13)
rspec-block_is_expected (~> 1.0, >= 1.0.6)
rubocop-lts (~> 10.1)
rubocop-packaging (~> 0.5, >= 0.5.2)
rubocop-rspec (~> 3.0)
ruby-openid2
standard (~> 1.40)
yard (~> 0.9, >= 0.9.34)
yard-junk (~> 0.0.10)
Expand Down
8 changes: 4 additions & 4 deletions gemfiles/ancient.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ source "https://rubygems.org"
# On CI we only need the gemspecs' dependencies (including development dependencies).
# Exceptions, if any, will be found in gemfiles/*.gemfile

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

Expand Down
2 changes: 1 addition & 1 deletion rots.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = ">= 2.7.0"

spec.add_dependency("date")
spec.add_dependency("net-http")
spec.add_dependency("net-http", "~> 0.4", ">= 0.4.1")
spec.add_dependency("openssl")
spec.add_dependency("optparse")
spec.add_dependency("psych", "~> 5.1")
Expand Down

0 comments on commit 23dd78f

Please sign in to comment.