diff -Nru ruby-redis-activesupport-5.2.0/debian/changelog ruby-redis-activesupport-5.3.0/debian/changelog --- ruby-redis-activesupport-5.2.0/debian/changelog 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/changelog 2022-01-21 21:30:37.000000000 +0000 @@ -1,3 +1,45 @@ +ruby-redis-activesupport (5.3.0-1) unstable; urgency=medium + + * Team upload. + * New upstream version 5.3.0 + * Fix build with Ruby3.0. + - d/p/Fix-Ruby-3.0-keyword-argument-issue.patch: Remove patch. + This has been incorporated by upstream. + - d/p/Use-redis.exists-method-instead-of-exists.patch: Fix testcase + failure when building with Ruby3.0. + + -- Sergio Durigan Junior Fri, 21 Jan 2022 16:30:37 -0500 + +ruby-redis-activesupport (5.2.1-1) unstable; urgency=medium + + * Team upload. + * New upstream LTS release. + - Fixes a keyword handlung issue with Ruby 3.0 (see #996365). + + [ Debian Janitor ] + * Trim trailing whitespace. + * Use secure copyright file specification URI. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + [ Daniel Leidert ] + * d/control: Add Rules-Requires-Root field. + (Standards-Version): Bump to 4.6.0. + (Depends): Remove interpreters and use ${ruby:Depends}. + * d/copyright: Add Upstream-Contact field. + (Copyright): Add team. + * d/rules: Use gem installation layout. + * d/patches/Fix-Ruby-3.0-keyword-argument-issue.patch: Add patch. + - Fix a keyword argument handling error with Ruby 3.0. + * d/patches/Disable-tests-which-will-fail-with-Rails-6.patch: Add patch. + - Fix remaining test failures caused by this gem not being targeted at + Rails 6 (closes: #996365). + * d/patches/series: Enable new patches. + * d/upstream/metadata: Add Archive field. + * d/tests/control.ex: Remove template. + + -- Daniel Leidert Wed, 24 Nov 2021 20:06:35 +0100 + ruby-redis-activesupport (5.2.0-1) unstable; urgency=medium [ Utkarsh Gupta ] @@ -43,14 +85,14 @@ ruby-redis-activesupport (4.0.0-3) unstable; urgency=medium - * Fix homepage field in debian/control. + * Fix homepage field in debian/control. -- Balasankar C Sat, 18 Jul 2015 10:03:22 +0530 ruby-redis-activesupport (4.0.0-2) unstable; urgency=medium * Move starting of redis-server to ruby-tests.rake for DebCI - * Fix path of library file + * Fix path of library file -- Balasankar C Sat, 17 Jan 2015 16:02:02 +0530 diff -Nru ruby-redis-activesupport-5.2.0/debian/control ruby-redis-activesupport-5.3.0/debian/control --- ruby-redis-activesupport-5.2.0/debian/control 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/control 2022-01-21 18:49:20.000000000 +0000 @@ -1,31 +1,30 @@ Source: ruby-redis-activesupport Section: ruby Priority: optional -Maintainer: Debian Ruby Extras Maintainers +Maintainer: Debian Ruby Team Uploaders: Balasankar C , Pirate Praveen -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), gem2deb, procps, redis-server, ruby-activesupport, ruby-connection-pool, ruby-mocha, - ruby-redis-store (>= 1.3~) -Standards-Version: 4.5.0 + ruby-redis-store +Standards-Version: 4.6.0 Vcs-Git: https://salsa.debian.org/ruby-team/ruby-redis-activesupport.git Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-redis-activesupport Homepage: https://github.com/redis-store/redis-activesupport Testsuite: autopkgtest-pkg-ruby XS-Ruby-Versions: all +Rules-Requires-Root: no Package: ruby-redis-activesupport Architecture: all XB-Ruby-Versions: ${ruby:Versions} -Depends: ruby | ruby-interpreter, - ruby-activesupport, - ruby-redis-store (>= 1.3~), - ${misc:Depends}, +Depends: ${misc:Depends}, + ${ruby:Depends}, ${shlibs:Depends} Description: Redis store for ActiveSupport::Cache redis-activesupport provides a cache for ActiveSupport. Redis Store provides a diff -Nru ruby-redis-activesupport-5.2.0/debian/copyright ruby-redis-activesupport-5.3.0/debian/copyright --- ruby-redis-activesupport-5.2.0/debian/copyright 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/copyright 2022-01-21 18:49:20.000000000 +0000 @@ -1,15 +1,17 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: redis-activesupport +Upstream-Contact: https://github.com/redis-store/redis-activesupport/issues Source: https://github.com/redis-store/redis-activesupport Files: * -Copyright: 2009 - 2011 Luca Guidi - http://lucaguidi.com +Copyright: 2009 - 2011 Luca Guidi - https://lucaguidi.com License: Expat Files: debian/* Copyright: 2014 Balasankar C + 2021 Debian Ruby Extras Maintainers License: Expat -Comment: the Debian packaging is licensed under the same terms as the original package. +Comment: The Debian packaging is licensed under the same terms as the source. License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy diff -Nru ruby-redis-activesupport-5.2.0/debian/patches/Bundler-Requirement ruby-redis-activesupport-5.3.0/debian/patches/Bundler-Requirement --- ruby-redis-activesupport-5.2.0/debian/patches/Bundler-Requirement 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/patches/Bundler-Requirement 2022-01-21 21:27:24.000000000 +0000 @@ -1,14 +1,16 @@ -Description: Remove bundler requirement - Remove the bundler dependency from test file. - . - ruby-redis-activesupport (4.0.0-1) UNRELEASED; urgency=medium - . - * Initial release (Closes: #nnnn) -Author: Balasankar C +From: Balasankar C +Date: Fri, 28 Nov 2014 20:59:03 +0530 +Subject: Remove bundler requirement +Remove the bundler dependency from test file. +--- + test/test_helper.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- ruby-redis-activesupport-4.0.0.orig/test/test_helper.rb -+++ ruby-redis-activesupport-4.0.0/test/test_helper.rb +diff --git a/test/test_helper.rb b/test/test_helper.rb +index 804bd70..7a208b6 100644 +--- a/test/test_helper.rb ++++ b/test/test_helper.rb @@ -1,4 +1,4 @@ -require 'bundler/setup' +#require 'bundler/setup' diff -Nru ruby-redis-activesupport-5.2.0/debian/patches/Disable-tests-which-will-fail-with-Rails-6.patch ruby-redis-activesupport-5.3.0/debian/patches/Disable-tests-which-will-fail-with-Rails-6.patch --- ruby-redis-activesupport-5.2.0/debian/patches/Disable-tests-which-will-fail-with-Rails-6.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/patches/Disable-tests-which-will-fail-with-Rails-6.patch 2022-01-21 21:27:00.000000000 +0000 @@ -0,0 +1,115 @@ +From: Daniel Leidert +Date: Wed, 24 Nov 2021 20:01:37 +0100 +Subject: Disable tests which will fail with Rails 6 + +Rails 6 adds :store=>"ActiveSupport::Cache::RedisStore" to each payload. +So we ignore these tests there. However, this gem is for Rails < 6. No +need to forward this workaround. + +Forwarded: not-needed +--- + test/active_support/cache/redis_store_test.rb | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/test/active_support/cache/redis_store_test.rb b/test/active_support/cache/redis_store_test.rb +index 7ee3a18..39c9c0d 100644 +--- a/test/active_support/cache/redis_store_test.rb ++++ b/test/active_support/cache/redis_store_test.rb +@@ -566,13 +566,13 @@ describe ActiveSupport::Cache::RedisStore do + end + + read.name.must_equal('cache_read.active_support') +- read.payload.must_equal(read_payload) ++ read.payload.must_equal(read_payload) if ActiveSupport::VERSION::MAJOR < 6 + + generate.name.must_equal('cache_generate.active_support') +- generate.payload.must_equal({ :key => 'radiohead' }) ++ generate.payload.must_equal({ :key => 'radiohead' }) if ActiveSupport::VERSION::MAJOR < 6 + + write.name.must_equal('cache_write.active_support') +- write.payload.must_equal({ :key => 'radiohead' }) ++ write.payload.must_equal({ :key => 'radiohead' }) if ActiveSupport::VERSION::MAJOR < 6 + end + + it "notifies on #read" do +@@ -582,7 +582,7 @@ describe ActiveSupport::Cache::RedisStore do + + read = @events.first + read.name.must_equal('cache_read.active_support') +- read.payload.must_equal({ :key => 'metallica', :hit => false }) ++ read.payload.must_equal({ :key => 'metallica', :hit => false }) if ActiveSupport::VERSION::MAJOR < 6 + end + + it "notifies on #write" do +@@ -592,7 +592,7 @@ describe ActiveSupport::Cache::RedisStore do + + write = @events.first + write.name.must_equal('cache_write.active_support') +- write.payload.must_equal({ :key => 'depeche mode' }) ++ write.payload.must_equal({ :key => 'depeche mode' }) if ActiveSupport::VERSION::MAJOR < 6 + end + + it "notifies on #delete" do +@@ -602,7 +602,7 @@ describe ActiveSupport::Cache::RedisStore do + + delete = @events.first + delete.name.must_equal('cache_delete.active_support') +- delete.payload.must_equal({ :key => 'the new cardigans' }) ++ delete.payload.must_equal({ :key => 'the new cardigans' }) if ActiveSupport::VERSION::MAJOR < 6 + end + + it "notifies on #exist?" do +@@ -612,7 +612,7 @@ describe ActiveSupport::Cache::RedisStore do + + exist = @events.first + exist.name.must_equal('cache_exist?.active_support') +- exist.payload.must_equal({ :key => 'the smiths' }) ++ exist.payload.must_equal({ :key => 'the smiths' }) if ActiveSupport::VERSION::MAJOR < 6 + end + + it "notifies on #read_multi" do +@@ -624,7 +624,7 @@ describe ActiveSupport::Cache::RedisStore do + + read = @events.first + read.name.must_equal('cache_read_multi.active_support') +- read.payload.must_equal({ :key => ["metallica", "depeche mode"], :hits => ["depeche mode"] }) ++ read.payload.must_equal({ :key => ["metallica", "depeche mode"], :hits => ["depeche mode"] }) if ActiveSupport::VERSION::MAJOR < 6 + end + + it "notifies on #delete_matched" do +@@ -634,7 +634,7 @@ describe ActiveSupport::Cache::RedisStore do + + delete_matched = @events.first + delete_matched.name.must_equal('cache_delete_matched.active_support') +- delete_matched.payload.must_equal({ :key => %("afterhours*") }) ++ delete_matched.payload.must_equal({ :key => %("afterhours*") }) if ActiveSupport::VERSION::MAJOR < 6 + end + + it "notifies on #increment" do +@@ -644,7 +644,7 @@ describe ActiveSupport::Cache::RedisStore do + + increment = @events.first + increment.name.must_equal('cache_increment.active_support') +- increment.payload.must_equal({ :key => 'pearl jam', :amount => 1 }) ++ increment.payload.must_equal({ :key => 'pearl jam', :amount => 1 }) if ActiveSupport::VERSION::MAJOR < 6 + end + + it "notifies on #decrement" do +@@ -654,7 +654,7 @@ describe ActiveSupport::Cache::RedisStore do + + decrement = @events.first + decrement.name.must_equal('cache_decrement.active_support') +- decrement.payload.must_equal({ :key => 'placebo', :amount => 1 }) ++ decrement.payload.must_equal({ :key => 'placebo', :amount => 1 }) if ActiveSupport::VERSION::MAJOR < 6 + end + + # it "notifies on cleanup" # TODO implement in ActiveSupport::Cache::RedisStore +@@ -666,7 +666,7 @@ describe ActiveSupport::Cache::RedisStore do + + clear = @events.first + clear.name.must_equal('cache_clear.active_support') +- clear.payload.must_equal({ :key => nil }) ++ clear.payload.must_equal({ :key => nil }) if ActiveSupport::VERSION::MAJOR < 6 + end + end + diff -Nru ruby-redis-activesupport-5.2.0/debian/patches/series ruby-redis-activesupport-5.3.0/debian/patches/series --- ruby-redis-activesupport-5.2.0/debian/patches/series 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/patches/series 2022-01-21 21:29:37.000000000 +0000 @@ -1 +1,3 @@ Bundler-Requirement +Disable-tests-which-will-fail-with-Rails-6.patch +Use-redis.exists-method-instead-of-exists.patch diff -Nru ruby-redis-activesupport-5.2.0/debian/patches/Use-redis.exists-method-instead-of-exists.patch ruby-redis-activesupport-5.3.0/debian/patches/Use-redis.exists-method-instead-of-exists.patch --- ruby-redis-activesupport-5.2.0/debian/patches/Use-redis.exists-method-instead-of-exists.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/patches/Use-redis.exists-method-instead-of-exists.patch 2022-01-21 21:29:37.000000000 +0000 @@ -0,0 +1,66 @@ +From: Sergio Durigan Junior +Date: Fri, 21 Jan 2022 15:52:33 -0500 +Subject: Use redis.exists? method instead of exists + +According to +https://github.com/redis/redis-rb/blob/e3cf29dfb1d933bcd6670eb87a6246d54546cd80/lib/redis.rb#L17, +it is recommended to use the "exists?" method instead of the +"exists". + +On Debian, we're seeing 4 related failures when using "exists". +Here's one: + + 1) Failure: +ActiveSupport::Cache::RedisStore#test_0006_namespaces all operations [/<>/test/active_support/cache/redis_store_test.rb:93]: +Expected: true + Actual: 1 + +These failures are solved by using "exists?". + +Signed-off-by: Sergio Durigan Junior + +Forwarded: yes, https://github.com/redis-store/redis-activesupport/pull/131 +--- + test/active_support/cache/redis_store_test.rb | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/active_support/cache/redis_store_test.rb b/test/active_support/cache/redis_store_test.rb +index 39c9c0d..0efd4ed 100644 +--- a/test/active_support/cache/redis_store_test.rb ++++ b/test/active_support/cache/redis_store_test.rb +@@ -45,7 +45,7 @@ describe ActiveSupport::Cache::RedisStore do + + store.write("rabbit", 0) + +- redis.exists("rabbit").must_equal(true) ++ redis.exists?("rabbit").must_equal(true) + end + + it "connects using an string of options" do +@@ -60,7 +60,7 @@ describe ActiveSupport::Cache::RedisStore do + + store.write("rabbit", 0) + +- redis.exists("rabbit").must_equal(true) ++ redis.exists?("rabbit").must_equal(true) + end + + it "connects using the passed hash of options" do +@@ -74,7 +74,7 @@ describe ActiveSupport::Cache::RedisStore do + + store.write("rabbit", 0) + +- redis.exists("rabbit").must_equal(true) ++ redis.exists?("rabbit").must_equal(true) + end + + it "raises an error if :pool isn't a pool" do +@@ -90,7 +90,7 @@ describe ActiveSupport::Cache::RedisStore do + + store.write("white-rabbit", 0) + +- redis.exists('cache-namespace:white-rabbit').must_equal(true) ++ redis.exists?('cache-namespace:white-rabbit').must_equal(true) + end + + it "creates a normal store when given no addresses" do diff -Nru ruby-redis-activesupport-5.2.0/debian/ruby-tests.rake ruby-redis-activesupport-5.3.0/debian/ruby-tests.rake --- ruby-redis-activesupport-5.2.0/debian/ruby-tests.rake 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/ruby-tests.rake 2022-01-21 18:49:20.000000000 +0000 @@ -1,5 +1,5 @@ - require 'gem2deb/rake/testtask' + task :default do Rake::Task[:start_redis].invoke failed = false diff -Nru ruby-redis-activesupport-5.2.0/debian/rules ruby-redis-activesupport-5.3.0/debian/rules --- ruby-redis-activesupport-5.2.0/debian/rules 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/rules 2022-01-21 18:49:20.000000000 +0000 @@ -1,6 +1,7 @@ #!/usr/bin/make -f export GEM2DEB_TEST_RUNNER = --check-dependencies +export DH_RUBY = --gem-install %: dh $@ --buildsystem=ruby --with ruby diff -Nru ruby-redis-activesupport-5.2.0/debian/tests/control.ex ruby-redis-activesupport-5.3.0/debian/tests/control.ex --- ruby-redis-activesupport-5.2.0/debian/tests/control.ex 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/tests/control.ex 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -# AUTOGENERATED FILE -# -# As of autopkgtest 3.5, Ruby packages that use gem2deb are automatically -# detected, and if debian/tests/control does not exist the contents below will -# be assumed (with the exception of gem2deb being filtered out from -# @builddeps@): - -Test-Command: gem2deb-test-runner --autopkgtest 2>&1 -Depends: @, @builddeps@, gem2deb-test-runner - -# if you would need to change something to the above, to that and rename this -# file to `control`. Otherwise, you should probably delete this file -# (recommended). diff -Nru ruby-redis-activesupport-5.2.0/debian/upstream/metadata ruby-redis-activesupport-5.3.0/debian/upstream/metadata --- ruby-redis-activesupport-5.2.0/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/upstream/metadata 2022-01-21 18:49:20.000000000 +0000 @@ -0,0 +1,6 @@ +--- +Archive: GitHub +Bug-Database: https://github.com/redis-store/redis-activesupport/issues +Bug-Submit: https://github.com/redis-store/redis-activesupport/issues/new +Repository: https://github.com/redis-store/redis-activesupport.git +Repository-Browse: https://github.com/redis-store/redis-activesupport diff -Nru ruby-redis-activesupport-5.2.0/debian/watch ruby-redis-activesupport-5.3.0/debian/watch --- ruby-redis-activesupport-5.2.0/debian/watch 2020-03-13 14:24:19.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/debian/watch 2022-01-21 18:49:20.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 https://gemwatch.debian.net/redis-activesupport .*/redis-activesupport-(.*).tar.gz diff -Nru ruby-redis-activesupport-5.2.0/.github/auto-assign-issues.yml ruby-redis-activesupport-5.3.0/.github/auto-assign-issues.yml --- ruby-redis-activesupport-5.2.0/.github/auto-assign-issues.yml 1970-01-01 00:00:00.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/.github/auto-assign-issues.yml 2022-01-21 19:29:04.000000000 +0000 @@ -0,0 +1,2 @@ +assignees: + - tubbo diff -Nru ruby-redis-activesupport-5.2.0/lib/active_support/cache/redis_store.rb ruby-redis-activesupport-5.3.0/lib/active_support/cache/redis_store.rb --- ruby-redis-activesupport-5.2.0/lib/active_support/cache/redis_store.rb 2019-09-04 09:17:01.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/lib/active_support/cache/redis_store.rb 2022-01-21 19:29:04.000000000 +0000 @@ -77,12 +77,12 @@ end def write(name, value, options = nil) - options = merged_options(options) - instrument(:write, name, options) do |payload| + options = merged_options(options.to_h.symbolize_keys) + instrument(:write, name, options) do |_payload| if options[:expires_in].present? && options[:race_condition_ttl].present? && options[:raw].blank? options[:expires_in] = options[:expires_in].to_f + options[:race_condition_ttl].to_f end - entry = options[:raw].present? ? value : Entry.new(value, options) + entry = options[:raw].present? ? value : Entry.new(value, **options) write_entry(normalize_key(name, options), entry, options) end end @@ -302,7 +302,7 @@ # # It's really needed and use # - def delete_entry(key, options) + def delete_entry(key, **options) failsafe(:delete_entry, returning: false) do with { |c| c.del key } end diff -Nru ruby-redis-activesupport-5.2.0/lib/redis/active_support/version.rb ruby-redis-activesupport-5.3.0/lib/redis/active_support/version.rb --- ruby-redis-activesupport-5.2.0/lib/redis/active_support/version.rb 2019-09-04 09:17:01.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/lib/redis/active_support/version.rb 2022-01-21 19:29:04.000000000 +0000 @@ -1,5 +1,5 @@ class Redis module ActiveSupport - VERSION = '5.2.0' + VERSION = '5.3.0' end end diff -Nru ruby-redis-activesupport-5.2.0/README.md ruby-redis-activesupport-5.3.0/README.md --- ruby-redis-activesupport-5.2.0/README.md 2019-09-04 09:17:01.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/README.md 2022-01-21 19:29:04.000000000 +0000 @@ -1,3 +1,11 @@ +# This gem is in LTS mode. + +Rails 5.2.0 [includes a Redis cache store out of the +box](https://github.com/rails/rails/pull/31134), so you don't really +need this anymore if you're generating a new Rails application. We +are no longer accepting new features for this gem, only security +updates will be considered for new pull requests. + # Redis stores for ActiveSupport __`redis-activesupport`__ provides a cache for __ActiveSupport__. @@ -9,14 +17,6 @@ If, for some reason, you're using `ActiveSupport::Cache` and not in a Rails app, read on to learn how to install/use this gem by itself! -## A quick note about Rails 5.2 - -Rails 5.2.0 [includes a Redis cache store out of the -box](https://github.com/rails/rails/pull/31134), so you don't really -need this anymore if you're generating a new Rails application. We -are no longer accepting new features for this gem, only pull requests -for security and compatibility fixes will be accepted. - ## Installation ```ruby diff -Nru ruby-redis-activesupport-5.2.0/redis-activesupport.gemspec ruby-redis-activesupport-5.3.0/redis-activesupport.gemspec --- ruby-redis-activesupport-5.2.0/redis-activesupport.gemspec 2019-09-04 09:17:01.000000000 +0000 +++ ruby-redis-activesupport-5.3.0/redis-activesupport.gemspec 2022-01-21 19:29:04.000000000 +0000 @@ -19,13 +19,13 @@ s.require_paths = ['lib'] s.add_runtime_dependency "redis-store", '>= 1.3', '< 2' - s.add_runtime_dependency 'activesupport', '>= 3', '< 7' + s.add_runtime_dependency 'activesupport', '>= 3', '< 8' - s.add_development_dependency 'rake', '~> 10' + s.add_development_dependency 'rake', '>= 12.3.3' s.add_development_dependency 'bundler' s.add_development_dependency 'mocha', '~> 0.14.0' s.add_development_dependency 'minitest', '>= 4.2', '< 6' - s.add_development_dependency 'connection_pool', '~> 2.2.0' + s.add_development_dependency 'connection_pool', '= 2.2.2' s.add_development_dependency 'redis-store-testing' s.add_development_dependency 'appraisal', '~> 2.0' s.add_development_dependency 'pry-byebug', '~> 3'