imap-backup 9.0.0 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3daac577a7328b73a4593e677826b2f168f7565487595a04b37504b863dccd46
-  data.tar.gz: 3290089c8c67f31d7dc7cfc53ca6c6d2dd20328727447b2164273409408d36d5
+  metadata.gz: b2482ddc0519b2eb1b1160cee2aae34befdb8faa4acf9de2127be214bac3907f
+  data.tar.gz: 2ed7b7b25497ee53cdfd1735628401076defaee63829aa9bfabd5fc483e69a28
 SHA512:
-  metadata.gz: df10381df343a5c4c08d8fa39310a6593b6383608926d360202feb92652bc2ad42bbeffc306789e6f4761bc06405cb2b8d51efe76e65cfc5a9507d397d36e2ae
-  data.tar.gz: 05a4d8b9941622fc56f68e952f71b38383a9593fe6abedb64d6c4b1a5670eee0ca2c40a27cc14a7d05d298638e3c242f056b3a8b68288a61dafae8449f51e36b
+  metadata.gz: a7a6790a9354d9c06eedb72b2a6bf1960ed691a53c95b4a11c0ce50359ca397e0929240b2eafc93365610f43588c190515367462c4cde3ccf58242d5afd31622
+  data.tar.gz: 6270491bbc12302365de92b666b438b3638baa67d162f01e0b825deef73544f349919b779d6f4ea3db4dc3e570b3d27ede88e108667745b811596c9214fd205f

data/docs/development.md

@@ -64,7 +64,7 @@ fetch_data_items = imap.uid_fetch(uids, ["BODY[]"])
 # Older Ruby Versions
 
 Dockerfiles are available for all the supported Ruby versions,
-see the `docker` directory.
+see the `container` directory.
 
 # Contributing
 

data/lib/imap/backup/account/connection/backup_folders.rb

@@ -14,24 +14,24 @@ module Imap::Backup
     def run
       all_names = Account::Connection::FolderNames.new(client: client, account: account).run
 
-      names =
-        if account.folders&.any?
+      configured =
+        case
+        when account.folders&.any?
           account.folders.map { |af| af[:name] }
+        when account.folder_blacklist
+          []
         else
           all_names
         end
 
-      all_names.map do |name|
-        backup =
-          if account.folder_blacklist
-            !names.include?(name)
-          else
-            names.include?(name)
-          end
-        next if !backup
+      names =
+        if account.folder_blacklist
+          all_names - configured
+        else
+          all_names & configured
+        end
 
-        Account::Folder.new(account.connection, name)
-      end.compact
+      names.map { |name| Account::Folder.new(account.connection, name) }
     end
   end
 end

data/lib/imap/backup/cli.rb

@@ -75,14 +75,7 @@ module Imap::Backup
       When one or other account uses a delimiter other than `/` (i.e. `.`),
       use the `--source-delimiter=` and/or `--destination-delimiter=` options.
 
-      Usually, you should migrate to an account with empty folders.
-
-      Before migrating each folder, `imap-backup` checks if the destination
-      folder is empty.
-
-      If it finds a non-empty destination folder, it halts with an error.
-
-      If you are sure that these destination emails can be deleted,
+      If you you want to delete existing emails in destination folders,
       use the `--reset` option. In this case, all existing emails are
       deleted before uploading the migrated emails.
     DESC

data/lib/imap/backup/migrator.rb

@@ -13,7 +13,7 @@ module Imap::Backup
     def run
       count = serializer.uids.count
       folder.create
-      ensure_destination_empty!
+      folder.clear if reset
 
       Logger.logger.debug "[#{folder.name}] #{count} to migrate"
       serializer.each_message(serializer.uids).with_index do |message, i|
@@ -31,25 +31,5 @@ module Imap::Backup
         end
       end
     end
-
-    private
-
-    def ensure_destination_empty!
-      if reset
-        folder.clear
-      else
-        fail_if_destination_not_empty!
-      end
-    end
-
-    def fail_if_destination_not_empty!
-      return if folder.uids.empty?
-
-      raise <<~ERROR
-        The destination folder '#{folder.name}' is not empty.
-        Pass the --reset flag if you want to clear existing emails from destination
-        folders before uploading.
-      ERROR
-    end
   end
 end

data/lib/imap/backup/mirror/map.rb

@@ -33,14 +33,24 @@ module Imap::Backup
     end
 
     def source_uid(destination_uid)
+      if destination_store == {}
+        raise "Assign UID validities with #reset before calling #source_uid"
+      end
+
       map.key(destination_uid)
     end
 
     def destination_uid(source_uid)
+      if destination_store == {}
+        raise "Assign UID validities with #reset before calling #destination_uid"
+      end
+
       map[source_uid]
     end
 
     def map_uids(source:, destination:)
+      raise "Assign UID validities with #reset before calling #map_uids" if destination_store == {}
+
       map[source] = destination
     end
 

data/lib/imap/backup/version.rb

@@ -3,7 +3,7 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 9
   MINOR    = 0
-  REVISION = 0
+  REVISION = 2
   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.0
+  version: 9.0.2
 platform: ruby
 authors:
 - Joe Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-29 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline