imap-backup 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59babb556b2f47a07590debff15dcd5456f1e61454c3aba2e504610ce4322647
-  data.tar.gz: 89909077444746e44fe3955070df6b590942da0d44da58c9b08b282e694000d5
+  metadata.gz: 164962561883b82372b32826843681c6a802e88982f4906778758a073e1479d8
+  data.tar.gz: 8a71ad18952f675f61bc6342a3a9a60c2fc71797444142c2af5f98ef18ac13e9
 SHA512:
-  metadata.gz: ea00bb55bb853cef73ec12171a4bdde9b0b5ef88a914065bbe307f48712db3329e8c8f1712cfa48b4a49102d20fb38cc465dc463c2d3ea9e0caba000a184766b
-  data.tar.gz: 24d368c209c11db4ae7f05a93b9cf4e0435b65eef0cffd7e58f8c669e634ca735aa3187b6a6506b7b10ba3bec961d3aa9d7387df40d4880f1bed73df7f24bbb9
+  metadata.gz: 600ff4b72954cecfb2037b9ef12b16029248a6c6e27b2b801661b5c746264a8aed7a99aa689cbeecc8e89f571b9f4c26350669e582bc087a518981bceb677141
+  data.tar.gz: b706026f0b8231f10dfbb0a0c39162ccdf6a8671c513b6cbf637352dcd8d99987a3f93d2b523db7f4a8e3ff7178877dc3d84c1ad506245a9773330abea2a792f

data/README.md

@@ -1,7 +1,3 @@
-[![Build Status](https://circleci.com/gh/joeyates/imap-backup.svg?style=svg)][Continuous Integration]
-[![Source Analysis](https://codeclimate.com/github/joeyates/imap-backup/badges/gpa.svg)](https://codeclimate.com/github/joeyates/imap-backup)
-[![Test Coverage](https://codeclimate.com/github/joeyates/imap-backup/badges/coverage.svg)](https://codeclimate.com/github/joeyates/imap-backup/coverage)
-
 # imap-backup
 
 *Backup GMail (or other IMAP) accounts to disk*
@@ -9,12 +5,10 @@
   * [Source Code]
   * [API documentation]
   * [Rubygem]
-  * [Continuous Integration]
 
 [Source Code]: https://github.com/joeyates/imap-backup "Source code at GitHub"
 [API documentation]: http://rubydoc.info/gems/imap-backup/frames "RDoc API Documentation at Rubydoc.info"
 [Rubygem]: http://rubygems.org/gems/imap-backup "Ruby gem at rubygems.org"
-[Continuous Integration]: https://circleci.com/gh/joeyates/imap-backup "Build status by CirceCI"
 
 # Installation
 

data/bin/imap-backup

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH.unshift(File.expand_path("../lib/", __dir__))
+
+require "cli_coverage"
+CliCoverage.conditionally_activate
+
 require "imap/backup/cli"
 require "imap/backup/logger"
 

data/imap-backup.gemspec

@@ -30,14 +30,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "thunderbird", ">= 0.0.0"
 
   gem.add_development_dependency "aruba", ">= 0.0.0"
-  gem.add_development_dependency "codeclimate-test-reporter", "~> 0.4.8"
-  if RUBY_ENGINE == "jruby"
-    gem.add_development_dependency "pry-debugger-jruby"
-  else
-    gem.add_development_dependency "pry-byebug"
-  end
+  gem.add_development_dependency "pry-byebug"
   gem.add_development_dependency "rspec", ">= 3.0.0"
-  gem.add_development_dependency "rspec_junit_formatter"
   gem.add_development_dependency "rubocop-rspec"
   gem.add_development_dependency "simplecov"
 end

data/lib/cli_coverage.rb

@@ -0,0 +1,18 @@
+class CliCoverage
+  def self.conditionally_activate
+    if ENV["COVERAGE"]
+      require "simplecov"
+
+      # Collect coverage separately
+      SimpleCov.command_name "#{ENV['COVERAGE']} coverage"
+
+      # Silence output
+      SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter
+      SimpleCov.print_error_status = false
+
+      # Ensure SimpleCov doesn't filter out all out code
+      project_root = File.expand_path("..", __dir__)
+      SimpleCov.root project_root
+    end
+  end
+end

data/lib/imap/backup/account/folder.rb

@@ -68,22 +68,6 @@ module Imap::Backup
       []
     end
 
-    def fetch(uid)
-      examine
-      fetch_data_items =
-        retry_on_error(errors: UID_FETCH_RETRY_CLASSES) do
-          client.uid_fetch([uid.to_i], [BODY_ATTRIBUTE])
-        end
-      return nil if fetch_data_items.nil?
-
-      fetch_data_item = fetch_data_items[0]
-      attributes = fetch_data_item.attr
-
-      attributes[BODY_ATTRIBUTE]
-    rescue FolderNotFound
-      nil
-    end
-
     def fetch_multi(uids)
       examine
       fetch_data_items =

data/lib/imap/backup/cli.rb

@@ -100,7 +100,7 @@ module Imap::Backup
       aliases: ["-s"]
     )
     def migrate(source_email, destination_email)
-      Migrate.new(source_email, destination_email, symbolized(options)).run
+      Migrate.new(source_email, destination_email, **symbolized(options)).run
     end
 
     desc "remote SUBCOMMAND [OPTIONS]", "View info about online accounts"

data/lib/imap/backup/serializer/mbox.rb

@@ -71,8 +71,8 @@ module Imap::Backup
       digit = 0
       new_name = nil
       loop do
-        extra = digit.zero? ? "" : ".#{digit}"
-        new_name = "#{folder}.#{store.uid_validity}#{extra}"
+        extra = digit.zero? ? "" : "-#{digit}"
+        new_name = "#{folder}-#{store.uid_validity}#{extra}"
         test_store = Serializer::MboxStore.new(path, new_name)
         break if !test_store.exist?
 

data/lib/imap/backup/version.rb

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

data/spec/features/backup_spec.rb

@@ -60,7 +60,7 @@ RSpec.describe "backup", type: :aruba, docker: true do
         connection.disconnect
         server_rename_folder folder, new_name
       end
-      let(:renamed_folder) { "#{folder}.#{original_folder_uid_validity}" }
+      let(:renamed_folder) { "#{folder}-#{original_folder_uid_validity}" }
 
       after do
         server_delete_folder new_name
@@ -83,7 +83,7 @@ RSpec.describe "backup", type: :aruba, docker: true do
         end
 
         it "moves the old backup to a uniquely named directory" do
-          renamed = "#{folder}.#{original_folder_uid_validity}.1"
+          renamed = "#{folder}-#{original_folder_uid_validity}-1"
           expect(mbox_content(renamed)).to eq(message_as_mbox_entry(msg3))
         end
       end

data/spec/features/restore_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe "restore", type: :aruba, docker: true do
       end
 
       context "when the folder has content" do
-        let(:new_folder) { "#{folder}.#{uid_validity}" }
+        let(:new_folder) { "#{folder}-#{uid_validity}" }
         let(:cleanup) do
           server_delete_folder new_folder
           super()

data/spec/features/support/aruba.rb

@@ -67,6 +67,10 @@ RSpec.configure do |config|
     FileUtils.rm_rf "./tmp/home"
   end
 
+  config.before(:example, type: :aruba) do
+    set_environment_variable("COVERAGE", "aruba")
+  end
+
   config.after do
     FileUtils.rm_rf "./tmp/home"
   end

data/spec/spec_helper.rb

@@ -1,17 +1,13 @@
-require "codeclimate-test-reporter"
 require "rspec"
 
-CodeClimate::TestReporter.start
-
 $LOAD_PATH << File.expand_path("../lib", __dir__)
 
 support_glob = File.join(__dir__, "support", "**", "*.rb")
 Dir[support_glob].sort.each { |f| require f }
 
 require "simplecov"
-SimpleCov.start do
-  add_filter "/spec/"
-end
+
+SimpleCov.command_name "RSpec tests"
 
 require "imap/backup"
 require "imap/backup/cli"

data/spec/unit/imap/backup/account/folder_spec.rb

@@ -66,24 +66,24 @@ describe Imap::Backup::Account::Folder do
     end
   end
 
-  describe "#fetch" do
+  describe "#fetch_multi" do
     let(:message_body) { instance_double(String, force_encoding: nil) }
-    let(:attributes) { {"BODY[]" => message_body, "other" => "xxx"} }
+    let(:attributes) { {"UID" => "uid", "BODY[]" => message_body, "other" => "xxx"} }
     let(:fetch_data_item) do
       instance_double(Net::IMAP::FetchData, attr: attributes)
     end
 
     before { allow(client).to receive(:uid_fetch) { [fetch_data_item] } }
 
-    it "returns the message" do
-      expect(subject.fetch(123)).to eq(message_body)
+    it "returns the uid and message" do
+      expect(subject.fetch_multi([123])).to eq([{uid: "uid", body: message_body}])
     end
 
     context "when the server responds with nothing" do
       before { allow(client).to receive(:uid_fetch) { nil } }
 
       it "is nil" do
-        expect(subject.fetch(123)).to be_nil
+        expect(subject.fetch_multi([123])).to be_nil
       end
     end
 
@@ -94,15 +94,7 @@ describe Imap::Backup::Account::Folder do
       end
 
       it "is nil" do
-        expect(subject.fetch(123)).to be_nil
-      end
-    end
-
-    context "when the response doesn't include 'BODY[]'" do
-      let(:attributes) { {} }
-
-      it "is nil" do
-        expect(subject.fetch(123)).to be_nil
+        expect(subject.fetch_multi([123])).to be_nil
       end
     end
 
@@ -113,13 +105,13 @@ describe Imap::Backup::Account::Folder do
       end
 
       it "retries" do
-        subject.fetch(123)
+        subject.fetch_multi([123])
 
         expect(client).to have_received(:uid_fetch).twice
       end
 
       it "succeeds" do
-        subject.fetch(123)
+        subject.fetch_multi([123])
       end
     end
   end

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

@@ -34,8 +34,8 @@ describe Imap::Backup::Downloader do
 
     context "with failed fetches" do
       specify "are skipped" do
-        allow(folder).to receive(:fetch).with("333") { nil }
-        expect(serializer).to_not receive(:save).with("333", anything)
+        allow(folder).to receive(:fetch_multi) { nil }
+        expect(serializer).to_not receive(:save)
 
         subject.run
       end

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

@@ -39,7 +39,7 @@ module Imap::Backup
           expect(described_class.logger.level).to eq(::Logger::Severity::ERROR)
         end
 
-        it "sets the Net::IMAP debug flag" do
+        it "doesn't set the Net::IMAP debug flag" do
           expect(Net::IMAP.debug).to be_a(FalseClass)
         end
       end

data/spec/unit/imap/backup/serializer/mbox_spec.rb

@@ -132,13 +132,13 @@ describe Imap::Backup::Serializer::Mbox do
 
       context "when adding the uid validity does not cause a name clash" do
         it "renames the store, adding the existing uid validity" do
-          expect(store).to receive(:rename).with("folder.bbb")
+          expect(store).to receive(:rename).with("folder-bbb")
 
           subject.apply_uid_validity("aaa")
         end
 
         it "returns the new name" do
-          expect(subject.apply_uid_validity("aaa")).to eq("folder.bbb")
+          expect(subject.apply_uid_validity("aaa")).to eq("folder-bbb")
         end
       end
 
@@ -146,13 +146,13 @@ describe Imap::Backup::Serializer::Mbox do
         let(:exists) { true }
 
         it "renames the store, adding the existing uid validity and a digit" do
-          expect(store).to receive(:rename).with("folder.bbb.1")
+          expect(store).to receive(:rename).with("folder-bbb-1")
 
           subject.apply_uid_validity("aaa")
         end
 
         it "returns the new name" do
-          expect(subject.apply_uid_validity("aaa")).to eq("folder.bbb.1")
+          expect(subject.apply_uid_validity("aaa")).to eq("folder-bbb-1")
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.0
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +136,6 @@ 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
@@ -207,6 +179,7 @@ files:
 - docs/restore.md
 - docs/setup.md
 - imap-backup.gemspec
+- lib/cli_coverage.rb
 - lib/email/mboxrd/message.rb
 - lib/email/provider.rb
 - lib/email/provider/apple_mail.rb