imap-backup 4.0.2 → 4.0.3

data/spec/unit/imap/backup/account/folder_spec.rb

@@ -6,9 +6,9 @@ describe Imap::Backup::Account::Folder do
 
   subject { described_class.new(connection, FOLDER_NAME) }
 
-  let(:imap) do
+  let(:client) do
     instance_double(
-      Net::IMAP,
+      Imap::Backup::Client::Default,
       append: append_response,
       create: nil,
       examine: nil,
@@ -16,7 +16,7 @@ describe Imap::Backup::Account::Folder do
     )
   end
   let(:connection) do
-    instance_double(Imap::Backup::Account::Connection, imap: imap)
+    instance_double(Imap::Backup::Account::Connection, client: client)
   end
   let(:missing_mailbox_data) do
     OpenStruct.new(text: "Unknown Mailbox: #{FOLDER_NAME}")
@@ -31,7 +31,7 @@ describe Imap::Backup::Account::Folder do
   describe "#uids" do
     let(:uids) { [5678, 123] }
 
-    before { allow(imap).to receive(:uid_search) { uids } }
+    before { allow(client).to receive(:uid_search) { uids } }
 
     it "lists available messages" do
       expect(subject.uids).to eq(uids.reverse)
@@ -39,7 +39,7 @@ describe Imap::Backup::Account::Folder do
 
     context "with missing mailboxes" do
       before do
-        allow(imap).to receive(:examine).
+        allow(client).to receive(:examine).
           with(ENCODED_FOLDER_NAME).and_raise(missing_mailbox_error)
       end
 
@@ -54,7 +54,7 @@ describe Imap::Backup::Account::Folder do
       end
 
       before do
-        allow(imap).to receive(:examine).
+        allow(client).to receive(:examine).
           with(ENCODED_FOLDER_NAME).and_raise(missing_mailbox_error)
       end
 
@@ -66,19 +66,19 @@ describe Imap::Backup::Account::Folder do
 
   describe "#fetch" do
     let(:message_body) { instance_double(String, force_encoding: nil) }
-    let(:attributes) { {"RFC822" => message_body, "other" => "xxx"} }
+    let(:attributes) { {"BODY[]" => message_body, "other" => "xxx"} }
     let(:fetch_data_item) do
       instance_double(Net::IMAP::FetchData, attr: attributes)
     end
 
-    before { allow(imap).to receive(:uid_fetch) { [fetch_data_item] } }
+    before { allow(client).to receive(:uid_fetch) { [fetch_data_item] } }
 
     it "returns the message" do
-      expect(subject.fetch(123)).to eq(attributes)
+      expect(subject.fetch(123)).to eq(message_body)
     end
 
     context "when the server responds with nothing" do
-      before { allow(imap).to receive(:uid_fetch) { nil } }
+      before { allow(client).to receive(:uid_fetch) { nil } }
 
       it "is nil" do
         expect(subject.fetch(123)).to be_nil
@@ -87,7 +87,7 @@ describe Imap::Backup::Account::Folder do
 
     context "when the mailbox doesn't exist" do
       before do
-        allow(imap).to receive(:examine).
+        allow(client).to receive(:examine).
           with(ENCODED_FOLDER_NAME).and_raise(missing_mailbox_error)
       end
 
@@ -96,7 +96,7 @@ describe Imap::Backup::Account::Folder do
       end
     end
 
-    context "when the response doesn't have RFC822" do
+    context "when the response doesn't include 'BODY[]'" do
       let(:attributes) { {} }
 
       it "is nil" do
@@ -107,13 +107,13 @@ describe Imap::Backup::Account::Folder do
     context "when the first fetch_uid attempts fail" do
       before do
         outcomes = [-> { raise EOFError }, -> { [fetch_data_item] }]
-        allow(imap).to receive(:uid_fetch) { outcomes.shift.call }
+        allow(client).to receive(:uid_fetch) { outcomes.shift.call }
       end
 
       it "retries" do
         subject.fetch(123)
 
-        expect(imap).to have_received(:uid_fetch).twice
+        expect(client).to have_received(:uid_fetch).twice
       end
 
       it "succeeds" do
@@ -137,7 +137,7 @@ describe Imap::Backup::Account::Folder do
 
     context "when the folder doesn't exist" do
       before do
-        allow(imap).to receive(:examine).
+        allow(client).to receive(:examine).
           with(ENCODED_FOLDER_NAME).and_raise(missing_mailbox_error)
       end
 
@@ -150,7 +150,7 @@ describe Imap::Backup::Account::Folder do
   describe "#create" do
     context "when the folder exists" do
       it "is does not create the folder" do
-        expect(imap).to_not receive(:create)
+        expect(client).to_not receive(:create)
 
         subject.create
       end
@@ -158,18 +158,18 @@ describe Imap::Backup::Account::Folder do
 
     context "when the folder doesn't exist" do
       before do
-        allow(imap).to receive(:examine).
+        allow(client).to receive(:examine).
           with(ENCODED_FOLDER_NAME).and_raise(missing_mailbox_error)
       end
 
       it "creates the folder" do
-        expect(imap).to receive(:create)
+        expect(client).to receive(:create)
 
         subject.create
       end
 
       it "encodes the folder name" do
-        expect(imap).to receive(:create).with(ENCODED_FOLDER_NAME)
+        expect(client).to receive(:create).with(ENCODED_FOLDER_NAME)
 
         subject.create
       end
@@ -185,7 +185,7 @@ describe Imap::Backup::Account::Folder do
 
     context "when the folder doesn't exist" do
       before do
-        allow(imap).to receive(:examine).
+        allow(client).to receive(:examine).
           with(ENCODED_FOLDER_NAME).and_raise(missing_mailbox_error)
       end
 
@@ -211,13 +211,13 @@ describe Imap::Backup::Account::Folder do
     end
 
     it "appends the message" do
-      expect(imap).to receive(:append)
+      expect(client).to receive(:append)
 
       subject.append(message)
     end
 
     it "sets the date and time" do
-      expect(imap).to receive(:append).
+      expect(client).to receive(:append).
         with(anything, anything, anything, message_date)
 
       subject.append(message)

data/spec/unit/imap/backup/cli/utils_spec.rb

@@ -16,13 +16,13 @@ describe Imap::Backup::CLI::Utils do
       exist?: true,
       name: "name",
       uid_validity: "uid_validity",
-      uids: ["123", "456"]
+      uids: %w(123 456)
     )
   end
   let(:serializer) do
     instance_double(
       Imap::Backup::Serializer::Mbox,
-      uids: ["123", "789"],
+      uids: %w(123 789),
       apply_uid_validity: nil,
       save: nil
     )

data/spec/unit/imap/backup/client/default_spec.rb

@@ -0,0 +1,22 @@
+describe Imap::Backup::Client::Default do
+  subject { described_class.new("server", {}) }
+
+  let(:imap) { instance_double(Net::IMAP, list: imap_folders) }
+  let(:imap_folders) { [] }
+
+  before do
+    allow(Net::IMAP).to receive(:new) { imap }
+  end
+
+  describe "#list" do
+    context "with non-ASCII folder names" do
+      let(:imap_folders) do
+        [instance_double(Net::IMAP::MailboxList, name: "Gel&APY-scht")]
+      end
+
+      it "converts them to UTF-8" do
+        expect(subject.list).to eq(["Gelöscht"])
+      end
+    end
+  end
+end

data/spec/unit/imap/backup/configuration/connection_tester_spec.rb

@@ -1,7 +1,7 @@
 describe Imap::Backup::Configuration::ConnectionTester do
   describe ".test" do
     let(:connection) do
-      instance_double(Imap::Backup::Account::Connection, imap: nil)
+      instance_double(Imap::Backup::Account::Connection, client: nil)
     end
 
     before do
@@ -10,7 +10,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
 
     describe "call" do
       it "tries to connect" do
-        expect(connection).to receive(:imap)
+        expect(connection).to receive(:client)
 
         subject.test("foo")
       end
@@ -24,7 +24,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
 
     describe "failure" do
       before do
-        allow(connection).to receive(:imap).and_raise(error)
+        allow(connection).to receive(:client).and_raise(error)
       end
 
       context "with no connection" do

data/spec/unit/imap/backup/configuration/store_spec.rb

@@ -1,4 +1,5 @@
 require "json"
+require "os"
 
 # rubocop:disable RSpec/PredicateMatcher
 
@@ -189,10 +190,16 @@ describe Imap::Backup::Configuration::Store do
     end
 
     context "when file permissions are too open" do
-      it "sets them to 0600" do
-        expect(FileUtils).to receive(:chmod).with(0o600, file_path)
+      context "when on UNIX" do
+        before do
+          allow(OS).to receive(:windows?) { false }
+        end
 
-        subject.save
+        it "sets them to 0600" do
+          expect(FileUtils).to receive(:chmod).with(0o600, file_path)
+
+          subject.save
+        end
       end
     end
 
@@ -206,18 +213,24 @@ describe Imap::Backup::Configuration::Store do
       end
     end
 
-    context "when the config file permissions are too lax" do
-      let(:file_exists) { true }
-
+    context "when on UNIX" do
       before do
-        allow(Imap::Backup::Utils).to receive(:check_permissions).
-          with(file_path, 0o600).and_raise("Error")
+        allow(OS).to receive(:windows?) { false }
       end
 
-      it "fails" do
-        expect do
-          subject.save
-        end.to raise_error(RuntimeError, "Error")
+      context "when 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, 0o600).and_raise("Error")
+        end
+
+        it "fails" do
+          expect do
+            subject.save
+          end.to raise_error(RuntimeError, "Error")
+        end
       end
     end
   end

data/spec/unit/imap/backup/downloader_spec.rb

@@ -3,11 +3,10 @@ describe Imap::Backup::Downloader do
     subject { described_class.new(folder, serializer) }
 
     let(:body) { "blah" }
-    let(:message) { {"RFC822" => body} }
     let(:folder) do
       instance_double(
         Imap::Backup::Account::Folder,
-        fetch: message,
+        fetch: body,
         name: "folder",
         uids: folder_uids
       )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +181,10 @@ files:
 - imap-backup.gemspec
 - lib/email/mboxrd/message.rb
 - lib/email/provider.rb
+- lib/email/provider/apple_mail.rb
+- lib/email/provider/default.rb
+- lib/email/provider/fastmail.rb
+- lib/email/provider/gmail.rb
 - lib/imap/backup.rb
 - lib/imap/backup/account/connection.rb
 - lib/imap/backup/account/folder.rb
@@ -179,6 +197,8 @@ files:
 - lib/imap/backup/cli/setup.rb
 - lib/imap/backup/cli/status.rb
 - lib/imap/backup/cli/utils.rb
+- lib/imap/backup/client/apple_mail.rb
+- lib/imap/backup/client/default.rb
 - lib/imap/backup/configuration/account.rb
 - lib/imap/backup/configuration/asker.rb
 - lib/imap/backup/configuration/connection_tester.rb
@@ -197,11 +217,12 @@ files:
 - lib/imap/backup/version.rb
 - lib/retry_on_error.rb
 - lib/thunderbird.rb
+- lib/thunderbird/install.rb
 - lib/thunderbird/local_folder.rb
-- lib/thunderbird/local_folder_placeholder.rb
-- lib/thunderbird/mailbox.rb
 - lib/thunderbird/profile.rb
 - lib/thunderbird/profiles.rb
+- lib/thunderbird/subdirectory.rb
+- lib/thunderbird/subdirectory_placeholder.rb
 - spec/features/backup_spec.rb
 - spec/features/helper.rb
 - spec/features/restore_spec.rb
@@ -217,11 +238,16 @@ files:
 - spec/support/shared_examples/account_flagging.rb
 - spec/support/silence_logging.rb
 - spec/unit/email/mboxrd/message_spec.rb
+- spec/unit/email/provider/apple_mail_spec.rb
+- spec/unit/email/provider/default_spec.rb
+- spec/unit/email/provider/fastmail_spec.rb
+- spec/unit/email/provider/gmail_spec.rb
 - spec/unit/email/provider_spec.rb
 - spec/unit/imap/backup/account/connection_spec.rb
 - spec/unit/imap/backup/account/folder_spec.rb
 - spec/unit/imap/backup/cli/local_spec.rb
 - spec/unit/imap/backup/cli/utils_spec.rb
+- spec/unit/imap/backup/client/default_spec.rb
 - spec/unit/imap/backup/configuration/account_spec.rb
 - spec/unit/imap/backup/configuration/asker_spec.rb
 - spec/unit/imap/backup/configuration/connection_tester_spec.rb
@@ -255,42 +281,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Backup GMail (or other IMAP) accounts to disk
 test_files:
 - spec/spec_helper.rb
-- spec/fixtures/connection.yml
-- spec/unit/email/provider_spec.rb
-- spec/unit/email/mboxrd/message_spec.rb
 - spec/unit/imap/backup_spec.rb
-- spec/unit/imap/backup/cli/utils_spec.rb
-- spec/unit/imap/backup/cli/local_spec.rb
-- spec/unit/imap/backup/utils_spec.rb
-- spec/unit/imap/backup/downloader_spec.rb
-- spec/unit/imap/backup/configuration/store_spec.rb
+- spec/unit/imap/backup/configuration/account_spec.rb
+- spec/unit/imap/backup/configuration/list_spec.rb
 - spec/unit/imap/backup/configuration/connection_tester_spec.rb
-- spec/unit/imap/backup/configuration/asker_spec.rb
 - spec/unit/imap/backup/configuration/setup_spec.rb
+- spec/unit/imap/backup/configuration/asker_spec.rb
 - spec/unit/imap/backup/configuration/folder_chooser_spec.rb
-- spec/unit/imap/backup/configuration/account_spec.rb
-- spec/unit/imap/backup/configuration/list_spec.rb
-- spec/unit/imap/backup/account/folder_spec.rb
-- spec/unit/imap/backup/account/connection_spec.rb
+- spec/unit/imap/backup/configuration/store_spec.rb
 - spec/unit/imap/backup/serializer/mbox_spec.rb
 - spec/unit/imap/backup/serializer/mbox_store_spec.rb
 - spec/unit/imap/backup/serializer/mbox_enumerator_spec.rb
+- spec/unit/imap/backup/cli/utils_spec.rb
+- spec/unit/imap/backup/cli/local_spec.rb
+- spec/unit/imap/backup/downloader_spec.rb
 - spec/unit/imap/backup/uploader_spec.rb
-- spec/support/fixtures.rb
-- spec/support/shared_examples/account_flagging.rb
-- spec/support/higline_test_helpers.rb
-- spec/support/silence_logging.rb
-- spec/gather_rspec_coverage.rb
+- spec/unit/imap/backup/account/folder_spec.rb
+- spec/unit/imap/backup/account/connection_spec.rb
+- spec/unit/imap/backup/utils_spec.rb
+- spec/unit/imap/backup/client/default_spec.rb
+- spec/unit/email/mboxrd/message_spec.rb
+- spec/unit/email/provider/gmail_spec.rb
+- spec/unit/email/provider/default_spec.rb
+- spec/unit/email/provider/apple_mail_spec.rb
+- spec/unit/email/provider/fastmail_spec.rb
+- spec/unit/email/provider_spec.rb
 - spec/features/backup_spec.rb
 - spec/features/helper.rb
+- spec/features/restore_spec.rb
+- spec/features/support/email_server.rb
 - spec/features/support/backup_directory.rb
-- spec/features/support/shared/message_fixtures.rb
 - spec/features/support/shared/connection_context.rb
-- spec/features/support/email_server.rb
-- spec/features/restore_spec.rb
+- spec/features/support/shared/message_fixtures.rb
+- spec/support/fixtures.rb
+- spec/support/silence_logging.rb
+- spec/support/higline_test_helpers.rb
+- spec/support/shared_examples/account_flagging.rb
+- spec/fixtures/connection.yml
+- spec/gather_rspec_coverage.rb

data/lib/thunderbird/mailbox.rb

@@ -1,25 +0,0 @@
-class Thunderbird::Mailbox
-  attr_reader :local_folder
-  attr_reader :name
-
-  def initialize(local_folder, name)
-    @local_folder = local_folder
-    @name = name
-  end
-
-  def path
-    File.join(local_folder.full_path, name)
-  end
-
-  def exists?
-    File.exists?(path)
-  end
-
-  def msf_path
-    path + ".msf"
-  end
-
-  def msf_exists?
-    File.exists?(msf_path)
-  end
-end