imap-backup 1.0.5 → 1.0.6

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

@@ -1,40 +1,47 @@
 # encoding: utf-8
 
-module Imap
-  module Backup
-    module Configuration
-      module Asker
-        EMAIL_MATCHER = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
+module Imap::Backup::Configuration
+  class Asker < Struct.new(:highline)
+    EMAIL_MATCHER = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
 
-        def self.email(default = '')
-          Setup.highline.ask('email address: ') do |q|
-            q.default               = default
-            q.readline              = true
-            q.validate              = EMAIL_MATCHER
-            q.responses[:not_valid] = 'Enter a valid email address '
-          end
-        end
+    def email(default = '')
+      highline.ask('email address: ') do |q|
+        q.default               = default
+        q.readline              = true
+        q.validate              = EMAIL_MATCHER
+        q.responses[:not_valid] = 'Enter a valid email address '
+      end
+    end
 
-        def self.password
-          password     = Setup.highline.ask('password: ')        { |q| q.echo = false }
-          confirmation = Setup.highline.ask('repeat password: ') { |q| q.echo = false }
-          if password != confirmation
-            return nil unless Setup.highline.agree("the password and confirmation did not match.\nContinue? (y/n) ")
-            return self.password
-          end
-          password
-        end
+    def password
+      password     = highline.ask('password: ')        { |q| q.echo = false }
+      confirmation = highline.ask('repeat password: ') { |q| q.echo = false }
+      if password != confirmation
+        return nil unless highline.agree("the password and confirmation did not match.\nContinue? (y/n) ")
+        return self.password
+      end
+      password
+    end
 
-        def self.backup_path(default, validator)
-          Setup.highline.ask('backup directory: ') do |q|
-            q.default  = default
-            q.readline = true
-            q.validate = validator
-            q.responses[:not_valid] = 'Choose a different directory '
-          end
-        end
+    def backup_path(default, validator)
+      highline.ask('backup directory: ') do |q|
+        q.default  = default
+        q.readline = true
+        q.validate = validator
+        q.responses[:not_valid] = 'Choose a different directory '
       end
     end
+
+    def self.email(default = '')
+      new(Setup.highline).email(default)
+    end
+
+    def self.password
+      new(Setup.highline).password
+    end
+
+    def self.backup_path(default, validator)
+      new(Setup.highline).backup_path(default, validator)
+    end
   end
 end
-

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

@@ -1,19 +1,14 @@
 # encoding: utf-8
 
-module Imap
-  module Backup
-    module Configuration
-      module ConnectionTester
-        def self.test(account)
-          Imap::Backup::Account::Connection.new(account)
-          return 'Connection successful'
-        rescue Net::IMAP::NoResponseError
-          return 'No response'
-        rescue Exception => e
-          return "Unexpected error: #{e}"
-        end
-      end
+module Imap::Backup::Configuration
+  module ConnectionTester
+    def self.test(account)
+      Imap::Backup::Account::Connection.new(account).imap
+      return 'Connection successful'
+    rescue Net::IMAP::NoResponseError
+      return 'No response'
+    rescue Exception => e
+      return "Unexpected error: #{e}"
     end
   end
 end
-

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

@@ -1,60 +1,55 @@
 # encoding: utf-8
 
-module Imap
-  module Backup
-    module Configuration
-      class FolderChooser
-        def initialize(account)
-          @account = account
-        end
+module Imap::Backup::Configuration
+  class FolderChooser
+    def initialize(account)
+      @account = account
+    end
 
-        def run
-          begin
-            @connection = Imap::Backup::Account::Connection.new(@account)
-          rescue => e
-            puts 'Connection failed'
-            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 '
-            return
-          end
-          loop do
-            system('clear')
-            Setup.highline.choose do |menu|
-              menu.header = 'Add/remove folders'
-              menu.index = :number
-              @folders.each do |folder|
-                name  = folder.name
-                found = @account[:folders].find { |f| f[:name] == name }
-                mark  =
-                  if found
-                    '+'
-                  else
-                    '-'
-                  end
-                menu.choice("#{mark} #{name}") do
-                  if found
-                    @account[:folders].reject! { |f| f[:name] == name }
-                  else
-                    @account[:folders] << { :name => name }
-                  end
-                end
-              end
-              menu.choice('return to the account menu') do
-                return
+    def run
+      begin
+        @connection = Imap::Backup::Account::Connection.new(@account)
+      rescue => e
+        puts 'Connection failed'
+        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 '
+        return
+      end
+      loop do
+        system('clear')
+        Setup.highline.choose do |menu|
+          menu.header = 'Add/remove folders'
+          menu.index = :number
+          @folders.each do |folder|
+            name  = folder.name
+            found = @account[:folders].find { |f| f[:name] == name }
+            mark  =
+              if found
+                '+'
+              else
+                '-'
               end
-              menu.hidden('quit') do
-                return
+            menu.choice("#{mark} #{name}") do
+              if found
+                @account[:folders].reject! { |f| f[:name] == name }
+              else
+                @account[:folders] << { :name => name }
               end
             end
           end
+          menu.choice('return to the account menu') do
+            return
+          end
+          menu.hidden('quit') do
+            return
+          end
         end
       end
     end
   end
 end
-

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

@@ -1,33 +1,28 @@
 # encoding: utf-8
 
-module Imap
-  module Backup
-    module Configuration
-      class List
-        attr_reader :accounts
+module Imap::Backup::Configuration
+  class List
+    attr_reader :accounts
 
-        def initialize(accounts = nil)
-          if not Imap::Backup::Configuration::Store.exist?
-            raise ConfigurationNotFound.new("Configuration file '#{Imap::Backup::Configuration::Store.default_pathname}' not found")
-          end
-          @config = Imap::Backup::Configuration::Store.new
+    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")
+      end
+      @config = Imap::Backup::Configuration::Store.new
 
-          if accounts.nil?
-            @accounts = @config.data[:accounts]
-          else
-            @accounts = @config.data[:accounts].select{ |account| accounts.include?(account[:username]) }
-          end
-        end
+      if accounts.nil?
+        @accounts = @config.data[:accounts]
+      else
+        @accounts = @config.data[:accounts].select{ |account| accounts.include?(account[:username]) }
+      end
+    end
 
-        def each_connection
-          @accounts.each do |account|
-            connection = Imap::Backup::Account::Connection.new(account)
-            yield connection
-            connection.disconnect
-          end
-        end
+    def each_connection
+      @accounts.each do |account|
+        connection = Imap::Backup::Account::Connection.new(account)
+        yield connection
+        connection.disconnect
       end
     end
   end
 end
-

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

@@ -2,66 +2,71 @@
 require 'rubygems' if RUBY_VERSION < '1.9'
 require 'highline'
 
-module Imap
-  module Backup
-    module Configuration
-      class Setup
-        class << self
-          attr_accessor :highline
-        end
-        self.highline = HighLine.new
-
-        def initialize
-          @config = Imap::Backup::Configuration::Store.new
-        end
+module Imap::Backup::Configuration
+  class Setup
+    class << self
+      attr_accessor :highline
+    end
+    self.highline = HighLine.new
 
-        def run
-          loop do
-            system('clear')
-            self.class.highline.choose do |menu|
-              menu.header = 'Choose an action'
-              @config.data[:accounts].each do |account|
-                menu.choice("#{account[:username]}") do
-                  edit_account account[:username]
-                end
-              end
-              menu.choice('add account') do
-                username = Asker.email
-                edit_account username
-              end
-              menu.choice('save and exit') do
-                @config.save
-                return
-              end
-              menu.choice(:quit) do
-                return
-              end
+    def run
+      setup_logging
+      loop do
+        system('clear')
+        self.class.highline.choose do |menu|
+          menu.header = 'Choose an action'
+          config.data[:accounts].each do |account|
+            menu.choice("#{account[:username]}") do
+              edit_account account[:username]
             end
           end
+          menu.choice('add account') do
+            username = Asker.email
+            edit_account username
+          end
+          menu.choice('save and exit') do
+            config.save
+            return
+          end
+          menu.choice(:quit) do
+            return
+          end
         end
+      end
+    end
 
-        private
+    private
 
-        def add_account(username)
-          account = {
-            :username   => username,
-            :password   => '',
-            :local_path => File.join(@config.path, username.gsub('@', '_')),
-            :folders    => []
-          }
-          @config.data[:accounts] << account
-          account
-        end
+    def config
+      @config ||= Imap::Backup::Configuration::Store.new
+    end
 
-        def edit_account(username)
-          account = @config.data[:accounts].find { |a| a[:username] == username }
-          if account.nil?
-            account = add_account(username)
-          end
-          Account.new(@config, account).run
+    def setup_logging
+      Imap::Backup.logger.level =
+        if config.data[:debug]
+          ::Logger::Severity::DEBUG
+        else
+          ::Logger::Severity::ERROR
         end
+    end
+
+    def add_account(username)
+      account = {
+        :username   => username,
+        :password   => '',
+        :local_path => File.join(config.path, username.gsub('@', '_')),
+        :folders    => []
+      }
+      config.data[:accounts] << account
+      account
+    end
+
+    def edit_account(username)
+      account = config.data[:accounts].find { |a| a[:username] == username }
+      if account.nil?
+        account = add_account(username)
       end
+      Account.new(config, account, Imap::Backup::Configuration::Setup.highline).run
     end
   end
 end
-

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

@@ -2,69 +2,64 @@
 require 'rubygems' if RUBY_VERSION < '1.9'
 require 'json'
 
-module Imap
-  module Backup
-    module Configuration
-      class Store
-        CONFIGURATION_DIRECTORY = File.expand_path('~/.imap-backup')
+module Imap::Backup::Configuration
+  class Store
+    CONFIGURATION_DIRECTORY = File.expand_path('~/.imap-backup')
 
-        attr_reader :data
-        attr_reader :path
+    attr_reader :data
+    attr_reader :path
 
-        def self.default_pathname
-          File.join(CONFIGURATION_DIRECTORY, 'config.json')
-        end
+    def self.default_pathname
+      File.join(CONFIGURATION_DIRECTORY, 'config.json')
+    end
 
-        def self.exist?(pathname = default_pathname)
-          File.exist?(pathname)
-        end
+    def self.exist?(pathname = default_pathname)
+      File.exist?(pathname)
+    end
 
-        def initialize(pathname = self.class.default_pathname)
-          @pathname = pathname
-          if File.directory?(path)
-            Imap::Backup::Utils.check_permissions path, 0700
-          end
-          if File.exist?(@pathname)
-            Imap::Backup::Utils.check_permissions @pathname, 0600
-            @data = JSON.parse(File.read(@pathname), :symbolize_names => true)
-          else
-            @data = {:accounts => []}
-          end
-        end
+    def initialize(pathname = self.class.default_pathname)
+      @pathname = pathname
+      if File.directory?(path)
+        Imap::Backup::Utils.check_permissions path, 0700
+      end
+      if File.exist?(@pathname)
+        Imap::Backup::Utils.check_permissions @pathname, 0600
+        @data = JSON.parse(File.read(@pathname), :symbolize_names => true)
+      else
+        @data = {:accounts => []}
+      end
+    end
 
-        def save
-          mkdir_private path
-          File.open(@pathname, 'w') { |f| f.write(JSON.pretty_generate(@data)) }
-          FileUtils.chmod 0600, @pathname
-          @data[:accounts].each do |account|
-            mkdir_private account[:local_path]
-            account[:folders].each do |f|
-              parts = f[:name].split('/')
-              p     = account[:local_path].clone
-              parts.each do |part|
-                p    = File.join(p, part)
-                mkdir_private p
-              end
-            end
+    def save
+      mkdir_private path
+      File.open(@pathname, 'w') { |f| f.write(JSON.pretty_generate(@data)) }
+      FileUtils.chmod 0600, @pathname
+      @data[:accounts].each do |account|
+        mkdir_private account[:local_path]
+        account[:folders].each do |f|
+          parts = f[:name].split('/')
+          p     = account[:local_path].clone
+          parts.each do |part|
+            p    = File.join(p, part)
+            mkdir_private p
           end
         end
+      end
+    end
 
-        def path
-          File.dirname(@pathname)
-        end
+    def path
+      File.dirname(@pathname)
+    end
 
-        private
+    private
 
-        def mkdir_private(path)
-          if ! File.directory?(path)
-            FileUtils.mkdir path
-          end
-          if Imap::Backup::Utils::stat(path) != 0700
-            FileUtils.chmod 0700, path
-          end
-        end
+    def mkdir_private(path)
+      if ! File.directory?(path)
+        FileUtils.mkdir path
+      end
+      if Imap::Backup::Utils::stat(path) != 0700
+        FileUtils.chmod 0700, path
       end
     end
   end
 end
-