From 8c92a3b1f6f2360599732f8d1ff4ae95f515eb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Sun, 18 Aug 2019 20:43:16 +0200
Subject: [PATCH] Move development dependencies to Gemfile

This is more flexible anyways (you can point to git gems, for example),
but in this case it fixes an issue, because conditional dependencis in
the gemspec don't really work that way:

* On one hand, if I point to ransack through using `:path` or `:git`, I
would need to have the ENV["RAILS"] variable defined so that I can
bundle my application.

* If I point to a released gem, development_dependencies are ignored
anyways, but the specific value of the requirement would be set
unconditionally according to the `ENV["RAILS"]` value at release time,
definitely not what's expected
---
 Gemfile         | 9 ++++++++-
 ransack.gemspec | 8 --------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 15e26a3..e75d5db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,12 @@ gem 'rake'
 
 rails = ENV['RAILS'] || '6-0-stable'
 
-gem 'pry'
+gem 'faker', '~> 0.9.5'
+gem 'sqlite3', ::Gem::Version.new(ENV['RAILS']&.gsub(/^v/, '')) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
+gem 'pg', '~> 0.21'
+gem 'mysql2', '0.3.20'
+gem 'pry', '0.10'
+gem 'byebug'
 
 # Provide timezone information on Windows
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
@@ -33,6 +38,8 @@ end
 gem 'mysql2', '~> 0.5.2'
 
 group :test do
+  gem 'machinist', '~> 1.0.6'
+  gem 'rspec', '~> 3'
   # TestUnit was removed from Ruby 2.2 but still needed for testing Rails 3.x.
   gem 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
   gem 'simplecov', :require => false
diff --git a/ransack.gemspec b/ransack.gemspec
index 80303af..269cf3f 100644
--- a/ransack.gemspec
+++ b/ransack.gemspec
@@ -19,14 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>= 5.0'
   s.add_dependency 'i18n'
   s.add_dependency 'polyamorous', Ransack::VERSION.to_s
-  s.add_development_dependency 'rspec', '~> 3'
-  s.add_development_dependency 'machinist', '~> 1.0.6'
-  s.add_development_dependency 'faker', '~> 0.9.5'
-  s.add_development_dependency 'sqlite3', ::Gem::Version.new(ENV['RAILS']&.gsub(/^v/, '')) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
-  s.add_development_dependency 'pg', '~> 0.21'
-  s.add_development_dependency 'mysql2', '0.3.20'
-  s.add_development_dependency 'pry', '0.10'
-  s.add_development_dependency 'byebug'
 
   s.files         = `git ls-files`.split("\n")