imap_processor 1.2 → 1.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3 / 2009-08-04
+
+* 1 major enhancement
+  * IMAP IDLE support now matches ruby trunk's support.  See Net::IMAP#idle
+    and Net::IMAP#idle_done
+
 === 1.2 / 2009-06-02
 
 * 2 major enhancements

data/lib/imap_processor.rb

@@ -3,6 +3,7 @@ require 'optparse'
 require 'net/imap'
 require 'net/imap/date'
 require 'imap_sasl_plain'
+require 'yaml'
 
 ##
 # IMAPProcessor is a client for processing messages on an IMAP server.
@@ -20,7 +21,7 @@ class IMAPProcessor
   ##
   # The version of IMAPProcessor you are using
 
-  VERSION = '1.2'
+  VERSION = '1.3'
 
   ##
   # Base IMAPProcessor error class
@@ -131,7 +132,7 @@ class IMAPProcessor
       options.merge! YAML.load_file(opts_file)
     end
 
-    options[:SSL]      ||= true
+    options[:SSL]        = true unless options.key? :SSL
     options[:Username] ||= ENV['USER']
     options[:Root]     ||= nil
     options[:Verbose]  ||= false
@@ -266,7 +267,7 @@ Example ~/.#{opts_file_name}:
        options[:Password].nil? or
        options[:Boxes].nil? or
        required_options.any? { |k,(v,m)| options[k].nil? } then
-      $stderr.puts opts
+      $stderr.puts op
       $stderr.puts
       $stderr.puts "Host name not set" if options[:Host].nil?
       $stderr.puts "Password not set"  if options[:Password].nil?
@@ -287,6 +288,8 @@ Example ~/.#{opts_file_name}:
     options = process_args args
     client = new(options, &block)
     client.run
+  rescue Interrupt
+    exit
   rescue SystemExit
     raise
   rescue Exception => e
@@ -295,7 +298,7 @@ Example ~/.#{opts_file_name}:
 
     exit 1
   ensure
-    client.imap.logout if client
+    client.imap.logout if client and client.imap
   end
 
   ##

data/lib/imap_processor/idle.rb

@@ -62,14 +62,12 @@ imap_idle lists messages added or expunged from a mailbox
 
   def show_messages_in(mailbox, uids)
     connect do |connection|
-      @imap = connection.imap
+      imap = connection.imap
 
-      @imap.select mailbox
+      imap.select mailbox
 
       show_messages uids
     end
-  ensure
-    @imap = nil
   end
 
 end

data/lib/net/imap/idle.rb

@@ -6,7 +6,7 @@ class Net::IMAP
   # Sends an IDLE command that waits for notifications of new or expunged
   # messages.  Yields responses from the server during the IDLE.
   #
-  # Use +break+ in the response handler to leave IDLE.
+  # Use #idle_done to leave IDLE.
 
   def idle(&response_handler)
     raise LocalJumpError, "no block given" unless response_handler
@@ -17,23 +17,32 @@ class Net::IMAP
       tag = Thread.current[:net_imap_tag] = generate_tag
       put_string "#{tag} IDLE#{CRLF}"
 
-      add_response_handler response_handler
-
       begin
-        response = get_tagged_response tag
-      rescue LocalJumpError # can't break cross-threads or something
-      ensure
-        unless response then
-          put_string "DONE#{CRLF}"
-          response = get_tagged_response tag
-        end
+        add_response_handler response_handler
 
+        @idle_done_cond = new_cond
+        @idle_done_cond.wait
+        @idle_done_cond = nil
+      ensure
         remove_response_handler response_handler
+        put_string "DONE#{CRLF}"
+        response = get_tagged_response tag
       end
     end
 
     response
   end
 
-end
+  ##
+  # Leaves IDLE
+
+  def idle_done
+    raise Net::IMAP::Error, 'not during idle' unless @idle_done_cond
+
+    synchronize do
+      @idle_done_cond.signal
+    end
+  end
+
+end unless Net::IMAP.method_defined? :idle
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: imap_processor
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -30,7 +30,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-07-07 00:00:00 -07:00
+date: 2009-08-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: IMAPProcessor is a client for processing messages on an IMAP server