imap-backup 2.1.1 → 3.0.0

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

@@ -2,7 +2,9 @@ describe Imap::Backup::Uploader do
   subject { described_class.new(folder, serializer) }
 
   let(:folder) do
-    instance_double(Imap::Backup::Account::Folder, uids: [2, 3], append: 99)
+    instance_double(
+      Imap::Backup::Account::Folder, uids: [2, 3], append: 99, name: "foo"
+    )
   end
   let(:serializer) do
     instance_double(
@@ -11,27 +13,41 @@ describe Imap::Backup::Uploader do
       update_uid: nil
     )
   end
+  let(:missing_message) do
+    instance_double(Email::Mboxrd::Message, supplied_body: "missing message")
+  end
+  let(:existing_message) do
+    instance_double(Email::Mboxrd::Message, supplied_body: "existing message")
+  end
+
+  def message_enumerator
+    yield [1, missing_message]
+  end
 
   describe "#run" do
     before do
-      allow(serializer).to receive(:load).with(1) { "missing message" }
-      allow(serializer).to receive(:load).with(2) { "existing message" }
-      subject.run
+      allow(serializer).to receive(:each_message).and_return(enum_for(:message_enumerator))
     end
 
     context "with messages that are missing" do
       it "restores them" do
-        expect(folder).to have_received(:append).with("missing message")
+        expect(folder).to receive(:append).with(missing_message)
+
+        subject.run
       end
 
       it "updates the local message id" do
-        expect(serializer).to have_received(:update_uid).with(1, 99)
+        expect(serializer).to receive(:update_uid).with(1, 99)
+
+        subject.run
       end
     end
 
     context "with messages that are present on server" do
       it "does nothing" do
-        expect(folder).to_not have_received(:append).with("existing message")
+        expect(folder).to_not receive(:append).with(existing_message)
+
+        subject.run
       end
     end
   end

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

@@ -5,13 +5,14 @@ describe Imap::Backup::Utils do
   let(:exists) { true }
 
   before do
-    allow(File).to receive(:stat).and_return(stat)
-    allow(File).to receive(:exist?).with(filename).and_return(exists)
+    allow(File).to receive(:stat) { stat }
+    allow(File).to receive(:exist?).with(filename) { exists }
   end
 
   describe ".check_permissions" do
     let(:requested) { 0o345 }
 
+    # rubocop:disable RSpec/EmptyExampleGroup
     context "with existing files" do
       [
         [0o100, "less than the limit", true],
@@ -36,6 +37,7 @@ describe Imap::Backup::Utils do
         end
       end
     end
+    # rubocop:enable RSpec/EmptyExampleGroup
 
     context "with non-existent files" do
       let(:exists) { false }
@@ -72,22 +74,21 @@ describe Imap::Backup::Utils do
     end
 
     it "does nothing if an empty path is supplied" do
-      described_class.make_folder("aaa", "", 0o222)
+      expect(FileUtils).to_not receive(:mkdir_p)
 
-      expect(FileUtils).to_not have_received(:mkdir_p)
+      described_class.make_folder("aaa", "", 0o222)
     end
 
     it "creates the path" do
-      described_class.make_folder("/base/path", "new/folder", 0o222)
+      expect(FileUtils).to receive(:mkdir_p).with("/base/path/new/folder")
 
-      expect(FileUtils).to have_received(:mkdir_p).with("/base/path/new/folder")
+      described_class.make_folder("/base/path", "new/folder", 0o222)
     end
 
     it "sets permissions on the path" do
-      described_class.make_folder("/base/path/new", "folder", 0o222)
+      expect(FileUtils).to receive(:chmod).with(0o222, "/base/path/new/folder")
 
-      expect(FileUtils).
-        to have_received(:chmod).with(0o222, "/base/path/new/folder")
+      described_class.make_folder("/base/path/new", "folder", 0o222)
     end
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gmail_xoauth
+  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: googleauth
+  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: highline
   requirement: !ruby/object:Gem::Requirement
@@ -142,10 +170,38 @@ files:
 - Rakefile
 - bin/imap-backup
 - docker-compose.yml
+- docs/01-credentials-screen.png
+- docs/02-new-project.png
+- docs/03-initial-credentials-for-project.png
+- docs/04-credential-type-selection.png
+- docs/05-cant-create-without-consent-setup.png
+- docs/06-user-type-selection.png
+- docs/07-consent-screen-form.png
+- docs/08-app-scopes.png
+- docs/09-scope-selection.png
+- docs/10-updated-app-scopes.png
+- docs/11-test-users.png
+- docs/12-add-users.png
+- docs/13-create-oauth-client.png
+- docs/14-application-details.png
+- docs/16-initial-menu.png
+- docs/17-inputting-the-email-address.png
+- docs/18-choose-password.png
+- docs/19-supply-client-info.png
+- docs/20-choose-gmail-account.png
+- docs/21-accept-warnings.png
+- docs/22-grant-access.png
+- docs/24-confirm-choices.png
+- docs/25-success-code.png
+- docs/26-type-code-into-imap-backup.png
+- docs/27-success.png
 - docs/docker-imap.md
+- docs/setting-up-gmail.md
 - imap-backup.gemspec
 - lib/email/mboxrd/message.rb
 - lib/email/provider.rb
+- lib/gmail/authenticator.rb
+- lib/google/auth/stores/in_memory_token_store.rb
 - lib/imap/backup.rb
 - lib/imap/backup/account/connection.rb
 - lib/imap/backup/account/folder.rb
@@ -153,6 +209,7 @@ files:
 - lib/imap/backup/configuration/asker.rb
 - lib/imap/backup/configuration/connection_tester.rb
 - lib/imap/backup/configuration/folder_chooser.rb
+- lib/imap/backup/configuration/gmail_oauth2.rb
 - lib/imap/backup/configuration/list.rb
 - lib/imap/backup/configuration/setup.rb
 - lib/imap/backup/configuration/store.rb
@@ -180,12 +237,15 @@ files:
 - spec/support/silence_logging.rb
 - spec/unit/email/mboxrd/message_spec.rb
 - spec/unit/email/provider_spec.rb
+- spec/unit/gmail/authenticator_spec.rb
+- spec/unit/google/auth/stores/in_memory_token_store_spec.rb
 - spec/unit/imap/backup/account/connection_spec.rb
 - spec/unit/imap/backup/account/folder_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
 - spec/unit/imap/backup/configuration/folder_chooser_spec.rb
+- spec/unit/imap/backup/configuration/gmail_oauth2_spec.rb
 - spec/unit/imap/backup/configuration/list_spec.rb
 - spec/unit/imap/backup/configuration/setup_spec.rb
 - spec/unit/imap/backup/configuration/store_spec.rb
@@ -200,11 +260,7 @@ files:
 homepage: https://github.com/joeyates/imap-backup
 licenses: []
 metadata: {}
-post_install_message: |
-  Note that, when upgrading imap-backup from version 1.x to 2.x,
-  the metadata storage method has changed (from flat file to JSON).
-   As a result, on the first run after an upgrade, old backup folders will be
-  **deleted** and a full new backup created.
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -212,14 +268,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Backup GMail (or other IMAP) accounts to disk
@@ -240,12 +296,15 @@ test_files:
 - spec/support/silence_logging.rb
 - spec/unit/email/mboxrd/message_spec.rb
 - spec/unit/email/provider_spec.rb
+- spec/unit/gmail/authenticator_spec.rb
+- spec/unit/google/auth/stores/in_memory_token_store_spec.rb
 - spec/unit/imap/backup/account/connection_spec.rb
 - spec/unit/imap/backup/account/folder_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
 - spec/unit/imap/backup/configuration/folder_chooser_spec.rb
+- spec/unit/imap/backup/configuration/gmail_oauth2_spec.rb
 - spec/unit/imap/backup/configuration/list_spec.rb
 - spec/unit/imap/backup/configuration/setup_spec.rb
 - spec/unit/imap/backup/configuration/store_spec.rb