imap-backup 9.0.2 → 9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2482ddc0519b2eb1b1160cee2aae34befdb8faa4acf9de2127be214bac3907f
-  data.tar.gz: 2ed7b7b25497ee53cdfd1735628401076defaee63829aa9bfabd5fc483e69a28
+  metadata.gz: f5cf8072ca8c7a95ca74edc961352099b468a287e846c71c0243d5c2fc285e17
+  data.tar.gz: 8b66b63ed93044a9fe019ce5af838f165589a9f7b1eebe0751cc804891dacab2
 SHA512:
-  metadata.gz: a7a6790a9354d9c06eedb72b2a6bf1960ed691a53c95b4a11c0ce50359ca397e0929240b2eafc93365610f43588c190515367462c4cde3ccf58242d5afd31622
-  data.tar.gz: 6270491bbc12302365de92b666b438b3638baa67d162f01e0b825deef73544f349919b779d6f4ea3db4dc3e570b3d27ede88e108667745b811596c9214fd205f
+  metadata.gz: 79a410fe6b307969a27cafed38cd145951016c86c45f62033b91dd6b9df289993f4e134c42bd6ddabbb8b4a523534fdad18ea4b71cd40aa6656375c750c4aaf6
+  data.tar.gz: baf5eb4583afe8263f54cede96ad308f1b0ce507987b10adfba337eb899ecc456f22c9895cb18805a87ef486ba3712f150af17ca21beed5160081b3eb4c07ffe

data/lib/imap/backup/cli/backup.rb

@@ -15,6 +15,12 @@ module Imap::Backup
         config = load_config(**options)
         each_connection(config, emails) do |connection|
           connection.run_backup(refresh: refresh)
+        rescue StandardError => e
+          message =
+            "Backup for account '#{connection.account.username}' " \
+            "failed with error #{e}"
+          Logger.logger.warn message
+          next
         end
       end
 

data/lib/imap/backup/cli.rb

@@ -54,8 +54,8 @@ module Imap::Backup
       aliases: ["-r"]
     )
     def backup
-      Imap::Backup::Logger.setup_logging options
-      Backup.new(options).run
+      non_logging_options = Imap::Backup::Logger.setup_logging(options)
+      Backup.new(non_logging_options).run
     end
 
     desc "local SUBCOMMAND [OPTIONS]", "View local info"
@@ -111,8 +111,8 @@ module Imap::Backup
       aliases: ["-s"]
     )
     def migrate(source_email, destination_email)
-      Imap::Backup::Logger.setup_logging options
-      Migrate.new(source_email, destination_email, **options).run
+      non_logging_options = Imap::Backup::Logger.setup_logging(options)
+      Migrate.new(source_email, destination_email, **non_logging_options).run
     end
 
     desc(
@@ -161,8 +161,8 @@ module Imap::Backup
       aliases: ["-s"]
     )
     def mirror(source_email, destination_email)
-      Imap::Backup::Logger.setup_logging options
-      Mirror.new(source_email, destination_email, **options).run
+      non_logging_options = Imap::Backup::Logger.setup_logging(options)
+      Mirror.new(source_email, destination_email, **non_logging_options).run
     end
 
     desc "remote SUBCOMMAND [OPTIONS]", "View info about online accounts"
@@ -178,8 +178,8 @@ module Imap::Backup
     quiet_option
     verbose_option
     def restore(email = nil)
-      Imap::Backup::Logger.setup_logging options
-      Restore.new(email, options).run
+      non_logging_options = Imap::Backup::Logger.setup_logging(options)
+      Restore.new(email, non_logging_options).run
     end
 
     desc "setup", "Configure imap-backup"
@@ -191,8 +191,8 @@ module Imap::Backup
     quiet_option
     verbose_option
     def setup
-      Imap::Backup::Logger.setup_logging options
-      Setup.new(options).run
+      non_logging_options = Imap::Backup::Logger.setup_logging(options)
+      Setup.new(non_logging_options).run
     end
 
     desc "stats EMAIL [OPTIONS]", "Print stats for each account folder"
@@ -206,8 +206,8 @@ module Imap::Backup
     quiet_option
     verbose_option
     def stats(email)
-      Imap::Backup::Logger.setup_logging options
-      Stats.new(email, options).run
+      non_logging_options = Imap::Backup::Logger.setup_logging(options)
+      Stats.new(email, non_logging_options).run
     end
 
     desc "utils SUBCOMMAND [OPTIONS]", "Various utilities"

data/lib/imap/backup/logger.rb

@@ -13,11 +13,14 @@ module Imap::Backup
     end
 
     def self.setup_logging(options = {})
+      copy = options.clone
+      quiet = copy.delete(:quiet)
+      verbose = copy.delete(:verbose)
       level =
         case
-        when options[:quiet]
+        when quiet
           ::Logger::Severity::UNKNOWN
-        when options[:verbose]
+        when verbose
           ::Logger::Severity::DEBUG
         else
           ::Logger::Severity::INFO
@@ -25,6 +28,8 @@ module Imap::Backup
       logger.level = level
       debug = level == ::Logger::Severity::DEBUG
       Net::IMAP.debug = debug
+
+      copy
     end
 
     def self.sanitize_stderr

data/lib/imap/backup/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.1.1
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -217,11 +217,8 @@ files:
 - LICENSE
 - README.md
 - bin/imap-backup
-- docs/configuration.md
 - docs/delimiters-and-prefixes.md
 - docs/development.md
-- docs/restore.md
-- docs/setup.md
 - imap-backup.gemspec
 - lib/cli_coverage.rb
 - lib/email/mboxrd/message.rb

data/docs/configuration.md

@@ -1,25 +0,0 @@
-Configuration is stored in a JSON file.
-
-The format is documented [here](files/config.md).
-
-# Folders
-
-By default, all folders are backed-up. You can override this by choosing
-specific folders.
-
-# Connection options
-
-You can override the parameters passed to `Net::IMAP` with `connection_options`.
-
-See the Ruby Standard Library documentation for `Net::IMAP` of details of [supported parameters](https://ruby-doc.org/stdlib-3.1.2/libdoc/net-imap/rdoc/Net/IMAP.html#method-c-new).
-
-Specifically, if you are using a self-signed certificate and get SSL errors, e.g.
-`certificate verify failed`, you can choose to not verify the TLS connection.
-
-Connection options can be entered via `imap-backup setup` as JSON.
-
-Choose the account, then 'modify connection options'.
-
-For example:
-
-![Entering connection options as JSON](./images/entering-connection-options-as-json.png "Entering connection options as JSON")

data/docs/restore.md

@@ -1,28 +0,0 @@
-# FAQ
-
-# How does restore work?
-
-Backed-up emails are pushed to the IMAP server.
-If there are clashes, folders are renamed.
-
-# What are all these 'INBOX.12345' files?
-
-If, when the backup is launched, the IMAP server contains a folder with
-the same name, but different history to the local backup, the local
-emails cannot simply be added to the existing folder.
-
-In this case, a numeric suffix is added to the **local** folder,
-before it is restored.
-
-In this way, old and new emails are kept separate.
-
-# Will my email get overwritten?
-
-No.
-
-Emails are identified by folder and a specific email id. Any email that
-is already on the server is skipped.
-
-## How do I restore to a different service?
-
-It is best to use the `migrate` command in this case.

data/docs/setup.md

@@ -1,5 +0,0 @@
-# HOWTOs
-
-## Set the server for a Google Apps account
-
-Use `imap.gmail.com` as the 'server' setting.