imap-backup 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac9741caa296c80fd63a064ba94efb71757200d
-  data.tar.gz: f405d8fb91c9f75cba102587d2867f606aa40c81
+  metadata.gz: 28c9159f1439c7b12a52c7149284c714218cef47
+  data.tar.gz: ff1ed3afecd0e1753734bc2bc8f6bd0ddd42d063
 SHA512:
-  metadata.gz: aa78818bc59cca9065fab40444798db9b107c2b3fb88b2ba6485c8f18dca5a26b0ca85fc51446fa25373bf8bbfb6275db6527c7fe271c8126f59bb68a7878a8a
-  data.tar.gz: 9841997c5f74550963486207905676d9f9d4bcfbb149e5055209a84f93869dfb5c45f545058ab87ecbb6c534a944e8706f39cec7dc94a941f310b2999f624b23
+  metadata.gz: fd6d123a800c8e1cfea9897c3f7edd70b5be9e7ad36581ae9aeb90e129d52dbc058372880cb677db40637e5ba4d68015220f8d6ca0c45e7087b1e748568aaae7
+  data.tar.gz: b52ce2115eae0a0bc175fe2264eb9842a8b535f16d6a5237e9df4f250cedcc5e4b4fe26ded3e06a43f0f5b4636b839bcf91c983f217efaf2b05e4549bb122507

data/.gitignore

@@ -5,4 +5,3 @@ coverage
 pkg
 .rbenv-version
 vendor
-

data/.travis.yml

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

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-

data/README.md

@@ -127,4 +127,3 @@ $ imap-backup status
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-

data/Rakefile

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

data/bin/imap-backup

@@ -84,4 +84,3 @@ when 'status'
     end
   end
 end
-

data/imap-backup.gemspec

@@ -32,4 +32,3 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'simplecov'
   end
 end
-

data/lib/email/mboxrd/message.rb

@@ -1,37 +1,36 @@
 require 'mail'
 
-module Email
-  module Mboxrd
-    class Message
-      def initialize(body)
-        @body = body.clone
-        @body.force_encoding('binary') if RUBY_VERSION >= '1.9.0'
-      end
-
-      def to_s
-        'From ' + from + "\n" + body + "\n"
-      end
-
-      private
-
-      def parsed
-        @parsed ||= Mail.new(@body)
-      end
-
-      def from
-        parsed.from[0] + ' ' + asctime
-      end
-
-      def body
-        mbox = @body.gsub(/\n(>*From)/, "\n>\\1")
-        mbox + "\n" unless mbox.end_with?("\n")
-        mbox
-      end
-
-      def asctime
-        parsed.date.asctime
-      end
+module Email; end
+
+module Email::Mboxrd
+  class Message
+    def initialize(body)
+      @body = body.clone
+      @body.force_encoding('binary') if RUBY_VERSION >= '1.9.0'
+    end
+
+    def to_s
+      'From ' + from + "\n" + body + "\n"
+    end
+
+    private
+
+    def parsed
+      @parsed ||= Mail.new(@body)
+    end
+
+    def from
+      parsed.from[0] + ' ' + asctime
+    end
+
+    def body
+      mbox = @body.gsub(/\n(>*From)/, "\n>\\1")
+      mbox + "\n" unless mbox.end_with?("\n")
+      mbox
+    end
+
+    def asctime
+      parsed.date.asctime
     end
   end
 end
-

data/lib/imap/backup.rb

@@ -14,9 +14,22 @@ require 'imap/backup/serializer/directory'
 require 'imap/backup/serializer/mbox'
 require 'imap/backup/version'
 
-module Imap
-  module Backup
-    class ConfigurationNotFound < StandardError; end
+require 'logger'
+
+module Imap::Backup
+  class ConfigurationNotFound < StandardError; end
+
+  class Logger
+    include Singleton
+
+    attr_reader :logger
+
+    def initialize
+      @logger = ::Logger.new(STDOUT)
+    end
   end
-end
 
+  def self.logger
+    Imap::Backup::Logger.instance.logger
+  end
+end

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

@@ -1,79 +1,85 @@
 require 'net/imap'
 
-module Imap
-  module Backup
-    module Account
-      class Connection
-        attr_reader :username, :local_path, :backup_folders, :server
+module Imap::Backup::Account
+  class Connection
+    attr_reader :username, :local_path, :backup_folders, :server
 
-        def initialize(options)
-          @username, @password = options[:username], options[:password]
-          @local_path, @backup_folders = options[:local_path], options[:folders]
-          @server = options[:server] || host_for(username)
-        end
+    def initialize(options)
+      @username, @password = options[:username], options[:password]
+      @local_path, @backup_folders = options[:local_path], options[:folders]
+      @server = options[:server] || host_for(username)
+    end
+
+    def folders
+      root = root_for(username)
+      imap.list(root, '*')
+    end
+
+    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])
+        {:name => folder[:name], :local => s.uids, :remote => f.uids}
+      end
+    end
 
-        def folders
-          root = root_for(username)
-          imap.list(root, '*')
-        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)
+        d.run
+      end
+    end
 
-        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])
-            {:name => folder[:name], :local => s.uids, :remote => f.uids}
-          end
-        end
+    def disconnect
+      imap.disconnect
+    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)
-            d.run
-          end
-        end
+    def imap
+      return @imap unless @imap.nil?
+      options = options_for(username)
+      Imap::Backup.logger.debug "Creating IMAP instance: #{server}, options: #{options.inspect}"
+      @imap = Net::IMAP.new(server, options)
+      Imap::Backup.logger.debug "Logging in: #{username}/#{masked_password}"
+      @imap.login(username, password)
+      @imap
+    end
 
-        def disconnect
-          imap.disconnect
-        end
+    private
 
-        def imap
-          return @imap unless @imap.nil?
-          options = options_for(username)
-          @imap = Net::IMAP.new(server, options)
-          @imap.login(username, @password)
-          @imap
-        end
+    def password
+      @password
+    end
 
-        private
+    def masked_password
+      password.gsub(/./, 'x')
+    end
 
-        def host_for(username)
-          case username
-          when /@gmail\.com/
-            'imap.gmail.com'
-          when /@fastmail\.fm/
-            'mail.messagingengine.com'
-          end
-        end
+    def host_for(username)
+      case username
+      when /@gmail\.com/
+        'imap.gmail.com'
+      when /@fastmail\.fm/
+        'mail.messagingengine.com'
+      end
+    end
 
-        def root_for(username)
-          case username
-          when /@gmail\.com/
-            '/'
-          when /@fastmail\.fm/
-            'INBOX'
-          end
-        end
+    def root_for(username)
+      case username
+      when /@gmail\.com/
+        '/'
+      when /@fastmail\.fm/
+        'INBOX'
+      end
+    end
 
-        def options_for(username)
-          case username
-          when /@gmail\.com/
-            {:port => 993, :ssl => true}
-          when /@fastmail\.fm/
-            {:port => 993, :ssl => true}
-          end
-        end
+    def options_for(username)
+      case username
+      when /@gmail\.com/
+        {:port => 993, :ssl => true}
+      when /@fastmail\.fm/
+        {:port => 993, :ssl => true}
       end
     end
   end

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

@@ -1,34 +1,29 @@
 # encoding: utf-8
 
-module Imap
-  module Backup
-    module Account
-      class Folder
-        REQUESTED_ATTRIBUTES = ['RFC822', 'FLAGS', 'INTERNALDATE']
+module Imap::Backup::Account
+  class Folder
+    REQUESTED_ATTRIBUTES = ['RFC822', 'FLAGS', 'INTERNALDATE']
 
-        def initialize(connection, folder)
-          @connection, @folder = connection, folder
-        end
+    def initialize(connection, folder)
+      @connection, @folder = connection, folder
+    end
 
-        def uids
-          @connection.imap.examine(@folder)
-          @connection.imap.uid_search(['ALL']).sort
-        rescue Net::IMAP::NoResponseError => e
-          warn "Folder '#{@folder}' does not exist"
-          []
-        end
+    def uids
+      @connection.imap.examine(@folder)
+      @connection.imap.uid_search(['ALL']).sort
+    rescue Net::IMAP::NoResponseError => e
+      warn "Folder '#{@folder}' does not exist"
+      []
+    end
 
-        def fetch(uid)
-          @connection.imap.examine(@folder)
-          message = @connection.imap.uid_fetch([uid.to_i], REQUESTED_ATTRIBUTES)[0][1]
-          message['RFC822'].force_encoding('utf-8') if RUBY_VERSION > '1.9'
-          message
-        rescue Net::IMAP::NoResponseError => e
-          warn "Folder '#{@folder}' does not exist"
-          nil
-        end
-      end
+    def fetch(uid)
+      @connection.imap.examine(@folder)
+      message = @connection.imap.uid_fetch([uid.to_i], REQUESTED_ATTRIBUTES)[0][1]
+      message['RFC822'].force_encoding('utf-8') if RUBY_VERSION > '1.9'
+      message
+    rescue Net::IMAP::NoResponseError => e
+      warn "Folder '#{@folder}' does not exist"
+      nil
     end
   end
 end
-

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

@@ -1,84 +1,138 @@
 # encoding: utf-8
 
-module Imap
-  module Backup
-    module Configuration
-      class Account
-        def initialize(store, account)
-          @store, @account = store, account
+module Imap::Backup::Configuration
+  class Account < Struct.new(:store, :account, :highline)
+    def run
+      catch :done do
+        loop do
+          system('clear')
+          create_menu
         end
+      end
+    end
+
+    private
+
+    def create_menu
+      highline.choose do |menu|
+        header menu
+        modify_email menu
+        modify_password menu
+        modify_server menu
+        modify_backup_path menu
+        choose_folders menu
+        test_connection menu
+        delete_account menu
+        menu.choice('return to main menu') { throw :done }
+        menu.hidden('quit') { throw :done }
+      end
+    end
 
-        def run
-          loop do
-            system('clear')
-            Setup.highline.choose do |menu|
-              password =
-                if @account[:password] == ''
-                 '(unset)'
-                else
-                  @account[:password].gsub(/./, 'x')
-                end
-              menu.header = <<EOT
+    def header(menu)
+      menu.header = <<-EOT
 Account:
-  email:    #{@account[:username]}
-  path:     #{@account[:local_path]}
-  folders:  #{@account[:folders].map { |f| f[:name] }.join(', ')}
-  password: #{password}
-EOT
-              menu.choice('modify email') do
-                username = Asker.email(username)
-                others   = @store.data[:accounts].select { |a| a != @account}.map { |a| a[:username] }
-                if others.include?(username)
-                  puts 'There is already an account set up with that email address'
-                else
-                  @account[:username] = username
-                end
-              end
-              menu.choice('modify password') do
-                password = Asker.password
-                if ! password.nil?
-                  @account[:password] = password
-                end
-              end
-              menu.choice('modify backup path') do
-                validator = lambda do |p|
-                  same = @store.data[:accounts].find do |a|
-                    a[:username] != @account[:username] && a[:local_path] == p
-                  end
-                  if same
-                    puts "The path '#{p}' is used to backup the account '#{same[:username]}'"
-                    false
-                  else
-                    true
-                  end
-                end
-                @account[:local_path] = Asker.backup_path(@account[:local_path], validator)
-              end
-              menu.choice('choose backup folders') do
-                FolderChooser.new(@account).run
-              end
-              menu.choice 'test authentication' do
-                result = ConnectionTester.test(@account)
-                puts result 
-                Setup.highline.ask 'Press a key '
-              end
-              menu.choice(:delete) do
-                if Setup.highline.agree("Are you sure? (y/n) ")
-                  @store.data[:accounts].reject! { |a| a[:username] == @account[:username] }
-                  return
-                end
-              end
-              menu.choice('return to main menu') do
-                return
-              end
-              menu.hidden('quit') do
-                return
-              end
-            end
+  email:    #{account[:username]}
+  server:   #{account[:server]}
+  path:     #{account[:local_path]}
+  folders:  #{folders.map { |f| f[:name] }.join(', ')}
+  password: #{masked_password}
+      EOT
+    end
+
+    def modify_email(menu)
+      menu.choice('modify email') do
+        username = Asker.email(username)
+        puts "username: #{username}"
+        others   = store.data[:accounts].select { |a| a != account}.map { |a| a[:username] }
+        puts "others: #{others.inspect}"
+        if others.include?(username)
+          puts 'There is already an account set up with that email address'
+        else
+          account[:username] = username
+          if account[:server].nil? or account[:server] == ''
+            account[:server] = default_server(username)
           end
         end
       end
     end
+
+    def modify_password(menu)
+      menu.choice('modify password') do
+        password = Asker.password
+        if ! password.nil?
+          account[:password] = password
+        end
+      end
+    end
+
+    def modify_server(menu)
+      menu.choice('modify server') do
+        server = highline.ask('server: ')
+        if ! server.nil?
+          account[:server] = server
+        end
+      end
+    end
+
+    def modify_backup_path(menu)
+      menu.choice('modify backup path') do
+        validator = lambda do |p|
+          same = store.data[:accounts].find do |a|
+            a[:username] != account[:username] && a[:local_path] == p
+          end
+          if same
+            puts "The path '#{p}' is used to backup the account '#{same[:username]}'"
+            false
+          else
+            true
+          end
+        end
+        account[:local_path] = Asker.backup_path(account[:local_path], validator)
+      end
+    end
+
+    def choose_folders(menu)
+      menu.choice('choose backup folders') do
+        FolderChooser.new(account).run
+      end
+    end
+
+    def test_connection(menu)
+      menu.choice('test connection') do
+        result = ConnectionTester.test(account)
+        puts result
+        highline.ask 'Press a key '
+      end
+    end
+
+    def delete_account(menu)
+      menu.choice('delete') do
+        if highline.agree("Are you sure? (y/n) ")
+          store.data[:accounts].reject! { |a| a[:username] == account[:username] }
+          throw :done
+        end
+      end
+    end
+
+    def folders
+      account[:folders] || []
+    end
+
+    def masked_password
+      if account[:password] == '' or account[:password].nil?
+        '(unset)'
+      else
+        account[:password].gsub(/./, 'x')
+      end
+    end
+
+    def default_server(username)
+      case username
+      when /@gmail\.com/
+        'imap.gmail.com'
+      when /@fastmail\.fm/
+        'mail.messagingengine.com'
+      end
+    end
   end
 end
-