Only load fog-rackspace on Rails 6.x due to incompatibility with fog-…

…core
carrierwaveuploader · Apr 14, 2024 · c3ae0d4 · c3ae0d4
1 parent aaeaca3
commit c3ae0d4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/carrierwave.gemspec b/carrierwave.gemspec
@@ -35,7 +35,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fog-aws"
   s.add_development_dependency "fog-google", ["~> 1.7", "!= 1.12.1"]
   s.add_development_dependency "fog-local"
-  s.add_development_dependency "fog-rackspace"
   s.add_development_dependency "mini_magick", ">= 3.6.0"
 
   if RUBY_ENGINE != 'jruby'

diff --git a/gemfiles/rails-6-0.gemfile b/gemfiles/rails-6-0.gemfile
@@ -2,8 +2,9 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.0.0"
 gem "activemodel-serializers-xml"
-gem 'sqlite3', platforms: :ruby
+gem "sqlite3", platforms: :ruby
 gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
 gem "fog-google", "~> 1.13.0" if RUBY_VERSION < '2.7'
+gem "fog-rackspace"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails-6-1.gemfile b/gemfiles/rails-6-1.gemfile
@@ -2,8 +2,9 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.1.0"
 gem "activemodel-serializers-xml"
-gem 'sqlite3', platforms: :ruby
+gem "sqlite3", platforms: :ruby
 gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
 gem "fog-google", "~> 1.13.0" if RUBY_VERSION < '2.7'
+gem "fog-rackspace"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails-7-0.gemfile b/gemfiles/rails-7-0.gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
 gem "activemodel-serializers-xml"
-gem 'sqlite3', platforms: :ruby
+gem "sqlite3", platforms: :ruby
 gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
 
 gemspec :path => "../"
diff --git a/gemfiles/rails-7-1.gemfile b/gemfiles/rails-7-1.gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "rails", "~> 7.1.0"
 gem "activemodel-serializers-xml"
-gem 'sqlite3', platforms: :ruby
+gem "sqlite3", platforms: :ruby
 gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
 gem "observer" # Workaround for https://github.com/rmagick/rmagick/pull/1411
 

diff --git a/gemfiles/rails-main.gemfile b/gemfiles/rails-main.gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "rails", github: "rails/rails", branch: "main"
 gem "activemodel-serializers-xml"
-gem 'sqlite3', platforms: :ruby
+gem "sqlite3", platforms: :ruby
 gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby, :truffleruby]
 
 gemspec :path => "../"
diff --git a/spec/storage/fog_spec.rb b/spec/storage/fog_spec.rb
@@ -2,7 +2,11 @@
 require 'fog/aws'
 require 'fog/google'
 require 'fog/local'
-require 'fog/rackspace'
+begin
+  require 'fog/rackspace'
+rescue LoadError
+  # Can be missing in CI
+end
 
 unless ENV['REMOTE'] == 'true'
   Fog.mock!