rgrove-larch 1.0.0.11 → 1.0.0.12

data/HISTORY

@@ -5,18 +5,18 @@ Version 1.0.1 (?)
   * Ruby 1.9.1 support.
   * Much more robust handling of unexpected server disconnects and dropped
     connections.
-  * Add --all option to copy all folders recursively.
-  * Add --dry-run option to simulate changes without actually making them.
-  * Add --ssl-certs option to specify a bundle of trusted SSL certificates.
-  * Add --ssl-verify option to verify server SSL certificates.
-  * Fix excessive post-scan processing times for very large mailboxes.
-  * Fetch message headers in blocks of up to 1024 at a time rather than all at
-    once, to prevent potential problems with certain servers when a mailbox
-    contains a huge number of messages.
-  * Don't try to trap POSIX signals on platforms that aren't likely to support
-    them, and don't die if the platform sniffing doesn't save us.
-  * Add a new "insane" logging level, which will output all IMAP commands and
+  * Added --all option to copy all folders recursively.
+  * Added --dry-run option to simulate changes without actually making them.
+  * Added --ssl-certs option to specify a bundle of trusted SSL certificates.
+  * Added --ssl-verify option to verify server SSL certificates.
+  * Added a new "insane" logging level, which will output all IMAP commands and
     responses to STDERR.
+  * Fixed excessive post-scan processing times for very large mailboxes.
+  * Message headers are now fetched in blocks of up to 1024 at a time rather
+    than all at once to prevent potential problems with certain servers when a
+    mailbox contains a huge number of messages.
+  * POSIX signals are no longer trapped on platforms that aren't likely to
+    support them.
 
 Version 1.0.0 (2009-03-17)
   * First release.

data/lib/larch/imap/mailbox.rb

@@ -20,7 +20,7 @@ class Mailbox
     @name       = name
     @delim      = delim
     @subscribed = subscribed
-    @attr       = attr
+    @attr       = *attr
 
     @ids       = {}
     @last_id   = 0
@@ -52,7 +52,9 @@ class Mailbox
     return false if has_message?(message)
 
     @imap.safely do
-      imap_select(!!@imap.options[:create_mailbox])
+      unless imap_select(!!@imap.options[:create_mailbox])
+        raise Larch::IMAP::Error, "mailbox cannot contain messages: #{@name}"
+      end
 
       debug "appending message: #{message.id}"
       @imap.conn.append(@name, message.rfc822, message.flags, message.internaldate) unless @imap.options[:dry_run]
@@ -121,7 +123,7 @@ class Mailbox
     return if @last_scan && (Time.now - @last_scan) < SCAN_INTERVAL
 
     begin
-      imap_examine
+      return unless imap_examine
     rescue Error => e
       return if @imap.options[:create_mailbox]
       raise
@@ -174,7 +176,7 @@ class Mailbox
     @subscribed
   end
 
-  # Unsubscribes to this mailbox.
+  # Unsubscribes from this mailbox.
   def unsubscribe(force = false)
     return unless subscribed? || force
     @imap.safely { @imap.conn.unsubscribe(@name) } unless @imap.options[:dry_run]
@@ -206,7 +208,8 @@ class Mailbox
   # if it is already selected (which isn't necessary unless you want to ensure
   # that it's in a read-only state).
   def imap_examine(force = false)
-    return if @state == :examined || (!force && @state == :selected)
+    return false if @attr.include?(:Noselect)
+    return true if @state == :examined || (!force && @state == :selected)
 
     @imap.safely do
       begin
@@ -221,6 +224,8 @@ class Mailbox
         raise Error, "unable to examine mailbox: #{e.message}"
       end
     end
+
+    return true
   end
 
   # Fetches the specified _fields_ for the specified message sequence id(s) from
@@ -246,7 +251,8 @@ class Mailbox
   # exist and _create_ is +true+, it will be created. Otherwise, a
   # Larch::IMAP::Error will be raised.
   def imap_select(create = false)
-    return if @state == :selected
+    return false if @attr.include?(:Noselect)
+    return true if @state == :selected
 
     @imap.safely do
       begin
@@ -270,6 +276,8 @@ class Mailbox
         end
       end
     end
+
+    return true
   end
 
   # Fetches the specified _fields_ for the specified UID(s) from the IMAP

data/lib/larch/imap.rb

@@ -86,6 +86,11 @@ class IMAP
     safely {} # connect, but do nothing else
   end
 
+  # Gets the server's mailbox hierarchy delimiter.
+  def delim
+    @delim ||= safely { @conn.list('', '')[0].delim }
+  end
+
   # Closes the IMAP connection if one is currently open.
   def disconnect
     return unless @conn
@@ -117,9 +122,11 @@ class IMAP
   # the mailbox doesn't exist and the +:create_mailbox+ option is +false+, or if
   # +:create_mailbox+ is +true+ and mailbox creation fails, a
   # Larch::IMAP::MailboxNotFoundError will be raised.
-  def mailbox(name)
+  def mailbox(name, delim = '/')
     retries = 0
 
+    name = name.gsub(delim, self.delim)
+
     begin
       @mailboxes.fetch(name) do
         update_mailboxes

data/lib/larch/version.rb

@@ -1,6 +1,6 @@
 module Larch
   APP_NAME      = 'Larch'
-  APP_VERSION   = '1.0.0.11'
+  APP_VERSION   = '1.0.0.12'
   APP_AUTHOR    = 'Ryan Grove'
   APP_EMAIL     = 'ryan@wonko.com'
   APP_URL       = 'http://github.com/rgrove/larch/'

data/lib/larch.rb

@@ -1,11 +1,10 @@
-# Append this file's directory to the include path if it's not there already.
+# Prepend this file's directory to the include path if it's not there already.
 $:.unshift(File.dirname(File.expand_path(__FILE__)))
 $:.uniq!
 
 require 'cgi'
 require 'digest/md5'
 require 'net/imap'
-require 'monitor'
 require 'time'
 require 'uri'
 
@@ -39,7 +38,7 @@ module Larch
         @failed = 0
         @total  = 0
 
-        mailbox_to = imap_to.mailbox(mailbox_from.name)
+        mailbox_to = imap_to.mailbox(mailbox_from.name, mailbox_from.delim)
         copy_messages(imap_from, mailbox_from, imap_to, mailbox_to)
         mailbox_to.subscribe if mailbox_from.subscribed?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rgrove-larch
 version: !ruby/object:Gem::Version 
-  version: 1.0.0.11
+  version: 1.0.0.12
 platform: ruby
 authors: 
 - Ryan Grove