catfriend 0.15 → 0.16

data/bin/catfriend

@@ -8,6 +8,7 @@
 # License:: MIT
 require 'catfriend/filetokenstack'
 require 'catfriend/imap'
+require 'catfriend/dbus'
 require 'net/imap'
 require 'optparse'
 
@@ -99,6 +100,7 @@ def self.main args
     work_accounts = false
     foreground = false
     Catfriend.verbose = false
+    done_action = false
     begin
         OptionParser.new do |opts|
             opts.banner = "usage: #{APP_NAME} [options]"
@@ -112,8 +114,20 @@ def self.main args
             opts.on("-v", "--verbose", "verbose output to console") do
                 Catfriend.verbose = true
             end
+
+            opts.on("-s", "--stop", "shut down running server") do
+                done_action = true
+                dbus = DBus.new
+                if dbus.send_shutdown
+                    puts "sent shutdown signal"
+                else
+                    puts "could not send shutdown signal, no server running?"
+                end
+            end
         end.parse!
 
+        return 0 if done_action
+
         Catfriend.verbose = false unless foreground
 
         servers = parse_config
@@ -121,10 +135,10 @@ def self.main args
         raise ConfigError, "no servers to check" if servers.empty?
 
         if foreground
-            start_servers servers
+            main_loop servers
         else
             pid = fork do
-                start_servers servers
+                main_loop servers
             end
             Process.detach pid
         end
@@ -141,9 +155,12 @@ def self.main args
     1
 end
 
-def self.start_servers servers
+def self.main_loop servers
+    dbus = DBus.new servers
+    dbus.start
     servers.each { |s| s.start }
     servers.each { |s| s.join }
+    dbus.join
 end
 
 end ########################### end module

data/lib/catfriend/dbus.rb

@@ -0,0 +1,71 @@
+require 'catfriend/thread'
+require 'catfriend/server'
+require 'dbus'
+
+module Catfriend # {
+
+SERVICE   = "org.freedesktop.Catfriend"
+PATH      = "/org/freedesktop/Catfriend"
+INTERFACE = "org.freedesktop.Catfriend.System"
+
+class DBus
+    include Thread
+
+    class DBusObject < ::DBus::Object
+        def initialize(main, servers)
+            @main    = main
+            @servers = servers
+            super PATH
+        end
+
+        dbus_interface INTERFACE do
+          dbus_method :stop do
+            Catfriend.whisper "received shutdown request"
+            @main.quit  # this must be run from within method handler
+            @servers.each { |s| s.disconnect }
+          end
+        end
+    end
+
+    def initialize(servers = nil)
+        @servers = servers
+    end
+
+    def init
+        @bus = ::DBus::SessionBus.instance unless @bus
+    end
+
+    def send_shutdown
+        init
+        service = @bus.service(SERVICE)
+        object = service.object(PATH)
+        object.introspect
+        object.default_iface = INTERFACE
+        object.stop
+        true
+    rescue
+        false
+    end
+
+    def start_service
+        object = DBusObject.new(@main, @servers)
+        service = @bus.request_service(SERVICE)
+        service.export object
+    end
+
+    def run
+        init
+        if send_shutdown
+            Catfriend.whisper "shut down existing catfriend"
+        end
+
+        @main = ::DBus::Main.new
+        start_service
+        @main << @bus
+        @main.run
+    rescue => e
+        puts "dbus unknown error #{e.message}\n#{e.backtrace.join("\n")}"
+    end
+end
+
+end # } end module

data/lib/catfriend/imap.rb

@@ -118,7 +118,6 @@ class ImapServer
     end
 
     def kill
-        @stopping = true
         disconnect
         super
     end
@@ -136,7 +135,13 @@ class ImapServer
         @imap = Net::IMAP.new(@host, args)
         @imap.login(@user, @password)
         @imap.select(@mailbox || "INBOX")
-        return @imap.fetch('*', 'UID').first.seqno
+
+        begin
+            # fetch raises an exception when the mailbox is empty
+            @imap.fetch('*', 'UID').first.seqno
+        rescue
+            0
+        end
     end
 
     def reconnect
@@ -151,10 +156,12 @@ class ImapServer
         @message_count = new_count
     end
 
-    def disconnect ; @imap.disconnect ; end
+    def disconnect
+        @stopping = true
+        @imap.disconnect
+    end
 
-    private :connect, :disconnect, :reconnect,
-            :check_loop, :run, :error, :notify_message
+    private :connect, :reconnect, :check_loop, :run, :error, :notify_message
 
     attr_writer :host, :password, :id, :user, :no_ssl, :cert_file, :mailbox
     attr_accessor :work_account

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catfriend
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.16'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &12249920 !ruby/object:Gem::Requirement
+  requirement: &12342540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *12249920
+  version_requirements: *12342540
+- !ruby/object:Gem::Dependency
+  name: ruby-dbus
+  requirement: &12340600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12340600
 description: E-mail checker with libnotify desktop notifications.
 email:
 - catfriend@chilon.net
@@ -32,11 +43,13 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - catfriend.example
+- lib/catfriend/dbus.rb
 - lib/catfriend/server.rb
 - lib/catfriend/filetokenstack.rb
 - lib/catfriend/thread.rb
 - lib/catfriend/imap.rb
-- bin/catfriend
+- !binary |-
+  YmluL2NhdGZyaWVuZA==
 homepage: https://github.com/nuisanceofcats/catfriend
 licenses:
 - Expat