From 54217b4d8e4ad9a24e4b6e8675db3c18a1cacbf9 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Mon, 5 Aug 2024 00:49:37 +0200 Subject: [PATCH] Improve dependencies settings --- Appraisals | 34 +++++++++++++++++++++++++++- Gemfile | 20 ++++++++++++++++ draper.gemspec | 44 ++++-------------------------------- gemfiles/rails_6.1.7.gemfile | 26 +++++++++++++++++++++ gemfiles/rails_7.0.8.gemfile | 26 +++++++++++++++++++++ gemfiles/rails_7.1.3.gemfile | 22 ++++++++++++++++++ 6 files changed, 131 insertions(+), 41 deletions(-) diff --git a/Appraisals b/Appraisals index 6cc1d60..0176b89 100644 --- a/Appraisals +++ b/Appraisals @@ -9,6 +9,38 @@ RAILS_VERSIONS = %w[ RAILS_VERSIONS.each do |version| appraise "rails_#{version}" do gem "rails", version - gem "sprockets-rails" if ["7.0.8", "7.1.3"].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 diff --git a/Gemfile b/Gemfile index be173b2..29242bf 100644 --- a/Gemfile +++ b/Gemfile @@ -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" diff --git a/draper.gemspec b/draper.gemspec index 25ff02f..9040ec6 100644 --- a/draper.gemspec +++ b/draper.gemspec @@ -15,45 +15,9 @@ Gem::Specification.new do |s| s.required_ruby_version = ">= 3.0.0" - s.files = `git ls-files`.split("\n") - s.require_paths = ["lib"] + s.files = `git ls-files`.split("\n") - 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 diff --git a/gemfiles/rails_6.1.7.gemfile b/gemfiles/rails_6.1.7.gemfile index 11e138d..8ef410c 100644 --- a/gemfiles/rails_6.1.7.gemfile +++ b/gemfiles/rails_6.1.7.gemfile @@ -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: "../" diff --git a/gemfiles/rails_7.0.8.gemfile b/gemfiles/rails_7.0.8.gemfile index a14dc5e..9d15fbd 100644 --- a/gemfiles/rails_7.0.8.gemfile +++ b/gemfiles/rails_7.0.8.gemfile @@ -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: "../" diff --git a/gemfiles/rails_7.1.3.gemfile b/gemfiles/rails_7.1.3.gemfile index 44ac759..555e715 100644 --- a/gemfiles/rails_7.1.3.gemfile +++ b/gemfiles/rails_7.1.3.gemfile @@ -2,7 +2,29 @@ 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: "../"