catfriend 0.19 → 0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70a3c7bfef9dea8ae908b9bd4f8ad5c152446c41
-  data.tar.gz: 6210b287d37486075d732b501e579d6263488ddc
+  metadata.gz: 4870d46bdd4296ca840969fcc9ebad30a4150c53
+  data.tar.gz: 10831e38fd1306167d09437695f824ea263dbcb5
 SHA512:
-  metadata.gz: d685013b3804d4fb0dd950717c68714dde0836acd46568d70101ce314d0562eb221b7f3222ae66cef4bed99ea0a92e6fe74112d84cfb0d31ec53d548d7498158
-  data.tar.gz: 4df0662912069f5f075281ec1d553198da65e1d1d2d45f07cbec13ec88318b86dd8c7f89c76d63a5411a81c964f196a688be20fc45dfb9b2bcf6e6af36aecb7b
+  metadata.gz: c56e2de3fb47164c7c20b47e9ed1c7826035716f8d9e6109395dcbd9c741f39ef0b4d765c4198fab1483f89a4454bd4d60a0fcc0d8faad1918cac36fe3e3d7ee
+  data.tar.gz: 5dcbeeeb1193e9cd7b5bc50a67727c0ec9616eda4dcd1a18af904cd1384b37a523e08028338844758847b3daf3a124eb5411b68e8f4b0cfb0c07c6d3e1d77193

data/bin/catfriend

@@ -153,19 +153,23 @@ end
 
 def self.main_loop servers
   mutex = Mutex.new
-  error_condition = ConditionVariable.new
+  shutdown_condition = ConditionVariable.new
   dbus = DBus.new
 
-  on_error = proc do
-    mutex.synchronize { error_condition.signal }
+  signal_shutdown = proc do
+    mutex.synchronize { shutdown_condition.signal }
   end
 
-  dbus.on :disconnect, on_error
+  dbus.on(:disconnect) do
+    Catfriend.whisper "received shutdown request"
+    signal_shutdown.call
+  end
 
   servers.each do |server|
     server.on(:error) do |message|
-      $stderr.puts "#{server.id}: #{message}"
-      on_error
+      $stderr.puts "#{server.id}: server error - #{message}"
+      # TODO: error notification?
+      signal_shutdown.call
     end
   end
 
@@ -173,11 +177,10 @@ def self.main_loop servers
   dbus.start
   servers.each &:start
 
-  # then wait for an error
-  mutex.synchronize { error_condition.wait(mutex) }
+  # then wait until something tells the main thread to shutdown
+  mutex.synchronize { shutdown_condition.wait(mutex) }
 
   # clean up and exit
-  Catfriend.whisper 'caught error condition, disconnecting from servers'
   servers.each &:disconnect
 
   Catfriend.whisper 'joining child threads'

data/lib/catfriend/dbus.rb

@@ -26,7 +26,6 @@ class DBus
 
     dbus_interface INTERFACE do
       dbus_method :stop do
-        Catfriend.whisper "received shutdown request"
         @main.quit  # this must be run from within method handler
         @emitter.emit :disconnect
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catfriend
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: '0.20'
 platform: ruby
 authors:
 - James Pike
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: E-mail checker with desktop notifications.