larch 1.1.1 → 1.1.2

data/HISTORY

@@ -1,6 +1,13 @@
 Larch History
 ================================================================================
 
+Version 1.1.2 (2013-01-24)
+  * Fixed an issue in which a folder containing only one message would not be
+    copied.
+  * Switched to the sqlite3 gem instead of amalgalite, since the latter fails
+    to compile against Ruby 1.9.3. This means you'll need to have SQLite
+    available on your system, since it's no longer bundled.
+
 Version 1.1.1 (2011-06-26)
   * Relaxed dependency versions.
 

data/README.rdoc

@@ -9,8 +9,8 @@ Larch is particularly well-suited for copying email to, from, or between Gmail
 accounts.
 
 *Author*::    Ryan Grove (mailto:ryan@wonko.com)
-*Version*::   1.1.0 (2011-01-22)
-*Copyright*:: Copyright (c) 2011 Ryan Grove. All rights reserved.
+*Version*::   1.1.2 (2013-01-24)
+*Copyright*:: Copyright (c) 2013 Ryan Grove. All rights reserved.
 *License*::   GPL 2.0 (http://opensource.org/licenses/gpl-2.0.php)
 *Website*::   http://github.com/rgrove/larch
 
@@ -245,19 +245,6 @@ has originated outside of Gmail (Gmail itself does not corrupt the message).
 There is currently no known solution for this problem apart from deleting the
 corrupted messages.
 
-==== Maximum folder name length of 40 characters
-
-Folders in Gmail IMAP are really just labels, and a nested folder hierarchy like
-"Foo\Bar\Baz" is actually just a single label with "\" characters in it. Since
-Gmail limits label names to 40 characters, it's impossible to create a nested
-folder hierarchy with a combined name length of more than 40 characters
-including delimiters.
-
-If you try to copy a too-long folder hierarchy to Gmail using Larch, Gmail will
-return a "Folder name is not allowed" error. To work around this, reorganize
-your mail into a shallower hierarchy on the source server to avoid hitting the
-folder name length limit.
-
 ==== Folder names cannot contain leading or trailing whitespace
 
 Most IMAP servers allow folder names to contain leading and trailing whitespace,
@@ -330,8 +317,9 @@ Larch was created and is maintained by Ryan Grove <ryan@wonko.com>.
 
 The following lovely people have also contributed to Larch:
 
-* Andrew Hobson <ahobson@damballa.com>
+* Torey Heinz <torey@ihswebdesign.com>
 * Edgardo Hames <ehames@gmail.com>
+* Andrew Hobson <ahobson@damballa.com>
 * Justin Mazzi <hh@mailheist.com>
 
 == Credit
@@ -347,7 +335,7 @@ Gray II).
 
 == License
 
-Copyright (c) 2011 Ryan Grove <ryan@wonko.com>
+Copyright (c) 2013 Ryan Grove <ryan@wonko.com>
 
 Licensed under the GNU General Public License version 2.0.
 

data/lib/larch.rb

@@ -121,7 +121,7 @@ module Larch
       end
 
       begin
-        db = Sequel.amalgalite(:database => filename)
+        db = Sequel.sqlite(:database => filename)
         db.test_connection
       rescue => e
         @log.fatal "unable to open message database: #{e}"

data/lib/larch/imap.rb

@@ -143,6 +143,9 @@ class IMAP
 
     # Gmail doesn't allow folders with leading or trailing whitespace.
     name.strip! if @quirks[:gmail]
+    
+    #Rackspace namespaces everything under INDEX.
+    name.sub!(/^|inbox\./i, "INBOX.") if @quirks[:rackspace] && name != 'INBOX'
 
     begin
       @mailboxes.fetch(name) do
@@ -264,6 +267,10 @@ class IMAP
     elsif host =~ /^imap(?:-ssl)?\.mail\.yahoo\.com$/
       @quirks[:yahoo] = true
       debug "looks like Yahoo! Mail"
+          
+    elsif host =~ /emailsrvr\.com/
+      @quirks[:rackspace] = true
+      debug "looks like Rackspace Mail"
     end
   end
 

data/lib/larch/imap/mailbox.rb

@@ -243,8 +243,8 @@ class Mailbox
 
     @db_mailbox.update(:uidvalidity => status['UIDVALIDITY'])
 
-    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
+    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
 
@@ -582,6 +582,7 @@ class Mailbox
       end
 
       yield data unless data.nil?
+      return
     end
 
     blocks = []

data/lib/larch/version.rb

@@ -1,9 +1,9 @@
 module Larch
   APP_NAME      = 'Larch'
-  APP_VERSION   = '1.1.1'
+  APP_VERSION   = '1.1.2'
   APP_AUTHOR    = 'Ryan Grove'
   APP_EMAIL     = 'ryan@wonko.com'
   APP_URL       = 'https://github.com/rgrove/larch/'
-  APP_COPYRIGHT = 'Copyright (c) 2011 Ryan Grove <ryan@wonko.com>. All ' <<
+  APP_COPYRIGHT = 'Copyright (c) 2013 Ryan Grove <ryan@wonko.com>. All ' <<
                   'rights reserved.'
 end

metadata

@@ -1,70 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: larch
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Ryan Grove
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: amalgalite
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.5"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
   name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.14'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.14'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.14"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.13"
+      - !ruby/object:Gem::Version
+        version: '1.13'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.13'
 description: 
 email: ryan@wonko.com
-executables: 
+executables:
 - larch
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - HISTORY
 - LICENSE
 - README.rdoc
@@ -82,32 +99,28 @@ files:
 - lib/larch/monkeypatch/net/imap.rb
 - lib/larch/version.rb
 - lib/larch.rb
-homepage: https://github.com/rgrove/larch/
+homepage: https://github.com/rgrove/larch
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Larch copies messages from one IMAP server to another. Awesomely.
 test_files: []
-