imap-backup 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21c07957777ccdca22ec2b9b98aa5ee23e03f9d4
-  data.tar.gz: 7f341ff59529f01e6d7c4ccb7eefa73610b68a57
+  metadata.gz: 664cab74407b44814015417f5488f9ebf194554a
+  data.tar.gz: 64acb39ad63cf6cf194e813c31c70edcb41afeba
 SHA512:
-  metadata.gz: d9cbe70b6dbe617645a4a3fadbaa75a9fa73870b889d361adeb9a3cd9bcee91143736327db1050e6dc4c9383fabe9161413bb6061b5ce26831ed1c0897fa7c2f
-  data.tar.gz: ce740410c22cfea3f5119cd7a65196db97296d56416b662b575f049bba4e45669a66bccca78af52dcb915ab51ced4690e760246237df1ec85aa3ec10c7fb3669
+  metadata.gz: 86a3fac151e45fc4d061e26a8569de2d89fb2b37063b11ae7374ee54400ce67eaa4e385ab37f9daef33fdd011305634cf37f50f908590829f037a7d8ca10fbdb
+  data.tar.gz: 292a8b80a095a74091e8b981783f92730a1044c429a761b983770585ead60c5bcd35928193767fdf5daefdb7a1e2f67fbbcfc67df5b7c41e1d9b920d19244f69

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.1

data/imap-backup.gemspec

@@ -16,23 +16,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Imap::Backup::VERSION
 
-  if RUBY_VERSION < '1.9'
-    gem.add_runtime_dependency 'rake', '< 10.2.0'
-  else
-    gem.add_runtime_dependency 'rake'
-  end
+  gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'highline'
   gem.add_runtime_dependency 'mail'
-  if RUBY_VERSION < '1.9'
-    gem.add_runtime_dependency 'json'
-  end
 
-  gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'pry-doc'
-  gem.add_development_dependency 'rspec',  '>= 2.12.0'
-  if RUBY_VERSION < '1.9'
-    gem.add_development_dependency 'rcov'
-  else
-    gem.add_development_dependency 'simplecov'
-  end
+  gem.add_development_dependency 'rspec',  '>= 3.0.0'
+  gem.add_development_dependency 'simplecov'
 end

data/lib/email/mboxrd/message.rb

@@ -4,29 +4,32 @@ module Email; end
 
 module Email::Mboxrd
   class Message
-    def initialize(body)
-      @body = body.clone
-      @body.force_encoding('binary') if RUBY_VERSION >= '1.9.0'
+    attr_reader :supplied_body
+
+    def initialize(supplied_body)
+      @supplied_body = supplied_body.clone
+      @supplied_body.force_encoding('binary') if RUBY_VERSION >= '1.9.0'
     end
 
     def to_s
-      'From ' + from + "\n" + body + "\n"
+      'From ' + from + "\n" + mboxrd_body + "\n"
     end
 
     private
 
     def parsed
-      @parsed ||= Mail.new(@body)
+      @parsed ||= Mail.new(supplied_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
+    def mboxrd_body
+      return @mboxrd_body if @mboxrd_body
+      @mboxrd_body = supplied_body.gsub(/\n(>*From)/, "\n>\\1")
+      @mboxrd_body += "\n" unless @mboxrd_body.end_with?("\n")
+      @mboxrd_body
     end
 
     def asctime

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

@@ -4,12 +4,14 @@ module Imap::Backup
   module Account; end
 
   class Account::Connection
-    attr_reader :username, :local_path, :backup_folders, :server
+    attr_reader :username
+    attr_reader :local_path
+    attr_reader :backup_folders
 
     def initialize(options)
       @username, @password = options[:username], options[:password]
       @local_path, @backup_folders = options[:local_path], options[:folders]
-      @server = options[:server] || host_for(username)
+      @server = options[:server]
     end
 
     def folders
@@ -38,6 +40,10 @@ module Imap::Backup
       imap.disconnect
     end
 
+    def server
+      @server ||= host_for(username)
+    end
+
     def imap
       return @imap unless @imap.nil?
       options = options_for(server)

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

@@ -6,25 +6,28 @@ module Imap::Backup
   class Account::Folder
     REQUESTED_ATTRIBUTES = ['RFC822', 'FLAGS', 'INTERNALDATE']
 
+    attr_reader :connection
+    attr_reader :folder
+
     def initialize(connection, folder)
       @connection, @folder = connection, folder
     end
 
     def uids
-      @connection.imap.examine(@folder)
-      @connection.imap.uid_search(['ALL']).sort
+      connection.imap.examine(folder)
+      connection.imap.uid_search(['ALL']).sort
     rescue Net::IMAP::NoResponseError => e
-      Imap::Backup.logger.warn "Folder '#{@folder}' does not exist"
+      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]
+      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
-      Imap::Backup.logger.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

@@ -4,6 +4,10 @@ module Imap::Backup
   module Configuration; end
 
   class Configuration::Account < Struct.new(:store, :account, :highline)
+    def initialize(store, account, highline)
+      super
+    end
+
     def run
       catch :done do
         loop do

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

@@ -6,6 +6,10 @@ module Imap::Backup
   class Configuration::Asker < Struct.new(:highline)
     EMAIL_MATCHER = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
 
+    def initialize(highline)
+      super
+    end
+
     def email(default = '')
       highline.ask('email address: ') do |q|
         q.default               = default

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

@@ -4,54 +4,79 @@ module Imap::Backup
   module Configuration; end
 
   class Configuration::FolderChooser
+    attr_reader :account
+
     def initialize(account)
       @account = account
     end
 
     def run
-      begin
-        @connection = Account::Connection.new(@account)
-      rescue => e
+      if connection.nil?
         Imap::Backup.logger.warn 'Connection failed'
-        Configuration::Setup.highline.ask 'Press a key '
+        highline.ask 'Press a key '
         return
       end
-      @folders = @connection.folders
-      if @folders.nil?
+
+      if folders.nil?
         Imap::Backup.logger.warn 'Unable to get folder list'
-        Configuration::Setup.highline.ask 'Press a key '
+        highline.ask 'Press a key '
         return
       end
-      loop do
-        system('clear')
-        Configuration::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
-          end
-          menu.hidden('quit') do
-            return
-          end
+
+      catch :done do
+        loop do
+          system('clear')
+          show_menu
+        end
+      end
+    end
+
+    private
+
+    def show_menu
+      highline.choose do |menu|
+        menu.header = 'Add/remove folders'
+        menu.index = :number
+        add_folders menu
+        menu.choice('return to the account menu') { throw :done }
+        menu.hidden('quit') { throw :done }
+      end
+    end
+
+    def add_folders(menu)
+      folders.each do |folder|
+        name = folder.name
+        mark = is_selected?(name) ? '+' : '-'
+        menu.choice("#{mark} #{name}") do
+          toggle_selection name
         end
       end
     end
+
+    def is_selected?(folder_name)
+      account[:folders].find { |f| f[:name] == folder_name }
+    end
+
+    def toggle_selection(folder_name)
+      if is_selected?(folder_name)
+        account[:folders].reject! { |f| f[:name] == folder_name }
+      else
+        account[:folders] << { :name => folder_name }
+      end
+    end
+
+    def connection
+      @connection ||= Account::Connection.new(account)
+    rescue => e
+      nil
+    end
+
+    def folders
+      @folders ||= connection.folders
+    end
+
+    def highline
+      Configuration::Setup.highline
+    end
   end
 end

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

@@ -4,27 +4,37 @@ module Imap::Backup
   module Configuration; end
 
   class Configuration::List
-    attr_reader :accounts
+    attr_reader :required_accounts
 
-    def initialize(accounts = nil)
-      if not Configuration::Store.exist?
-        raise ConfigurationNotFound.new("Configuration file '#{Configuration::Store.default_pathname}' not found")
-      end
-      @config = Configuration::Store.new
-
-      if accounts.nil?
-        @accounts = @config.data[:accounts]
-      else
-        @accounts = @config.data[:accounts].select{ |account| accounts.include?(account[:username]) }
-      end
+    def initialize(required_accounts = nil)
+      @required_accounts = required_accounts
     end
 
     def each_connection
-      @accounts.each do |account|
+      accounts.each do |account|
         connection = Account::Connection.new(account)
         yield connection
         connection.disconnect
       end
     end
+
+    private
+
+    def config
+      return @config if @config
+      if not Configuration::Store.exist?
+        raise ConfigurationNotFound.new("Configuration file '#{Configuration::Store.default_pathname}' not found")
+      end
+      @config = Configuration::Store.new
+    end
+
+    def accounts
+      return @accounts if @accounts
+      if required_accounts.nil?
+        @accounts = config.data[:accounts]
+      else
+        @accounts = config.data[:accounts].select{ |account| required_accounts.include?(account[:username]) }
+      end
+    end
   end
 end

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

@@ -13,32 +13,48 @@ module Imap::Backup
 
     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 = Configuration::Asker.email
-            edit_account username
-          end
-          menu.choice('save and exit') do
-            config.save
-            return
-          end
-          menu.choice(:quit) do
-            return
-          end
+      catch :done do
+        loop do
+          system('clear')
+          show_menu
         end
       end
     end
 
     private
 
+    def show_menu
+      self.class.highline.choose do |menu|
+        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
+        end
+        menu.choice(:quit) { throw :done }
+      end
+    end
+
+    def account_items(menu)
+      config.data[:accounts].each do |account|
+        menu.choice("#{account[:username]}") do
+          edit_account account[:username]
+        end
+      end
+    end
+
+    def add_account_item(menu)
+      menu.choice('add account') do
+        username = Configuration::Asker.email
+        edit_account username
+      end
+    end
+
     def config
       @config ||= Configuration::Store.new
     end
@@ -52,21 +68,20 @@ module Imap::Backup
         end
     end
 
-    def add_account(username)
+    def default_account_config(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)
+        account = default_account_config(username)
+        config.data[:accounts] << account
       end
       Configuration::Account.new(config, account, Configuration::Setup.highline).run
     end

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

@@ -8,8 +8,7 @@ module Imap::Backup
   class Configuration::Store
     CONFIGURATION_DIRECTORY = File.expand_path('~/.imap-backup')
 
-    attr_reader :data
-    attr_reader :path
+    attr_reader :pathname
 
     def self.default_pathname
       File.join(CONFIGURATION_DIRECTORY, 'config.json')
@@ -21,21 +20,19 @@ module Imap::Backup
 
     def initialize(pathname = self.class.default_pathname)
       @pathname = pathname
-      if File.directory?(path)
-        Utils.check_permissions path, 0700
-      end
-      if File.exist?(@pathname)
-        Utils.check_permissions @pathname, 0600
-        @data = JSON.parse(File.read(@pathname), :symbolize_names => true)
-      else
-        @data = {:accounts => []}
-      end
+    end
+
+    def path
+      File.dirname(pathname)
     end
 
     def save
+      if File.directory?(path)
+        Utils.check_permissions path, 0700
+      end
       mkdir_private path
-      File.open(@pathname, 'w') { |f| f.write(JSON.pretty_generate(@data)) }
-      FileUtils.chmod 0600, @pathname
+      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|
@@ -49,12 +46,18 @@ module Imap::Backup
       end
     end
 
-    def path
-      File.dirname(@pathname)
-    end
-
     private
 
+    def data
+      return @data if @data
+      if File.exist?(pathname)
+        Utils.check_permissions pathname, 0600
+        @data = JSON.parse(File.read(pathname), :symbolize_names => true)
+      else
+        @data = {:accounts => []}
+      end
+    end
+
     def mkdir_private(path)
       if ! File.directory?(path)
         FileUtils.mkdir path

data/lib/imap/backup/downloader.rb

@@ -4,16 +4,19 @@ require 'json'
 
 module Imap::Backup
   class Downloader
+    attr_reader :folder
+    attr_reader :serializer
+
     def initialize(folder, serializer)
       @folder, @serializer = folder, serializer
     end
 
     def run
-      uids = @folder.uids - @serializer.uids
+      uids = folder.uids - serializer.uids
       uids.each do |uid|
-        message = @folder.fetch(uid)
+        message = folder.fetch(uid)
         next if message.nil?
-        @serializer.save(uid, message)
+        serializer.save(uid, message)
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Imap::Backup
         imap = File.open(imap_pathname, 'ab')
         mbox.write mboxrd_message.to_s
         imap.write uid + "\n"
-      rescue ArgumentError => e
+      rescue => e
         Imap::Backup.logger.warn "Failed to save message #{uid}:\n#{body}. #{e}"
       ensure
         mbox.close if mbox

data/lib/imap/backup/version.rb

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

data/spec/unit/account/connection_spec.rb

@@ -43,7 +43,9 @@ describe Imap::Backup::Account::Connection do
       [:local_path, 'local_path'],
       [:backup_folders, [folder_config]],
     ].each do |attr, expected|
-      its(attr) { should eq(expected) }
+      it "expects #{attr}" do
+        expect(subject.send(attr)).to eq(expected)
+      end
     end
 
     context 'server' do
@@ -118,7 +120,7 @@ describe Imap::Backup::Account::Connection do
     before { subject.disconnect }
 
     it 'disconnects from the server' do
-      expect(imap).to have_received(:disconnect).with()
+      expect(imap).to have_received(:disconnect)
     end
 
     include_examples 'connects to IMAP'

data/spec/unit/configuration/account_spec.rb

@@ -19,6 +19,26 @@ describe Imap::Backup::Configuration::Account do
     end
   end
 
+  context '#initialize' do
+    it 'requires 3 parameters' do
+      expect do
+        described_class.new('foo')
+      end.to raise_error(ArgumentError, /1 for 3/)
+    end
+
+    let(:store) { 'store' }
+    let(:account) { 'account' }
+    let(:highline) { 'highline' }
+
+    subject { described_class.new(store, account, highline) }
+
+    [:store, :account, :highline].each do |param|
+      it "expects #{param}" do
+        expect(subject.send(param)).to eq(send(param))
+      end
+    end
+  end
+
   context '#run' do
     let(:highline) { double('Highline') }
     let(:menu) { MockHighlineMenu.new }
@@ -225,7 +245,7 @@ describe Imap::Backup::Configuration::Account do
       end
 
       it 'validates that the path is not used by other backups' do
-        expect(@validator.call(other_existing_path)).to be_false
+        expect(@validator.call(other_existing_path)).to be_falsey
       end
     end
 

data/spec/unit/configuration/asker_spec.rb

@@ -45,7 +45,15 @@ module Imap::Backup
     end
 
     context '#initialize' do
-      its(:highline) { should eq(highline) }
+      it 'requires 1 parameter' do
+        expect do
+          described_class.new
+        end.to raise_error(ArgumentError, /0 for 1/)
+      end
+
+      it 'expects a higline' do
+        expect(subject.highline).to eq(highline)
+      end
     end
 
     context '#email' do
@@ -56,7 +64,7 @@ module Imap::Backup
         @result = subject.email
       end
 
-      it 'asks for an email'  do
+      it 'asks for an email' do
         expect(highline).to have_received(:ask).with(/email/)
       end
 

data/spec/unit/configuration/folder_chooser_spec.rb

@@ -26,7 +26,7 @@ describe Imap::Backup::Configuration::FolderChooser do
       end
 
       it 'should show the menu' do
-        @output.string.should =~ %r{Add/remove folders}
+        expect(@output.string).to match %r{Add/remove folders}
       end
     end
 

data/spec/unit/configuration/list_spec.rb

@@ -12,26 +12,39 @@ describe Imap::Backup::Configuration::List do
     double('Imap::Backup::Configuration::Store', :data => {:accounts => accounts})
   end
   let(:exists) { true }
+  let(:connection1) { double('Imap::Backup::Account::Connection', :disconnect => nil) }
+  let(:connection2) { double('Imap::Backup::Account::Connection', :disconnect => nil) }
 
   before do
     allow(Imap::Backup::Configuration::Store).to receive(:new).and_return(store)
     allow(Imap::Backup::Configuration::Store).to receive(:exist?).and_return(exists)
+    allow(Imap::Backup::Account::Connection).to receive(:new).with(accounts[0]).and_return(connection1)
+    allow(Imap::Backup::Account::Connection).to receive(:new).with(accounts[1]).and_return(connection2)
   end
 
   subject { described_class.new }
 
   context '#initialize' do
+  end
+
+  context '#each_connection' do
+    specify "calls the block with each account's connection" do
+      connections = []
+
+      subject.each_connection { |a| connections << a }
+
+      expect(connections).to eq([connection1, connection2])
+    end
+
     context 'with account parameter' do
       subject { described_class.new(['a2@example.com']) }
 
       it 'should only create requested accounts' do
-        expect(subject.accounts).to eq([accounts[1]])
-      end
-    end
+        connections = []
+
+        subject.each_connection { |a| connections << a }
 
-    context 'without an account parameter' do
-      it 'selects all accounts' do
-        expect(subject.accounts).to eq(accounts)
+        expect(connections).to eq([connection2])
       end
     end
 
@@ -40,29 +53,9 @@ describe Imap::Backup::Configuration::List do
 
       it 'fails' do
         expect {
-          described_class.new
+          subject.each_connection {}
         }.to raise_error(Imap::Backup::ConfigurationNotFound, /not found/)
       end
     end
   end
-
-  context 'instance methods' do
-    let(:connection1) { double('Imap::Backup::Account::Connection', :disconnect => nil) }
-    let(:connection2) { double('Imap::Backup::Account::Connection', :disconnect => nil) }
-
-    before do
-      allow(Imap::Backup::Account::Connection).to receive(:new).with(accounts[0]).and_return(connection1)
-      allow(Imap::Backup::Account::Connection).to receive(:new).with(accounts[1]).and_return(connection2)
-    end
-
-    context '#each_connection' do
-      specify "calls the block with each account's connection" do
-        connections = []
-
-        subject.each_connection { |a| connections << a }
-
-        expect(connections).to eq([connection1, connection2])
-      end
-    end
-  end
 end

data/spec/unit/configuration/setup_spec.rb

@@ -20,7 +20,8 @@ describe Imap::Backup::Configuration::Setup do
       double(
         'Imap::Backup::Configuration::Store',
         :data => data,
-        :path => '/base/path'
+        :path => '/base/path',
+        :save => nil
       )
     end
 
@@ -45,15 +46,15 @@ describe Imap::Backup::Configuration::Setup do
     end
 
     it 'clears the screen' do
-      subject.should_receive(:system).with('clear')
-
       subject.run
+
+      expect(subject).to have_received(:system).with('clear')
     end
 
     it 'should list accounts' do
       subject.run
 
-      @output.string.should =~ /account@example.com/
+      expect(@output.string).to match /account@example.com/
     end
 
     context 'adding accounts' do
@@ -80,14 +81,15 @@ describe Imap::Backup::Configuration::Setup do
     end
 
     it 'should save the configuration' do
-      @input.should_receive(:gets).with().and_return("save\n")
-      store.should_receive(:save).with()
+      allow(@input).to receive(:gets).and_return("save\n")
 
       subject.run
+
+      expect(store).to have_received(:save)
     end
 
     it 'should exit' do
-      @input.should_receive(:gets).with().and_return("quit\n")
+      allow(@input).to receive(:gets).and_return("quit\n")
 
       subject.run
     end

data/spec/unit/configuration/store_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 require 'json'
 
 describe Imap::Backup::Configuration::Store do
-  let(:file_path) { '/base/path/config.json' }
-  let(:file_exists) { true }
   let(:directory) { '/base/path' }
+  let(:file_path) { File.join(directory, '/config.json') }
+  let(:file_exists) { true }
   let(:directory_exists) { true }
   let(:data) { {:the => :config} }
   let(:configuration) { data.to_json }
@@ -31,41 +31,9 @@ describe Imap::Backup::Configuration::Store do
     end
   end
 
-  context '#initialize' do
-    before :each do
-      allow(Imap::Backup::Utils).to receive(:check_permissions).and_return(nil)
-    end
-
-    context 'loading' do
-      subject { described_class.new }
-
-      it 'sets data' do
-        expect(subject.data).to eq(data)
-      end
-    end
-
-    context 'if the configuration file is missing' do
-      let(:file_exists) { false }
-
-      it "doesn't fail" do
-        expect do
-          described_class.new
-        end.to_not raise_error
-      end
-    end
-
-    context 'if the config file permissions are too lax' do
-      let(:file_exists) { true }
-
-      before do
-        allow(Imap::Backup::Utils).to receive(:check_permissions).with(file_path, 0600).and_raise('Error')
-      end
-
-      it 'fails' do
-        expect do
-          described_class.new
-        end.to raise_error(RuntimeError, 'Error')
-      end
+  context '#path' do
+    it 'is the directory containing the configuration file' do
+      expect(subject.path).to eq(directory)
     end
   end
 
@@ -79,6 +47,7 @@ describe Imap::Backup::Configuration::Store do
       allow(FileUtils).to receive(:chmod)
       allow(Imap::Backup::Utils).to receive(:stat).with(directory).and_return(0700)
       allow(Imap::Backup::Utils).to receive(:stat).with(file_path).and_return(0600)
+      allow(Imap::Backup::Utils).to receive(:check_permissions).and_return(nil)
       allow(File).to receive(:open).with(file_path, 'w') { |&b| b.call file }
       allow(JSON).to receive(:pretty_generate).and_return('JSON output')
     end
@@ -103,6 +72,30 @@ describe Imap::Backup::Configuration::Store do
       expect(FileUtils).to have_received(:chmod).with(0600, file_path)
     end
 
+    context 'if the configuration file is missing' do
+      let(:file_exists) { false }
+
+      it "doesn't fail" do
+        expect do
+          subject.save
+        end.to_not raise_error
+      end
+    end
+
+    context 'if the config file permissions are too lax' do
+      let(:file_exists) { true }
+
+      before do
+        allow(Imap::Backup::Utils).to receive(:check_permissions).with(file_path, 0600).and_raise('Error')
+      end
+
+      it 'fails' do
+        expect do
+          subject.save
+        end.to raise_error(RuntimeError, 'Error')
+      end
+    end
+
     context 'saving accounts' do
       let(:folders) { [{ :name => 'A folder' }] }
       let(:data) do

data/spec/unit/downloader_spec.rb

@@ -18,7 +18,7 @@ describe Imap::Backup::Downloader do
         :prepare => nil,
         :exist?  => true,
         :uids    => [],
-        :save    => nil
+        :save    => nil,
       )
     end
 
@@ -29,7 +29,7 @@ describe Imap::Backup::Downloader do
     context '#run' do
       context 'with folder' do
         it 'should list messages' do
-          folder.should_receive(:uids).and_return([])
+          allow(folder).to receive(:uids).and_return([])
 
           subject.run
         end
@@ -39,19 +39,12 @@ describe Imap::Backup::Downloader do
             allow(folder).to receive(:uids).and_return(['123', '999', '1234'])
           end
 
-          it 'should skip messages that are downloaded' do
-            allow(File).to receive(:exist?).and_return(true)
-
-            serializer.should_not_receive(:fetch)
-
-            subject.run
-          end
-
           it 'skips failed fetches' do
-            folder.should_receive(:fetch).with('999').and_return(nil)
-            serializer.should_not_receive(:save).with('999', anything)
+            allow(folder).to receive(:fetch).with('999').and_return(nil)
 
             subject.run
+
+            expect(serializer).to_not have_received(:save).with('999', anything)
           end
 
           context 'to download' do
@@ -65,18 +58,18 @@ describe Imap::Backup::Downloader do
               end
             end
 
-            it 'should request messages' do
-              folder.should_receive(:fetch).with('999')
-              folder.should_receive(:fetch).with('1234')
-
+            it 'requests messages' do
               subject.run
-            end
 
-            it 'should save messages' do
-              serializer.should_receive(:save).with('999', message)
-              serializer.should_receive(:save).with('1234', message)
+              expect(folder).to have_received(:fetch).with('999')
+              expect(folder).to have_received(:fetch).with('1234')
+            end
 
+            it 'saves messages' do
               subject.run
+
+              expect(serializer).to have_received(:save).with('999', message)
+              expect(serializer).to have_received(:save).with('1234', message)
             end
           end
         end

data/spec/unit/serializer/directory_spec.rb

@@ -24,14 +24,14 @@ describe Imap::Backup::Serializer::Directory do
     end
 
     it 'returns the backed-up uids' do
-      subject.uids.should == [1, 123]
+      expect(subject.uids).to eq([1, 123])
     end
 
     context 'if the directory does not exist' do
       let(:folder_exists) { false }
 
       it 'returns an empty array' do
-        subject.uids.should == []
+        expect(subject.uids).to eq([])
       end
     end
   end
@@ -40,7 +40,7 @@ describe Imap::Backup::Serializer::Directory do
     it 'checks if the file exists' do
       allow(File).to receive(:exist?).with(%r{/base/path/my_folder/0+123.json}).and_return(true)
 
-      subject.exist?(123).should be_true
+      expect(subject.exist?(123)).to be_truthy
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,48 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -203,4 +175,3 @@ test_files:
 - spec/unit/serializer/directory_spec.rb
 - spec/unit/serializer/mbox_spec.rb
 - spec/unit/utils_spec.rb
-has_rdoc: