imap-backup 4.0.7 → 4.1.1

data/spec/unit/imap/backup/{configuration/store_spec.rb → configuration_spec.rb}

@@ -3,7 +3,7 @@ require "os"
 
 # rubocop:disable RSpec/PredicateMatcher
 
-describe Imap::Backup::Configuration::Store do
+describe Imap::Backup::Configuration do
   let(:directory) { "/base/path" }
   let(:file_path) { File.join(directory, "/config.json") }
   let(:file_exists) { true }
@@ -17,7 +17,7 @@ describe Imap::Backup::Configuration::Store do
 
   before do
     stub_const(
-      "Imap::Backup::Configuration::Store::CONFIGURATION_DIRECTORY", directory
+      "Imap::Backup::Configuration::CONFIGURATION_DIRECTORY", directory
     )
     allow(File).to receive(:directory?).with(directory) { directory_exists }
     allow(File).to receive(:exist?).and_call_original

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

@@ -6,7 +6,7 @@ describe Imap::Backup::Downloader do
     let(:folder) do
       instance_double(
         Imap::Backup::Account::Folder,
-        fetch: body,
+        fetch_multi: [{uid: "111", body: body}],
         name: "folder",
         uids: folder_uids
       )

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

@@ -0,0 +1,48 @@
+require "net/imap"
+
+module Imap::Backup
+  describe Logger do
+    describe ".setup_logging" do
+      let(:config) { instance_double(Configuration, debug?: debug) }
+
+      around do |example|
+        logger_previous = described_class.logger.level
+        net_imap_previous = Net::IMAP.debug
+        described_class.logger.level = 42
+        Net::IMAP.debug = 42
+        example.run
+        Net::IMAP.debug = net_imap_previous
+        described_class.logger.level = logger_previous
+      end
+
+      before do
+        allow(Configuration).to receive(:new) { config }
+        described_class.setup_logging
+      end
+
+      context "when config.debug?" do
+        let(:debug) { true }
+
+        it "sets logger level to debug" do
+          expect(described_class.logger.level).to eq(::Logger::Severity::DEBUG)
+        end
+
+        it "sets the Net::IMAP debug flag" do
+          expect(Net::IMAP.debug).to be_a(TrueClass)
+        end
+      end
+
+      context "when not config.debug?" do
+        let(:debug) { false }
+
+        it "sets logger level to error" do
+          expect(described_class.logger.level).to eq(::Logger::Severity::ERROR)
+        end
+
+        it "sets the Net::IMAP debug flag" do
+          expect(Net::IMAP.debug).to be_a(FalseClass)
+        end
+      end
+    end
+  end
+end

data/spec/unit/imap/backup/{configuration → setup}/account_spec.rb

@@ -1,10 +1,10 @@
-describe Imap::Backup::Configuration::Account do
+describe Imap::Backup::Setup::Account do
   ACCOUNT = "account".freeze
   GMAIL_IMAP_SERVER = "imap.gmail.com".freeze
   HIGHLINE = "highline".freeze
-  STORE = "store".freeze
+  CONFIG = "config".freeze
 
-  subject { described_class.new(store, account, highline) }
+  subject { described_class.new(config, account, highline) }
 
   let(:account) do
     instance_double(
@@ -14,7 +14,8 @@ describe Imap::Backup::Configuration::Account do
       server: current_server,
       connection_options: nil,
       local_path: "/backup/path",
-      folders: [{name: "my_folder"}]
+      folders: [{name: "my_folder"}],
+      modified?: false
     )
   end
   let(:account1) do
@@ -33,10 +34,10 @@ describe Imap::Backup::Configuration::Account do
   let(:other_existing_path) { "/other/existing/path" }
 
   let(:highline) { HIGHLINE }
-  let(:store) { STORE }
+  let(:config) { CONFIG }
 
   describe "#initialize" do
-    [:store, :account, :highline].each do |param|
+    [:config, :account, :highline].each do |param|
       it "expects #{param}" do
         expect(subject.send(param)).to eq(send(param))
       end
@@ -65,8 +66,8 @@ describe Imap::Backup::Configuration::Account do
 
     let(:highline) { instance_double(HighLine) }
     let(:menu) { highline_menu_class.new }
-    let(:store) do
-      instance_double(Imap::Backup::Configuration::Store, accounts: accounts)
+    let(:config) do
+      instance_double(Imap::Backup::Configuration, accounts: accounts)
     end
 
     before do
@@ -103,7 +104,7 @@ describe Imap::Backup::Configuration::Account do
         "choose backup folders",
         "test connection",
         "delete",
-        "return to main menu",
+        "(q) return to main menu",
         "quit" # TODO: quit is hidden
       ].each do |item|
         before { subject.run }
@@ -116,11 +117,11 @@ describe Imap::Backup::Configuration::Account do
 
     describe "account details" do
       [
-        ["email", /email:\s+user@example.com/],
-        ["server", /server:\s+imap.example.com/],
-        ["password", /password:\s+x+/],
-        ["path", %r(path:\s+/backup/path)],
-        ["folders", /folders:\s+my_folder/]
+        ["email", /email\s+user@example.com/],
+        ["password", /password\s+x+/],
+        ["path", %r(path\s+/backup/path)],
+        ["folders", /folders\s+my_folder/],
+        ["server", /server\s+imap.example.com/]
       ].each do |attribute, value|
         before { subject.run }
 
@@ -135,7 +136,7 @@ describe Imap::Backup::Configuration::Account do
         before { subject.run }
 
         it "indicates that a password is not set" do
-          expect(menu.header).to include("password: (unset)")
+          expect(menu.header).to include("password   (unset)")
         end
       end
     end
@@ -144,7 +145,7 @@ describe Imap::Backup::Configuration::Account do
       before do
         allow(account).to receive(:"username=")
         allow(account).to receive(:"server=")
-        allow(Imap::Backup::Configuration::Asker).
+        allow(Imap::Backup::Setup::Asker).
           to receive(:email) { new_email }
         subject.run
         menu.choices["modify email"].call
@@ -218,7 +219,7 @@ describe Imap::Backup::Configuration::Account do
 
       before do
         allow(account).to receive(:"password=")
-        allow(Imap::Backup::Configuration::Asker).
+        allow(Imap::Backup::Setup::Asker).
           to receive(:password) { new_password }
         subject.run
         menu.choices["modify password"].call
@@ -263,7 +264,7 @@ describe Imap::Backup::Configuration::Account do
         allow(account).to receive(:"local_path=")
         @validator = nil
         allow(
-          Imap::Backup::Configuration::Asker
+          Imap::Backup::Setup::Asker
         ).to receive(:backup_path) do |_path, validator|
           @validator = validator
           new_backup_path
@@ -295,11 +296,11 @@ describe Imap::Backup::Configuration::Account do
 
     describe "choosing 'choose backup folders'" do
       let(:chooser) do
-        instance_double(Imap::Backup::Configuration::FolderChooser, run: nil)
+        instance_double(Imap::Backup::Setup::FolderChooser, run: nil)
       end
 
       before do
-        allow(Imap::Backup::Configuration::FolderChooser).
+        allow(Imap::Backup::Setup::FolderChooser).
           to receive(:new) { chooser }
         subject.run
         menu.choices["choose backup folders"].call
@@ -311,17 +312,23 @@ describe Imap::Backup::Configuration::Account do
     end
 
     describe "choosing 'test connection'" do
+      let(:connection_tester) do
+        instance_double(
+          Imap::Backup::Setup::ConnectionTester,
+          test: "All fine"
+        )
+      end
+
       before do
-        allow(Imap::Backup::Configuration::ConnectionTester).
-          to receive(:test) { "All fine" }
+        allow(Imap::Backup::Setup::ConnectionTester).
+          to receive(:new) { connection_tester }
         allow(highline).to receive(:ask)
         subject.run
         menu.choices["test connection"].call
       end
 
       it "tests the connection" do
-        expect(Imap::Backup::Configuration::ConnectionTester).
-          to have_received(:test).with(account)
+        expect(connection_tester).to have_received(:test)
       end
     end
 

data/spec/unit/imap/backup/{configuration → setup}/asker_spec.rb

@@ -1,5 +1,5 @@
 module Imap::Backup
-  describe Configuration::Asker do
+  describe Setup::Asker do
     subject { described_class.new(highline) }
 
     let(:highline) { double }
@@ -16,7 +16,7 @@ module Imap::Backup
     let(:answer) { "foo" }
 
     before do
-      allow(Configuration::Setup).to receive(:highline) { highline }
+      allow(Setup).to receive(:highline) { highline }
       allow(highline).to receive(:ask) do |&b|
         b.call query
         answer

data/spec/unit/imap/backup/{configuration → setup}/connection_tester_spec.rb

@@ -1,5 +1,7 @@
-describe Imap::Backup::Configuration::ConnectionTester do
-  describe ".test" do
+describe Imap::Backup::Setup::ConnectionTester do
+  describe "#test" do
+    subject { described_class.new("foo") }
+
     let(:connection) do
       instance_double(Imap::Backup::Account::Connection, client: nil)
     end
@@ -8,17 +10,15 @@ describe Imap::Backup::Configuration::ConnectionTester do
       allow(Imap::Backup::Account::Connection).to receive(:new) { connection }
     end
 
-    describe "call" do
-      it "tries to connect" do
-        expect(connection).to receive(:client)
+    it "tries to connect" do
+      expect(connection).to receive(:client)
 
-        subject.test("foo")
-      end
+      subject.test
     end
 
     describe "success" do
       it "returns success" do
-        expect(subject.test("foo")).to match(/successful/)
+        expect(subject.test).to match(/successful/)
       end
     end
 
@@ -35,7 +35,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
         end
 
         it "returns error" do
-          expect(subject.test("foo")).to match(/no response/i)
+          expect(subject.test).to match(/no response/i)
         end
       end
 
@@ -43,7 +43,7 @@ describe Imap::Backup::Configuration::ConnectionTester do
         let(:error) { "Error" }
 
         it "returns error" do
-          expect(subject.test("foo")).to match(/unexpected error/i)
+          expect(subject.test).to match(/unexpected error/i)
         end
       end
     end

data/spec/unit/imap/backup/{configuration → setup}/folder_chooser_spec.rb

@@ -1,4 +1,4 @@
-describe Imap::Backup::Configuration::FolderChooser do
+describe Imap::Backup::Setup::FolderChooser do
   include HighLineTestHelpers
 
   describe "#run" do
@@ -6,7 +6,7 @@ describe Imap::Backup::Configuration::FolderChooser do
 
     let(:connection) do
       instance_double(
-        Imap::Backup::Account::Connection, folders: connection_folders
+        Imap::Backup::Account::Connection, folder_names: connection_folders
       )
     end
     let(:account) do
@@ -25,7 +25,7 @@ describe Imap::Backup::Configuration::FolderChooser do
     before do
       allow(Imap::Backup::Account::Connection).to receive(:new) { connection }
       allow(Kernel).to receive(:system)
-      allow(Imap::Backup.logger).to receive(:warn)
+      allow(Imap::Backup::Logger.logger).to receive(:warn)
     end
 
     describe "display" do
@@ -108,12 +108,12 @@ describe Imap::Backup::Configuration::FolderChooser do
       let(:connection_folders) { nil }
 
       before do
-        allow(Imap::Backup::Configuration::Setup.highline).
+        allow(Imap::Backup::Setup.highline).
           to receive(:ask) { "q" }
       end
 
       it "asks to press a key" do
-        expect(Imap::Backup::Configuration::Setup.highline).
+        expect(Imap::Backup::Setup.highline).
           to receive(:ask).with("Press a key ")
 
         subject.run
@@ -124,19 +124,19 @@ describe Imap::Backup::Configuration::FolderChooser do
       before do
         allow(Imap::Backup::Account::Connection).
           to receive(:new).with(account).and_raise("error")
-        allow(Imap::Backup::Configuration::Setup.highline).
+        allow(Imap::Backup::Setup.highline).
           to receive(:ask) { "q" }
       end
 
       it "prints an error message" do
-        expect(Imap::Backup.logger).
+        expect(Imap::Backup::Logger.logger).
           to receive(:warn).with("Connection failed")
 
         subject.run
       end
 
       it "asks to continue" do
-        expect(Imap::Backup::Configuration::Setup.highline).
+        expect(Imap::Backup::Setup.highline).
           to receive(:ask).with("Press a key ")
 
         subject.run

data/spec/unit/imap/backup/{configuration/setup_spec.rb → setup_spec.rb}

@@ -1,4 +1,4 @@
-describe Imap::Backup::Configuration::Setup do
+describe Imap::Backup::Setup do
   include HighLineTestHelpers
 
   subject { described_class.new }
@@ -30,17 +30,17 @@ describe Imap::Backup::Configuration::Setup do
   let(:accounts) { [normal_account] }
   let(:store) do
     instance_double(
-      Imap::Backup::Configuration::Store,
+      Imap::Backup::Configuration,
       "accounts": accounts,
       "path": "/base/path",
       "save": nil,
       "debug?": debug,
       "debug=": nil,
-      "modified?": modified
+      "modified?": config_modified
     )
   end
   let(:debug) { false }
-  let(:modified) { false }
+  let(:config_modified) { false }
   let!(:highline_streams) { prepare_highline }
   let(:input) { highline_streams[0] }
   let(:output) { highline_streams[1] }
@@ -56,31 +56,42 @@ describe Imap::Backup::Configuration::Setup do
 
   describe "#run" do
     before do
-      allow(Imap::Backup::Configuration::Store).to receive(:new) { store }
-      allow(Imap::Backup).to receive(:setup_logging)
+      allow(Imap::Backup::Configuration).to receive(:new) { store }
+      allow(Imap::Backup::Logger).to receive(:setup_logging)
       allow(input).to receive(:eof?) { false }
-      allow(input).to receive(:gets) { "exit\n" }
+      allow(input).to receive(:gets) { "q\n" }
       allow(Kernel).to receive(:system)
     end
 
     describe "main menu" do
-      before { subject.run }
+      context "when changes have not been made" do
+        before { subject.run }
 
-      ["add account", "save and exit", "exit without saving"].each do |choice|
-        it "includes #{choice}" do
-          expect(output.string).to include(choice)
+        ["add account", "quit"].each do |choice|
+          it "includes #{choice}" do
+            expect(output.string).to include(choice)
+          end
         end
       end
-    end
 
-    it "clears the screen" do
-      expect(Kernel).to receive(:system).with("clear")
+      context "when changes have been made" do
+        let(:config_modified) { true }
 
-      subject.run
+        before do
+          allow(input).to receive(:gets) { "exit\n" }
+          subject.run
+        end
+
+        ["save and exit", "exit without saving"].each do |choice|
+          it "includes '#{choice}'" do
+            expect(output.string).to include(choice)
+          end
+        end
+      end
     end
 
-    it "updates logging status" do
-      expect(Imap::Backup).to receive(:setup_logging)
+    it "clears the screen" do
+      expect(Kernel).to receive(:system).with("clear")
 
       subject.run
     end
@@ -111,14 +122,15 @@ describe Imap::Backup::Configuration::Setup do
 
     context "when editing accounts" do
       let(:account) do
-        instance_double(Imap::Backup::Configuration::Account, run: nil)
+        instance_double(Imap::Backup::Setup::Account, run: nil)
       end
+      let(:config_modified) { true }
 
       before do
         allow(input).to receive(:gets).and_return("1\n", "exit\n")
-        allow(Imap::Backup::Configuration::Asker).to receive(:email).
+        allow(Imap::Backup::Setup::Asker).to receive(:email).
           with(no_args) { "new@example.com" }
-        allow(Imap::Backup::Configuration::Account).to receive(:new).
+        allow(Imap::Backup::Setup::Account).to receive(:new).
           with(store, normal_account, anything) { account }
       end
 
@@ -139,16 +151,17 @@ describe Imap::Backup::Configuration::Setup do
         }
       end
       let(:account) do
-        instance_double(Imap::Backup::Configuration::Account, run: nil)
+        instance_double(Imap::Backup::Setup::Account, run: nil)
       end
+      let(:config_modified) { true }
       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).
+        allow(Imap::Backup::Setup::Asker).to receive(:email).
           with(no_args) { added_email }
-        allow(Imap::Backup::Configuration::Account).to receive(:new).
+        allow(Imap::Backup::Setup::Account).to receive(:new).
           with(store, anything, anything) { account }
 
         subject.run
@@ -186,6 +199,8 @@ describe Imap::Backup::Configuration::Setup do
 
     describe "logging" do
       context "when debug logging is disabled" do
+        let(:config_modified) { true }
+
         before do
           allow(input).to receive(:gets).and_return("start\n", "exit\n")
         end
@@ -204,7 +219,7 @@ describe Imap::Backup::Configuration::Setup do
           end
 
           it "updates logging status" do
-            expect(Imap::Backup).to receive(:setup_logging).twice
+            expect(Imap::Backup::Logger).to receive(:setup_logging)
 
             subject.run
           end
@@ -213,6 +228,7 @@ describe Imap::Backup::Configuration::Setup do
 
       context "when debug logging is enabled" do
         let(:debug) { true }
+        let(:config_modified) { true }
 
         before do
           allow(input).to receive(:gets).and_return("stop\n", "exit\n")
@@ -236,7 +252,7 @@ describe Imap::Backup::Configuration::Setup do
           end
 
           it "updates logging status" do
-            expect(Imap::Backup).to receive(:setup_logging).twice
+            expect(Imap::Backup::Logger).to receive(:setup_logging)
 
             subject.run
           end
@@ -245,6 +261,8 @@ describe Imap::Backup::Configuration::Setup do
     end
 
     context "when 'save' is selected" do
+      let(:config_modified) { true }
+
       before do
         allow(input).to receive(:gets) { "save\n" }
       end
@@ -262,6 +280,8 @@ describe Imap::Backup::Configuration::Setup do
     end
 
     context "when 'exit without saving' is selected" do
+      let(:config_modified) { true }
+
       before do
         allow(input).to receive(:gets) { "exit\n" }
       end
@@ -271,22 +291,10 @@ describe Imap::Backup::Configuration::Setup do
         subject.run
       end
 
-      context "when the configuration is modified" do
-        let(:modified) { true }
+      it "doesn't save the configuration" do
+        expect(store).to_not receive(:save)
 
-        it "doesn't save the configuration" do
-          expect(store).to_not receive(:save)
-
-          subject.run
-        end
-      end
-
-      context "when the configuration isn't modified" do
-        it "doesn't save the configuration" do
-          expect(store).to_not receive(:save)
-
-          subject.run
-        end
+        subject.run
       end
     end
   end