catfriend 0.13 → 0.14

data/bin/catfriend

@@ -97,10 +97,14 @@ end
 # unrecoverable error. Perhaps I should make it exit if any thread exits.
 def self.main args
     work_accounts = false
+    foreground = false
     Catfriend.verbose = false
     begin
         OptionParser.new do |opts|
             opts.banner = "usage: #{APP_NAME} [options]"
+            opts.on("-f", "--foreground", "run in foreground") do
+                foreground = true
+            end
 
             opts.on("-w", "--work", "enable work accounts") do
                 work_accounts = true
@@ -110,13 +114,20 @@ def self.main args
             end
         end.parse!
 
+        Catfriend.verbose = false unless foreground
+
         servers = parse_config
         servers.reject! { |s| s.work_account } unless work_accounts
         raise ConfigError, "no servers to check" if servers.empty?
 
-        # todo: daemonize here unless certain command line argument given
-        servers.each { |s| s.start }
-        servers.each { |s| s.join }
+        if foreground
+            start_servers servers
+        else
+            pid = fork do
+                start_servers servers
+            end
+            Process.detach pid
+        end
     rescue ConfigError => e
         puts "misconfiguration: #{e.message}"
     rescue Interrupt
@@ -130,6 +141,11 @@ def self.main args
     1
 end
 
+def self.start_servers servers
+    servers.each { |s| s.start }
+    servers.each { |s| s.join }
+end
+
 end ########################### end module
 
 exit Catfriend.main ARGV

data/lib/catfriend/imap.rb

@@ -62,7 +62,7 @@ class ImapServer
         else
             loop {
                 check_loop
-                break if stopped?
+                break if stopping?
             }
         end
     end
@@ -93,11 +93,11 @@ class ImapServer
         Catfriend.whisper "idle loop over"
     rescue Net::IMAP::Error, IOError
         # reconnect and carry on
-        reconnect unless stopped?
+        reconnect unless stopping?
     rescue => e
-        unless stopped?
+        unless stopping?
             # todo: see if we have to re-open socket
-            notify_message "error - #{e.message}"
+            notify_message "#{@message_count} [error: #{e.message}]"
             puts e.backtrace.join "\n"
         end
     end
@@ -107,7 +107,12 @@ class ImapServer
         Catfriend.whisper @notification.summary
     end
 
+    def stopping?
+        stopped? or @stopping
+    end
+
     def kill
+        @stopping = true
         disconnect
         super
     end
@@ -129,10 +134,14 @@ class ImapServer
     end
 
     def reconnect
-        # todo: log an error unless this completes within a short time
-        Catfriend.whisper "#{id}: reconnecting"
+        notify_message "#{@message_count} [reconnecting]"
         new_count = connect
-        notify_message(new_count) if new_count != @message_count
+        if new_count != @message_count
+            notify_message new_count
+        else
+            # todo: only if it was still open
+            @notification.close
+        end
         @message_count = new_count
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catfriend
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: '0.14'
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &9300880 !ruby/object:Gem::Requirement
+  requirement: &14748540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *9300880
+  version_requirements: *14748540
 description: E-mail checker with libnotify desktop notifications.
 email:
 - catfriend@chilon.net