imap-backup 1.0.9 → 1.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 21c07957777ccdca22ec2b9b98aa5ee23e03f9d4
+  data.tar.gz: 7f341ff59529f01e6d7c4ccb7eefa73610b68a57
+SHA512:
+  metadata.gz: d9cbe70b6dbe617645a4a3fadbaa75a9fa73870b889d361adeb9a3cd9bcee91143736327db1050e6dc4c9383fabe9161413bb6061b5ce26831ed1c0897fa7c2f
+  data.tar.gz: ce740410c22cfea3f5119cd7a65196db97296d56416b662b575f049bba4e45669a66bccca78af52dcb915ab51ced4690e760246237df1ec85aa3ec10c7fb3669

data/.travis.yml

@@ -4,4 +4,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.1
 script: "bundle exec rake spec"

data/Rakefile

@@ -14,9 +14,4 @@ if RUBY_VERSION < '1.9'
     t.rcov      = true
     t.rcov_opts = ['--exclude', 'spec/,/gems/,vendor/']
   end
-else
-  desc 'Run specs and create coverage output'
-  RSpec::Core::RakeTask.new('spec:coverage') do |t|
-    t.pattern = ['spec/gather_rspec_coverage.rb', 'spec/**/*_spec.rb']
-  end
 end

data/imap-backup.gemspec

@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
-$:.unshift(File.expand_path('../lib/', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
 require 'imap/backup/version'
 
 Gem::Specification.new do |gem|
-  gem.authors       = ['Joe Yates']
-  gem.email         = ['joe.g.yates@gmail.com']
+  gem.name          = 'imap-backup'
   gem.description   = %q{Backup GMail, or any other IMAP email service, to disk.}
   gem.summary       = %q{Backup GMail (or other IMAP) accounts to disk}
+  gem.authors       = ['Joe Yates']
+  gem.email         = ['joe.g.yates@gmail.com']
   gem.homepage      = 'https://github.com/joeyates/imap-backup'
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^spec/})
-  gem.name          = 'imap-backup'
   gem.require_paths = ['lib']
   gem.version       = Imap::Backup::VERSION
 

data/lib/email/mboxrd/message.rb

@@ -25,7 +25,7 @@ module Email::Mboxrd
 
     def body
       mbox = @body.gsub(/\n(>*From)/, "\n>\\1")
-      mbox + "\n" unless mbox.end_with?("\n")
+      mbox += "\n" unless mbox.end_with?("\n")
       mbox
     end
 

data/lib/imap/backup.rb

@@ -1,3 +1,5 @@
+module Imap; end
+
 require 'imap/backup/utils'
 require 'imap/backup/account/connection'
 require 'imap/backup/account/folder'
@@ -30,6 +32,6 @@ module Imap::Backup
   end
 
   def self.logger
-    Imap::Backup::Logger.instance.logger
+    Logger.instance.logger
   end
 end

data/lib/imap/backup/account/connection.rb

@@ -1,7 +1,9 @@
 require 'net/imap'
 
-module Imap::Backup::Account
-  class Connection
+module Imap::Backup
+  module Account; end
+
+  class Account::Connection
     attr_reader :username, :local_path, :backup_folders, :server
 
     def initialize(options)
@@ -17,17 +19,17 @@ module Imap::Backup::Account
 
     def status
       backup_folders.map do |folder|
-        f = Imap::Backup::Account::Folder.new(self, folder[:name])
-        s = Imap::Backup::Serializer::Directory.new(local_path, folder[:name])
+        f = Account::Folder.new(self, folder[:name])
+        s = Serializer::Directory.new(local_path, folder[:name])
         {:name => folder[:name], :local => s.uids, :remote => f.uids}
       end
     end
 
     def run_backup
       backup_folders.each do |folder|
-        f = Imap::Backup::Account::Folder.new(self, folder[:name])
-        s = Imap::Backup::Serializer::Mbox.new(local_path, folder[:name])
-        d = Imap::Backup::Downloader.new(f, s)
+        f = Account::Folder.new(self, folder[:name])
+        s = Serializer::Mbox.new(local_path, folder[:name])
+        d = Downloader.new(f, s)
         d.run
       end
     end

data/lib/imap/backup/account/folder.rb

@@ -1,7 +1,9 @@
 # encoding: utf-8
 
-module Imap::Backup::Account
-  class Folder
+module Imap::Backup
+  module Account; end
+
+  class Account::Folder
     REQUESTED_ATTRIBUTES = ['RFC822', 'FLAGS', 'INTERNALDATE']
 
     def initialize(connection, folder)
@@ -12,7 +14,7 @@ module Imap::Backup::Account
       @connection.imap.examine(@folder)
       @connection.imap.uid_search(['ALL']).sort
     rescue Net::IMAP::NoResponseError => e
-      warn "Folder '#{@folder}' does not exist"
+      Imap::Backup.logger.warn "Folder '#{@folder}' does not exist"
       []
     end
 
@@ -22,7 +24,7 @@ module Imap::Backup::Account
       message['RFC822'].force_encoding('utf-8') if RUBY_VERSION > '1.9'
       message
     rescue Net::IMAP::NoResponseError => e
-      warn "Folder '#{@folder}' does not exist"
+      Imap::Backup.logger.warn "Folder '#{@folder}' does not exist"
       nil
     end
   end

data/lib/imap/backup/configuration/account.rb

@@ -1,7 +1,9 @@
 # encoding: utf-8
 
-module Imap::Backup::Configuration
-  class Account < Struct.new(:store, :account, :highline)
+module Imap::Backup
+  module Configuration; end
+
+  class Configuration::Account < Struct.new(:store, :account, :highline)
     def run
       catch :done do
         loop do
@@ -41,7 +43,7 @@ Account:
 
     def modify_email(menu)
       menu.choice('modify email') do
-        username = Asker.email(username)
+        username = Configuration::Asker.email(username)
         puts "username: #{username}"
         others   = store.data[:accounts].select { |a| a != account}.map { |a| a[:username] }
         puts "others: #{others.inspect}"
@@ -58,7 +60,7 @@ Account:
 
     def modify_password(menu)
       menu.choice('modify password') do
-        password = Asker.password
+        password = Configuration::Asker.password
         if ! password.nil?
           account[:password] = password
         end
@@ -87,19 +89,19 @@ Account:
             true
           end
         end
-        account[:local_path] = Asker.backup_path(account[:local_path], validator)
+        account[:local_path] = Configuration::Asker.backup_path(account[:local_path], validator)
       end
     end
 
     def choose_folders(menu)
       menu.choice('choose backup folders') do
-        FolderChooser.new(account).run
+        Configuration::FolderChooser.new(account).run
       end
     end
 
     def test_connection(menu)
       menu.choice('test connection') do
-        result = ConnectionTester.test(account)
+        result = Configuration::ConnectionTester.test(account)
         puts result
         highline.ask 'Press a key '
       end

data/lib/imap/backup/configuration/asker.rb

@@ -1,7 +1,9 @@
 # encoding: utf-8
 
-module Imap::Backup::Configuration
-  class Asker < Struct.new(:highline)
+module Imap::Backup
+  module Configuration; end
+
+  class Configuration::Asker < Struct.new(:highline)
     EMAIL_MATCHER = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
 
     def email(default = '')
@@ -33,15 +35,15 @@ module Imap::Backup::Configuration
     end
 
     def self.email(default = '')
-      new(Setup.highline).email(default)
+      new(Configuration::Setup.highline).email(default)
     end
 
     def self.password
-      new(Setup.highline).password
+      new(Configuration::Setup.highline).password
     end
 
     def self.backup_path(default, validator)
-      new(Setup.highline).backup_path(default, validator)
+      new(Configuration::Setup.highline).backup_path(default, validator)
     end
   end
 end

data/lib/imap/backup/configuration/connection_tester.rb

@@ -1,9 +1,11 @@
 # encoding: utf-8
 
-module Imap::Backup::Configuration
-  module ConnectionTester
+module Imap::Backup
+  module Configuration; end
+
+  module Configuration::ConnectionTester
     def self.test(account)
-      Imap::Backup::Account::Connection.new(account).imap
+      Account::Connection.new(account).imap
       return 'Connection successful'
     rescue Net::IMAP::NoResponseError
       return 'No response'

data/lib/imap/backup/configuration/folder_chooser.rb

@@ -1,28 +1,30 @@
 # encoding: utf-8
 
-module Imap::Backup::Configuration
-  class FolderChooser
+module Imap::Backup
+  module Configuration; end
+
+  class Configuration::FolderChooser
     def initialize(account)
       @account = account
     end
 
     def run
       begin
-        @connection = Imap::Backup::Account::Connection.new(@account)
+        @connection = Account::Connection.new(@account)
       rescue => e
-        puts 'Connection failed'
-        Setup.highline.ask 'Press a key '
+        Imap::Backup.logger.warn 'Connection failed'
+        Configuration::Setup.highline.ask 'Press a key '
         return
       end
       @folders = @connection.folders
       if @folders.nil?
-        puts 'Unable to get folder list'
-        Setup.highline.ask 'Press a key '
+        Imap::Backup.logger.warn 'Unable to get folder list'
+        Configuration::Setup.highline.ask 'Press a key '
         return
       end
       loop do
         system('clear')
-        Setup.highline.choose do |menu|
+        Configuration::Setup.highline.choose do |menu|
           menu.header = 'Add/remove folders'
           menu.index = :number
           @folders.each do |folder|

data/lib/imap/backup/configuration/list.rb

@@ -1,14 +1,16 @@
 # encoding: utf-8
 
-module Imap::Backup::Configuration
-  class List
+module Imap::Backup
+  module Configuration; end
+
+  class Configuration::List
     attr_reader :accounts
 
     def initialize(accounts = nil)
-      if not Imap::Backup::Configuration::Store.exist?
-        raise Imap::Backup::ConfigurationNotFound.new("Configuration file '#{Imap::Backup::Configuration::Store.default_pathname}' not found")
+      if not Configuration::Store.exist?
+        raise ConfigurationNotFound.new("Configuration file '#{Configuration::Store.default_pathname}' not found")
       end
-      @config = Imap::Backup::Configuration::Store.new
+      @config = Configuration::Store.new
 
       if accounts.nil?
         @accounts = @config.data[:accounts]
@@ -19,7 +21,7 @@ module Imap::Backup::Configuration
 
     def each_connection
       @accounts.each do |account|
-        connection = Imap::Backup::Account::Connection.new(account)
+        connection = Account::Connection.new(account)
         yield connection
         connection.disconnect
       end

data/lib/imap/backup/configuration/setup.rb

@@ -2,8 +2,10 @@
 require 'rubygems' if RUBY_VERSION < '1.9'
 require 'highline'
 
-module Imap::Backup::Configuration
-  class Setup
+module Imap::Backup
+  module Configuration; end
+
+  class Configuration::Setup
     class << self
       attr_accessor :highline
     end
@@ -21,7 +23,7 @@ module Imap::Backup::Configuration
             end
           end
           menu.choice('add account') do
-            username = Asker.email
+            username = Configuration::Asker.email
             edit_account username
           end
           menu.choice('save and exit') do
@@ -38,7 +40,7 @@ module Imap::Backup::Configuration
     private
 
     def config
-      @config ||= Imap::Backup::Configuration::Store.new
+      @config ||= Configuration::Store.new
     end
 
     def setup_logging
@@ -66,7 +68,7 @@ module Imap::Backup::Configuration
       if account.nil?
         account = add_account(username)
       end
-      Account.new(config, account, Imap::Backup::Configuration::Setup.highline).run
+      Configuration::Account.new(config, account, Configuration::Setup.highline).run
     end
   end
 end

data/lib/imap/backup/configuration/store.rb

@@ -2,8 +2,10 @@
 require 'rubygems' if RUBY_VERSION < '1.9'
 require 'json'
 
-module Imap::Backup::Configuration
-  class Store
+module Imap::Backup
+  module Configuration; end
+
+  class Configuration::Store
     CONFIGURATION_DIRECTORY = File.expand_path('~/.imap-backup')
 
     attr_reader :data
@@ -20,10 +22,10 @@ module Imap::Backup::Configuration
     def initialize(pathname = self.class.default_pathname)
       @pathname = pathname
       if File.directory?(path)
-        Imap::Backup::Utils.check_permissions path, 0700
+        Utils.check_permissions path, 0700
       end
       if File.exist?(@pathname)
-        Imap::Backup::Utils.check_permissions @pathname, 0600
+        Utils.check_permissions @pathname, 0600
         @data = JSON.parse(File.read(@pathname), :symbolize_names => true)
       else
         @data = {:accounts => []}
@@ -57,7 +59,7 @@ module Imap::Backup::Configuration
       if ! File.directory?(path)
         FileUtils.mkdir path
       end
-      if Imap::Backup::Utils::stat(path) != 0700
+      if Utils::stat(path) != 0700
         FileUtils.chmod 0700, path
       end
     end

data/lib/imap/backup/serializer/base.rb

@@ -4,10 +4,11 @@ module Imap::Backup
   module Serializer
     DIRECTORY_PERMISSIONS = 0700
     FILE_PERMISSIONS      = 0600
+
     class Base
       def initialize(path, folder)
         @path, @folder = path, folder
-        Imap::Backup::Utils.check_permissions(@path, DIRECTORY_PERMISSIONS)
+        Utils.check_permissions(@path, DIRECTORY_PERMISSIONS)
       end
     end
   end

data/lib/imap/backup/serializer/directory.rb

@@ -1,11 +1,13 @@
 # encoding: utf-8
 require 'fileutils'
 
-module Imap::Backup::Serializer
-  class Directory < Base
+module Imap::Backup
+  module Serializer; end
+
+  class Serializer::Directory < Serializer::Base
     def initialize(path, folder)
       super
-      Imap::Backup::Utils.make_folder(@path, @folder, DIRECTORY_PERMISSIONS)
+      Utils.make_folder(@path, @folder, Serializer::DIRECTORY_PERMISSIONS)
     end
 
     def uids

data/lib/imap/backup/serializer/mbox.rb

@@ -2,8 +2,10 @@
 require 'csv'
 require 'email/mboxrd/message'
 
-module Imap::Backup::Serializer
-  class Mbox < Base
+module Imap::Backup
+  module Serializer; end
+
+  class Serializer::Mbox < Serializer::Base
     def initialize(path, folder)
       super
       create_containing_directory
@@ -27,13 +29,16 @@ module Imap::Backup::Serializer
     def save(uid, message)
       uid = uid.to_s
       return if uids.include?(uid)
-      message = Email::Mboxrd::Message.new(message['RFC822'])
+      body = message['RFC822']
+      mboxrd_message = Email::Mboxrd::Message.new(body)
       mbox = imap = nil
       begin
         mbox = File.open(mbox_pathname, 'ab')
         imap = File.open(imap_pathname, 'ab')
-        mbox.write message.to_s
+        mbox.write mboxrd_message.to_s
         imap.write uid + "\n"
+      rescue ArgumentError => e
+        Imap::Backup.logger.warn "Failed to save message #{uid}:\n#{body}. #{e}"
       ensure
         mbox.close if mbox
         imap.close if imap
@@ -52,7 +57,7 @@ module Imap::Backup::Serializer
     def create_containing_directory
       mbox_relative_path = File.dirname(mbox_relative_pathname)
       return if mbox_relative_path == '.'
-      Imap::Backup::Utils.make_folder(@path, mbox_relative_path, DIRECTORY_PERMISSIONS)
+      Utils.make_folder(@path, mbox_relative_path, Serializer::DIRECTORY_PERMISSIONS)
     end
 
     def exist?