larch 1.1.0.dev.20100209 → 1.1.0.dev.20100807

data/HISTORY

@@ -15,7 +15,8 @@ Version 1.1.0 (git)
   * Added experimental support for Yahoo! Mail IMAP when connecting to
     imap.mail.yahoo.com or imap-ssl.mail.yahoo.com. See the README for caveats
     and known issues.
-  * Folders are now copied recursively by default.
+  * Folders are now copied recursively by default. Use the --no-recurse option
+    for the old behavior.
   * Progress information is now displayed regularly while scanning large
     mailboxes.
   * Added --delete option to delete messages from the source after copying them
@@ -39,6 +40,8 @@ Version 1.1.0 (git)
   * Fixed an issue when trying to copy a folder with leading or trailing
     whitespace in the name to Gmail, since Gmail doesn't allow whitespace around
     folder names.
+  * Fixed an issue with bogus Exchange STATUS responses containing trailing
+    spaces.
 
 Version 1.0.2 (2009-08-05)
   * Fixed a bug that caused Larch to try to set the read-only \Recent flag on

data/README.rdoc

@@ -324,6 +324,13 @@ http://groups.google.com/group/larch
 First-time senders to the list are moderated to prevent spam, so there may be a
 delay before your first message shows up.
 
+== Contributors
+
+The following lovely people have contributed code to Larch:
+
+* Ryan Grove <ryan@wonko.com>
+* Andrew Hobson <ahobson@damballa.com>
+
 == Credit
 
 The Larch::IMAP class borrows heavily from Sup[http://sup.rubyforge.org] by

data/bin/larch

@@ -36,6 +36,7 @@ EOS
     opt :exclude,          "List of mailbox names/patterns that shouldn't be copied", :short => :none, :type => :strings, :multi => true
     opt :exclude_file,     "Filename containing mailbox names/patterns that shouldn't be copied", :short => :none, :type => :string
     opt :expunge,          "Expunge deleted messages from the source", :short => '-x'
+    opt :no_recurse,       "Don't copy subfolders recursively (cannot be used with --all or --all_subscribed)", :short => :none
     opt :sync_flags,       "Sync message flags from the source to the destination for messages that already exist at the destination", :short => '-S'
 
     text "\nGeneral Options:"

data/lib/larch/config.rb

@@ -19,6 +19,7 @@ class Config
     'from-user'        => nil,
     'max-retries'      => 3,
     'no-create-folder' => false,
+    'no-recurse'       => false,
     'ssl-certs'        => nil,
     'ssl-verify'       => false,
     'sync-flags'       => false,
@@ -94,6 +95,10 @@ class Config
         # 'all' wins over 'all-subscribed'
         @cached['all-subscribed'] = false
       end
+
+      # 'no-recurse' is not compatible with 'all' and 'all-subscribed'
+      raise Error, "'no-recurse' option cannot be used with 'all' or 'all-subscribed'" if @cached['no-recurse']
+
     else
       @cached['from-folder'] ||= 'INBOX'
       @cached['to-folder']   ||= 'INBOX'

data/lib/larch/imap/mailbox.rb

@@ -246,6 +246,8 @@ class Mailbox
     need_flag_scan = flag_range && flag_range.max && flag_range.min && flag_range.max - flag_range.min > 0
     need_full_scan = full_range && full_range.max && full_range.min && full_range.max - full_range.min > 0
 
+    return unless need_flag_scan || need_full_scan
+
     fetch_flags(flag_range) if need_flag_scan
 
     if need_full_scan
@@ -592,10 +594,10 @@ class Mailbox
       end
 
     elsif set.is_a?(Range)
-      pos = set.first - 1
+      pos = set.min - 1
 
-      while pos < set.last
-        blocks << ((pos + 1)..[set.last, pos += block_size].min)
+      while pos < set.max
+        blocks << ((pos + 1)..[set.max, pos += block_size].min)
       end
     end
 

data/lib/larch/monkeypatch/net/imap.rb

@@ -1,16 +1,54 @@
-# Monkeypatch Net::IMAP in Ruby <= 1.9.1 to fix broken response handling,
-# particularly when changing mailboxes on a Dovecot 1.2+ server.
-#
-# This monkeypatch shouldn't be necessary in Ruby 1.9.2 and higher.
-
-if RUBY_VERSION <= '1.9.1'
-  module Net # :nodoc:
-    class IMAP # :nodoc:
-      class ResponseParser # :nodoc:
-        private
-
-        # This monkeypatched method is the one included in Ruby 1.9 SVN trunk as
-        # of 2010-02-08.
+# Monkeypatches for Net::IMAP.
+
+module Net # :nodoc:
+  class IMAP # :nodoc:
+    class ResponseParser # :nodoc:
+      private
+
+      # Fixes an issue with bogus STATUS responses from Exchange that contain
+      # trailing whitespace. This monkeypatch works cleanly against Ruby 1.8.x
+      # and 1.9.x.
+      def status_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        mailbox = astring
+        match(T_SPACE)
+        match(T_LPAR)
+        attr = {}
+        while true
+          token = lookahead
+          case token.symbol
+          when T_RPAR
+            shift_token
+            break
+          when T_SPACE
+            shift_token
+          end
+          token = match(T_ATOM)
+          key = token.value.upcase
+          match(T_SPACE)
+          val = number
+          attr[key] = val
+        end
+
+        # Monkeypatch starts here...
+        token = lookahead
+        shift_token if token.symbol == T_SPACE
+        # ...and ends here.
+
+        data = StatusData.new(mailbox, attr)
+        return UntaggedResponse.new(name, data, @str)
+      end
+
+      if RUBY_VERSION <= '1.9.1'
+
+        # Monkeypatches Net::IMAP in Ruby <= 1.9.1 to fix broken response
+        # handling, particularly when changing mailboxes on a Dovecot 1.2+
+        # server.
+        #
+        # This monkeypatch shouldn't be necessary in Ruby 1.9.2 and higher.
+        # It's included in Ruby 1.9 SVN trunk as of 2010-02-08.
         def resp_text_code
           @lex_state = EXPR_BEG
           match(T_LBRA)
@@ -44,5 +82,6 @@ if RUBY_VERSION <= '1.9.1'
       end
 
     end
+
   end
 end

data/lib/larch/version.rb

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

data/lib/larch.rb

@@ -131,14 +131,11 @@ module Larch
       # Ensure that the database schema is up to date.
       migration_dir = File.join(LIB_DIR, 'db', 'migrate')
 
-      unless Sequel::Migrator.get_current_migration_version(db) ==
-          Sequel::Migrator.latest_migration_version(migration_dir)
-        begin
-          Sequel::Migrator.apply(db, migration_dir)
-        rescue => e
-          @log.fatal "unable to migrate message database: #{e}"
-          abort
-        end
+      begin
+        Sequel::Migrator.apply(db, migration_dir)
+      rescue => e
+        @log.fatal "unable to migrate message database: #{e}"
+        abort
       end
 
       require 'larch/db/message'
@@ -165,10 +162,12 @@ module Larch
       mailbox_to.subscribe if mailbox_from.subscribed?
       copy_messages(mailbox_from, mailbox_to)
 
-      mailbox_from.each_mailbox do |child_from|
-        next if excluded?(child_from.name)
-        child_to = mailbox_to.imap.mailbox(child_from.name, child_from.delim)
-        copy_mailbox(child_from, child_to)
+      unless @config['no-recurse']
+        mailbox_from.each_mailbox do |child_from|
+          next if excluded?(child_from.name)
+          child_to = mailbox_to.imap.mailbox(child_from.name, child_from.delim)
+          copy_mailbox(child_from, child_to)
+        end
       end
     end
 

metadata

@@ -1,7 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: larch
 version: !ruby/object:Gem::Version 
-  version: 1.1.0.dev.20100209
+  hash: 1678109927
+  prerelease: true
+  segments: 
+  - 1
+  - 1
+  - 0
+  - dev
+  - 20100807
+  version: 1.1.0.dev.20100807
 platform: ruby
 authors: 
 - Ryan Grove
@@ -9,49 +17,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -08:00
+date: 2010-08-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sequel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.8"
-    version: 
+        hash: 27
+        segments: 
+        - 3
+        - 14
+        version: "3.14"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
         version: 1.2.5
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: trollop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 13
         version: "1.13"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: 
 email: ryan@wonko.com
 executables: 
@@ -88,21 +118,31 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Larch copies messages from one IMAP server to another. Awesomely.