From 8b114aa5ef7918c5af84f33317e118ab69ce178a Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sat, 20 Jun 2020 03:32:41 -0700 Subject: [PATCH] Use bundler for dev dependencies --- Gemfile | 3 ++- Rakefile | 7 ------- searchkick.gemspec | 4 ---- test/gemfiles/activerecord50.gemfile | 5 +++-- test/gemfiles/activerecord51.gemfile | 5 +++-- test/gemfiles/activerecord52.gemfile | 5 +++-- test/gemfiles/apartment.gemfile | 8 -------- test/gemfiles/cequel.gemfile | 5 +++-- test/gemfiles/mongoid6.gemfile | 5 +++-- test/gemfiles/mongoid7.gemfile | 5 +++-- test/gemfiles/nobrainer.gemfile | 5 +++-- test/gemfiles/parallel_tests.gemfile | 8 -------- 12 files changed, 23 insertions(+), 42 deletions(-) delete mode 100644 test/gemfiles/apartment.gemfile delete mode 100644 test/gemfiles/parallel_tests.gemfile diff --git a/Gemfile b/Gemfile index a26c0f9..5bd18f4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,9 @@ source "https://rubygems.org" -# Specify your gem's dependencies in searchkick.gemspec gemspec +gem "rake" +gem "minitest", ">= 5" gem "activerecord", "~> 6.0.0" gem "activejob", "~> 6.0.0", require: "active_job" gem "actionpack", "~> 6.0.0" diff --git a/Rakefile b/Rakefile index 2bc5e15..35dafa0 100644 --- a/Rakefile +++ b/Rakefile @@ -1,13 +1,6 @@ require "bundler/gem_tasks" require "rake/testtask" -begin - require "parallel_tests/tasks" - require "shellwords" -rescue LoadError - # do nothing -end - task default: :test Rake::TestTask.new do |t| t.libs << "test" diff --git a/searchkick.gemspec b/searchkick.gemspec index f235c2c..bf56e3d 100644 --- a/searchkick.gemspec +++ b/searchkick.gemspec @@ -18,8 +18,4 @@ Gem::Specification.new do |spec| spec.add_dependency "activemodel", ">= 5" spec.add_dependency "elasticsearch", ">= 6" spec.add_dependency "hashie" - - spec.add_development_dependency "bundler" - spec.add_development_dependency "minitest" - spec.add_development_dependency "rake" end diff --git a/test/gemfiles/activerecord50.gemfile b/test/gemfiles/activerecord50.gemfile index d103d70..01c262d 100644 --- a/test/gemfiles/activerecord50.gemfile +++ b/test/gemfiles/activerecord50.gemfile @@ -1,8 +1,9 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -# Specify your gem's dependencies in searchkick.gemspec gemspec path: "../../" +gem "rake" +gem "minitest", ">= 5" gem "sqlite3", "~> 1.3.0" gem "activerecord", "~> 5.0.0" gem "actionpack", "~> 5.0.0" diff --git a/test/gemfiles/activerecord51.gemfile b/test/gemfiles/activerecord51.gemfile index a6d8b9e..733d4ac 100644 --- a/test/gemfiles/activerecord51.gemfile +++ b/test/gemfiles/activerecord51.gemfile @@ -1,8 +1,9 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -# Specify your gem's dependencies in searchkick.gemspec gemspec path: "../../" +gem "rake" +gem "minitest", ">= 5" gem "sqlite3" gem "activerecord", "~> 5.1.0" gem "actionpack", "~> 5.1.0" diff --git a/test/gemfiles/activerecord52.gemfile b/test/gemfiles/activerecord52.gemfile index 3cf974d..cfbf334 100644 --- a/test/gemfiles/activerecord52.gemfile +++ b/test/gemfiles/activerecord52.gemfile @@ -1,8 +1,9 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -# Specify your gem's dependencies in searchkick.gemspec gemspec path: "../../" +gem "rake" +gem "minitest", ">= 5" gem "sqlite3" gem "activerecord", "~> 5.2.0" gem "actionpack", "~> 5.2.0" diff --git a/test/gemfiles/apartment.gemfile b/test/gemfiles/apartment.gemfile deleted file mode 100644 index 276147c..0000000 --- a/test/gemfiles/apartment.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "sqlite3", "~> 1.3.0" -gem "activerecord", "~> 4.2.0" -gem "apartment" diff --git a/test/gemfiles/cequel.gemfile b/test/gemfiles/cequel.gemfile index c16a665..437f14c 100644 --- a/test/gemfiles/cequel.gemfile +++ b/test/gemfiles/cequel.gemfile @@ -1,8 +1,9 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -# Specify your gem's dependencies in searchkick.gemspec gemspec path: "../../" +gem "rake" +gem "minitest", ">= 5" gem "cequel" gem "activejob" gem "redis" diff --git a/test/gemfiles/mongoid6.gemfile b/test/gemfiles/mongoid6.gemfile index 5807101..6c3b168 100644 --- a/test/gemfiles/mongoid6.gemfile +++ b/test/gemfiles/mongoid6.gemfile @@ -1,8 +1,9 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -# Specify your gem's dependencies in searchkick.gemspec gemspec path: "../../" +gem "rake" +gem "minitest", ">= 5" gem "mongoid", "~> 6.0.0" gem "activejob", require: "active_job" gem "redis" diff --git a/test/gemfiles/mongoid7.gemfile b/test/gemfiles/mongoid7.gemfile index 8e4979f..e93f455 100644 --- a/test/gemfiles/mongoid7.gemfile +++ b/test/gemfiles/mongoid7.gemfile @@ -1,8 +1,9 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -# Specify your gem's dependencies in searchkick.gemspec gemspec path: "../../" +gem "rake" +gem "minitest", ">= 5" gem "mongoid", "~> 7.0.0" gem "activejob", require: "active_job" gem "redis" diff --git a/test/gemfiles/nobrainer.gemfile b/test/gemfiles/nobrainer.gemfile index 1778494..aa11d44 100644 --- a/test/gemfiles/nobrainer.gemfile +++ b/test/gemfiles/nobrainer.gemfile @@ -1,8 +1,9 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -# Specify your gem's dependencies in searchkick.gemspec gemspec path: "../../" +gem "rake" +gem "minitest", ">= 5" gem "nobrainer", ">= 0.21.0" gem "activejob" gem "redis" diff --git a/test/gemfiles/parallel_tests.gemfile b/test/gemfiles/parallel_tests.gemfile deleted file mode 100644 index 3d59b7a..0000000 --- a/test/gemfiles/parallel_tests.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "sqlite3", "~> 1.3.0" -gem "activerecord", "~> 5.0.0" -gem "parallel_tests" -- libgit2 0.21.0