Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Gemfiles to manage dev/test dependencies + cleanup #1949

Merged
merged 8 commits into from
Sep 24, 2023
Merged

Use Gemfiles to manage dev/test dependencies + cleanup #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b8b6e3
Manage development dependencies with `Gemfile`s
dentarg Sep 16, 2023
0a8ea48
Remove unnecessary sinatra-contrib dev deps
dentarg Sep 16, 2023
4735681
Remove Gemfile groups, it is all test/dev deps
dentarg Sep 16, 2023
6871ce5
Remove open-ended dependencies in gemspecs
dentarg Sep 16, 2023
e3b82c0
Document `yard` dependency
dentarg Sep 22, 2023
10b9b5c
Remove `activesupport` from Gemfile
dentarg Sep 22, 2023
6857f5d
Remove `json` from Gemfile
dentarg Sep 22, 2023
607cb3a
Remove `jar-dependencies` from Gemfile
dentarg Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ gem 'puma', puma_version
gem 'minitest', '~> 5.0'
gem 'rack-test', github: 'rack/rack-test'
gem 'rubocop', '~> 1.32.0', require: false
gem 'yard'
gem 'yard' # used by rake doc

gem 'rack-protection', path: 'rack-protection'
gem 'sinatra-contrib', path: 'sinatra-contrib'
Expand All @@ -37,8 +37,6 @@ gem 'sinatra-contrib', path: 'sinatra-contrib'
# https://github.com/socketry/async-http/pull/124/files#r1237988899
gem 'traces', '< 0.10.0' if RUBY_VERSION >= '2.6.0' && RUBY_VERSION < '2.7.0'

gem 'activesupport', '~> 6.1'

gem 'asciidoctor'
gem 'builder'
gem 'commonmarker', '~> 0.23.4', platforms: [:ruby]
Expand All @@ -60,7 +58,3 @@ gem 'sass-embedded', '~> 1.54'
gem 'simplecov', require: false
gem 'slim', '~> 4'
gem 'yajl-ruby', platforms: [:ruby]

gem 'json', platforms: %i[jruby mri]

gem 'jar-dependencies', '= 0.4.1', platforms: [:jruby] # Gem::LoadError with jar-dependencies 0.4.2
1 change: 1 addition & 0 deletions rack-protection/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source 'https://rubygems.org'
# encoding: utf-8

gem 'rake'
gem 'rspec', '~> 3'

rack_version = ENV['rack'].to_s
rack_version = nil if rack_version.empty? || (rack_version == 'stable')
Expand Down
5 changes: 1 addition & 4 deletions rack-protection/rack-protection.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
s.required_ruby_version = '>= 2.6.0'

# dependencies
s.add_dependency 'base64'
s.add_dependency 'base64', '>= 0.1.0'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is still open-ended 😄 (same with multi_json in sinatra-contrib)

Not sure we need to act, hopefully conservative gems that don't change the API anytime soon (if ever?)

s.add_dependency 'rack', '~> 2.2', '>= 2.2.4'

s.add_development_dependency 'rack-test', '~> 2'
s.add_development_dependency 'rspec', '~> 3'
end
45 changes: 13 additions & 32 deletions sinatra-contrib/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,26 @@
# frozen_string_literal: true

source 'https://rubygems.org'
gemspec

gem 'rack-protection', path: '../rack-protection'
gem 'sinatra', path: '..'

gem 'rack-test', github: 'rack/rack-test'

group :development, :test do
platform :jruby do
gem 'json'
gem 'rdoc'
gem 'therubyrhino'
gem 'jar-dependencies', '= 0.4.1' # Gem::LoadError with jar-dependencies 0.4.2
end

platform :jruby, :ruby do
gem 'hamlit', '>= 3'
gem 'liquid'
# Use main until there's a slim release that can be used with Tilt 2.1.0
# https://github.com/slim-template/slim/pull/910
gem 'slim', github: 'slim-template/slim'
end

platform :ruby do
gem 'execjs', '>= 2.0.0'
gem 'nokogiri', '>= 1.13.6'
gem 'redcarpet', '>= 3.5.1'
gem 'yajl-ruby'
end

gem 'multi_json'
end
gemspec

rack_version = ENV['rack'].to_s
rack_version = nil if rack_version.empty? || (rack_version == 'stable')
rack_version = { github: 'rack/rack' } if rack_version == 'head'
gem 'rack', rack_version

tilt_version = ENV['tilt'].to_s
tilt_version = nil if tilt_version.empty? || (tilt_version == 'stable')
tilt_version = { github: 'jeremyevans/tilt' } if tilt_version == 'head'

gem 'erubi'
gem 'haml'
gem 'hamlit', '>= 3'
gem 'rack', rack_version
gem 'rack-protection', path: '../rack-protection'
gem 'rack-test', github: 'rack/rack-test'
gem 'rake', '>= 12.3.3'
gem 'rspec', '~> 3'
gem 'sinatra', path: '..'
gem 'slim'
gem 'tilt', tilt_version
gem 'yajl-ruby', platforms: [:ruby] # c-ext
16 changes: 1 addition & 15 deletions sinatra-contrib/sinatra-contrib.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,9 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can

s.required_ruby_version = '>= 2.6.0'

s.add_dependency 'multi_json'
s.add_dependency 'multi_json', '>= 0.0.2'
s.add_dependency 'mustermann', '~> 3.0'
s.add_dependency 'rack-protection', version
s.add_dependency 'sinatra', version
s.add_dependency 'tilt', '~> 2.0'

s.add_development_dependency 'asciidoctor'
s.add_development_dependency 'builder'
s.add_development_dependency 'erubi'
s.add_development_dependency 'haml'
s.add_development_dependency 'liquid'
s.add_development_dependency 'markaby'
s.add_development_dependency 'nokogiri'
s.add_development_dependency 'rack-test', '~> 2'
s.add_development_dependency 'rake', '>= 12.3.3'
s.add_development_dependency 'redcarpet'
s.add_development_dependency 'rspec', '~> 3'
s.add_development_dependency 'sass-embedded', '~> 1.54'
s.add_development_dependency 'slim'
end
2 changes: 0 additions & 2 deletions sinatra.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,4 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
s.add_dependency 'rack', '~> 2.2', '>= 2.2.4'
s.add_dependency 'rack-protection', version
s.add_dependency 'tilt', '~> 2.0'

s.add_development_dependency 'rack-test', '~> 2'
end