imap-backup 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41b597de5360d295f1e974e5014c7b8004749298b4332db083aea95e5aa0815a
-  data.tar.gz: 95da2ebb094473eae711c85b177b6beb10153cfb1f3074942165599f40d54f63
+  metadata.gz: 78b548972cde69ce86be3d23e21dd973730f414b90e5fd0526fd94c2852dc031
+  data.tar.gz: d83b2679e25bea24837b3474ce53c5dede5e90e3611b4c2e7374930dc531aa20
 SHA512:
-  metadata.gz: 063bcef552b10a3cdff22d7c92346466533bea168b37d258db4277fe8165edb38967194933b5fd1d17cc5a245f721bcd14201f3f6e604092a39ea17fd4002978
-  data.tar.gz: 9121fda4183536a3a9856ad9fc6e0c1a416d31b44b5dc5e88cb884e3c843cfb668754d2a30fb024399c35aa0137d66ec2143cc2eb5df075b3445120348ae6fd9
+  metadata.gz: 419aa2779f25fdb7d34d50b8931a7c77118042082bad3e8d4dcc94a0b5b0a9084d20a684bfe8b8e8b6820f134e3e4f6a3ec0e1d185ad53eb6ccb6ec718f97371
+  data.tar.gz: 90a2a552949b4977acd5bbe920de73ac2f39a20bd3c7656dbac1000176d7457c7969305334d9be7e8d3ec8075f292dbbff2901246022dd5e51d65104e507c8df

data/README.md

@@ -212,6 +212,12 @@ $ rake
 
 To exclude Docker-based tests:
 
+```sh
+rake no-docker
+```
+
+or
+
 ```sh
 $ rspec --tag ~docker
 ```

data/Rakefile

@@ -6,6 +6,12 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = "spec/**/*_spec.rb"
 end
 
+desc "Run RSpec examples, excluding ones relying on Docker IMAP"
+RSpec::Core::RakeTask.new("no-docker") do |t|
+  t.pattern = "spec/**/*_spec.rb"
+  t.rspec_opts = "--tag ~docker"
+end
+
 RuboCop::RakeTask.new
 
 task default: :spec

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

@@ -26,8 +26,20 @@ module Imap::Backup
     def run
       Kernel.system("clear")
       Kernel.puts BANNER
-      @client_id = highline.ask("client_id: ")
-      @client_secret = highline.ask("client_secret: ")
+
+      keep = if token.valid?
+        highline.agree("Use existing client info?")
+      else
+        false
+      end
+
+      if keep
+        @client_id = token.client_id
+        @client_secret = token.client_secret
+      else
+        @client_id = highline.ask("client_id: ")
+        @client_secret = highline.ask("client_secret: ")
+      end
 
       Kernel.puts <<~MESSAGE
 
@@ -46,9 +58,9 @@ module Imap::Backup
 
       raise "Failed" if !@credentials
 
-      token = JSON.parse(token_store.load(email))
-      token["client_secret"] = client_secret
-      token.to_json
+      new_token = JSON.parse(token_store.load(email))
+      new_token["client_secret"] = client_secret
+      new_token.to_json
     end
 
     private
@@ -57,6 +69,14 @@ module Imap::Backup
       account[:username]
     end
 
+    def password
+      account[:password]
+    end
+
+    def token
+      @token ||= Gmail::Authenticator::ImapBackupToken.new(password)
+    end
+
     def highline
       Configuration::Setup.highline
     end

data/lib/imap/backup/version.rb

@@ -2,8 +2,8 @@ module Imap; end
 
 module Imap::Backup
   MAJOR    = 3
-  MINOR    = 2
-  REVISION = 1
+  MINOR    = 3
+  REVISION = 0
   PRE      = nil
   VERSION  = [MAJOR, MINOR, REVISION, PRE].compact.map(&:to_s).join(".")
 end

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

@@ -1,6 +1,9 @@
 describe Imap::Backup::Configuration::GmailOauth2 do
   include HighLineTestHelpers
 
+  CLIENT_ID = "my_client_id".freeze
+  CLIENT_SECRET = "my_client_secret".freeze
+
   subject { described_class.new(account) }
 
   let(:authorization_url) { "some long authorization_url" }
@@ -11,6 +14,7 @@ describe Imap::Backup::Configuration::GmailOauth2 do
   let(:input) { highline_streams[0] }
   let(:output) { highline_streams[1] }
   let(:account) { {} }
+  let(:user_input) { %W(my_client_id\n my_secret\n my_code\n) }
 
   let(:authorizer) do
     instance_double(
@@ -25,23 +29,31 @@ describe Imap::Backup::Configuration::GmailOauth2 do
       load: json_token
     )
   end
+  let(:token) do
+    instance_double(
+      Gmail::Authenticator::ImapBackupToken,
+      valid?: valid,
+      client_id: CLIENT_ID,
+      client_secret: CLIENT_SECRET
+    )
+  end
+  let(:valid) { false }
 
   before do
     allow(Google::Auth::UserAuthorizer).
       to receive(:new) { authorizer }
     allow(Google::Auth::Stores::InMemoryTokenStore).
       to receive(:new) { token_store }
+    allow(Gmail::Authenticator::ImapBackupToken).
+      to receive(:new) { token }
 
     allow(highline).to receive(:ask).and_call_original
+    allow(highline).to receive(:agree).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"
-    )
+    allow(input).to receive(:gets).and_return(*user_input)
   end
 
   describe "#run" do
@@ -80,5 +92,30 @@ describe Imap::Backup::Configuration::GmailOauth2 do
     it "includes the client_secret in the credentials" do
       expect(result).to match('"client_secret":"my_secret"')
     end
+
+    context "when the account already has client info" do
+      let(:valid) { true }
+      let(:user_input) { %W(yes\n) }
+
+      it "requests confirmation of client info" do
+        expect(highline).to have_received(:agree).with("Use existing client info?")
+      end
+
+      context "when yhe user says 'no'" do
+        let(:user_input) { %W(no\n) }
+
+        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 "requests the success code" do
+          expect(highline).to have_received(:ask).with("success code: ")
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gmail_xoauth