imap-backup 2.2.2 → 3.2.1

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

@@ -6,11 +6,11 @@ describe Imap::Backup::Configuration::FolderChooser do
 
     let(:connection) do
       instance_double(
-        Imap::Backup::Account::Connection, folders: remote_folders
+        Imap::Backup::Account::Connection, folders: connection_folders
       )
     end
     let(:account) { {folders: []} }
-    let(:remote_folders) { [] }
+    let(:connection_folders) { [] }
     let!(:highline_streams) { prepare_highline }
     let(:input) { highline_streams[0] }
     let(:output) { highline_streams[1] }
@@ -37,15 +37,9 @@ describe Imap::Backup::Configuration::FolderChooser do
 
     describe "folder listing" do
       let(:account) { {folders: [{name: "my_folder"}]} }
-      let(:remote_folders) do
-        # this one is already backed up:
-        folder1 = instance_double(
-          Imap::Backup::Account::Folder, name: "my_folder"
-        )
-        folder2 = instance_double(
-          Imap::Backup::Account::Folder, name: "another_folder"
-        )
-        [folder1, folder2]
+      let(:connection_folders) do
+        # N.B. my_folder is already backed up
+        %w(my_folder another_folder)
       end
 
       describe "display" do
@@ -93,7 +87,7 @@ describe Imap::Backup::Configuration::FolderChooser do
       let(:account) do
         {folders: [{name: "on_server"}, {name: "not_on_server"}]}
       end
-      let(:remote_folders) do
+      let(:connection_folders) do
         [
           instance_double(Imap::Backup::Account::Folder, name: "on_server")
         ]
@@ -112,7 +106,7 @@ describe Imap::Backup::Configuration::FolderChooser do
     end
 
     context "when folders are not available" do
-      let(:remote_folders) { nil }
+      let(:connection_folders) { nil }
 
       before do
         allow(Imap::Backup::Configuration::Setup.highline).

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

@@ -0,0 +1,84 @@
+describe Imap::Backup::Configuration::GmailOauth2 do
+  include HighLineTestHelpers
+
+  subject { described_class.new(account) }
+
+  let(:authorization_url) { "some long authorization_url" }
+  let(:credentials) { "credentials" }
+  let(:json_token) { '{"sentinel":"foo"}' }
+  let!(:highline_streams) { prepare_highline }
+  let(:highline) { Imap::Backup::Configuration::Setup.highline }
+  let(:input) { highline_streams[0] }
+  let(:output) { highline_streams[1] }
+  let(:account) { {} }
+
+  let(:authorizer) do
+    instance_double(
+      Google::Auth::UserAuthorizer,
+      get_authorization_url: authorization_url,
+      get_and_store_credentials_from_code: credentials
+    )
+  end
+  let(:token_store) do
+    instance_double(
+      Google::Auth::Stores::InMemoryTokenStore,
+      load: json_token
+    )
+  end
+
+  before do
+    allow(Google::Auth::UserAuthorizer).
+      to receive(:new) { authorizer }
+    allow(Google::Auth::Stores::InMemoryTokenStore).
+      to receive(:new) { token_store }
+
+    allow(highline).to receive(:ask).and_call_original
+
+    allow(Kernel).to receive(:system)
+    allow(Kernel).to receive(:puts)
+
+    allow(input).to receive(:gets).and_return(
+      "my_client_id\n",
+      "my_secret\n",
+      "my_code\n"
+    )
+  end
+
+  describe "#run" do
+    let!(:result) { subject.run }
+
+    it "clears the screen" do
+      expect(Kernel).to have_received(:system).with("clear")
+    end
+
+    it "requests client_id" do
+      expect(highline).to have_received(:ask).with("client_id: ")
+    end
+
+    it "requests client_secret" do
+      expect(highline).to have_received(:ask).with("client_secret: ")
+    end
+
+    it "displays the authorization URL" do
+      expect(Kernel).
+        to have_received(:puts).
+        with(/#{authorization_url}/)
+    end
+
+    it "requests the success code" do
+      expect(highline).to have_received(:ask).with("success code: ")
+    end
+
+    it "requests an access_token via the code" do
+      expect(authorizer).to have_received(:get_and_store_credentials_from_code)
+    end
+
+    it "returns the credentials" do
+      expect(result).to match('"sentinel":"foo"')
+    end
+
+    it "includes the client_secret in the credentials" do
+      expect(result).to match('"client_secret":"my_secret"')
+    end
+  end
+end

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

@@ -1,8 +1,28 @@
-# rubocop:disable RSpec/NestedGroups
-
 describe Imap::Backup::Configuration::Setup do
   include HighLineTestHelpers
 
+  subject { described_class.new }
+
+  let(:normal) { {username: "account@example.com"} }
+  let(:accounts) { [normal] }
+  let(:store) do
+    instance_double(
+      Imap::Backup::Configuration::Store,
+      "accounts": accounts,
+      "path": "/base/path",
+      "save": nil,
+      "debug?": debug,
+      "debug=": nil,
+      "modified?": modified
+    )
+  end
+  let(:debug) { false }
+  let(:modified) { false }
+  let!(:highline_streams) { prepare_highline }
+  let(:input) { highline_streams[0] }
+  let(:output) { highline_streams[1] }
+  let(:gmail_imap_server) { "imap.gmail.com" }
+
   describe "#initialize" do
     context "without a config file" do
       it "works" do
@@ -12,27 +32,6 @@ describe Imap::Backup::Configuration::Setup do
   end
 
   describe "#run" do
-    subject { described_class.new }
-
-    let(:normal) { {username: "account@example.com"} }
-    let(:accounts) { [normal] }
-    let(:store) do
-      instance_double(
-        Imap::Backup::Configuration::Store,
-        "accounts": accounts,
-        "path": "/base/path",
-        "save": nil,
-        "debug?": debug,
-        "debug=": nil,
-        "modified?": modified
-      )
-    end
-    let(:debug) { false }
-    let(:modified) { false }
-    let!(:highline_streams) { prepare_highline }
-    let(:input) { highline_streams[0] }
-    let(:output) { highline_streams[1] }
-
     before do
       allow(Imap::Backup::Configuration::Store).to receive(:new) { store }
       allow(Imap::Backup).to receive(:setup_logging)
@@ -112,28 +111,51 @@ describe Imap::Backup::Configuration::Setup do
     context "when adding accounts" do
       let(:blank_account) do
         {
-          username: "new@example.com",
+          username: added_email,
           password: "",
-          local_path: "/base/path/new_example.com",
+          local_path: local_path,
           folders: []
         }
       end
       let(:account) do
         instance_double(Imap::Backup::Configuration::Account, run: nil)
       end
+      let(:added_email) { "new@example.com" }
+      let(:local_path) { "/base/path/new_example.com" }
 
       before do
         allow(input).to receive(:gets).and_return("add\n", "exit\n")
         allow(Imap::Backup::Configuration::Asker).to receive(:email).
-          with(no_args) { "new@example.com" }
+          with(no_args) { added_email }
         allow(Imap::Backup::Configuration::Account).to receive(:new).
-          with(store, blank_account, anything) { account }
+          with(store, anything, anything) { account }
 
         subject.run
       end
 
-      it "adds account data" do
-        expect(accounts[1]).to eq(blank_account)
+      it "sets username" do
+        expect(accounts[1][:username]).to eq(added_email)
+      end
+
+      it "sets blank password" do
+        expect(accounts[1][:password]).to eq("")
+      end
+
+      it "sets local_path" do
+        expect(accounts[1][:local_path]).to eq(local_path)
+      end
+
+      it "sets folders" do
+        expect(accounts[1][:folders]).to eq([])
+      end
+
+      context "when the account is a GMail account" do
+        let(:added_email) { "new@gmail.com" }
+        let(:local_path) { "/base/path/new_gmail.com" }
+
+        it "sets the server" do
+          expect(accounts[1][:server]).to eq(gmail_imap_server)
+        end
       end
 
       it "doesn't flag the unedited account as modified" do
@@ -248,5 +270,3 @@ describe Imap::Backup::Configuration::Setup do
     end
   end
 end
-
-# rubocop:enable RSpec/NestedGroups

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.2.1
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2021-02-17 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
@@ -94,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  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: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,22 +172,50 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rspec-all"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - 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 +223,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
@@ -164,6 +235,7 @@ files:
 - lib/imap/backup/uploader.rb
 - lib/imap/backup/utils.rb
 - lib/imap/backup/version.rb
+- lib/retry_on_error.rb
 - spec/features/backup_spec.rb
 - spec/features/helper.rb
 - spec/features/restore_spec.rb
@@ -180,12 +252,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 +275,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
@@ -219,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Backup GMail (or other IMAP) accounts to disk
@@ -240,12 +311,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

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-
-services:
-  - docker
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - jruby-19mode
-
-branches:
-  only:
-    - master
-
-before_install:
-  - gem update --system
-  - gem update bundler
-
-script:
-  - docker pull antespi/docker-imap-devel:latest
-  - docker run -d --env MAIL_ADDRESS=address@example.org --env MAIL_PASS=pass --env MAILNAME=example.org --publish 8993:993 antespi/docker-imap-devel:latest
-  - sleep 10
-  - bundle exec rake