ruby-dbus 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95dfa24c76e4ed5aeb5997bd160a4efd69a8c146
-  data.tar.gz: 244e215c35cff67f53c7f7ac51a699c2fec22b2d
+  metadata.gz: 1ca1c79fb320bdde63e80e01a065481bbb705b75
+  data.tar.gz: 3a85e1c88c87d352fc2e838f64df72ccf90e4ddf
 SHA512:
-  metadata.gz: f020e993e5a6777c7ea540cf1197200aa6f1c3c7003f331b42b73cea3d5937925243bf46d2668488e8854bb7ac34d88a20934a18e90a2bb46d9fca7bcb8de764
-  data.tar.gz: 160ebb98a13e02b982c7b634a02aa271b5899d54be289c9f5d71c0a2f8b9fcfc1190e4e19854a1a236a237f875cd108bad280a6bdbe571e68cb38afaad10b6b4
+  metadata.gz: cced70bcf377786b5e5b28d29fbccdc0513e9535af05dcc2b0580b5eb860fbe0f1822c46aedc910c4c8479ba0f21e5b3927df48d283fd121fc980a49bd015d9b
+  data.tar.gz: e38930b71af6c62a9dad723001ccdd8bb059d1130b7089b210c1e35334faa3e6d413823abdf70ccaf2af6d49a9116b0afa4fc68135ff7f1936504f7b77d729cf

data/NEWS.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## Ruby D-Bus 0.14.1 - 2018-01-05
+
+Bug fixes:
+ * Allow registering signal handlers while a signal is being handled
+   ([#70][], Jan Biniok).
+
+[#70]: https://github.com/mvidner/ruby-dbus/pull/70
+
 ## Ruby D-Bus 0.14.0 - 2017-10-13
 
 Bug fixes:

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.14.1

data/lib/dbus/bus.rb

@@ -538,7 +538,8 @@ module DBus
         end
       when DBus::Message::SIGNAL
         # the signal can match multiple different rules
-        @signal_matchrules.each do |mrs, slot|
+        # clone to allow new signale handlers to be registered
+        @signal_matchrules.dup.each do |mrs, slot|
           if DBus::MatchRule.new.from_s(mrs).match(m)
             slot.call(m)
           end

data/ruby-dbus.gemspec

@@ -1,6 +1,5 @@
 # -*- ruby -*-
 require "rubygems"
-require "rake"
 
 GEMSPEC = Gem::Specification.new do |s|
   s.name = "ruby-dbus"
@@ -12,10 +11,11 @@ GEMSPEC = Gem::Specification.new do |s|
   s.author = "Ruby DBus Team"
   s.email = "ruby-dbus-devel@lists.luon.net"
   s.homepage = "https://trac.luon.net/ruby-dbus"
-  s.files = FileList[
+  s.files = Dir[
     "{doc,examples,lib,spec}/**/*",
     "COPYING", "NEWS.md", "Rakefile", "README.md",
-    "ruby-dbus.gemspec", "VERSION", ".rspec"].to_a.sort
+    "ruby-dbus.gemspec", "VERSION", ".rspec"
+  ]
   s.require_path = "lib"
 
   s.required_ruby_version = ">= 2.0.0"

data/spec/signal_spec.rb

@@ -3,6 +3,19 @@
 require_relative "spec_helper"
 require "dbus"
 
+def new_quitter(main_loop)
+  Thread.new do
+    DBus.logger.debug "sleep before quit"
+    # FIXME: if we sleep for too long
+    # the socket will be drained and we deadlock in a select.
+    # It could be worked around by sending ourselves a Unix signal
+    # (with a dummy handler) to interrupt the select
+    sleep 1
+    DBus.logger.debug "will quit"
+    main_loop.quit
+  end
+end
+
 describe "SignalHandlerTest" do
   before(:each) do
     @session_bus = DBus::ASessionBus.new
@@ -32,16 +45,7 @@ describe "SignalHandlerTest" do
     DBus.logger.debug "will begin"
     @obj.LongTaskBegin 3
 
-    quitter = Thread.new do
-      DBus.logger.debug "sleep before quit"
-      # FIXME: if we sleep for too long
-      # the socket will be drained and we deadlock in a select.
-      # It could be worked around by sending ourselves a Unix signal
-      # (with a dummy handler) to interrupt the select
-      sleep 1
-      DBus.logger.debug "will quit"
-      @loop.quit
-    end
+    quitter = new_quitter(@loop)
     @loop.run
     quitter.join
 
@@ -60,12 +64,7 @@ describe "SignalHandlerTest" do
       counter += 1
     end
     @obj.LongTaskBegin 3
-    quitter = Thread.new do
-      DBus.logger.debug "sleep before quit"
-      sleep 1
-      DBus.logger.debug "will quit"
-      @loop.quit
-    end
+    quitter = new_quitter(@loop)
     @loop.run
     quitter.join
 
@@ -75,6 +74,22 @@ describe "SignalHandlerTest" do
     expect { @intf.on_signal "to", "many", "yarrrrr!" }.to raise_error(ArgumentError)
   end
 
+  it "is possible to add signal handlers from within handlers" do
+    ended = false
+    @intf.on_signal "LongTaskStart" do
+      @intf.on_signal "LongTaskEnd" do
+        ended = true
+      end
+    end
+
+    @obj.LongTaskBegin 3
+    quitter = new_quitter(@loop)
+    @loop.run
+    quitter.join
+
+    expect(ended).to eq(true)
+  end
+
   it "tests too many rules" do
     100.times do
       @obj.on_signal "Whichever" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dbus
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Ruby DBus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls