Skip to content

Commit

Permalink
Improve dependencies settings
Browse files Browse the repository at this point in the history
  • Loading branch information
n-rodriguez committed Aug 4, 2024
1 parent 90103d3 commit 4d42c8c
Show file tree
Hide file tree
Showing 8 changed files with 140 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- '3.0'
- 'head'
rails:
- rails_7.1.0
- rails_7.1.3
- rails_7.0.8
- rails_6.1.7

Expand Down
36 changes: 34 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,44 @@
RAILS_VERSIONS = %w[
6.1.7
7.0.8
7.1.0
7.1.3
].freeze

RAILS_VERSIONS.each do |version|
appraise "rails_#{version}" do
gem "rails", version
gem "sprockets-rails" if ["7.0.8", "7.1.0"].include?(version)

case version
when "6.1.7"
# Fix: LoadError: cannot load such file -- base64
install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.3.0") }' do
gem "base64"
gem "bigdecimal"
gem "mutex_m"
gem "drb"
gem "logger"
end

when "7.0.8"
gem "sprockets-rails"

# Fix: LoadError: cannot load such file -- base64
install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.3.0") }' do
gem "base64"
gem "bigdecimal"
gem "mutex_m"
gem "drb"
gem "logger"
end

when "7.1.3"
gem "sprockets-rails"

# Fix: warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0. Add logger to your Gemfile or gemspec.
install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
gem "logger"
end
end

end
end
20 changes: 20 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,23 @@
source "https://rubygems.org"

gemspec

gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"

gem "capybara"
gem "cuprite"
gem "database_cleaner"
gem "factory_bot"
gem "faker"
gem "guard-rspec"
gem "puma"
gem "rake"
gem "rspec-rails"
gem "rspec-retry"
gem "rubocop"
gem "rubocop-capybara"
gem "rubocop-factory_bot"
gem "rubocop-rake"
gem "rubocop-rspec"
gem "simplecov"
gem "sqlite3", "~> 1.5.0"
41 changes: 3 additions & 38 deletions draper.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,7 @@ Gem::Specification.new do |s|
s.files = `git ls-files`.split("\n")
s.require_paths = ["lib"]

s.add_runtime_dependency "rails", ">= 6.1"
s.add_runtime_dependency "request_store", ">= 1.0"
s.add_runtime_dependency "zeitwerk"

s.add_development_dependency "appraisal"
s.add_development_dependency "capybara"
s.add_development_dependency "cuprite"
s.add_development_dependency "database_cleaner"
s.add_development_dependency "factory_bot"
s.add_development_dependency "faker"
s.add_development_dependency "guard-rspec"
s.add_development_dependency "puma"
s.add_development_dependency "rake"
s.add_development_dependency "rspec-rails"
s.add_development_dependency "rspec-retry"
s.add_development_dependency "rubocop"
s.add_development_dependency "rubocop-capybara"
s.add_development_dependency "rubocop-factory_bot"
s.add_development_dependency "rubocop-rake"
s.add_development_dependency "rubocop-rspec"
s.add_development_dependency "simplecov"
s.add_development_dependency "sqlite3", "~> 1.5.0"

# rubocop:disable Gemspec/RubyVersionGlobalsUsage
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1.0")
s.add_development_dependency "net-imap"
s.add_development_dependency "net-pop"
s.add_development_dependency "net-smtp"
end

if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
s.add_development_dependency "base64"
s.add_development_dependency "bigdecimal"
s.add_development_dependency "mutex_m"
s.add_development_dependency "drb"
s.add_development_dependency "logger"
end
# rubocop:enable Gemspec/RubyVersionGlobalsUsage
s.add_dependency "rails", ">= 6.1"
s.add_dependency "request_store", ">= 1.0"
s.add_dependency "zeitwerk"
end
26 changes: 26 additions & 0 deletions gemfiles/rails_6.1.7.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@

source "https://rubygems.org"

gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
gem "capybara"
gem "cuprite"
gem "database_cleaner"
gem "factory_bot"
gem "faker"
gem "guard-rspec"
gem "puma"
gem "rake"
gem "rspec-rails"
gem "rspec-retry"
gem "rubocop"
gem "rubocop-capybara"
gem "rubocop-factory_bot"
gem "rubocop-rake"
gem "rubocop-rspec"
gem "simplecov"
gem "sqlite3", "~> 1.5.0"
gem "rails", "6.1.7"

install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.3.0") } do
gem "base64"
gem "bigdecimal"
gem "mutex_m"
gem "drb"
gem "logger"
end

gemspec path: "../"
26 changes: 26 additions & 0 deletions gemfiles/rails_7.0.8.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,33 @@

source "https://rubygems.org"

gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
gem "capybara"
gem "cuprite"
gem "database_cleaner"
gem "factory_bot"
gem "faker"
gem "guard-rspec"
gem "puma"
gem "rake"
gem "rspec-rails"
gem "rspec-retry"
gem "rubocop"
gem "rubocop-capybara"
gem "rubocop-factory_bot"
gem "rubocop-rake"
gem "rubocop-rspec"
gem "simplecov"
gem "sqlite3", "~> 1.5.0"
gem "rails", "7.0.8"
gem "sprockets-rails"

install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.3.0") } do
gem "base64"
gem "bigdecimal"
gem "mutex_m"
gem "drb"
gem "logger"
end

gemspec path: "../"
8 changes: 0 additions & 8 deletions gemfiles/rails_7.1.0.gemfile

This file was deleted.

30 changes: 30 additions & 0 deletions gemfiles/rails_7.1.3.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
gem "capybara"
gem "cuprite"
gem "database_cleaner"
gem "factory_bot"
gem "faker"
gem "guard-rspec"
gem "puma"
gem "rake"
gem "rspec-rails"
gem "rspec-retry"
gem "rubocop"
gem "rubocop-capybara"
gem "rubocop-factory_bot"
gem "rubocop-rake"
gem "rubocop-rspec"
gem "simplecov"
gem "sqlite3", "~> 1.5.0"
gem "rails", "7.1.3"
gem "sprockets-rails"

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

gemspec path: "../"

0 comments on commit 4d42c8c

Please sign in to comment.