imap-backup 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7b1789e72adf3229dc78e51f865b55b051c1915
-  data.tar.gz: 2f6918a2cd223adc68cc37a5cff138cd30332d6e
+  metadata.gz: c3d7f421192f5e5b15efcb55aa13b55cd769899e
+  data.tar.gz: d98f149a116634df9e6aa79898da5e2c61ac770a
 SHA512:
-  metadata.gz: 0cf0f94758f44e4b5920aea52f363141d10bb3353d92635d8e4285f561498515c60e8c7494bf80245c046a59013c0aa7abf17e1263ebc3aed987479987505b7e
-  data.tar.gz: f77e1381ddae8bbcf0e99c93bb337f49ee9d2de5940fa30f450432e890e96fc304829d85c2a68f36cf5b6e3b62dec05859fd14195eb7c1203f2c03fd063afe84
+  metadata.gz: 7173984ab8c9ef01013d2d6468097aa7b928b59cf12b363b66b3119074f26996c80ffac4c27b36499cd739132eb4105d6f4c0fbd917ee53df69e90f34918a533
+  data.tar.gz: 3f5a4e52b736fabb1404ffa0b4ed01ff22b83a1c706f6de90c96f68b66fecaf22eed6af251b674c519dcb2e235aaca56d1b074a347a9a4ec54fb7c6a410e92e2

data/.travis.yml

@@ -3,4 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
+branches:
+  only:
+    - master
 script: "bundle exec rake spec"

data/bin/imap-backup

@@ -41,7 +41,7 @@ if ARGV.size > 0
   options[:command] = ARGV.shift
 end
 
-if KNOWN_COMMANDS.find{|c| c[:name] == options[:command] }.nil?
+if KNOWN_COMMANDS.find{ |c| c[:name] == options[:command] }.nil?
   raise "Unknown command '#{options[:command]}'"
 end
 
@@ -57,6 +57,8 @@ rescue Imap::Backup::ConfigurationNotFound
   exit
 end
 
+configuration.setup_logging
+
 case options[:command]
 when 'backup'
   configuration.each_connection do |connection|

data/lib/imap/backup.rb

@@ -34,4 +34,13 @@ module Imap::Backup
   def self.logger
     Logger.instance.logger
   end
+
+  def self.setup_logging(config)
+    logger.level =
+      if config.debug?
+        ::Logger::Severity::DEBUG
+      else
+        ::Logger::Severity::ERROR
+      end
+  end
 end

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

@@ -12,11 +12,17 @@ module Imap::Backup
       @local_path = options[:local_path]
       @backup_folders = options[:folders]
       @server = options[:server]
+      @folders = nil
     end
 
     def folders
+      return @folders if @folders
       root = root_for(username)
-      imap.list(root, '*')
+      @folders = imap.list(root, '*')
+      if @folders.nil?
+        Imap::Backup.logger.warn "Unable to get folder list for account #{username}, (root '#{root}'"
+      end
+      @folders
     end
 
     def status
@@ -28,7 +34,11 @@ module Imap::Backup
     end
 
     def run_backup
+      Imap::Backup.logger.debug "Running backup of account: #{username}"
+      # start the connection so we get logging messages in the right order
+      imap
       backup_folders.each do |folder|
+        Imap::Backup.logger.debug "Folder: #{folder[:name]}"
         f = Account::Folder.new(self, folder[:name])
         s = Serializer::Mbox.new(local_path, folder[:name])
         d = Downloader.new(f, s)
@@ -66,7 +76,7 @@ module Imap::Backup
     
     def backup_folders
       return @backup_folders if @backup_folders and @backup_folders.size > 0
-      folders.map { |f| {:name => f} }
+      (folders || []).map { |f| {:name => f.name} }
     end
 
     def host_for(username)

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

@@ -58,6 +58,7 @@ Account:
           if account[:server].nil? or account[:server] == ''
             account[:server] = default_server(username)
           end
+          account[:modified] = true
         end
       end
     end
@@ -67,6 +68,7 @@ Account:
         password = Configuration::Asker.password
         if ! password.nil?
           account[:password] = password
+          account[:modified] = true
         end
       end
     end
@@ -76,6 +78,7 @@ Account:
         server = highline.ask('server: ')
         if ! server.nil?
           account[:server] = server
+          account[:modified] = true
         end
       end
     end
@@ -93,7 +96,9 @@ Account:
             true
           end
         end
+        existing = account[:local_path].clone
         account[:local_path] = Configuration::Asker.backup_path(account[:local_path], validator)
+        account[:modified] = true if existing != account[:local_path]
       end
     end
 
@@ -114,7 +119,7 @@ Account:
     def delete_account(menu)
       menu.choice('delete') do
         if highline.agree("Are you sure? (y/n) ")
-          store.accounts.reject! { |a| a[:username] == account[:username] }
+          account[:delete] = true
           throw :done
         end
       end

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

@@ -59,9 +59,11 @@ module Imap::Backup
 
     def toggle_selection(folder_name)
       if is_selected?(folder_name)
-        account[:folders].reject! { |f| f[:name] == folder_name }
+        changed = account[:folders].reject! { |f| f[:name] == folder_name }
+        account[:modified] = true if changed
       else
         account[:folders] << { :name => folder_name }
+        account[:modified] = true
       end
     end
 

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

@@ -10,6 +10,10 @@ module Imap::Backup
       @required_accounts = required_accounts
     end
 
+    def setup_logging
+      Imap::Backup.setup_logging config
+    end
+
     def each_connection
       accounts.each do |account|
         connection = Account::Connection.new(account)

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

@@ -12,7 +12,7 @@ module Imap::Backup
     self.highline = HighLine.new
 
     def run
-      setup_logging
+      Imap::Backup.setup_logging config
       catch :done do
         loop do
           system('clear')
@@ -28,17 +28,23 @@ module Imap::Backup
         menu.header = 'Choose an action'
         account_items menu
         add_account_item menu
+        toggle_logging_item menu
         menu.choice('save and exit') do
           config.save
           throw :done
         end
-        menu.choice(:quit) { throw :done }
+        menu.choice('exit without saving changes') do
+          throw :done
+        end
       end
     end
 
     def account_items(menu)
       config.accounts.each do |account|
-        menu.choice("#{account[:username]}") do
+        next if account[:delete]
+        item = account[:username].clone
+        item << ' *' if account[:modified]
+        menu.choice(item) do
           edit_account account[:username]
         end
       end
@@ -51,17 +57,17 @@ module Imap::Backup
       end
     end
 
-    def config
-      @config ||= Configuration::Store.new
+    def toggle_logging_item(menu)
+      menu_item = config.debug? ? 'stop logging' : 'start logging'
+      new_setting = ! config.debug?
+      menu.choice(menu_item) do
+        config.debug = new_setting
+        Imap::Backup.setup_logging config
+      end
     end
 
-    def setup_logging
-      Imap::Backup.logger.level =
-        if config.debug?
-          ::Logger::Severity::DEBUG
-        else
-          ::Logger::Severity::ERROR
-        end
+    def config
+      @config ||= Configuration::Store.new
     end
 
     def default_account_config(username)

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

@@ -31,27 +31,26 @@ module Imap::Backup
         Utils.check_permissions path, 0700
       end
       mkdir_private path
+      remove_modified_flags
+      remove_deleted_accounts
       File.open(pathname, 'w') { |f| f.write(JSON.pretty_generate(data)) }
       FileUtils.chmod 0600, pathname
-      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 accounts
       data[:accounts]
     end
 
+    def modified?
+      accounts.any? { |a| a[:modified] || a[:delete] }
+    end
+
     def debug?
-      data.include?(:debug)
+      data[:debug]
+    end
+
+    def debug=(value)
+      data[:debug] = [true, false].include?(value) ? value : false
     end
 
     private
@@ -60,10 +59,22 @@ module Imap::Backup
       return @data if @data
       if File.exist?(pathname)
         Utils.check_permissions pathname, 0600
-        @data = JSON.parse(File.read(pathname), :symbolize_names => true)
+        contents = File.read(pathname)
+        @data = JSON.parse(contents, :symbolize_names => true)
       else
         @data = {:accounts => []}
       end
+      @data[:debug] = false unless @data.include?(:debug)
+      @data[:debug] = false unless [true, false].include?(@data[:debug])
+      @data
+    end
+
+    def remove_modified_flags
+      accounts.each { |a| a.delete(:modified) }
+    end
+
+    def remove_deleted_accounts
+      accounts.reject! { |a| a[:delete] }
     end
 
     def mkdir_private(path)

data/lib/imap/backup/downloader.rb

@@ -13,6 +13,7 @@ module Imap::Backup
 
     def run
       uids = folder.uids - serializer.uids
+      Imap::Backup.logger.debug "New messages: #{uids.count}"
       uids.each do |uid|
         message = folder.fetch(uid)
         next if message.nil?

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

@@ -23,6 +23,7 @@ module Imap::Backup
       CSV.foreach(imap_pathname) do |row|
         @uids << row[0]
       end
+      @uids = @uids.map(&:to_i).sort
       @uids
     end
 

data/lib/imap/backup/version.rb

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

data/spec/support/shared_examples/account_flagging.rb

@@ -0,0 +1,23 @@
+shared_examples 'it flags the account as modified' do
+  it 'flags that the account has changed' do
+    expect(account[:modified]).to be_truthy
+  end
+end
+
+shared_examples "it doesn't flag the account as modified" do
+  it 'does not flag that the account has changed' do
+    expect(account[:modified]).to be_falsey
+  end
+end
+
+shared_examples 'it flags the account to be deleted' do
+  it 'flags that the account is to be deleted' do
+    expect(account[:delete]).to be_truthy
+  end
+end
+
+shared_examples "it doesn't flag the account to be deleted" do
+  it 'does not flags that the account is to be deleted' do
+    expect(account[:delete]).to be_falsey
+  end
+end

data/spec/unit/account/connection_spec.rb

@@ -158,7 +158,7 @@ describe Imap::Backup::Account::Connection do
     end
 
     context 'without supplied backup_folders' do
-      let(:imap_folders) { ['foo'] }
+      let(:imap_folders) { [double(:name => 'foo')] }
 
       before do
         allow(Imap::Backup::Account::Folder).to receive(:new).
@@ -186,6 +186,15 @@ describe Imap::Backup::Account::Connection do
           expect(downloader).to have_received(:run)
         end
       end
+
+      context "when the imap server doesn't return folders" do
+        let(:backup_folders) { nil }
+        let(:imap_folders) { nil }
+
+        it 'does not fail' do
+          expect { subject.run_backup }.to_not raise_error
+        end
+      end
     end
   end
 end

data/spec/unit/configuration/account_spec.rb

@@ -20,12 +20,6 @@ describe Imap::Backup::Configuration::Account do
   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' }
@@ -171,8 +165,12 @@ describe Imap::Backup::Configuration::Account do
         end
       end
 
-      it 'modifies the email address' do
-        expect(account[:username]).to eq(new_email)
+      context 'the email is new' do
+        it 'modifies the email address' do
+          expect(account[:username]).to eq(new_email)
+        end
+
+        include_examples 'it flags the account as modified'
       end
 
       context 'the email already exists' do
@@ -185,6 +183,8 @@ describe Imap::Backup::Configuration::Account do
         it "doesn't set the email" do
           expect(account[:username]).to eq(existing_email)
         end
+
+        include_examples "it doesn't flag the account as modified"
       end
     end
 
@@ -197,8 +197,12 @@ describe Imap::Backup::Configuration::Account do
         menu.choices['modify password'].call
       end
 
-      it 'updates the password' do
-        expect(account[:password]).to eq(new_password)
+      context 'if the user enters a password' do
+        it 'updates the password' do
+          expect(account[:password]).to eq(new_password)
+        end
+
+        include_examples 'it flags the account as modified'
       end
 
       context 'if the user cancels' do
@@ -207,6 +211,8 @@ describe Imap::Backup::Configuration::Account do
         it 'does nothing' do
           expect(account[:password]).to eq(existing_password)
         end
+
+        include_examples "it doesn't flag the account as modified"
       end
     end
 
@@ -225,6 +231,8 @@ describe Imap::Backup::Configuration::Account do
       it 'updates the server' do
         expect(account[:server]).to eq(server)
       end
+
+      include_examples 'it flags the account as modified'
     end
 
     context 'backup_path' do
@@ -247,6 +255,8 @@ describe Imap::Backup::Configuration::Account do
       it 'validates that the path is not used by other backups' do
         expect(@validator.call(other_existing_path)).to be_falsey
       end
+
+      include_examples 'it flags the account as modified'
     end
 
     context 'folders' do
@@ -291,16 +301,14 @@ describe Imap::Backup::Configuration::Account do
         expect(highline).to have_received(:agree)
       end
 
-      it 'deletes the account' do
-        expect(accounts.find { |a| a[:username] == existing_email }).to be_nil
+      context 'when the user confirms deletion' do
+        include_examples 'it flags the account to be deleted'
       end
 
       context 'without confirmation' do
         let(:confirmed) { false }
 
-        it 'does nothing' do
-          expect(accounts.find{|a| a[:username] == existing_email}).to eq(account)
-        end
+        include_examples "it doesn't flag the account to be deleted"
       end
     end
   end

data/spec/unit/configuration/folder_chooser_spec.rb

@@ -60,6 +60,8 @@ describe Imap::Backup::Configuration::FolderChooser do
         specify 'are added to the account' do
           expect(account[:folders]).to include({:name => 'another_folder'})
         end
+
+        include_examples 'it flags the account as modified'
       end
 
       context 'removing folders' do
@@ -72,6 +74,8 @@ describe Imap::Backup::Configuration::FolderChooser do
         specify 'are removed from the account' do
           expect(account[:folders]).to_not include({:name => 'my_folder'})
         end
+
+        include_examples 'it flags the account as modified'
       end
     end
 

data/spec/unit/configuration/setup_spec.rb

@@ -13,24 +13,28 @@ describe Imap::Backup::Configuration::Setup do
   end
 
   context '#run' do
-    let(:account1) { {:username => 'account@example.com'} }
-    let(:account) { double('Imap::Backup::Configuration::Account', :run => nil) }
-    let(:accounts) { [account1] }
+    let(:normal) { {:username => 'account@example.com'} }
+    let(:accounts) { [normal] }
     let(:store) do
       double(
         'Imap::Backup::Configuration::Store',
         :accounts => accounts,
         :path => '/base/path',
         :save => nil,
-        :debug? => false,
+        :debug? => debug,
+        :debug= => nil,
+        :modified? => modified,
       )
     end
+    let(:debug) { false }
+    let(:modified) { false }
 
     before :each do
       allow(Imap::Backup::Configuration::Store).to receive(:new).and_return(store)
+      allow(Imap::Backup).to receive(:setup_logging)
       @input, @output = prepare_highline
       allow(@input).to receive(:eof?).and_return(false)
-      allow(@input).to receive(:gets).and_return("q\n")
+      allow(@input).to receive(:gets).and_return("exit\n")
       allow(subject).to receive(:system)
     end
 
@@ -39,7 +43,7 @@ describe Imap::Backup::Configuration::Setup do
     context 'main menu' do
       before { subject.run }
 
-      %w(add\ account save\ and\ exit quit).each do |choice|
+      %w(add\ account save\ and\ exit exit\ without\ saving).each do |choice|
         it "includes #{choice}" do
           expect(@output.string).to include(choice)
         end
@@ -52,10 +56,36 @@ describe Imap::Backup::Configuration::Setup do
       expect(subject).to have_received(:system).with('clear')
     end
 
-    it 'should list accounts' do
+    it 'updates logging status' do
       subject.run
 
-      expect(@output.string).to match /account@example.com/
+      expect(Imap::Backup).to have_received(:setup_logging)
+    end
+
+    context 'listing' do
+      let(:accounts) { [normal, modified, deleted] }
+      let(:modified) { {:username => 'modified@example.com', :modified => true} }
+      let(:deleted) { {:username => 'deleted@example.com', :delete => true} }
+
+      before { subject.run }
+
+      context 'normal accounts' do
+        it 'are listed' do
+          expect(@output.string).to match /account@example.com/
+        end
+      end
+
+      context 'modified accounts' do
+        it 'are flagged' do
+          expect(@output.string).to match /modified@example.com \*/
+        end
+      end
+
+      context 'deleted accounts' do
+        it 'are hidden' do
+          expect(@output.string).to_not match /delete@example.com/
+        end
+      end
     end
 
     context 'adding accounts' do
@@ -67,9 +97,10 @@ describe Imap::Backup::Configuration::Setup do
           :folders => []
         }
       end
+      let(:account) { double('Imap::Backup::Configuration::Account', :run => nil) }
 
       before do
-        allow(@input).to receive(:gets).and_return("add\n", "q\n")
+        allow(@input).to receive(:gets).and_return("add\n", "exit\n")
         allow(Imap::Backup::Configuration::Asker).to receive(:email).with(no_args).and_return('new@example.com')
         allow(Imap::Backup::Configuration::Account).to receive(:new).with(store, blank_account, anything).and_return(account)
 
@@ -79,20 +110,101 @@ describe Imap::Backup::Configuration::Setup do
       it 'adds account data' do
         expect(accounts[1]).to eq(blank_account)
       end
+
+      it "doesn't flag the unedited account as modified" do
+        expect(accounts[1][:modified]).to be_nil
+      end
     end
 
-    it 'should save the configuration' do
-      allow(@input).to receive(:gets).and_return("save\n")
+    context 'logging' do
+      context 'when debug logging is disabled' do
+        before do
+          allow(@input).to receive(:gets).and_return("start\n", "exit\n")
+          subject.run
+        end
 
-      subject.run
+        it 'shows a menu item' do
+          expect(@output.string).to include('start logging')
+        end
+
+        context 'when selected' do
+          it 'sets the debug flag' do
+            expect(store).to have_received(:debug=).with(true)
+          end
+
+          it 'updates logging status' do
+            expect(Imap::Backup).to have_received(:setup_logging).twice
+          end
+        end
+      end
+
+      context 'when debug logging is enabled' do
+        let(:debug) { true }
+
+        before do
+          allow(@input).to receive(:gets).and_return("stop\n", "exit\n")
+          subject.run
+        end
+
+        it 'shows a menu item' do
+          expect(@output.string).to include('stop logging')
+        end
 
-      expect(store).to have_received(:save)
+        context 'when selected' do
+          before do
+            allow(@input).to receive(:gets).and_return("stop\n", "exit\n")
+          end
+
+          it 'unsets the debug flag' do
+            expect(store).to have_received(:debug=).with(false)
+          end
+
+          it 'updates logging status' do
+            expect(Imap::Backup).to have_received(:setup_logging).twice
+          end
+        end
+      end
     end
 
-    it 'should exit' do
-      allow(@input).to receive(:gets).and_return("quit\n")
+    context "when 'save' is selected" do
+      before do
+        allow(@input).to receive(:gets).and_return("save\n")
+        subject.run
+      end
 
-      subject.run
+      it 'exits' do
+        # N.B. this will hang forever if save does not cause an exit
+      end
+
+      it 'saves the configuration' do
+        expect(store).to have_received(:save)
+      end
+    end
+
+    context "when 'exit without saving' is selected" do
+      before do
+        allow(@input).to receive(:gets).and_return("exit\n")
+
+        subject.run
+      end
+
+      it 'exits' do
+        # N.B. this will hang forever if quit does not cause an exit
+      end
+
+      context 'when the configuration is modified' do
+        let(:modified) { true }
+
+        it "doesn't save the configuration" do
+          expect(store).to_not have_received(:save)
+        end
+      end
+
+      context "when the configuration isn't modified" do
+        it "doesn't save the configuration" do
+          expect(store).to_not have_received(:save)
+        end
+      end
     end
   end
 end

data/spec/unit/configuration/store_spec.rb

@@ -7,18 +7,22 @@ describe Imap::Backup::Configuration::Store do
   let(:file_path) { File.join(directory, '/config.json') }
   let(:file_exists) { true }
   let(:directory_exists) { true }
-  let(:data) { {:the => :config} }
+  let(:data) { {:debug => debug, :accounts => accounts} }
+  let(:debug) { true }
+  let(:accounts) { [] }
   let(:configuration) { data.to_json }
 
   before do
     stub_const('Imap::Backup::Configuration::Store::CONFIGURATION_DIRECTORY', directory)
     allow(File).to receive(:directory?).with(directory).and_return(directory_exists)
     allow(File).to receive(:exist?).with(file_path).and_return(file_exists)
+    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(:read).with(file_path).and_return(configuration)
-    allow(JSON).to receive(:parse).with(configuration, anything).and_return(data)
   end
 
-  context '.exist?' do
+  describe '.exist?' do
     [true, false].each do |exists|
       state = exists ? 'exists' : "doesn't exist"
       context "when the file #{state}" do
@@ -31,23 +35,103 @@ describe Imap::Backup::Configuration::Store do
     end
   end
 
-  context '#path' do
+  describe '#path' do
     it 'is the directory containing the configuration file' do
       expect(subject.path).to eq(directory)
     end
   end
 
-  context '#save' do
+  describe '#modified?' do
+    context "'with accounts flagged 'modified'" do
+      let(:accounts) { [{:name => 'foo', :modified => true}] }
+
+      it 'is true' do
+        expect(subject.modified?).to be_truthy
+      end
+    end
+
+    context "'with accounts flagged 'delete'" do
+      let(:accounts) { [{:name => 'foo', :delete => true}] }
+
+      it 'is true' do
+        expect(subject.modified?).to be_truthy
+      end
+    end
+
+    context "without accounts flagged 'modified'" do
+      let(:accounts) { [{:name => 'foo'}] }
+
+      it 'is false' do
+        expect(subject.modified?).to be_falsey
+      end
+    end
+  end
+
+  describe '#debug?' do
+    context 'when the debug flag is true' do
+      it 'is true' do
+        expect(subject.debug?).to be_truthy
+      end
+    end
+
+    context 'when the debug flag is false' do
+      let(:debug) { false }
+
+      it 'is false' do
+        expect(subject.debug?).to be_falsey
+      end
+    end
+
+    context 'when the debug flag is missing' do
+      let(:data) { {:accounts => accounts} }
+
+      it 'is false' do
+        expect(subject.debug?).to be_falsey
+      end
+    end
+
+    context 'when the debug flag is neither true nor false' do
+      let(:debug) { 'hi' }
+
+      it 'is false' do
+        expect(subject.debug?).to be_falsey
+      end
+    end
+  end
+
+  describe '#debug=' do
+    before { subject.debug = debug }
+
+    context 'when the supplied value is true' do
+      it 'sets the flag to true' do
+        expect(subject.debug?).to be_truthy
+      end
+    end
+
+    context 'when the supplied value is false' do
+      let(:debug) { false }
+
+      it 'sets the flag to false' do
+        expect(subject.debug?).to be_falsey
+      end
+    end
+
+    context 'when the supplied value is neither true nor false' do
+      let(:debug) { 'ciao' }
+
+      it 'sets the flag to false' do
+        expect(subject.debug?).to be_falsey
+      end
+    end
+  end
+
+  describe '#save' do
     let(:directory_exists) { false }
-    let(:file_exists) { false }
     let(:file) { double('File', :write => nil) }
 
     before do
       allow(FileUtils).to receive(:mkdir)
       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
@@ -66,10 +150,43 @@ describe Imap::Backup::Configuration::Store do
       expect(file).to have_received(:write).with('JSON output')
     end
 
-    it 'sets config perms to 0600' do
-      subject.save
+    context 'when accounts are modified' do
+      let(:accounts) { [{:name => 'foo', :modified => true}] }
+      
+      before { subject.save }
+
+      it "skips the 'modified' flag" do
+        expected = Marshal.load(Marshal.dump(data))
+        expected[:accounts][0].delete(:modified)
 
-      expect(FileUtils).to have_received(:chmod).with(0600, file_path)
+        expect(JSON).to have_received(:pretty_generate).with(expected)
+      end
+    end
+
+    context 'when accounts are to be deleted' do
+      let(:accounts) do
+        [
+          {:name => 'keep_me'},
+          {:name => 'delete_me', :delete => true},
+        ]
+      end
+
+      before { subject.save }
+
+      it 'does not save them' do
+        expected = Marshal.load(Marshal.dump(data))
+        expected[:accounts].pop
+
+        expect(JSON).to have_received(:pretty_generate).with(expected)
+      end
+    end
+
+    context 'when file permissions are too open' do
+      before { subject.save }
+
+      it 'sets them to 0600' do
+        expect(FileUtils).to have_received(:chmod).with(0600, file_path)
+      end
     end
 
     context 'if the configuration file is missing' do
@@ -95,68 +212,5 @@ describe Imap::Backup::Configuration::Store do
         end.to raise_error(RuntimeError, 'Error')
       end
     end
-
-    context 'saving accounts' do
-      let(:folders) { [{ :name => 'A folder' }] }
-      let(:data) do
-        {
-          :accounts => [
-            :local_path => '/my/backup/path',
-            :folders    => folders
-          ]
-        }
-      end
-      let(:file_exists) { true }
-      let(:a_folder_perms) { 0700 }
-
-      before do
-        allow(Imap::Backup::Utils).to receive(:check_permissions)
-        allow(File).to receive(:directory?).with('/my/backup/path').and_return(false)
-        allow(Imap::Backup::Utils).to receive(:stat).with('/my/backup/path').and_return(0700)
-        allow(File).to receive(:directory?).with('/my/backup/path/A folder').and_return(false)
-        allow(Imap::Backup::Utils).to receive(:stat).with('/my/backup/path/A folder').and_return(a_folder_perms)
-      end
-
-      it 'creates account directories' do
-        subject.save
-
-        expect(FileUtils).to have_received(:mkdir).with('/my/backup/path')
-      end
-
-      it 'creates folder directories' do
-        subject.save
-
-        expect(FileUtils).to have_received(:mkdir).with('/my/backup/path/A folder')
-      end
-
-      context 'when directory permissions are too open' do
-        let(:a_folder_perms) { 0755 }
-
-        it 'sets premissions' do
-          subject.save
-
-          expect(FileUtils).to have_received(:chmod).with(0700, '/my/backup/path/A folder')
-        end
-      end
-
-      context 'when folders have slashes' do
-        let(:directory_exists) { true }
-        let(:folders) { [{:name => 'folder/path'}] }
-
-        before do
-          allow(File).to receive(:directory?).with('/my/backup/path/folder').and_return(true)
-          allow(Imap::Backup::Utils).to receive(:stat).with('/my/backup/path/folder').and_return(0700)
-          allow(File).to receive(:directory?).with('/my/backup/path/folder/path').and_return(false)
-          allow(Imap::Backup::Utils).to receive(:stat).with('/my/backup/path/folder/path').and_return(0700)
-          allow(FileUtils).to receive(:mkdir)
-        end
-
-        it 'creates subdirectories' do
-          subject.save
-
-          expect(FileUtils).to have_received(:mkdir).with('/my/backup/path/folder/path')
-        end
-      end
-    end
   end
 end

data/spec/unit/serializer/mbox_spec.rb

@@ -49,7 +49,7 @@ describe Imap::Backup::Serializer::Mbox do
   end
 
   context 'instance methods' do
-    let(:ids) { %w(1 123) }
+    let(:ids) { %w(3 2 1) }
 
     before do
       allow(CSV).to receive(:foreach) { |&b| ids.each { |id| b.call [id] } }
@@ -58,8 +58,8 @@ describe Imap::Backup::Serializer::Mbox do
     subject { described_class.new(base_path, 'my/folder') }
 
     context '#uids' do
-      it 'returns the backed-up uids' do
-        expect(subject.uids).to eq(ids)
+      it 'returns the backed-up uids as sorted integers' do
+        expect(subject.uids).to eq(ids.map(&:to_i).sort)
       end
 
       context 'if the mbox does not exist' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,7 @@ files:
 - spec/gather_rspec_coverage.rb
 - spec/spec_helper.rb
 - spec/support/higline_test_helpers.rb
+- spec/support/shared_examples/account_flagging.rb
 - spec/support/silence_logging.rb
 - spec/unit/account/connection_spec.rb
 - spec/unit/account/folder_spec.rb
@@ -159,6 +160,7 @@ test_files:
 - spec/gather_rspec_coverage.rb
 - spec/spec_helper.rb
 - spec/support/higline_test_helpers.rb
+- spec/support/shared_examples/account_flagging.rb
 - spec/support/silence_logging.rb
 - spec/unit/account/connection_spec.rb
 - spec/unit/account/folder_spec.rb