imap-backup 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 664cab74407b44814015417f5488f9ebf194554a
-  data.tar.gz: 64acb39ad63cf6cf194e813c31c70edcb41afeba
+  metadata.gz: 7c42e0f05b9fe1321562fd54446d99f765ad1544
+  data.tar.gz: 6e005f9c0605e371063ea1b2eec65e04ad6bd71c
 SHA512:
-  metadata.gz: 86a3fac151e45fc4d061e26a8569de2d89fb2b37063b11ae7374ee54400ce67eaa4e385ab37f9daef33fdd011305634cf37f50f908590829f037a7d8ca10fbdb
-  data.tar.gz: 292a8b80a095a74091e8b981783f92730a1044c429a761b983770585ead60c5bcd35928193767fdf5daefdb7a1e2f67fbbcfc67df5b7c41e1d9b920d19244f69
+  metadata.gz: ea5b48a3cbbf5b9513efbb0f453941bf33e96e1f6008b8d4af4414ef5b03a8502c30393c512e630186c0ba49e6d232facc93433fa86616aaab97716ac5082d8d
+  data.tar.gz: c9d9a35daf1ed227922de3e7601a30a383ea4cc5d87259a546a1a8914db48206909b6c75c60993db12ee147a50ae204fe5d9bff41ca0ffd427fa72aa86a3cc24

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

@@ -1,29 +1,34 @@
 # encoding: utf-8
+require 'forwardable'
 
 module Imap::Backup
   module Account; end
 
   class Account::Folder
+    extend Forwardable
+
     REQUESTED_ATTRIBUTES = ['RFC822', 'FLAGS', 'INTERNALDATE']
 
     attr_reader :connection
     attr_reader :folder
 
+    delegate imap: :connection
+
     def initialize(connection, folder)
       @connection, @folder = connection, folder
     end
 
     def uids
-      connection.imap.examine(folder)
-      connection.imap.uid_search(['ALL']).sort
+      imap.examine(folder)
+      imap.uid_search(['ALL']).sort
     rescue Net::IMAP::NoResponseError => e
       Imap::Backup.logger.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]
+      imap.examine(folder)
+      message = 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

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

@@ -49,7 +49,7 @@ Account:
       menu.choice('modify email') do
         username = Configuration::Asker.email(username)
         puts "username: #{username}"
-        others   = store.data[:accounts].select { |a| a != account}.map { |a| a[:username] }
+        others   = store.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'
@@ -83,7 +83,7 @@ Account:
     def modify_backup_path(menu)
       menu.choice('modify backup path') do
         validator = lambda do |p|
-          same = store.data[:accounts].find do |a|
+          same = store.accounts.find do |a|
             a[:username] != account[:username] && a[:local_path] == p
           end
           if same
@@ -114,7 +114,7 @@ Account:
     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] }
+          store.accounts.reject! { |a| a[:username] == account[:username] }
           throw :done
         end
       end

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

@@ -31,9 +31,9 @@ module Imap::Backup
     def accounts
       return @accounts if @accounts
       if required_accounts.nil?
-        @accounts = config.data[:accounts]
+        @accounts = config.accounts
       else
-        @accounts = config.data[:accounts].select{ |account| required_accounts.include?(account[:username]) }
+        @accounts = config.accounts.select{ |account| required_accounts.include?(account[:username]) }
       end
     end
   end

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

@@ -28,10 +28,6 @@ module Imap::Backup
         menu.header = 'Choose an action'
         account_items menu
         add_account_item menu
-        menu.choice('add account') do
-          username = Configuration::Asker.email
-          edit_account username
-        end
         menu.choice('save and exit') do
           config.save
           throw :done
@@ -41,7 +37,7 @@ module Imap::Backup
     end
 
     def account_items(menu)
-      config.data[:accounts].each do |account|
+      config.accounts.each do |account|
         menu.choice("#{account[:username]}") do
           edit_account account[:username]
         end
@@ -61,7 +57,7 @@ module Imap::Backup
 
     def setup_logging
       Imap::Backup.logger.level =
-        if config.data[:debug]
+        if config.debug?
           ::Logger::Severity::DEBUG
         else
           ::Logger::Severity::ERROR
@@ -78,10 +74,10 @@ module Imap::Backup
     end
 
     def edit_account(username)
-      account = config.data[:accounts].find { |a| a[:username] == username }
+      account = config.accounts.find { |a| a[:username] == username }
       if account.nil?
         account = default_account_config(username)
-        config.data[:accounts] << account
+        config.accounts << account
       end
       Configuration::Account.new(config, account, Configuration::Setup.highline).run
     end

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

@@ -33,7 +33,7 @@ module Imap::Backup
       mkdir_private path
       File.open(pathname, 'w') { |f| f.write(JSON.pretty_generate(data)) }
       FileUtils.chmod 0600, pathname
-      @data[:accounts].each do |account|
+      accounts.each do |account|
         mkdir_private account[:local_path]
         account[:folders].each do |f|
           parts = f[:name].split('/')
@@ -46,6 +46,14 @@ module Imap::Backup
       end
     end
 
+    def accounts
+      data[:accounts]
+    end
+
+    def debug?
+      data.include?(:debug)
+    end
+
     private
 
     def data

data/lib/imap/backup/version.rb

@@ -3,6 +3,6 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 1
   MINOR    = 0
-  REVISION = 11
+  REVISION = 12
   VERSION  = [MAJOR, MINOR, REVISION].map(&:to_s).join('.')
 end

data/spec/unit/configuration/account_spec.rb

@@ -42,8 +42,8 @@ describe Imap::Backup::Configuration::Account do
   context '#run' do
     let(:highline) { double('Highline') }
     let(:menu) { MockHighlineMenu.new }
-    let(:store) { double('Imap::Backup::Configuration::Store', :data => data) }
-    let(:data) { {:accounts => [account, account1]} }
+    let(:store) { double('Imap::Backup::Configuration::Store', :accounts => accounts) }
+    let(:accounts) { [account, account1] }
     let(:account) do
       {
         :username => existing_email,
@@ -292,14 +292,14 @@ describe Imap::Backup::Configuration::Account do
       end
 
       it 'deletes the account' do
-        expect(data[:accounts].find{|a| a[:username] == existing_email}).to be_nil
+        expect(accounts.find { |a| a[:username] == existing_email }).to be_nil
       end
 
       context 'without confirmation' do
         let(:confirmed) { false }
 
         it 'does nothing' do
-          expect(data[:accounts].find{|a| a[:username] == existing_email}).to eq(account)
+          expect(accounts.find{|a| a[:username] == existing_email}).to eq(account)
         end
       end
     end

data/spec/unit/configuration/list_spec.rb

@@ -9,7 +9,7 @@ describe Imap::Backup::Configuration::List do
     ]
   end
   let(:store) do
-    double('Imap::Backup::Configuration::Store', :data => {:accounts => accounts})
+    double('Imap::Backup::Configuration::Store', accounts: accounts)
   end
   let(:exists) { true }
   let(:connection1) { double('Imap::Backup::Account::Connection', :disconnect => nil) }

data/spec/unit/configuration/setup_spec.rb

@@ -15,13 +15,14 @@ describe Imap::Backup::Configuration::Setup do
   context '#run' do
     let(:account1) { {:username => 'account@example.com'} }
     let(:account) { double('Imap::Backup::Configuration::Account', :run => nil) }
-    let(:data) { {:accounts => [account1]} }
+    let(:accounts) { [account1] }
     let(:store) do
       double(
         'Imap::Backup::Configuration::Store',
-        :data => data,
+        :accounts => accounts,
         :path => '/base/path',
-        :save => nil
+        :save => nil,
+        :debug? => false,
       )
     end
 
@@ -76,7 +77,7 @@ describe Imap::Backup::Configuration::Setup do
       end
 
       it 'adds account data' do
-        expect(data[:accounts][1]).to eq(blank_account)
+        expect(accounts[1]).to eq(blank_account)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake