imap-backup 2.0.0 → 2.2.2

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

@@ -1,10 +1,10 @@
-require "spec_helper"
-
 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(
@@ -13,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

@@ -1,19 +1,18 @@
-require "spec_helper"
-
 describe Imap::Backup::Utils do
   let(:filename) { "foobar" }
-  let(:stat) { double("File::Stat", mode: mode) }
+  let(:stat) { instance_double(File::Stat, mode: mode) }
   let(:mode) { 0o777 }
   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
 
-  context ".check_permissions" do
+  describe ".check_permissions" do
     let(:requested) { 0o345 }
 
+    # rubocop:disable RSpec/EmptyExampleGroup
     context "with existing files" do
       [
         [0o100, "less than the limit", true],
@@ -38,6 +37,7 @@ describe Imap::Backup::Utils do
         end
       end
     end
+    # rubocop:enable RSpec/EmptyExampleGroup
 
     context "with non-existent files" do
       let(:exists) { false }
@@ -49,7 +49,7 @@ describe Imap::Backup::Utils do
     end
   end
 
-  context ".mode" do
+  describe ".mode" do
     context "with existing files" do
       let(:mode) { 0o2345 }
 
@@ -67,29 +67,28 @@ describe Imap::Backup::Utils do
     end
   end
 
-  context ".make_folder" do
+  describe ".make_folder" do
     before do
       allow(FileUtils).to receive(:mkdir_p)
       allow(FileUtils).to receive(:chmod)
     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

data/spec/unit/imap/backup_spec.rb

@@ -0,0 +1,28 @@
+require "ostruct"
+require "imap/backup"
+
+describe Imap::Backup do
+  describe ".setup_logging" do
+    let!(:previous) { described_class.logger.level }
+
+    before { described_class.setup_logging(config) }
+
+    after { described_class.logger.level = previous }
+
+    context "when config.debug?" do
+      let(:config) { OpenStruct.new(debug?: true) }
+
+      it "sets logger level to debug" do
+        expect(described_class.logger.level).to eq(::Logger::Severity::DEBUG)
+      end
+    end
+
+    context "when not config.debug?" do
+      let(:config) { OpenStruct.new(debug?: false) }
+
+      it "sets logger level to debug" do
+        expect(described_class.logger.level).to eq(::Logger::Severity::ERROR)
+      end
+    end
+  end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -134,6 +134,7 @@ files:
 - ".rspec"
 - ".rspec-all"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -158,6 +159,7 @@ files:
 - lib/imap/backup/downloader.rb
 - lib/imap/backup/serializer.rb
 - lib/imap/backup/serializer/mbox.rb
+- lib/imap/backup/serializer/mbox_enumerator.rb
 - lib/imap/backup/serializer/mbox_store.rb
 - lib/imap/backup/uploader.rb
 - lib/imap/backup/utils.rb
@@ -188,10 +190,12 @@ files:
 - spec/unit/imap/backup/configuration/setup_spec.rb
 - spec/unit/imap/backup/configuration/store_spec.rb
 - spec/unit/imap/backup/downloader_spec.rb
+- spec/unit/imap/backup/serializer/mbox_enumerator_spec.rb
 - spec/unit/imap/backup/serializer/mbox_spec.rb
 - spec/unit/imap/backup/serializer/mbox_store_spec.rb
 - spec/unit/imap/backup/uploader_spec.rb
 - spec/unit/imap/backup/utils_spec.rb
+- spec/unit/imap/backup_spec.rb
 - tmp/.gitkeep
 homepage: https://github.com/joeyates/imap-backup
 licenses: []
@@ -208,14 +212,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.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
@@ -246,7 +250,9 @@ test_files:
 - spec/unit/imap/backup/configuration/setup_spec.rb
 - spec/unit/imap/backup/configuration/store_spec.rb
 - spec/unit/imap/backup/downloader_spec.rb
+- spec/unit/imap/backup/serializer/mbox_enumerator_spec.rb
 - spec/unit/imap/backup/serializer/mbox_spec.rb
 - spec/unit/imap/backup/serializer/mbox_store_spec.rb
 - spec/unit/imap/backup/uploader_spec.rb
 - spec/unit/imap/backup/utils_spec.rb
+- spec/unit/imap/backup_spec.rb