From 75ed952d430de616c94aca9c104077424608bcf7 Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Thu, 21 Jun 2018 14:47:29 -0300 Subject: [PATCH 1/5] Remove guard-minitest as a dev dependency --- Guardfile | 9 --------- rack-attack.gemspec | 7 ------- 2 files changed, 16 deletions(-) delete mode 100644 Guardfile diff --git a/Guardfile b/Guardfile deleted file mode 100644 index 06b986b..0000000 --- a/Guardfile +++ /dev/null @@ -1,9 +0,0 @@ -# A sample Guardfile -# More info at https://github.com/guard/guard#readme - -guard :minitest do - # with Minitest::Spec - watch(%r{^spec/(.*)_spec\.rb$}) - watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } - watch(%r{^spec/spec_helper\.rb$}) { 'spec' } -end diff --git a/rack-attack.gemspec b/rack-attack.gemspec index 233e9ea..45a8b0f 100644 --- a/rack-attack.gemspec +++ b/rack-attack.gemspec @@ -30,7 +30,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'appraisal' s.add_development_dependency 'connection_pool' s.add_development_dependency 'dalli' - s.add_development_dependency 'guard-minitest' s.add_development_dependency 'memcache-client' s.add_development_dependency 'minitest' s.add_development_dependency "minitest-stub-const" @@ -41,12 +40,6 @@ Gem::Specification.new do |s| s.add_development_dependency "rubocop", "0.57.2" s.add_development_dependency "timecop" - # Need to explicitly depend on guard because guard-minitest doesn't declare - # the dependency intentionally - # - # See https://github.com/guard/guard-minitest/pull/131 - s.add_development_dependency 'guard' - # byebug only works with MRI if RUBY_ENGINE == "ruby" s.add_development_dependency 'byebug' From 0c26efc187e60258c4f6ea57eda8ce49ff0644c9 Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Thu, 21 Jun 2018 14:49:45 -0300 Subject: [PATCH 2/5] Remove pry as a dev dependency. Using byebug. --- rack-attack.gemspec | 1 - spec/spec_helper.rb | 6 ------ 2 files changed, 7 deletions(-) diff --git a/rack-attack.gemspec b/rack-attack.gemspec index 45a8b0f..eb9336a 100644 --- a/rack-attack.gemspec +++ b/rack-attack.gemspec @@ -33,7 +33,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'memcache-client' s.add_development_dependency 'minitest' s.add_development_dependency "minitest-stub-const" - s.add_development_dependency 'pry' s.add_development_dependency 'rack-test' s.add_development_dependency 'rake' s.add_development_dependency 'redis-activesupport' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6b6f661..7d2c851 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,12 +9,6 @@ require 'action_dispatch' require "rack/attack" -begin - require 'pry' -rescue LoadError - # nothing to do here -end - if RUBY_ENGINE == "ruby" require "byebug" end From aca0fb6f1d700634df3ca98dc02209da8ce7311a Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Thu, 21 Jun 2018 14:59:27 -0300 Subject: [PATCH 3/5] Clarify in gemspec existence of two group of semantically distict dev deps --- rack-attack.gemspec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rack-attack.gemspec b/rack-attack.gemspec index eb9336a..a021f10 100644 --- a/rack-attack.gemspec +++ b/rack-attack.gemspec @@ -25,17 +25,11 @@ Gem::Specification.new do |s| s.add_dependency 'rack' - s.add_development_dependency 'actionpack', '>= 3.0.0' - s.add_development_dependency 'activesupport', '>= 3.0.0' s.add_development_dependency 'appraisal' - s.add_development_dependency 'connection_pool' - s.add_development_dependency 'dalli' - s.add_development_dependency 'memcache-client' s.add_development_dependency 'minitest' s.add_development_dependency "minitest-stub-const" s.add_development_dependency 'rack-test' s.add_development_dependency 'rake' - s.add_development_dependency 'redis-activesupport' s.add_development_dependency "rubocop", "0.57.2" s.add_development_dependency "timecop" @@ -43,4 +37,13 @@ Gem::Specification.new do |s| if RUBY_ENGINE == "ruby" s.add_development_dependency 'byebug' end + + # The following are potential runtime dependencies users may have, + # which rack-attack uses only for testing compatibility in test suite. + s.add_development_dependency 'actionpack', '>= 3.0.0' + s.add_development_dependency 'activesupport', '>= 3.0.0' + s.add_development_dependency 'connection_pool' + s.add_development_dependency 'dalli' + s.add_development_dependency 'memcache-client' + s.add_development_dependency 'redis-activesupport' end From 7a4b206dfdfc69d408f93573038e3618a653aee1 Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Thu, 21 Jun 2018 15:50:49 -0300 Subject: [PATCH 4/5] Let everyone developing rack-attack use compatible/simiar dev deps versions --- rack-attack.gemspec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rack-attack.gemspec b/rack-attack.gemspec index a021f10..652c0d2 100644 --- a/rack-attack.gemspec +++ b/rack-attack.gemspec @@ -25,17 +25,17 @@ Gem::Specification.new do |s| s.add_dependency 'rack' - s.add_development_dependency 'appraisal' - s.add_development_dependency 'minitest' - s.add_development_dependency "minitest-stub-const" - s.add_development_dependency 'rack-test' - s.add_development_dependency 'rake' + s.add_development_dependency 'appraisal', '~> 2.2' + s.add_development_dependency 'minitest', "~> 5.11" + s.add_development_dependency "minitest-stub-const", "~> 0.6" + s.add_development_dependency 'rack-test', "~> 1.0" + s.add_development_dependency 'rake', "~> 12.3" s.add_development_dependency "rubocop", "0.57.2" - s.add_development_dependency "timecop" + s.add_development_dependency "timecop", "~> 0.9.1" # byebug only works with MRI if RUBY_ENGINE == "ruby" - s.add_development_dependency 'byebug' + s.add_development_dependency 'byebug', '~> 10.0' end # The following are potential runtime dependencies users may have, From 9257e40b9690e0fc9ded742b859476b06a34c787 Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Thu, 21 Jun 2018 17:40:39 -0300 Subject: [PATCH 5/5] Make rack-test compatible again with actionpack for some appraisals runs --- Appraisals | 8 ++++++++ gemfiles/rack_1_6.gemfile | 1 + gemfiles/rails_4_2.gemfile | 1 + 3 files changed, 10 insertions(+) diff --git a/Appraisals b/Appraisals index f0495db..2ccb781 100644 --- a/Appraisals +++ b/Appraisals @@ -4,6 +4,10 @@ end appraise "rack_1_6" do gem "rack", "~> 1.6.9" + + # Override rack-test version constraint by making it more loose + # so it's compatible with actionpack 4.2.x + gem "rack-test", ">= 0.6" end appraise 'rails_5-2' do @@ -19,6 +23,10 @@ end appraise 'rails_4-2' do gem 'actionpack', '~> 4.2.0' gem 'activesupport', '~> 4.2.0' + + # Override rack-test version constraint by making it more loose + # so it's compatible with actionpack 4.2.x + gem "rack-test", ">= 0.6" end appraise 'dalli2' do diff --git a/gemfiles/rack_1_6.gemfile b/gemfiles/rack_1_6.gemfile index 18b3acf..8b636ed 100644 --- a/gemfiles/rack_1_6.gemfile +++ b/gemfiles/rack_1_6.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rack", "~> 1.6.9" +gem "rack-test", ">= 0.6" gemspec path: "../" diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile index 3937ece..eb09083 100644 --- a/gemfiles/rails_4_2.gemfile +++ b/gemfiles/rails_4_2.gemfile @@ -4,5 +4,6 @@ source "https://rubygems.org" gem "actionpack", "~> 4.2.0" gem "activesupport", "~> 4.2.0" +gem "rack-test", ">= 0.6" gemspec path: "../"