8 changed files with 259 additions and 39 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +0,0 @@
-/listen-*.gem
-/rubygem-listen-*-spec.txz
--- a/.rubygem-listen.metadata
+++ b/.rubygem-listen.metadata
--- a/SOURCES/listen-3.7.1.gem
+++ b/SOURCES/listen-3.7.1.gem
--- a/SOURCES/rubygem-listen-3.7.1-Fix-kwargs-matching-with-rspec-mock-3.12-and-Ruby-3.patch
+++ b/SOURCES/rubygem-listen-3.7.1-Fix-kwargs-matching-with-rspec-mock-3.12-and-Ruby-3.patch
@ -0,0 +1,239 @@
+From 2947373cd6325b273e3206b63d16ddbfc1118ecf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Thu, 3 Nov 2022 17:28:43 +0100
+Subject: [PATCH] Fix kwargs matching with rspec-mock 3.12 and Ruby 3+
+
+The test seems to be broken by:
+
+https://github.com/rspec/rspec-mocks/pull/1461
+---
+ spec/lib/listen/adapter/base_spec.rb        |  2 +-
+ spec/lib/listen/adapter/linux_spec.rb       |  6 ++++--
+ spec/lib/listen/adapter/polling_spec.rb     |  2 +-
+ spec/lib/listen/directory_spec.rb           | 12 ++++++------
+ spec/lib/listen/listener_spec.rb            | 20 ++++++++++----------
+ spec/lib/listen/silencer/controller_spec.rb | 12 ++++++------
+ 6 files changed, 28 insertions(+), 26 deletions(-)
+
+diff --git a/spec/lib/listen/adapter/base_spec.rb b/spec/lib/listen/adapter/base_spec.rb
+index 6cf0cad..2b53127 100644
+--- a/spec/lib/listen/adapter/base_spec.rb
+++ b/spec/lib/listen/adapter/base_spec.rb
+@@ -91,7 +91,7 @@ RSpec.describe Listen::Adapter::Base do
+       it 'passes invalidates the snapshot based on the event' do
+         subject.start
+ 
+-        expect(snapshot).to receive(:invalidate).with(:file, 'bar', cookie: 3)
+        expect(snapshot).to receive(:invalidate).with(:file, 'bar', { cookie: 3 })
+ 
+         event = { dir: '/foo/dir1', file: 'bar', type: :moved, cookie: 3 }
+         subject.fake_event(event)
+diff --git a/spec/lib/listen/adapter/linux_spec.rb b/spec/lib/listen/adapter/linux_spec.rb
+index e55bbf6..14f5d48 100644
+--- a/spec/lib/listen/adapter/linux_spec.rb
+++ b/spec/lib/listen/adapter/linux_spec.rb
+@@ -112,8 +112,10 @@ RSpec.describe Listen::Adapter::Linux do
+             expect(snapshot).to receive(:invalidate).with(
+               :file,
+               'path/foo.txt',
+-              cookie: 123,
+-              change: change
+              {
+                cookie: 123,
+                change: change
+              }
+             )
+           end
+         end
+diff --git a/spec/lib/listen/adapter/polling_spec.rb b/spec/lib/listen/adapter/polling_spec.rb
+index 925db74..fae546f 100644
+--- a/spec/lib/listen/adapter/polling_spec.rb
+++ b/spec/lib/listen/adapter/polling_spec.rb
+@@ -56,7 +56,7 @@ RSpec.describe Adapter::Polling do
+ 
+       it 'notifies change on every listener directories path' do
+         expect(snapshot).to receive(:invalidate).
+-          with(:dir, '.', recursive: true)
+          with(:dir, '.', { recursive: true })
+ 
+         t = Thread.new { subject.start }
+         sleep 0.25
+diff --git a/spec/lib/listen/directory_spec.rb b/spec/lib/listen/directory_spec.rb
+index 43ea522..3340067 100644
+--- a/spec/lib/listen/directory_spec.rb
+++ b/spec/lib/listen/directory_spec.rb
+@@ -76,7 +76,7 @@ RSpec.describe Directory do
+           expect(snapshot).to receive(:invalidate).with(:file, 'file.rb', {})
+ 
+           expect(snapshot).to receive(:invalidate).
+-            with(:dir, 'subdir', recursive: false)
+            with(:dir, 'subdir', { recursive: false })
+ 
+           described_class.scan(snapshot, '.', options)
+         end
+@@ -91,7 +91,7 @@ RSpec.describe Directory do
+ 
+         it 'notices subdir does not exist' do
+           expect(snapshot).to receive(:invalidate).
+-            with(:dir, 'subdir', recursive: false)
+            with(:dir, 'subdir', { recursive: false })
+ 
+           described_class.scan(snapshot, '.', options)
+         end
+@@ -219,7 +219,7 @@ RSpec.describe Directory do
+           expect(snapshot).to receive(:invalidate).with(:file, 'file.rb', {})
+ 
+           expect(snapshot).to receive(:invalidate).
+-            with(:dir, 'subdir', recursive: true)
+            with(:dir, 'subdir', { recursive: true })
+ 
+           described_class.scan(snapshot, '.', options)
+         end
+@@ -240,10 +240,10 @@ RSpec.describe Directory do
+           expect(snapshot).to receive(:invalidate).with(:file, 'file.rb', {})
+ 
+           expect(snapshot).to receive(:invalidate).
+-            with(:dir, 'subdir', recursive: true)
+            with(:dir, 'subdir', { recursive: true })
+ 
+           expect(snapshot).to receive(:invalidate).
+-            with(:dir, 'subdir2', recursive: true)
+            with(:dir, 'subdir2', { recursive: true })
+ 
+           described_class.scan(snapshot, '.', options)
+         end
+@@ -274,7 +274,7 @@ RSpec.describe Directory do
+ 
+         it 'snapshots changes for subdir' do
+           expect(snapshot).to receive(:invalidate).
+-            with(:dir, 'subdir', recursive: true)
+            with(:dir, 'subdir', { recursive: true })
+ 
+           described_class.scan(snapshot, '.', options)
+         end
+diff --git a/spec/lib/listen/listener_spec.rb b/spec/lib/listen/listener_spec.rb
+index 9b67e27..8dd9a7a 100644
+--- a/spec/lib/listen/listener_spec.rb
+++ b/spec/lib/listen/listener_spec.rb
+@@ -245,12 +245,12 @@ RSpec.describe Listener do
+       let(:options) { { ignore: /bar/ } }
+ 
+       it 'adds up to existing ignore options' do
+-        expect(silencer).to receive(:configure).once.with(ignore: [/bar/])
+        expect(silencer).to receive(:configure).once.with({ ignore: [/bar/] })
+ 
+         subject
+ 
+         expect(silencer).to receive(:configure).once.
+-          with(ignore: [/bar/, /foo/])
+          with({ ignore: [/bar/, /foo/] })
+ 
+         subject.ignore(/foo/)
+       end
+@@ -260,12 +260,12 @@ RSpec.describe Listener do
+       let(:options) { { ignore: [/bar/] } }
+ 
+       it 'adds up to existing ignore options' do
+-        expect(silencer).to receive(:configure).once.with(ignore: [/bar/])
+        expect(silencer).to receive(:configure).once.with({ ignore: [/bar/] })
+ 
+         subject
+ 
+         expect(silencer).to receive(:configure).once.
+-          with(ignore: [/bar/, /foo/])
+          with({ ignore: [/bar/, /foo/] })
+ 
+         subject.ignore(/foo/)
+       end
+@@ -287,9 +287,9 @@ RSpec.describe Listener do
+       let(:options) { { ignore!: /bar/ } }
+ 
+       it 'overwrites existing ignore options' do
+-        expect(silencer).to receive(:configure).once.with(ignore!: [/bar/])
+        expect(silencer).to receive(:configure).once.with({ ignore!: [/bar/] })
+         subject
+-        expect(silencer).to receive(:configure).once.with(ignore!: [/foo/])
+        expect(silencer).to receive(:configure).once.with({ ignore!: [/foo/] })
+         subject.ignore!([/foo/])
+       end
+     end
+@@ -298,9 +298,9 @@ RSpec.describe Listener do
+       let(:options) { { ignore: /bar/ } }
+ 
+       it 'deletes ignore options' do
+-        expect(silencer).to receive(:configure).once.with(ignore: [/bar/])
+        expect(silencer).to receive(:configure).once.with({ ignore: [/bar/] })
+         subject
+-        expect(silencer).to receive(:configure).once.with(ignore!: [/foo/])
+        expect(silencer).to receive(:configure).once.with({ ignore!: [/foo/] })
+         subject.ignore!([/foo/])
+       end
+     end
+@@ -311,9 +311,9 @@ RSpec.describe Listener do
+       let(:options) { { only: /bar/ } }
+ 
+       it 'overwrites existing ignore options' do
+-        expect(silencer).to receive(:configure).once.with(only: [/bar/])
+        expect(silencer).to receive(:configure).once.with({ only: [/bar/] })
+         subject
+-        expect(silencer).to receive(:configure).once.with(only: [/foo/])
+        expect(silencer).to receive(:configure).once.with({ only: [/foo/] })
+         subject.only([/foo/])
+       end
+     end
+diff --git a/spec/lib/listen/silencer/controller_spec.rb b/spec/lib/listen/silencer/controller_spec.rb
+index 984630c..5393a34 100644
+--- a/spec/lib/listen/silencer/controller_spec.rb
+++ b/spec/lib/listen/silencer/controller_spec.rb
+@@ -26,7 +26,7 @@ RSpec.describe Listen::Silencer::Controller do
+       context 'when providing a single regexp as argument' do
+         it 'sets the given :ignore rules as array' do
+           subject
+-          allow(silencer).to receive(:configure).with(ignore: [/foo/])
+          allow(silencer).to receive(:configure).with({ ignore: [/foo/] })
+           subject.append_ignores(/foo/)
+         end
+       end
+@@ -34,7 +34,7 @@ RSpec.describe Listen::Silencer::Controller do
+       context 'when providing multiple arguments' do
+         it 'sets the given :ignore rules as a flat array' do
+           subject
+-          allow(silencer).to receive(:configure).with(ignore: [/foo/, /bar/])
+          allow(silencer).to receive(:configure).with({ ignore: [/foo/, /bar/] })
+           subject.append_ignores(/foo/, /bar/)
+         end
+       end
+@@ -42,7 +42,7 @@ RSpec.describe Listen::Silencer::Controller do
+       context 'when providing as array' do
+         it 'sets the given :ignore rules' do
+           subject
+-          allow(silencer).to receive(:configure).with(ignore: [/foo/, /bar/])
+          allow(silencer).to receive(:configure).with({ ignore: [/foo/, /bar/] })
+           subject.append_ignores([/foo/, /bar/])
+         end
+       end
+@@ -50,18 +50,18 @@ RSpec.describe Listen::Silencer::Controller do
+ 
+     context 'with previous :ignore rules' do
+       subject do
+-        described_class.new(silencer, ignore: [/foo/, /bar/])
+        described_class.new(silencer, { ignore: [/foo/, /bar/] })
+       end
+ 
+       before do
+-        allow(silencer).to receive(:configure).with(ignore: [/foo/, /bar/])
+        allow(silencer).to receive(:configure).with({ ignore: [/foo/, /bar/] })
+       end
+ 
+       context 'when providing a nil' do
+         # TODO: should this invocation maybe reset the rules?
+         it 'reconfigures with existing :ignore rules' do
+           subject
+-          allow(silencer).to receive(:configure).with(ignore: [/foo/, /bar/])
+          allow(silencer).to receive(:configure).with({ ignore: [/foo/, /bar/] })
+           subject.append_ignores(nil)
+         end
+       end
+-- 
+2.38.1
+
--- a/SOURCES/rubygem-listen-3.7.1-spec.txz
+++ b/SOURCES/rubygem-listen-3.7.1-spec.txz
--- a/SPECS/rubygem-listen.spec
+++ b/SPECS/rubygem-listen.spec
@ -2,15 +2,18 @@
 %global gem_name listen

 Name: rubygem-%{gem_name}
-Version: 3.7.0
+Version: 3.7.1
 Release: 2%{?dist}
 Summary: Listen to file modifications
 License: MIT
 URL: https://github.com/guard/listen
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone https://github.com/guard/listen.git --no-checkout
-# cd listen && git archive -v -o rubygem-listen-3.7.0-spec.txz v3.7.0 spec
+# cd listen && git archive -v -o rubygem-listen-3.7.1-spec.txz v3.7.1 spec
 Source1: rubygem-listen-%{version}-spec.txz
+# Fix kwargs matching compatibility with RSpec 3.12+.
+# https://github.com/guard/listen/pull/564
+Patch0: rubygem-listen-3.7.1-Fix-kwargs-matching-with-rspec-mock-3.12-and-Ruby-3.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
@ -36,10 +39,11 @@ Documentation for %{name}.
 %setup -q -n %{gem_name}-%{version} -b 1

 pushd %{_builddir}
+%patch0 -p1
 popd

 # Remove the hardcoded dependencies. We don't have them in Fedora
-# (except rb-inotify), they are platform specifis and not needed.
+# (except rb-inotify), they are platform specific and not needed.
 # https://github.com/guard/listen/pull/54
 %gemspec_remove_dep -g rb-fsevent [">= 0.10.3", "~> 0.10"]
 sed -i '/def self.usable?$/a         return false' lib/listen/adapter/darwin.rb
@ -92,6 +96,19 @@ popd
 %doc %{gem_instdir}/README.md

 %changelog
+* Thu Sep 21 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 3.7.1-2
+- Rebuilt for MSVSphere 9.2
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Nov 03 2022 Vít Ondruch <vondruch@redhat.com> - 3.7.1-1
+- Update to Listen 3.7.1.
+  Resolves: rhbz#2040523
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

--- a/rubygem-listen-3.1.5-Fix-issue-with-2.6.patch
+++ b/rubygem-listen-3.1.5-Fix-issue-with-2.6.patch
@ -1,32 +0,0 @@
-From 2908365366792ac3ba010fa32bc3be2beaed451a Mon Sep 17 00:00:00 2001
-From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
-Date: Sun, 16 Dec 2018 11:32:45 +1300
-Subject: [PATCH] Use raw Pathname to fix Linux specs.
-
---
- spec/lib/listen/adapter/linux_spec.rb | 12 +-----------
- 1 file changed, 1 insertions(+), 11 deletions(-)
-
-diff --git a/spec/lib/listen/adapter/linux_spec.rb b/spec/lib/listen/adapter/linux_spec.rb
-index d77f0c0..da48319 100644
--- a/spec/lib/listen/adapter/linux_spec.rb
-+++ b/spec/lib/listen/adapter/linux_spec.rb
-@@ -10,17 +10,7 @@
-   end
- 
-   if linux?
-    let(:dir1) do
-      instance_double(
-        Pathname,
-        'dir1',
-        to_s: '/foo/dir1',
-        cleanpath: real_dir1
-      )
-    end
-
-    # just so cleanpath works in above double
-    let(:real_dir1) { instance_double(Pathname, 'dir1', to_s: '/foo/dir1') }
-+    let(:dir1) {Pathname.new("/foo/dir1")}
- 
-     let(:config) { instance_double(Listen::Adapter::Config) }
-     let(:queue) { instance_double(Queue) }
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-SHA512 (listen-3.7.0.gem) = 06d812c4032a906405ea5ffafe9aa2242685bd6ef935a2409bfa75d8d3ec2589ca28ceb32a238a911fd840d0a2d44a86c2e8060c1a9ab4c5f2b9f9275b68c44e
-SHA512 (rubygem-listen-3.7.0-spec.txz) = 3287729d2913a18bfbb4abbfbb2c025b914fd331d1c8bac24cbc998f6fc08696b01049eee83e2d586900700d4b801392fae1e82f110b79e8048cfe00b9543c3c