[DRE-commits] [rerun] 03/11: Port to listen 3

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository rerun.

commit ec5c8971a60017834c95652cfb07cb5a0a34613c
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sat Aug 8 11:07:44 2015 -0300

    Port to listen 3
---
 debian/changelog                           |  3 ++
 debian/patches/0002-Port-to-listen-3.patch | 69 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 73 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5b41900..7838b61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 rerun (0.10.0-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #nnnn)
+  * Patches:
+    - 0001-Read-version-number-from-installed-gemspec.patch
+    - debian/patches/0002-Port-to-listen-3.patch
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 08 Aug 2015 10:19:47 -0300
diff --git a/debian/patches/0002-Port-to-listen-3.patch b/debian/patches/0002-Port-to-listen-3.patch
new file mode 100644
index 0000000..8586ce2
--- /dev/null
+++ b/debian/patches/0002-Port-to-listen-3.patch
@@ -0,0 +1,69 @@
+From: Antonio Terceiro <terceiro at softwarelivre.org>
+Date: Sat, 8 Aug 2015 11:06:39 -0300
+Subject: Port to listen 3
+
+---
+ lib/rerun/runner.rb  |  3 +--
+ lib/rerun/watcher.rb | 11 ++---------
+ rerun.gemspec        |  2 +-
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/lib/rerun/runner.rb b/lib/rerun/runner.rb
+index 6c61084..dcb041f 100644
+--- a/lib/rerun/runner.rb
++++ b/lib/rerun/runner.rb
+@@ -193,8 +193,7 @@ module Rerun
+         watcher.start
+         @watcher = watcher
+         say "Watching #{dir.join(', ')} for #{pattern}" +
+-                (ignore.empty? ? "" : " (ignoring #{ignore.join(',')})") +
+-                " using #{watcher.adapter.class.name.split('::').last} adapter"
++                (ignore.empty? ? "" : " (ignoring #{ignore.join(',')})")
+       end
+     end
+ 
+diff --git a/lib/rerun/watcher.rb b/lib/rerun/watcher.rb
+index 23a1ecd..402bcc6 100644
+--- a/lib/rerun/watcher.rb
++++ b/lib/rerun/watcher.rb
+@@ -85,13 +85,6 @@ module Rerun
+       [dotfiles] + @ignore.map { |x| Rerun::Glob.new(x).to_regexp }
+     end
+ 
+-    def adapter
+-      @listener.registry[:adapter] || (timeout(4) do
+-        sleep 1 until adapter = @listener.registry[:adapter]
+-        adapter
+-      end)
+-    end
+-
+     # kill the file watcher thread
+     def stop
+       @thread.wakeup rescue ThreadError
+@@ -115,11 +108,11 @@ module Rerun
+     end
+ 
+     def unpause
+-      @listener.unpause if @listener
++      @listener.start if @listener
+     end
+ 
+     def running?
+-      @listener && @listener.instance_variable_get(:@adapter)
++      @listener && @listener.processing?
+     end
+ 
+   end
+diff --git a/rerun.gemspec b/rerun.gemspec
+index 0b84799..8f80d0c 100644
+--- a/rerun.gemspec
++++ b/rerun.gemspec
+@@ -25,7 +25,7 @@ $spec = Gem::Specification.new do |s|
+ 
+   s.extra_rdoc_files = %w[README.md]
+ 
+-  s.add_runtime_dependency 'listen', '~> 2.7', '>= 2.7.3'
++  s.add_runtime_dependency 'listen', '~> 3.0'
+ 
+   s.homepage = "http://github.com/alexch/rerun/"
+   s.require_paths = %w[lib]
diff --git a/debian/patches/series b/debian/patches/series
index 3249890..fad3e0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Read-version-number-from-installed-gemspec.patch
+0002-Port-to-listen-3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rerun.git